Continued work on header layout
Continued work on the header layout