Significant reworking for bootstrap and highcharts conversion
...