Refactored code back into the old style of grids.

Added col_or_span back to shift() to get accurate results.