fix heatmap
link to upgrade ring
fix warn issues, improve back button experience
tidy up