heatmap overlay with toggling is working
fixed merge conflicts