Catalogue views refactoring. Removing duplicate code.