Changed some style on tooltip
Merged Doug and Master branches
Merged again