Chart fix

10% changed to 40% in the energy monthly and annually section
Merge branch 'tb-savingschartfix'
Image commit
Merge branch 'rr-calculatorcleanup'
Fix for calculator link
Fix for data in bar graphs
Merge branch 'rr-calculatorcleanup'
Test auto commit / pull
Merge branch 'test-pull'