Added progress bar
Merge branch 'feature/tidyup-grid' into develop

* feature/tidyup-grid:
  Added progress bar