A bunch of template work, in an attempt to fix CMS issues.