Added more to User, fixed views.