Update heatmap and viewer properly