Extend menu hiding to submenus, rearraneg setting submenus