Cosmetic tweaks

Lots of cosmetic tweaks, mostly to the "Locations" section.