header-wrapper structure made cleaner