Restructured popup.