Update default template layout, migrate header to site-wide
Wrapping up switching to site heading