Bug fixing on progress bar, cancel button added