Updated views
Updated user model