Map Cosmetics

Swapped keys
Added label for map