changes to user model, and fixes for ux