Map and legend tweaks