Added tooltips plus some code refactoring
Minor tooltip styles