Improved integration with Layout's ModelView and CatalogItem thumbnails