Cleanup tooltips and fix positioning