Made submenus factorized