tweaked user edit view
Merge branch 'master' into feature/authorization