fix menu handling