Corrected nesting issues in Grids.
Merge pull request #1453 from pjackson28/v3.0

Corrected nesting issues in Grids