fixed error in user model and updated layout