Popup is mini too. DRY. Some general tweaks.