Corrected nesting issues in Grids.
Corrected nesting issues in Grids.
Merge branch 'v3.0'
Merge pull request #1454 from pjackson28/master

Fixed Grids issues