flipped random and map buttons, fixed null location bug