Improved CMS templates