Menus reworked (top bar); temporary solution, pending upstream fix