Improved how grids are displayed