fix menu issues