Major improvements to the popup visuals