Updated grids drawing logics