Further UI optimization including progress indicator