Fix empty cell rendering.
Add cell states to grid.