Improve heatmap