fix topbar issue