New header layout and behavior