Small tweaks to edit forms