Added enable/disable tooltip setting

And another round of fixes for unwanted tooltip popups