Self-submission: add 'Save and close' button to final screen