Moved some of the CMS templates handling into PageTemplates object