More reliable header layout