Pop up menu for click on map is actually PopUpMenu now. Minor refactoring.