Remove lame template and add progress bar