Fixing header layout some more