More submenu toggle improvements