Header redesign

Code cleanup and a work page.