Improve controller and view