Switch from classes to data-table-

Yay semantics!