fixup style and topbar menu