reordered topbar fixed code