Revise Heatmap design