diff --git a/static/client/pages/Main/Main.tsx b/static/client/pages/Main/Main.tsx
index f0c60a1a..d2c7bdef 100644
--- a/static/client/pages/Main/Main.tsx
+++ b/static/client/pages/Main/Main.tsx
@@ -13,19 +13,23 @@ const Main = (): React.ReactNode => {
   useUsers();
   const { data } = usePages();
 
+  function getDynamicRoutes() {
+    if (!data?.length) return;
+    return data.map(
+      (project) =>
+        project?.data?.templates && RoutesServices.generateRoutes(project.data.name, [project.data.templates]),
+    );
+  }
+
   return (
     <BrowserRouter>
       <Routes>
         <Route element={<MainLayout />} path="/app">
           <Route element={<Owned />} path="views/owned" />
           <Route element={<Reviewed />} path="views/reviewed" />
+          {getDynamicRoutes()}
         </Route>
         <Route element={<Navigate to="/app" />} path="/" />
-        {data?.length &&
-          data.map(
-            (project) =>
-              project?.data?.templates && RoutesServices.generateRoutes(project.data.name, [project.data.templates]),
-          )}
       </Routes>
     </BrowserRouter>
   );
diff --git a/static/client/pages/NewWebpage/NewWebpage.tsx b/static/client/pages/NewWebpage/NewWebpage.tsx
index a5ce00dd..cb1d4e59 100644
--- a/static/client/pages/NewWebpage/NewWebpage.tsx
+++ b/static/client/pages/NewWebpage/NewWebpage.tsx
@@ -22,7 +22,7 @@ const LoadingState = {
 };
 
 const NewWebpage = (): JSX.Element => {
-  const [titleValue, setTitleValue] = useState<string>();
+  const [titleValue, setTitleValue] = useState<string>("");
   const [copyDoc, setCopyDoc] = useState<string>();
   const [owner, setOwner] = useState<IUser | null>();
   const [reviewers, setReviewers] = useState<IUser[]>([]);
diff --git a/static/client/services/routes/index.tsx b/static/client/services/routes/index.tsx
index 749ba1e4..d4fecec3 100644
--- a/static/client/services/routes/index.tsx
+++ b/static/client/services/routes/index.tsx
@@ -2,7 +2,6 @@ import React from "react";
 
 import { Route } from "react-router-dom";
 
-import MainLayout from "@/components/MainLayout";
 import NewWebpage from "@/pages/NewWebpage";
 import Webpage from "@/pages/Webpage";
 import { type IPage } from "@/services/api/types/pages";
@@ -11,23 +10,11 @@ export function generateRoutes(project: string, pages: IPage[]): JSX.Element[] {
   return pages.map((page, index) => (
     <React.Fragment key={`${page.name}-${index}`}>
       <Route
-        element={
-          <MainLayout>
-            <Webpage page={page} project={project} />
-          </MainLayout>
-        }
+        element={<Webpage page={page} project={project} />}
         key={page.name}
-        path={`/app/webpage/${project}${page.name}`}
-      />
-      <Route
-        element={
-          <MainLayout>
-            <NewWebpage />
-          </MainLayout>
-        }
-        key="new-webpage"
-        path="/app/new-webpage"
+        path={`webpage/${project}${page.name}`}
       />
+      <Route element={<NewWebpage />} key="new-webpage" path="new-webpage" />
       {page.children?.length && generateRoutes(project, page.children)}
     </React.Fragment>
   ));