Popup window update

Update to the popup window, it now works correctly