Header bar.
Merge branch 'refactor'