Fix tooltip + enhancement

Adressed PR's comment

Fix CSS issue