swc-608: move cancel button into uploader, relocate upload/save buttons to the bottom
Merge pull request #452 from dburdick/swc-608

swc-608: move cancel button into uploader, relocate upload/save buttons ...