Add popup. Clean up HTML.