FIX Improved readability of a few maps