Refactor nav bar
Merge pull request #25 from girb0t/refactor_topbar

Refactor nav bar