More fixes for success UI