Another header layout tweak