Adressed PR's comment

Fix tooltip + enhancement