fixed formatting of rowspan and extra columns