Improve heatmap example