Improve colors and legends for map display; update label names