Fixed submenu issue