diff --git a/.webpack/webpack.base.js b/.webpack/webpack.base.js
index 330ff07d6..c1020e3e3 100644
--- a/.webpack/webpack.base.js
+++ b/.webpack/webpack.base.js
@@ -60,7 +60,10 @@ module.exports = (env, argv, { SRC_DIR, DIST_DIR }) => {
       alias: {
         // Viewer project
         '@routes': path.resolve(__dirname, '../platform/viewer/src/routes'),
-        '@components': path.resolve(__dirname, '../platform/viewer/src/components'),
+        '@components': path.resolve(
+          __dirname,
+          '../platform/viewer/src/components'
+        ),
       },
       // Which directories to search when resolving modules
       modules: [
diff --git a/extensions/default/src/ViewerLayout/index.jsx b/extensions/default/src/ViewerLayout/index.jsx
index 75e9b0ca5..cd743ad44 100644
--- a/extensions/default/src/ViewerLayout/index.jsx
+++ b/extensions/default/src/ViewerLayout/index.jsx
@@ -27,12 +27,10 @@ function ViewerLayout({
   leftPanels,
   rightPanels,
   viewports,
-  children,
+  children: ViewportGrid,
 }) {
   const [displaySets, setDisplaySets] = useState({});
 
-  console.log(children);
-  debugger;
   /**
    * Set body classes (tailwindcss) that don't allow vertical
    * or horizontal overflow (no scrolling). Also guarantee window
@@ -81,7 +79,9 @@ function ViewerLayout({
   // TODO -> make toolbar service
   const toolBarLayout = { tools: [], moreTools: [] };
 
-  const [primaryToolBarLayout, secondaryToolBarLayout] = toolBarLayout;
+  //const [primaryToolBarLayout, secondaryToolBarLayout] = toolBarLayout;
+  const primaryToolBarLayout = toolBarLayout;
+  const secondaryToolBarLayout = toolBarLayout;
 
   return (
     <div>
@@ -105,7 +105,7 @@ function ViewerLayout({
             <Toolbar type="secondary" tools={secondaryToolBarLayout.tools} />
           </div>
           <div className="flex flex-1 h-full overflow-hidden bg-black items-center justify-center pb-2 pt-1">
-            <children.ViewportGrid
+            <ViewportGrid
               servicesManager={servicesManager}
               viewportComponents={viewportComponents}
             />
diff --git a/platform/viewer/src/routes/Mode/Mode.jsx b/platform/viewer/src/routes/Mode/Mode.jsx
index 0e8891bfd..7453244cb 100644
--- a/platform/viewer/src/routes/Mode/Mode.jsx
+++ b/platform/viewer/src/routes/Mode/Mode.jsx
@@ -15,7 +15,6 @@ export default function ModeRoute({
   extensionManager,
   servicesManager,
 }) {
-  console.warn('ModeRoute rerendering');
   const { routes, extensions, sopClassHandlers } = mode;
   const dataSources = extensionManager.getDataSources(dataSourceName);
   // TODO: For now assume one unique datasource.
@@ -54,10 +53,7 @@ export default function ModeRoute({
   const CombinedContextProvider = ({ children }) =>
     Compose({ components: contextModuleProviders, children });
 
-  debugger;
-
   function ViewportGridWithDataSource(props) {
-    debugger;
     return ViewportGrid({ ...props, dataSource });
   }
 
@@ -87,15 +83,6 @@ export default function ModeRoute({
   return (
     <React.Fragment>
       {/*<ToolbarLayoutProvider>*/}
-      {/*
-          <DisplaySetCreator
-            location={location}
-            mode={mode}
-            dataSourceName={dataSourceName}
-            extensionManager={extensionManager}
-            DisplaySetService={DisplaySetService}
-          />
-        */}
       <CombinedContextProvider>
         {/* TODO: extensionManager is already provided to the extension module.
          *  Use it from there instead of passing as a prop here.