Added user model and view modifications