Updated user model and views