fix menu, one issue still present