Fixing massive oversight re custom templates/layouts