fix menu and submenu