added heatmaps and new layout