refactore header layout w/Neat