some changes on Popup