Gird Update

Fixes to the grid system.