Updated controller and view.