Moved add and update user to own screens