Popup improvements, leveling tweaks