Your proposed modifications sound good. You might have forgotten to edit your page to show your screenshots.
