Changes to the controller and views