Adapt the heatmap charts label and improve the bars chart