Updated controller and views