Minors popup improvements