Minor fixes

* Move'd (vs copy'd) files to upload directory.
* Fixed Cancel button on Fill Suggested upload page.