Major refactor of tooltips handling.
Fix bugs after refactor