Moved tooltips to text elements
Revert "Moved tooltips to text elements"

This reverts commit 41d04cb8a541f2ffe04940773b10dd002f71f647.