Small fixes in grid
Small fixes in fields