Refactoring header bar.
Merge pull request #9 from ZOwl/develop

Refactoring header bar.