Refactor & enhancements
Progress bar fix