Moved everything into template files and a progress bar view