Update form with small tweaks