Fix label and change ODB map colour
Merge branch 'enhancement-#87' into develop