Yes. I think this is better.

PS Unfortunately, now the contrast between table cells is almost lost. Don't know if it was intended.