Popup related changes