Enhance header layout