Change cell demos to use grids