Refactored header layout