Better support for menus and submenus created by plugins