diff --git a/app/dashboard/src/App.tsx b/app/dashboard/src/App.tsx
index e610aa2..a87886d 100644
--- a/app/dashboard/src/App.tsx
+++ b/app/dashboard/src/App.tsx
@@ -7,6 +7,7 @@ import Login from 'pages/Login';
 import 'react-datepicker/dist/react-datepicker.css';
 import 'react-loading-skeleton/dist/skeleton.css';
 import { Route, Routes } from 'react-router-dom';
+import { fetchAdminLoader } from 'components/modules/Router';
 
 function App() {
   return (
@@ -35,7 +36,8 @@ function App() {
         <GridItem area={'main'}>
           <Routes>
             {pages.map((route: PageRoute) =>
-              <Route {...route} />
+              <Route {...route} errorElement={<Login />} loader={fetchAdminLoader} />
+
             )}
           </Routes>
         </GridItem>
diff --git a/app/dashboard/src/components/Sidebar/index.tsx b/app/dashboard/src/components/Sidebar/index.tsx
index 863bc35..8148a0c 100644
--- a/app/dashboard/src/components/Sidebar/index.tsx
+++ b/app/dashboard/src/components/Sidebar/index.tsx
@@ -10,10 +10,10 @@ import { FC, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
 export type SideBarItemProps = Pick<
-    PageType,
-    | 'name'
-    | 'path'
-    | 'itemIcon'
+  PageType,
+  | 'name'
+  | 'path'
+  | 'itemIcon'
 >
 
 export const SidebarMenuIcon = chakra(HamburgerIcon, {
@@ -53,23 +53,24 @@ export const SidebarItem: FC<SideBarItemProps & { index: number }> = ({ itemIcon
 }
 
 export const Sidebar = () => {
-
   return (
-    <Flex
-      pos="sticky"
-      left="5"
-      borderRightWidth="4px"
-      borderRightColor="primary.100"
-      borderRightStyle="solid"
-      flexDir="column"
-      h="100vh"
-      bg="gray.50"
-    >
-      <VStack pt="30px" gap="6">
-        <Image src="favicon/logo.svg" alt="marzneshin" boxSize="50px" />
-        {pages.map((item: SideBarItemProps, index: number) =>
-          <SidebarItem path={item.path} name={item.name} itemIcon={item.itemIcon} index={index} />)}
-      </VStack>
-    </Flex>
+    <aside>
+      <Flex
+        pos="sticky"
+        left="5"
+        borderRightWidth="4px"
+        borderRightColor="primary.100"
+        borderRightStyle="solid"
+        flexDir="column"
+        h="100vh"
+        bg="gray.50"
+      >
+        <VStack pt="30px" gap="6">
+          <Image src="favicon/logo.svg" alt="marzneshin" boxSize="50px" />
+          {pages.map((item: SideBarItemProps, index: number) =>
+            <SidebarItem path={item.path} name={item.name} itemIcon={item.itemIcon} index={index} />)}
+        </VStack>
+      </Flex>
+    </aside>
   )
 }
diff --git a/app/dashboard/src/constants/Pages.tsx b/app/dashboard/src/constants/Pages.tsx
index a799b05..d9d201e 100644
--- a/app/dashboard/src/constants/Pages.tsx
+++ b/app/dashboard/src/constants/Pages.tsx
@@ -2,10 +2,8 @@ import { PageType } from 'types/Page';
 import { chakra } from '@chakra-ui/react';
 import { CubeIcon, HomeIcon, ServerIcon, ServerStackIcon, UsersIcon } from '@heroicons/react/24/outline';
 import { IconBaseStyle } from 'constants/IconBaseStyle';
-import { fetchAdminLoader } from 'components/modules/Router';
 import { UsersPage } from 'pages/Users';
 import { NodesPage } from 'pages/Nodes';
-import { Login } from 'pages/Login';
 import { ServicesPage } from 'pages/Services';
 import { HostPage } from 'pages/Host';
 import { Dashboard } from 'pages/Dashboard';
@@ -21,45 +19,34 @@ export const pages: PageType[] = [
     name: 'pageHeaderTitle.Home',
     path: '/',
     itemIcon: HomeSidebarItemIcon,
-    loader: fetchAdminLoader,
     element: <Dashboard />,
-    errorElement: <Login />
   },
   {
     name: 'pageHeaderTitle.Users',
     path: '/users',
     itemIcon: UsersSidebarItemIcon,
-    loader: fetchAdminLoader,
     element: <UsersPage />,
-    errorElement: <Login />
   },
   {
     name: 'pageHeaderTitle.Services',
     path: '/services',
     itemIcon: ServicesSidebarItemIcon,
     element: <ServicesPage />,
-    loader: fetchAdminLoader, errorElement: <Login />
   },
   {
     name: 'pageHeaderTitle.Nodes',
     path: '/nodes',
     itemIcon: NodesSidebarItemIcon,
     element: <NodesPage />,
-    loader: fetchAdminLoader,
-    errorElement: <Login />
   },
   {
     name: 'pageHeaderTitle.Host',
     path: '/host',
     itemIcon: HostSidebarItemIcon,
     element: <HostPage />,
-    loader: fetchAdminLoader,
-    errorElement: <Login />
   },
 ];
 
 export type PageRoute = Pick<PageType,
-    | 'path'
-    | 'loader'
-    | 'element'
-    | 'errorElement'>
+  | 'path'
+  | 'element'>
diff --git a/app/dashboard/src/constants/Project.ts b/app/dashboard/src/constants/Project.ts
index c78e9bb..cdb34e2 100644
--- a/app/dashboard/src/constants/Project.ts
+++ b/app/dashboard/src/constants/Project.ts
@@ -1,3 +1,3 @@
-export const REPO_URL = 'https://github.com/Gozargah/Marzban';
-export const ORGANIZATION_URL = 'https://github.com/Gozargah';
-export const DONATION_URL = 'https://github.com/Gozargah/Marzban#donation';
+export const REPO_URL = 'https://github.com/khodedawosh/Marzneshin';
+export const ORGANIZATION_URL = 'https://github.com/khodedawosh';
+export const DONATION_URL = 'https://github.com/khodedawosh/Marzneshin#donation';
diff --git a/app/dashboard/src/types/Page.ts b/app/dashboard/src/types/Page.ts
index 3549c39..f054a70 100644
--- a/app/dashboard/src/types/Page.ts
+++ b/app/dashboard/src/types/Page.ts
@@ -4,8 +4,6 @@ import { ChakraIcon } from 'types/ChakraIcon'
 export interface PageType {
     path: string;
     name: string;
-    errorElement: ReactElement;
     element: ReactElement;
-    loader: () => Promise<any>;
     itemIcon: ChakraIcon;
 }