Updated controller.
Updated controller and view.