Improve formatting of USNG names on front page map
Merge remote-tracking branch 'origin/master'