refactors the progress view updating
Merge remote-tracking branch 'origin/master'