Fixing up maps

The maps have a consistent look and also work for the various flags
now.