Tooltip fixes

Clean up some code around the tooltips, and move script enqueuing from enqueue styles to enqueue scripts