Refactored commands and fixed progress bar