Attempting to fix CMS template issues.