Merge progress bar w/ John's buttons

merged and deleted old main.js w/ just progress bar.