More tweaks to the heatmap