Better Sablonified Table.

And cleaned up some cruft in the overall layout.