Fix display bug and add progressbar