getting rid of more extra divs within table cells
fix incorrect colspan