Revised charts to use highcharts
refactored chart code