Major rejig of BarDiagram.class