Harmonize the next and save buttons in upload form

Currently, there is a separate save button for each part of the form, as well as a button to go to the next step. It would probably be easier for users if there is a single button that saves and continues (or potentially another one that only saves), but at least not several save buttons on a single page.