Fixed several popup have issues + tooltip sticks
Merge pull request #1206 from nutan-gooru/dev-branch

Fixed several popup have issues + tooltip sticks