Fix up success UI (fixes #1565)