Split header and nav

Header and nav should be independent in html5. Tried wrapping them both
in headwrap. Code is better, but the page doesn't look right… need to
keep good code but fix the way the page looks