rejigged the cell layout a bit