More grid tidying up