Remove legacy HTML from the base template
Merge pull request #1845 from darkwing/base-template-cleanup

Remove legacy HTML from the base template