Feature/grid refactor