Change edit fields to use form items instead