Final tweaks to header layout