Changed the view and the controller a bit