Updated user controller and views
Updated views