First attempt to refactor the formatting of tables

And remove the concealing stuff. This was a bad idea.