Fix UserController
Fix user views