Improved CatalogItem layout, as well as some admin layouts