removed rowspans where not needed