more grid improvements
Use middle-class for the grid object because it's better
organize grid after refactor