Reconfigured Grids to make use of new fields instead of flexforms