Restore table layout as well