Rework progress indicator to persist throughout the entire process.