Added cell and grid classes