popup improvements, still not working