Added magic menu, needs submenu switches