Updated layouts. Improved CatalogItemHelper