Refactoring Catalog page