Fixed up some stuff in MapMenu