Shorten chart legend keys cleanly
Merge branch 'feature/rework' into develop