Small fixes to the grid after these last modifications