diff --git a/src/components/EntityScaffold.res b/src/components/EntityScaffold.res
index ff304dd82..68afbe809 100644
--- a/src/components/EntityScaffold.res
+++ b/src/components/EntityScaffold.res
@@ -1,85 +1,32 @@
-module ComingSoon = {
-  @react.component
-  let make = (~title) => {
-    <div className="h-full w-full flex flex-col items-center justify-center">
-      <div className="text-2xl text-gray-500 pb-4"> {React.string(title)} </div>
-      <div> {React.string("Coming soon...")} </div>
-    </div>
-  }
-}
-
-module ShowPage = {
-  @react.component
-  let make = (~entityName, ~id) => {
-    <div className="h-full w-fit flex flex-col m-12">
-      <div className="text-2xl text-gray-500 pb-4">
-        {React.string(`Show ${entityName} `)}
-        <span className="text-sm"> {React.string(`#${id}`)} </span>
-      </div>
-      <div> {React.string("Coming soon...")} </div>
-    </div>
-  }
-}
-
-module UnauthorizedPage = {
-  @react.component
-  let make = (~entityName) => {
-    <div className="h-full w-fit flex flex-col m-12">
-      <div className="text-2xl text-gray-500 pb-4"> {React.string(entityName)} </div>
-      <div> {React.string("You don't have access to this module. Contact admin for access")} </div>
-    </div>
-  }
-}
-
 @react.component
 let make = (
   ~entityName="",
   ~remainingPath,
   ~isAdminAccount=false,
   ~access: AuthTypes.authorization=Access,
-  ~renderList=_ => <ComingSoon title="List" />,
-  ~renderNewForm=_ => <ComingSoon title="New Form" />,
+  ~renderList,
+  ~renderNewForm=?,
   ~renderShow=?,
-  ~renderOrder=?,
-  ~renderEdit=_ => <ComingSoon title="Edit Form" />,
-  ~renderEditWithMultiId=(_, _) => <ComingSoon title="Edit Form" />,
-  ~renderClone=_ => <ComingSoon title="Clone Form" />,
 ) => {
   if access === NoAccess {
-    <UnauthorizedPage entityName />
+    <UnauthorizedPage />
   } else {
     switch remainingPath {
     | list{"new"} =>
       switch access {
-      | Access => renderNewForm()
-      | NoAccess => <UnauthorizedPage entityName />
-      }
-    | list{id, "clone"} =>
-      switch access {
-      | Access => renderClone(id)
-      | NoAccess => <UnauthorizedPage entityName />
+      | Access =>
+        switch renderNewForm {
+        | Some(element) => element()
+        | None => React.null
+        }
+      | NoAccess => <UnauthorizedPage />
       }
     | list{id} =>
       let page = switch renderShow {
       | Some(fn) => fn(id)
-      | None => <ShowPage entityName id />
+      | None => React.null
       }
       page
-    | list{id, "edit"} =>
-      switch access {
-      | Access => renderEdit(id)
-      | NoAccess => <UnauthorizedPage entityName />
-      }
-    | list{id1, id2, "edit"} =>
-      switch access {
-      | Access => renderEditWithMultiId(id1, id2)
-      | NoAccess => <UnauthorizedPage entityName />
-      }
-    | list{"order", id} =>
-      switch renderOrder {
-      | Some(fn) => fn(id)
-      | None => <NotFoundPage />
-      }
     | list{} => renderList()
     | _ => <NotFoundPage />
     }
diff --git a/src/components/UnauthorizedPage.res b/src/components/UnauthorizedPage.res
new file mode 100644
index 000000000..55bddadc9
--- /dev/null
+++ b/src/components/UnauthorizedPage.res
@@ -0,0 +1,19 @@
+@react.component
+let make = (~message="You don't have access to this module. Contact admin for access") => {
+  let {setDashboardPageState} = React.useContext(GlobalProvider.defaultContext)
+  React.useEffect0(() => {
+    RescriptReactRouter.replace("/unauthorized")
+    None
+  })
+  <NoDataFound message renderType={Locked}>
+    <Button
+      text={"Go to Home"}
+      buttonType=Primary
+      onClick={_ => {
+        setDashboardPageState(_ => #HOME)
+        RescriptReactRouter.replace("/home")
+      }}
+      customButtonStyle="mt-4 !p-2"
+    />
+  </NoDataFound>
+}
diff --git a/src/entryPoints/hyperswitch/HyperSwitchApp.res b/src/entryPoints/hyperswitch/HyperSwitchApp.res
index 6e54d224a..f8d8e2979 100644
--- a/src/entryPoints/hyperswitch/HyperSwitchApp.res
+++ b/src/entryPoints/hyperswitch/HyperSwitchApp.res
@@ -350,7 +350,7 @@ let make = () => {
                       | list{"quick-start"} => determineQuickStartPageState()
                       | list{"woocommerce"} => determineWooCommerce()
                       | list{"stripe-plus-paypal"} => determineStripePlusPayPal()
-
+                      | list{"unauthorized"} => <UnauthorizedPage />
                       | _ =>
                         RescriptReactRouter.replace(`${hyperSwitchFEPrefix}/home`)
                         <Home />