edited the User Edit page
Merge branch 'user_edit_style' into development
Made some last minute changes to user edit view
Merge branch 'user_edit_style' into development