diff --git a/vuu-ui/package.json b/vuu-ui/package.json
index 5beb15f7b..9b90791e0 100644
--- a/vuu-ui/package.json
+++ b/vuu-ui/package.json
@@ -7,8 +7,7 @@
   "workspaces": [
     "packages/**",
     "sample-apps/**",
-    "showcase",
-    "salt/packages/lab"
+    "showcase"
   ],
   "scripts": {
     "lint": "eslint . --ext .js,.jsx",
diff --git a/vuu-ui/packages/vuu-datagrid-extras/tsconfig-emit-types.json b/vuu-ui/packages/vuu-datagrid-extras/tsconfig-emit-types.json
new file mode 100644
index 000000000..7e727a3d4
--- /dev/null
+++ b/vuu-ui/packages/vuu-datagrid-extras/tsconfig-emit-types.json
@@ -0,0 +1,10 @@
+{
+    "extends": "../../tsconfig-emit-types.json",
+    "compilerOptions": {
+      "outDir": "../../dist/vuu-datagrid-extras/types"
+    },
+    "include": [
+      "src"
+    ]
+  }
+  
\ No newline at end of file
diff --git a/vuu-ui/packages/vuu-datatable/package.json b/vuu-ui/packages/vuu-datatable/package.json
index 22a540721..9091f4600 100644
--- a/vuu-ui/packages/vuu-datatable/package.json
+++ b/vuu-ui/packages/vuu-datatable/package.json
@@ -19,7 +19,6 @@
     "@salt-ds/core": "1.0.0",
     "@salt-ds/icons": "1.0.0",
     "@heswell/salt-lab": "1.0.0-alpha.0",
-    "@finos/vuu-layout": "0.0.26",
     "@finos/vuu-utils": "0.0.26",
     "classnames": "^2.2.6",
     "react": "^17.0.2",
diff --git a/vuu-ui/packages/vuu-datatable/src/useDataSource.ts b/vuu-ui/packages/vuu-datatable/src/useDataSource.ts
index b2601fafa..33da03ccb 100644
--- a/vuu-ui/packages/vuu-datatable/src/useDataSource.ts
+++ b/vuu-ui/packages/vuu-datatable/src/useDataSource.ts
@@ -6,7 +6,6 @@ import {
 } from "@finos/vuu-data";
 import { VuuDataRow, VuuRange, VuuSortCol } from "@finos/vuu-protocol-types";
 import { getFullRange, metadataKeys, WindowRange } from "@finos/vuu-utils";
-import { useViewContext } from "@finos/vuu-layout";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 
 const { RENDER_IDX } = metadataKeys;
@@ -34,7 +33,6 @@ export function useDataSource({
   onSubscribed,
   range = { from: 0, to: 0 },
 }: DataSourceHookProps) {
-  const { title } = useViewContext();
   const [, forceUpdate] = useState<unknown>(null);
   const isMounted = useRef(true);
   const hasUpdated = useRef(false);
diff --git a/vuu-ui/packages/vuu-datatable/tsconfig-emit-types.json b/vuu-ui/packages/vuu-datatable/tsconfig-emit-types.json
new file mode 100644
index 000000000..f77ab54f7
--- /dev/null
+++ b/vuu-ui/packages/vuu-datatable/tsconfig-emit-types.json
@@ -0,0 +1,10 @@
+{
+    "extends": "../../tsconfig-emit-types.json",
+    "compilerOptions": {
+      "outDir": "../../dist/vuu-datatable/types"
+    },
+    "include": [
+      "src"
+    ]
+  }
+  
\ No newline at end of file
diff --git a/vuu-ui/scripts/build-all-type-defs.mjs b/vuu-ui/scripts/build-all-type-defs.mjs
index b7dd7e54f..5e052b584 100644
--- a/vuu-ui/scripts/build-all-type-defs.mjs
+++ b/vuu-ui/scripts/build-all-type-defs.mjs
@@ -11,6 +11,8 @@ const packages = [
   "vuu-data",
   //   'ui-controls',
   //   'vuu-datagrid',
+  "vuu-datatable",
+  // "vuu-datagrid-extras",
   //   'vuu-layout',
   //   'vuu-shell'
 ];
diff --git a/vuu-ui/yarn.lock b/vuu-ui/yarn.lock
index 6389c7ee7..ae1b258d8 100644
--- a/vuu-ui/yarn.lock
+++ b/vuu-ui/yarn.lock
@@ -145,6 +145,28 @@
   resolved "https://registry.yarnpkg.com/@heswell/component-anatomy/-/component-anatomy-0.0.5.tgz#cf75e642fb7c2184794114fe62f2382d4196846a"
   integrity sha512-pwuowxKvsxPoOkAbtHFNyqdzjTj8CHDZtk7+P8jRtJJmsJTzblOMn6WNS9csFf6gU1NdvD11EcTCnFZaG8TLxg==
 
+"@heswell/salt-lab@1.0.0-alpha.0":
+  version "1.0.0-alpha.0"
+  resolved "https://registry.yarnpkg.com/@heswell/salt-lab/-/salt-lab-1.0.0-alpha.0.tgz#4673c7ee2640d60b71e01f52b47a8a8f8a9d144d"
+  integrity sha512-f/LhcuGdJnGpsshF7fddB+jOlb+DvXWBlPPUwm9zkO5RVje/Gql656kwZ87jVQpDtRvNXqRvdQJVUdW0eSLaIw==
+  dependencies:
+    "@floating-ui/react-dom-interactions" "^0.5.0"
+    "@internationalized/date" "^3.0.0"
+    "@salt-ds/core" "1.0.0"
+    "@salt-ds/icons" "1.0.0"
+    aria-hidden "^1.1.1"
+    attr-accept "^2.0.0"
+    classnames "^2.2.6"
+    clipboard-copy "^4.0.1"
+    compute-scroll-into-view "^1.0.16"
+    deepmerge "^4.2.2"
+    no-scroll "^2.1.1"
+    react-color "^2.19.3"
+    react-window "^1.8.6"
+    rifm "^0.12.0"
+    tinycolor2 "^1.4.2"
+    warning "^4.0.3"
+
 "@humanwhocodes/config-array@^0.11.6":
   version "0.11.7"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.7.tgz#38aec044c6c828f6ed51d5d7ae3d9b9faf6dbb0f"
@@ -484,6 +506,13 @@ argparse@^2.0.1:
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
   integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
 
+aria-hidden@^1.1.1:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/aria-hidden/-/aria-hidden-1.2.2.tgz#8c4f7cc88d73ca42114106fdf6f47e68d31475b8"
+  integrity sha512-6y/ogyDTk/7YAe91T3E2PR1ALVKyM2QbTio5HwM+N1Q6CMlCKhvClyIjkckBswa0f2xJhjsfzIGa1yVSe1UMVA==
+  dependencies:
+    tslib "^2.0.0"
+
 aria-hidden@^1.1.3:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/aria-hidden/-/aria-hidden-1.2.1.tgz#ad8c1edbde360b454eb2bf717ea02da00bfee0f8"