Fixed several popup have issues + tooltip sticks