refactor(grid): moving to right grids