Re-added loading modal
Merge pull request #666 from jfarid27/master

Re-added loading modal