completely refactor loading modal
Merge branch 'feature/loadingmodal'