Further export popup improvements