added modal dialog
refactored uploader
fixed merge conflict
Merge pull request #322 from CalvinFernandez/refactor-uploader

Refactor uploader