Tweaked the base map display a little.
Restructured to deal with the new combined tiles.