Large improvements in how to render the table