fix menu management