Fix profile/settings form to not take full width and handle email field correctly as part of form