Updated the grid mixin

Was miscalculating some of the spans within spans.