Tidying up the grid