fix menu and spam issues