Changes to controller and views