Bug fixes from Oct 2 USF meeting. Added new icons for heatmap.