use progress bar ui instead of loading template
Merge remote-tracking branch 'origin/master'