edit_user page minor changes
solved merge conflicts