Fixing topbar buttons