Wrapped up highcharts and changed formatting