Refactoring - Added second progress bar - Fixed Progress bars