Changes to field ordering & buttons in 'User Settings'