merge PRs
Add loading & modal