Move heatmap ElementDecorators to respective layers