Update form field types and rearrange form layout