Fixes 86
Merge pull request #87 from bigspring/hotfix/86-header-fix

Fixes issues with the header and footer