Switch to 2D grids and blocks