Major progress on header layout