Fixes another corner case layout
Fixes inconsistent height/width for row/colspan > 1