Initial pass at header design updates