Formatting and UI. Small changes to user model