Completely redo Tables module