More organization. Microscopic UI tweaks to popup.