Popup modal modified