Moved buttons to top nav bar and integrated heatmap settings. fixes #564
Added Annotations button to top header. fixes #566.
Merge pull request #572 from jfarid27/fix-issue-564

Fix issue 564