Cleaning up some of the refactor. Moved some methods internally
Reduced padding on tooltip