cleaned up topbar