Improving header layout