edited progress bar
fixed progress bar conflict