Changes to allow for grid within a grid