More popup tweaks