Adding user update screens.
Merging changes to add user edit screens.