FlightMap:  Added waypoint labels
GuidePoint: changed text from [*] to [#]