more updates to the structure of the Batch Form