Improved UserController
Improved codes