Optimize charts (a bit) and upgrade highcharts