Fix many colspan issues