Fixing rendering issues for duplicate fields.
Everything but the nested ones now going into the fomr.