Popup bubbles fixed