Finally getting the grid correct