refactor; added cancel button; added loading text
merge
merge
Merge pull request #2 from tiffanyzhong/update

Update