Updated sorting, labelling and colour-coding of totals; updated charts in general