Layout refactoring of the header
First tabbed version