Remove hasMenuOptions (new compat library?)
Heatmap tweaks