Some basic fixes for header layout