Made colours consistent in map display
Merging update with map