Layout cleanup and Naming Convention adjustments (Changed all "Reset Password" naming to "Change Password" naming to more accurately represent the associated functionality)