fix menu and message