fixed issues related to topbar
streamlining