Refactoring catalogue views, controllers and routes