Sorted out topbar structure