diff --git a/src/app/[locale]/[name]/[id]/page.tsx b/src/app/[name]/[id]/page.tsx
similarity index 100%
rename from src/app/[locale]/[name]/[id]/page.tsx
rename to src/app/[name]/[id]/page.tsx
diff --git a/src/app/[locale]/[name]/about/AboutPage.tsx b/src/app/[name]/about/AboutPage.tsx
similarity index 100%
rename from src/app/[locale]/[name]/about/AboutPage.tsx
rename to src/app/[name]/about/AboutPage.tsx
diff --git a/src/app/[locale]/[name]/about/layout.tsx b/src/app/[name]/about/layout.tsx
similarity index 100%
rename from src/app/[locale]/[name]/about/layout.tsx
rename to src/app/[name]/about/layout.tsx
diff --git a/src/app/[locale]/[name]/about/page.tsx b/src/app/[name]/about/page.tsx
similarity index 100%
rename from src/app/[locale]/[name]/about/page.tsx
rename to src/app/[name]/about/page.tsx
diff --git a/src/app/[locale]/[name]/chat/[id]/page.tsx b/src/app/[name]/chat/[id]/page.tsx
similarity index 100%
rename from src/app/[locale]/[name]/chat/[id]/page.tsx
rename to src/app/[name]/chat/[id]/page.tsx
diff --git a/src/app/[locale]/[name]/chat/page.tsx b/src/app/[name]/chat/page.tsx
similarity index 100%
rename from src/app/[locale]/[name]/chat/page.tsx
rename to src/app/[name]/chat/page.tsx
diff --git a/src/app/[locale]/[name]/layout.tsx b/src/app/[name]/layout.tsx
similarity index 100%
rename from src/app/[locale]/[name]/layout.tsx
rename to src/app/[name]/layout.tsx
diff --git a/src/app/[locale]/[name]/loading.tsx b/src/app/[name]/loading.tsx
similarity index 100%
rename from src/app/[locale]/[name]/loading.tsx
rename to src/app/[name]/loading.tsx
diff --git a/src/app/[locale]/[name]/orders/layout.tsx b/src/app/[name]/orders/layout.tsx
similarity index 100%
rename from src/app/[locale]/[name]/orders/layout.tsx
rename to src/app/[name]/orders/layout.tsx
diff --git a/src/app/[locale]/[name]/orders/page.tsx b/src/app/[name]/orders/page.tsx
similarity index 100%
rename from src/app/[locale]/[name]/orders/page.tsx
rename to src/app/[name]/orders/page.tsx
diff --git a/src/app/[locale]/[name]/page.tsx b/src/app/[name]/page.tsx
similarity index 99%
rename from src/app/[locale]/[name]/page.tsx
rename to src/app/[name]/page.tsx
index e389693..82307a4 100644
--- a/src/app/[locale]/[name]/page.tsx
+++ b/src/app/[name]/page.tsx
@@ -222,7 +222,7 @@ const MenuIndex = () => {
 
 
   return (
-    <div className="flex flex-col gap-4 items-center pt-8" ref={wrapperRef}>
+    <div className="flex flex-col gap-4 items-center pt-8 mb-8" ref={wrapperRef}>
       <div className="w-full">
         <SearchBox value={search} placeholder={tCommon('SearchPlaceholder')} onChange={updateSearch} />
         <HorizontalScrollView className="w-full noscrollbar mt-4! py-4!">
diff --git a/src/app/[locale]/[name]/rating/[orderId]/page.tsx b/src/app/[name]/rating/[orderId]/page.tsx
similarity index 100%
rename from src/app/[locale]/[name]/rating/[orderId]/page.tsx
rename to src/app/[name]/rating/[orderId]/page.tsx
diff --git a/src/app/[locale]/[name]/transactions/page.tsx b/src/app/[name]/transactions/page.tsx
similarity index 100%
rename from src/app/[locale]/[name]/transactions/page.tsx
rename to src/app/[name]/transactions/page.tsx
diff --git a/src/app/[locale]/[name]/transactions/review/page.tsx b/src/app/[name]/transactions/review/page.tsx
similarity index 100%
rename from src/app/[locale]/[name]/transactions/review/page.tsx
rename to src/app/[name]/transactions/review/page.tsx
diff --git a/src/app/[locale]/auth/layout.tsx b/src/app/auth/layout.tsx
similarity index 100%
rename from src/app/[locale]/auth/layout.tsx
rename to src/app/auth/layout.tsx
diff --git a/src/app/[locale]/auth/page.tsx b/src/app/auth/page.tsx
similarity index 100%
rename from src/app/[locale]/auth/page.tsx
rename to src/app/auth/page.tsx
diff --git a/src/app/[locale]/dictionaries.ts b/src/app/dictionaries.ts
similarity index 100%
rename from src/app/[locale]/dictionaries.ts
rename to src/app/dictionaries.ts
diff --git a/src/app/[locale]/layout.tsx b/src/app/layout.tsx
similarity index 79%
rename from src/app/[locale]/layout.tsx
rename to src/app/layout.tsx
index 1dc3c7b..05d05fd 100644
--- a/src/app/[locale]/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,26 +1,24 @@
 import { Metadata } from "next";
-import "../globals.css";
+import "./globals.css";
 import { ReactQueryProvider } from "@/components/providers/ReactQueryProvider";
 import { notFound } from "next/navigation";
-import i18nConfig from "../../../i18nConfig";
+import i18nConfig from "../../i18nConfig";
 import initTranslations from '@/lib/i18n';
 import TranslationsProvider from "@/components/utils/TranslationsProdiver";
 
 export const metadata: Metadata = {
   title: 'Dashboard',
-  description: 'Webapp dashboard'
+  description: 'Webapp dashboard',
 }
 
 const i18nNamespaces = ['common', 'menu', 'orders', 'auth'];
 
 export default async function RootLayout({
   children,
-  params,
 }: Readonly<{
   children: React.ReactNode;
-  params: Promise<{ locale: string }>
 }>) {
-  const { locale } = await params;
+  const locale = "fa";
   if (!i18nConfig.locales.includes(locale)) {
     notFound();
   }
@@ -28,9 +26,12 @@ export default async function RootLayout({
 
   return (
 
-    <html lang={locale} className="h-svh overflow-hidden">
+    <html
+      lang='fa'
+      dir='rtl'
+      className="h-svh overflow-hidden">
       <body
-        dir={locale === 'fa' ? 'rtl' : 'ltr'}
+
         className={`antialiased bg-background h-svh overflow-hidden`}
       >
         <ReactQueryProvider>
diff --git a/src/app/[locale]/loading.tsx b/src/app/loading.tsx
similarity index 100%
rename from src/app/[locale]/loading.tsx
rename to src/app/loading.tsx
diff --git a/src/app/[locale]/page.tsx b/src/app/page.tsx
similarity index 100%
rename from src/app/[locale]/page.tsx
rename to src/app/page.tsx
diff --git a/src/app/[locale]/profile/edit/page.tsx b/src/app/profile/edit/page.tsx
similarity index 100%
rename from src/app/[locale]/profile/edit/page.tsx
rename to src/app/profile/edit/page.tsx
diff --git a/src/app/[locale]/profile/layout.tsx b/src/app/profile/layout.tsx
similarity index 100%
rename from src/app/[locale]/profile/layout.tsx
rename to src/app/profile/layout.tsx
diff --git a/src/app/[locale]/profile/page.tsx b/src/app/profile/page.tsx
similarity index 100%
rename from src/app/[locale]/profile/page.tsx
rename to src/app/profile/page.tsx
diff --git a/src/components/icons/HomeIcon.tsx b/src/components/icons/HomeIcon.tsx
index 0807bfd..95eb9d7 100644
--- a/src/components/icons/HomeIcon.tsx
+++ b/src/components/icons/HomeIcon.tsx
@@ -12,7 +12,7 @@ const HomeIcon: React.FC<Props> = ({ ...props }) => {
             fill="none"
             {...props}
         >
-            <path d="M17.79 22.75H6.21c-2.74 0-4.96-2.23-4.96-4.97v-7.41c0-1.36.84-3.07 1.92-3.91l5.39-4.2C10.18 1 12.77.94 14.45 2.12l6.18 4.33c1.19.83 2.12 2.61 2.12 4.06v7.28c0 2.73-2.22 4.96-4.96 4.96ZM9.48 3.46-3.46v-7.28c0-.96-.69-2.29-1.48-2.83l-6.18-4.33c-1.14-.8-3.02-.76-4.11.09Z"></path>
+            <path d="M17.79 22.75H6.21c-2.74 0-4.96-2.23-4.96-4.97v-7.41c0-1.36.84-3.07 1.92-3.91l5.39-4.2C10.18 1 12.77.94 14.45 2.12l6.18 4.33c1.19.83 2.12 2.61 2.12 4.06v7.28c0 2.73-2.22 4.96-4.96 4.96Z" />
             <path d="M12 18.75c-.41 0-.75-.34-.75-.75v-3c0-.41.34-.75.75-.75s.75.34.75.75v3c0 .41-.34.75-.75.75Z"></path>
         </svg>
     );
diff --git a/src/middleware.ts b/src/middleware.ts
index 0ed4a3e..0ab2d42 100644
--- a/src/middleware.ts
+++ b/src/middleware.ts
@@ -1,9 +1,8 @@
-import { i18nRouter } from 'next-i18n-router';
 import { NextRequest } from 'next/server';
-import i18nConfig from '../i18nConfig';
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 export function middleware(request: NextRequest) {
-  return i18nRouter(request, i18nConfig);
+  
 }
 
 // only applies this middleware to files in the app directory