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

...to the bottom