Fixed submenu workings