yet more grid tidying