made changes for user edits and settings
Made changes for users, admins and user settings