Popup UI improvement, widget bugfix