Start to move product grid to the new implementation