Jump button resets after swimming

On the customized D Pad, swimming resets the swim buttons down to the bottom right and then after you adjust them and get out of the water it resets the jump button to the upper swim buttons size and location.