Topbar rearranged