Add close button to popup, popup now close with main window