Revert "Remove references to table cards"

This reverts commit 170126eb7a830f751c34dfd589491ad3b7baae0c.
Revert "Fix bunch of bugs"

This reverts commit daf0f4f61e3f4680f73b9611b9112a69ba4b93bb.