Refine layout
Fix typo
Add fields to user model