Issue #130, edit the controller according to the right conventions and edit the view