Fixing a few things, including Highcharts which broke at some point

Highcharts was also moved out of the master template to the only place
where it's currently being used