Correct table row data WIP