Fixing header layout issues