Refactored top-bar to be more compact
Merge branch 'new_topbar_iteration'