Upgrading ChartJS to the latest version + minor layout updates