Further work on header layout issues.