Code review user controller and views
update 2