update Form()._populateSubforms() to support new form layout