refactored header, not sure what to do with body and footer
tidy
reduce duplication of html
Merge branch 'refactor-view'