added sync changes to control.js
fixed merge conflicts
added progress bar functionality