Modified user controller and views.