COMMIT-2

Changes done after testing "Edit Profile"