Implemented changes on UI Popup