New edit user UI
Merge pull request #3176 from PaulAdamDavis/2422-edit-user-ui

New edit user UI