upload: re-ordering layout
camera: going to 'upload' on file sav
camera: removing button for img upload
camera: minor refactor