Added progress bar + changed Angular controller logic