A few popup tweaks