diff --git a/app/components/BaseChemicals.js b/app/components/BaseChemicals.js
index 235bc92..42fd72b 100644
--- a/app/components/BaseChemicals.js
+++ b/app/components/BaseChemicals.js
@@ -1,5 +1,11 @@
-import { CoreTypographyBody1 } from "@wrappid/core";
-
-export default function BaseChemicals() {
-  return (<CoreTypographyBody1>Base Chemicals</CoreTypographyBody1>);
+import { CoreTypographyBody1, CoreLayoutItem, AppContainerLayout } from "@wrappid/core";
+
+export default function BaseChemicals() {
+  return (
+    <>
+      <CoreLayoutItem id={AppContainerLayout.PLACEHOLDER.CONTENT}>
+        <CoreTypographyBody1>Base Chemicals</CoreTypographyBody1>
+      </CoreLayoutItem>
+    </>
+  )
 }
\ No newline at end of file
diff --git a/app/components/Departments.js b/app/components/Departments.js
index ad65895..42b1a03 100644
--- a/app/components/Departments.js
+++ b/app/components/Departments.js
@@ -1,5 +1,11 @@
-import { CoreTypographyBody1 } from "@wrappid/core";
-
-export default function Departments() {
-  return (<CoreTypographyBody1>Departments</CoreTypographyBody1>);
+import { CoreTypographyBody1, CoreLayoutItem, AppContainerLayout } from "@wrappid/core";
+
+export default function Departments() {
+  return (
+    <>
+      <CoreLayoutItem id={AppContainerLayout.PLACEHOLDER.CONTENT}>
+        <CoreTypographyBody1>Departments</CoreTypographyBody1>
+      </CoreLayoutItem>
+    </>
+  );
 }
\ No newline at end of file
diff --git a/app/components/LanguageDataManager.js b/app/components/LanguageDataManager.js
index f9412ba..0e215af 100644
--- a/app/components/LanguageDataManager.js
+++ b/app/components/LanguageDataManager.js
@@ -1,18 +1,22 @@
-import { coreUseParams, CoreDataTable, CoreBox } from "@wrappid/core";
-
-import LanguageEditorForm from "./LanguageEditorForm";
-
-export default function LanguageDataManager() {
-  const { key } = coreUseParams();
-
-  return (
-    <CoreBox>
-      <CoreDataTable
-        hideForm={true}
-        entity={"DefaultStringValues"}
-        preRenderDetailsPaneComponent={LanguageEditorForm}
-        filterQuery={{ filter: key ? { key } : null }}
-      />
-    </CoreBox>
-  );
-}
+import { coreUseParams, CoreDataTable, CoreBox, CoreLayoutItem, AppContainerLayout } from "@wrappid/core";
+
+import LanguageEditorForm from "./LanguageEditorForm";
+
+export default function LanguageDataManager() {
+  const { key } = coreUseParams();
+
+  return (
+    <>
+      <CoreLayoutItem id={AppContainerLayout.PLACEHOLDER.CONTENT}>
+        <CoreBox>
+          <CoreDataTable
+            hideForm={true}
+            entity={"DefaultStringValues"}
+            preRenderDetailsPaneComponent={LanguageEditorForm}
+            filterQuery={{ filter: key ? { key } : null }}
+          />
+        </CoreBox>
+      </CoreLayoutItem>
+    </>
+  );
+}
diff --git a/app/components/MasterData.js b/app/components/MasterData.js
index 4262796..3baf88a 100644
--- a/app/components/MasterData.js
+++ b/app/components/MasterData.js
@@ -1,56 +1,60 @@
-import React from "react";
-
-import { coreUseNavigate, coreUseParams, CoreDataTable } from "@wrappid/core";
-
-import { RoutesRegistry } from "../routes.registry";
-
-export default function MasterData() {
-  const navigate = coreUseNavigate();
-  const { parentID } = coreUseParams();
-  const [filter, setFilter] = React.useState({ parentId: { eq: null } });
-
-  React.useEffect(() => {
-    let filterTemp = filter;
-
-    // eslint-disable-next-line no-console
-    console.log("MOUNT parent", parentID);
-    if (parentID) {
-      filterTemp.parentId.eq = parentID;
-    } else {
-      filterTemp.parentId.eq = null;
-    }
-    setFilter(filterTemp);
-  }, [parentID]);
-
-  const onChildClick = (data) => {
-    navigate("/" + RoutesRegistry.MASTER_DATA + "/" + data.id);
-  };
-
-  // eslint-disable-next-line no-console
-  console.log("FILTER", filter);
-  return (
-    <CoreDataTable
-      entity="LayeredMasterData"
-      filterQuery={{ filter: filter }}
-      createFormID="newMasterData"
-      updateFormID="newMasterData"
-      rowActions={[
-        {
-          action: onChildClick,
-          hide  : (data) => {
-            // eslint-disable-next-line no-console
-            console.log("CHECKING CHILD", data);
-            if (data.id && data.Children && data.Children.length > 0) {
-              return false;
-            } else {
-              return true;
-            }
-          },
-          icon : "chevron_right",
-          label: "Go to child",
-          type : "action",
-        },
-      ]}
-    />
-  );
-}
+import React from "react";
+
+import { coreUseNavigate, coreUseParams, CoreDataTable, CoreLayoutItem, AppContainerLayout } from "@wrappid/core";
+
+import { RoutesRegistry } from "../routes.registry";
+
+export default function MasterData() {
+  const navigate = coreUseNavigate();
+  const { parentID } = coreUseParams();
+  const [filter, setFilter] = React.useState({ parentId: { eq: null } });
+
+  React.useEffect(() => {
+    let filterTemp = filter;
+
+    // eslint-disable-next-line no-console
+    console.log("MOUNT parent", parentID);
+    if (parentID) {
+      filterTemp.parentId.eq = parentID;
+    } else {
+      filterTemp.parentId.eq = null;
+    }
+    setFilter(filterTemp);
+  }, [parentID]);
+
+  const onChildClick = (data) => {
+    navigate("/" + RoutesRegistry.MASTER_DATA + "/" + data.id);
+  };
+
+  // eslint-disable-next-line no-console
+  console.log("FILTER", filter);
+  return (
+    <>
+      <CoreLayoutItem id={AppContainerLayout.PLACEHOLDER.CONTENT}>
+        <CoreDataTable
+          entity="LayeredMasterData"
+          filterQuery={{ filter: filter }}
+          createFormID="newMasterData"
+          updateFormID="newMasterData"
+          rowActions={[
+            {
+              action: onChildClick,
+              hide: (data) => {
+                // eslint-disable-next-line no-console
+                console.log("CHECKING CHILD", data);
+                if (data.id && data.Children && data.Children.length > 0) {
+                  return false;
+                } else {
+                  return true;
+                }
+              },
+              icon: "chevron_right",
+              label: "Go to child",
+              type: "action",
+            },
+          ]}
+        />
+      </CoreLayoutItem>
+    </>
+  );
+}
diff --git a/app/components/MedicalTestData.js b/app/components/MedicalTestData.js
index 7fd338d..50256c8 100644
--- a/app/components/MedicalTestData.js
+++ b/app/components/MedicalTestData.js
@@ -1,5 +1,11 @@
-import { CoreTypographyBody1 } from "@wrappid/core";
-
-export default function MedicalTestData() {
-  return <CoreTypographyBody1>Medical Test Data</CoreTypographyBody1>;
-}
+import { CoreTypographyBody1, CoreLayoutItem, AppContainerLayout } from "@wrappid/core";
+
+export default function MedicalTestData() {
+  return (
+    <>
+      <CoreLayoutItem id={AppContainerLayout.PLACEHOLDER.CONTENT}>
+        <CoreTypographyBody1>Medical Test Data</CoreTypographyBody1>
+      </CoreLayoutItem>
+    </>
+  )
+}
diff --git a/app/components/MedicineDatabase.js b/app/components/MedicineDatabase.js
index 5b061e2..626969d 100644
--- a/app/components/MedicineDatabase.js
+++ b/app/components/MedicineDatabase.js
@@ -1,49 +1,52 @@
-import { CoreDivider, CoreTypographyBody1, CoreDataTable } from "@wrappid/core";
-
-export default function MedicineDatabase() {
-  return (
-    <>
-      <CoreTypographyBody1>
-        CoreTypographyBody1. Fusce mattis egestas risus, in euismod odio
-        tincidunt in. Maecenas ut ultricies quam. Curabitur sit amet diam a
-        magna rhoncus posuere quis eu sem. Donec nec convallis ipsum. Donec
-        euismod, ex vel maximus tincidunt, lacus libero faucibus nulla, eu
-        scelerisque nisi metus at mi. Phasellus luctus in magna id finibus.
-        CoreTypographyBody1. Fusce mattis egestas risus, in euismod odio
-        tincidunt in. Maecenas ut ultricies quam. Curabitur sit amet diam a
-        magna rhoncus posuere quis eu sem. Donec nec convallis ipsum. Donec
-        euismod, ex vel maximus tincidunt, lacus libero faucibus nulla, eu
-        scelerisque nisi metus at mi. Phasellus luctus in magna id finibus.
-        CoreTypographyBody1. Fusce mattis egestas risus, in euismod odio
-        tincidunt in. Maecenas ut ultricies quam. Curabitur sit amet diam a
-        magna rhoncus posuere quis eu sem. Donec nec convallis ipsum. Donec
-        euismod, ex vel maximus tincidunt, lacus libero faucibus nulla, eu
-        scelerisque nisi metus at mi. Phasellus luctus in magna id finibus.
-      </CoreTypographyBody1>
-
-      <CoreDivider />
-
-      <CoreDataTable entity={"Medicines"} />
-
-      <CoreDivider />
-
-      <CoreTypographyBody1>
-        CoreTypographyBody1. Fusce mattis egestas risus, in euismod odio
-        tincidunt in. Maecenas ut ultricies quam. Curabitur sit amet diam a
-        magna rhoncus posuere quis eu sem. Donec nec convallis ipsum. Donec
-        euismod, ex vel maximus tincidunt, lacus libero faucibus nulla, eu
-        scelerisque nisi metus at mi. Phasellus luctus in magna id finibus.
-        CoreTypographyBody1. Fusce mattis egestas risus, in euismod odio
-        tincidunt in. Maecenas ut ultricies quam. Curabitur sit amet diam a
-        magna rhoncus posuere quis eu sem. Donec nec convallis ipsum. Donec
-        euismod, ex vel maximus tincidunt, lacus libero faucibus nulla, eu
-        scelerisque nisi metus at mi. Phasellus luctus in magna id finibus.
-        CoreTypographyBody1. Fusce mattis egestas risus, in euismod odio
-        tincidunt in. Maecenas ut ultricies quam. Curabitur sit amet diam a
-        magna rhoncus posuere quis eu sem. Donec nec convallis ipsum. Donec
-        euismod, ex vel maximus tincidunt, lacus libero faucibus nulla, eu
-        scelerisque nisi metus at mi. Phasellus luctus in magna id finibus.
-      </CoreTypographyBody1>
-    </>
-  );
-}
+import { CoreDivider, CoreTypographyBody1, CoreDataTable, CoreLayoutItem, AppContainerLayout } from "@wrappid/core";
+
+export default function MedicineDatabase() {
+  return (
+    <>
+      <CoreLayoutItem id={AppContainerLayout.PLACEHOLDER.CONTENT}>
+
+        <CoreTypographyBody1>
+          CoreTypographyBody1. Fusce mattis egestas risus, in euismod odio
+          tincidunt in. Maecenas ut ultricies quam. Curabitur sit amet diam a
+          magna rhoncus posuere quis eu sem. Donec nec convallis ipsum. Donec
+          euismod, ex vel maximus tincidunt, lacus libero faucibus nulla, eu
+          scelerisque nisi metus at mi. Phasellus luctus in magna id finibus.
+          CoreTypographyBody1. Fusce mattis egestas risus, in euismod odio
+          tincidunt in. Maecenas ut ultricies quam. Curabitur sit amet diam a
+          magna rhoncus posuere quis eu sem. Donec nec convallis ipsum. Donec
+          euismod, ex vel maximus tincidunt, lacus libero faucibus nulla, eu
+          scelerisque nisi metus at mi. Phasellus luctus in magna id finibus.
+          CoreTypographyBody1. Fusce mattis egestas risus, in euismod odio
+          tincidunt in. Maecenas ut ultricies quam. Curabitur sit amet diam a
+          magna rhoncus posuere quis eu sem. Donec nec convallis ipsum. Donec
+          euismod, ex vel maximus tincidunt, lacus libero faucibus nulla, eu
+          scelerisque nisi metus at mi. Phasellus luctus in magna id finibus.
+        </CoreTypographyBody1>
+
+        <CoreDivider />
+
+        <CoreDataTable entity={"Medicines"} />
+
+        <CoreDivider />
+
+        <CoreTypographyBody1>
+          CoreTypographyBody1. Fusce mattis egestas risus, in euismod odio
+          tincidunt in. Maecenas ut ultricies quam. Curabitur sit amet diam a
+          magna rhoncus posuere quis eu sem. Donec nec convallis ipsum. Donec
+          euismod, ex vel maximus tincidunt, lacus libero faucibus nulla, eu
+          scelerisque nisi metus at mi. Phasellus luctus in magna id finibus.
+          CoreTypographyBody1. Fusce mattis egestas risus, in euismod odio
+          tincidunt in. Maecenas ut ultricies quam. Curabitur sit amet diam a
+          magna rhoncus posuere quis eu sem. Donec nec convallis ipsum. Donec
+          euismod, ex vel maximus tincidunt, lacus libero faucibus nulla, eu
+          scelerisque nisi metus at mi. Phasellus luctus in magna id finibus.
+          CoreTypographyBody1. Fusce mattis egestas risus, in euismod odio
+          tincidunt in. Maecenas ut ultricies quam. Curabitur sit amet diam a
+          magna rhoncus posuere quis eu sem. Donec nec convallis ipsum. Donec
+          euismod, ex vel maximus tincidunt, lacus libero faucibus nulla, eu
+          scelerisque nisi metus at mi. Phasellus luctus in magna id finibus.
+        </CoreTypographyBody1>
+      </CoreLayoutItem>
+    </>
+  );
+}
diff --git a/app/components/MedicineTestData.js b/app/components/MedicineTestData.js
index 2eca872..81f02a2 100644
--- a/app/components/MedicineTestData.js
+++ b/app/components/MedicineTestData.js
@@ -1,5 +1,11 @@
-import { CoreDataTable } from "@wrappid/core";
-
-export default function MedicineTestData() {
-  return <CoreDataTable entity={"TestMedicine"} />;
-}
+import { CoreDataTable, CoreLayoutItem, AppContainerLayout } from "@wrappid/core";
+
+export default function MedicineTestData() {
+  return (
+    <>
+      <CoreLayoutItem id={AppContainerLayout.PLACEHOLDER.CONTENT}>
+        <CoreDataTable entity={"TestMedicine"} />
+      </CoreLayoutItem>
+    </>
+  )
+}
diff --git a/app/components/SupportedLanguages.js b/app/components/SupportedLanguages.js
index f841352..9958d9b 100644
--- a/app/components/SupportedLanguages.js
+++ b/app/components/SupportedLanguages.js
@@ -1,5 +1,11 @@
-import { CoreDataTable } from "@wrappid/core";
-
-export default function SupportedLanguages() {
-  return <CoreDataTable entity="SupportedLanguages" enableCreate={true} />;
-}
+import { CoreDataTable, CoreLayoutItem, AppContainerLayout } from "@wrappid/core";
+
+export default function SupportedLanguages() {
+  return (
+    <>
+      <CoreLayoutItem id={AppContainerLayout.PLACEHOLDER.CONTENT}>
+        <CoreDataTable entity="SupportedLanguages" enableCreate={true} />
+      </CoreLayoutItem>
+    </>
+  );
+}
diff --git a/app/routes.registry.js b/app/routes.registry.js
index 58f59e4..a4cebcc 100644
--- a/app/routes.registry.js
+++ b/app/routes.registry.js
@@ -1,30 +1 @@
-export const RoutesRegistry = {
-  BASE_CHEMICALS                        : "chemical/base",
-  CHEMICAL_COMPOSITIONS                 : "chemical/compositions",
-  DEPARTMENTS                           : "departments",
-  DRUG_DATA_MANAGEMENT                  : "drug_data_management",
-  EDIT_SUGGESTIONS                      : "edit_suggestions",
-  HELP_DOCUMENTS                        : "help_documents",
-  INUSE_DRUG_DATA                       : "inuse_drug_data",
-  INUSE_MEDICAL_TEST_DATA               : "inuse_medical_test_data",
-  MASTER_DATA                           : "masterData/all",
-  MASTER_DATA_TYPES                     : "masterData/types",
-  MASTER_DATA_TYPE_SPECIFIC             : "masterData/all/:parentID",
-  MASTER_DATA_TYPE_SPECIFIC_CROWDSOURCED: "masterData/crowdsourced/:parentID",
-  MASTER_DATA_TYPE_SPECIFIC_SCRAPED     : "masterData/scraped/:parentID",
-  MDM                                   : "mdm",
-  MEDICAL_TEST_DATA_MANAGEMENT          : "medical_test_data_management",
-  MEDICINES                             : "medicine/all",
-  MEDICINE_COMPANIES                    : "medicine/companies",
-  MEDICINE_DATA                         : "medicine_data",
-  MEDICINE_DATABASE                     : "medicine_database",
-  MEDICINE_DETAILS                      : "medicine/details",
-  MEDICINE_PACKAGES                     : "medicine/packages",
-  MTDM_EDIT_SUGGESTIONS                 : "mtdm_edit_suggestions",
-  PROSPECTED_DOCTORS                    : "prospected_doctors",
-  SCRAPED_DRUG_DATA                     : "scraped_drug_data",
-  SCRAPED_MEDICAL_TEST_DATA             : "scraped_medical_test_data",
-  SCRAPED_MEDICINES                     : "medicine/scraped",
-  STRING_TABLE                          : "string_table",
-  STRING_TABLE_FILTERED                 : "string_table/:key",
-};
\ No newline at end of file
+export const RoutesRegistry = {};
\ No newline at end of file