Improved ProgressBar
(cherry picked from commit d133a1dd9173732430f7e9794b2c707d5783ce7e)