Modified Users controller and views