Reverted change password and refactored settings page
Settings bugfix and refactoring