Fix it so that we have a more modualar grid.