-Adding Account Settings
-Refactor code