Merge pull request #666 from jfarid27/master

Re-added loading modal
Fixes #667
Merge pull request #668 from lev-kuznetsov/master

Fixes #667