Change page template to promote good practice.
Merge pull request #2144 from michael-e/fix-page-template

Change page template to promote good practice. Closes #2141