Corrected nesting issues in Grids