fixed the progress bar and the time label. No null pointer exceptions
Merge branch 'branch-1'