[Refactor] Grid