Submenus now work with old context menu structure