Fix problems with the grid