improvement TableRow