Organizing form elements for edit_profile page
 and cleaning out change_password_page