Final changes to the No Location and Poor Location displays on the map. Cleanup of some outdated testing code.