Cleaned up buttons. fixes #107
Fixed Heatmap overlay