submenu issues fixed