Formatting for legend values
Minor legend improvements
Merge branch 'feature/issue-137-legend-improvements' into develop