Cleaned up tooltips and improved overlays