Added timer, modified progressbar