moved things and also added the yes/no menu