Heatmap redesign and cleanup.