Added CatalogPages class, Updated Search class