Fix add and remove form fields, add DYNAMIC read in for form values