Allow more than one grid fields to be added to a form.

These changes allow more than one grid field to be added to a form.