menu fixes, support submenus