Make the table more uniform
Merge branch 'table-fixes'