* Fix header layout issues