table and row columns now match correctly