More form edits