Heatmap refactor

Refactored Heatmap widget