Entire progress bar fix in one commit