Hi,
I think the ergonomy can be a little improved with low cost. When you have finished, you click on Save. A pop-up appears and suggest you to review the changes. Another pop-up appears. Then you can click on "Return" and click on "Continue" to go to square one.
"Continue" and "Return" both mean ''Go back''. Why the first button is on the top of the pop-up and the second is on the bottom? I suggest to put the "Return" button on the top on the left. It's easy and it avoids mistakes.