Made some changes to tooltip