User controller and views changes