Add grid, adjust spacing