heatmap save work
merge
Tidy up heatmap transition from upload to display