Changed all the grid classes so that Map creates a proper grid.