Refactoring header bar to get a handle on grid breaking elements.