Popup Fix and enhance