templates: more form wizard tweaks

refs #13905