diff --git a/.env.local.example b/.env.local.example
index b31998e..2abfdad 100644
--- a/.env.local.example
+++ b/.env.local.example
@@ -1,4 +1,4 @@
 HOST="rms.witel.ir"
-NEXT_PUBLIC_VERSION="1.0.3"
+NEXT_PUBLIC_VERSION="1.0.4"
 NEXT_PUBLIC_API_URL="https://rms.witel.ir"
 NEXT_PUBLIC_MAPTILE_ENDPOINT="https://rmsmap.rmto.ir/141map"
\ No newline at end of file
diff --git a/src/app/(withAuth)/dashboard/azmayesh/loading.jsx b/src/app/(withAuth)/(dashboardLayout)/dashboard/azmayesh/loading.jsx
similarity index 100%
rename from src/app/(withAuth)/dashboard/azmayesh/loading.jsx
rename to src/app/(withAuth)/(dashboardLayout)/dashboard/azmayesh/loading.jsx
diff --git a/src/app/(withAuth)/dashboard/azmayesh/page.js b/src/app/(withAuth)/(dashboardLayout)/dashboard/azmayesh/page.js
similarity index 100%
rename from src/app/(withAuth)/dashboard/azmayesh/page.js
rename to src/app/(withAuth)/(dashboardLayout)/dashboard/azmayesh/page.js
diff --git a/src/app/(withAuth)/dashboard/azmayesh_type/loading.jsx b/src/app/(withAuth)/(dashboardLayout)/dashboard/azmayesh_type/loading.jsx
similarity index 100%
rename from src/app/(withAuth)/dashboard/azmayesh_type/loading.jsx
rename to src/app/(withAuth)/(dashboardLayout)/dashboard/azmayesh_type/loading.jsx
diff --git a/src/app/(withAuth)/dashboard/azmayesh_type/page.js b/src/app/(withAuth)/(dashboardLayout)/dashboard/azmayesh_type/page.js
similarity index 100%
rename from src/app/(withAuth)/dashboard/azmayesh_type/page.js
rename to src/app/(withAuth)/(dashboardLayout)/dashboard/azmayesh_type/page.js
diff --git a/src/app/(withAuth)/dashboard/damage-items/page.js b/src/app/(withAuth)/(dashboardLayout)/dashboard/damage-items/page.js
similarity index 100%
rename from src/app/(withAuth)/dashboard/damage-items/page.js
rename to src/app/(withAuth)/(dashboardLayout)/dashboard/damage-items/page.js
diff --git a/src/app/(withAuth)/dashboard/damages/operator/page.js b/src/app/(withAuth)/(dashboardLayout)/dashboard/damages/operator/page.js
similarity index 100%
rename from src/app/(withAuth)/dashboard/damages/operator/page.js
rename to src/app/(withAuth)/(dashboardLayout)/dashboard/damages/operator/page.js
diff --git a/src/app/(withAuth)/dashboard/damages/report/page.js b/src/app/(withAuth)/(dashboardLayout)/dashboard/damages/report/page.js
similarity index 100%
rename from src/app/(withAuth)/dashboard/damages/report/page.js
rename to src/app/(withAuth)/(dashboardLayout)/dashboard/damages/report/page.js
diff --git a/src/app/(withAuth)/dashboard/fast-react/operator/page.js b/src/app/(withAuth)/(dashboardLayout)/dashboard/fast-react/operator/page.js
similarity index 100%
rename from src/app/(withAuth)/dashboard/fast-react/operator/page.js
rename to src/app/(withAuth)/(dashboardLayout)/dashboard/fast-react/operator/page.js
diff --git a/src/app/(withAuth)/dashboard/fast-react/supervisor/page.js b/src/app/(withAuth)/(dashboardLayout)/dashboard/fast-react/supervisor/page.js
similarity index 100%
rename from src/app/(withAuth)/dashboard/fast-react/supervisor/page.js
rename to src/app/(withAuth)/(dashboardLayout)/dashboard/fast-react/supervisor/page.js
diff --git a/src/app/(withAuth)/dashboard/inquiry-privacy/assistant/zamin-gov/page.js b/src/app/(withAuth)/(dashboardLayout)/dashboard/inquiry-privacy/assistant/zamin-gov/page.js
similarity index 100%
rename from src/app/(withAuth)/dashboard/inquiry-privacy/assistant/zamin-gov/page.js
rename to src/app/(withAuth)/(dashboardLayout)/dashboard/inquiry-privacy/assistant/zamin-gov/page.js
diff --git a/src/app/(withAuth)/dashboard/inquiry-privacy/city-admin/zamin-gov/page.js b/src/app/(withAuth)/(dashboardLayout)/dashboard/inquiry-privacy/city-admin/zamin-gov/page.js
similarity index 100%
rename from src/app/(withAuth)/dashboard/inquiry-privacy/city-admin/zamin-gov/page.js
rename to src/app/(withAuth)/(dashboardLayout)/dashboard/inquiry-privacy/city-admin/zamin-gov/page.js
diff --git a/src/app/(withAuth)/dashboard/inquiry-privacy/general-manager/zamin-gov/page.js b/src/app/(withAuth)/(dashboardLayout)/dashboard/inquiry-privacy/general-manager/zamin-gov/page.js
similarity index 100%
rename from src/app/(withAuth)/dashboard/inquiry-privacy/general-manager/zamin-gov/page.js
rename to src/app/(withAuth)/(dashboardLayout)/dashboard/inquiry-privacy/general-manager/zamin-gov/page.js
diff --git a/src/app/(withAuth)/dashboard/inquiry-privacy/province-admin/zamin-gov/page.js b/src/app/(withAuth)/(dashboardLayout)/dashboard/inquiry-privacy/province-admin/zamin-gov/page.js
similarity index 100%
rename from src/app/(withAuth)/dashboard/inquiry-privacy/province-admin/zamin-gov/page.js
rename to src/app/(withAuth)/(dashboardLayout)/dashboard/inquiry-privacy/province-admin/zamin-gov/page.js
diff --git a/src/app/(withAuth)/dashboard/loading.jsx b/src/app/(withAuth)/(dashboardLayout)/dashboard/loading.jsx
similarity index 100%
rename from src/app/(withAuth)/dashboard/loading.jsx
rename to src/app/(withAuth)/(dashboardLayout)/dashboard/loading.jsx
diff --git a/src/app/(withAuth)/dashboard/page.js b/src/app/(withAuth)/(dashboardLayout)/dashboard/page.js
similarity index 52%
rename from src/app/(withAuth)/dashboard/page.js
rename to src/app/(withAuth)/(dashboardLayout)/dashboard/page.js
index 46d4a05..13e6158 100644
--- a/src/app/(withAuth)/dashboard/page.js
+++ b/src/app/(withAuth)/(dashboardLayout)/dashboard/page.js
@@ -1,3 +1,7 @@
+export const metadata = {
+    title: "پیشخوان",
+};
+
 const Page = () => {
     return <></>;
 };
diff --git a/src/app/(withAuth)/dashboard/permissions/page.js b/src/app/(withAuth)/(dashboardLayout)/dashboard/permissions/page.js
similarity index 100%
rename from src/app/(withAuth)/dashboard/permissions/page.js
rename to src/app/(withAuth)/(dashboardLayout)/dashboard/permissions/page.js
diff --git a/src/app/(withAuth)/dashboard/road-items/operator/page.js b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-items/operator/page.js
similarity index 100%
rename from src/app/(withAuth)/dashboard/road-items/operator/page.js
rename to src/app/(withAuth)/(dashboardLayout)/dashboard/road-items/operator/page.js
diff --git a/src/app/(withAuth)/dashboard/road-items/reports/items-report/page.js b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-items/reports/items-report/page.js
similarity index 100%
rename from src/app/(withAuth)/dashboard/road-items/reports/items-report/page.js
rename to src/app/(withAuth)/(dashboardLayout)/dashboard/road-items/reports/items-report/page.js
diff --git a/src/app/(withAuth)/dashboard/road-items/reports/map/page.js b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-items/reports/map/page.js
similarity index 100%
rename from src/app/(withAuth)/dashboard/road-items/reports/map/page.js
rename to src/app/(withAuth)/(dashboardLayout)/dashboard/road-items/reports/map/page.js
diff --git a/src/app/(withAuth)/dashboard/road-items/reports/sub-items-report/page.js b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-items/reports/sub-items-report/page.js
similarity index 100%
rename from src/app/(withAuth)/dashboard/road-items/reports/sub-items-report/page.js
rename to src/app/(withAuth)/(dashboardLayout)/dashboard/road-items/reports/sub-items-report/page.js
diff --git a/src/app/(withAuth)/dashboard/road-items/supervisor/page.js b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-items/supervisor/page.js
similarity index 100%
rename from src/app/(withAuth)/dashboard/road-items/supervisor/page.js
rename to src/app/(withAuth)/(dashboardLayout)/dashboard/road-items/supervisor/page.js
diff --git a/src/app/(withAuth)/dashboard/road-patrols/operator/loading.jsx b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-patrols/operator/loading.jsx
similarity index 100%
rename from src/app/(withAuth)/dashboard/road-patrols/operator/loading.jsx
rename to src/app/(withAuth)/(dashboardLayout)/dashboard/road-patrols/operator/loading.jsx
diff --git a/src/app/(withAuth)/dashboard/road-patrols/operator/page.js b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-patrols/operator/page.js
similarity index 100%
rename from src/app/(withAuth)/dashboard/road-patrols/operator/page.js
rename to src/app/(withAuth)/(dashboardLayout)/dashboard/road-patrols/operator/page.js
diff --git a/src/app/(withAuth)/dashboard/road-patrols/reports/page.js b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-patrols/reports/page.js
similarity index 100%
rename from src/app/(withAuth)/dashboard/road-patrols/reports/page.js
rename to src/app/(withAuth)/(dashboardLayout)/dashboard/road-patrols/reports/page.js
diff --git a/src/app/(withAuth)/dashboard/road-patrols/supervisor/loading.jsx b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-patrols/supervisor/loading.jsx
similarity index 100%
rename from src/app/(withAuth)/dashboard/road-patrols/supervisor/loading.jsx
rename to src/app/(withAuth)/(dashboardLayout)/dashboard/road-patrols/supervisor/loading.jsx
diff --git a/src/app/(withAuth)/dashboard/road-patrols/supervisor/page.js b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-patrols/supervisor/page.js
similarity index 100%
rename from src/app/(withAuth)/dashboard/road-patrols/supervisor/page.js
rename to src/app/(withAuth)/(dashboardLayout)/dashboard/road-patrols/supervisor/page.js
diff --git a/src/app/(withAuth)/dashboard/road-safety/operator/loading.jsx b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-safety/operator/loading.jsx
similarity index 100%
rename from src/app/(withAuth)/dashboard/road-safety/operator/loading.jsx
rename to src/app/(withAuth)/(dashboardLayout)/dashboard/road-safety/operator/loading.jsx
diff --git a/src/app/(withAuth)/dashboard/road-safety/operator/page.js b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-safety/operator/page.js
similarity index 100%
rename from src/app/(withAuth)/dashboard/road-safety/operator/page.js
rename to src/app/(withAuth)/(dashboardLayout)/dashboard/road-safety/operator/page.js
diff --git a/src/app/(withAuth)/dashboard/road-safety/reports/map/page.js b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-safety/reports/map/page.js
similarity index 100%
rename from src/app/(withAuth)/dashboard/road-safety/reports/map/page.js
rename to src/app/(withAuth)/(dashboardLayout)/dashboard/road-safety/reports/map/page.js
diff --git a/src/app/(withAuth)/dashboard/road-safety/reports/page.js b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-safety/reports/page.js
similarity index 100%
rename from src/app/(withAuth)/dashboard/road-safety/reports/page.js
rename to src/app/(withAuth)/(dashboardLayout)/dashboard/road-safety/reports/page.js
diff --git a/src/app/(withAuth)/dashboard/user-activities/page.js b/src/app/(withAuth)/(dashboardLayout)/dashboard/user-activities/page.js
similarity index 100%
rename from src/app/(withAuth)/dashboard/user-activities/page.js
rename to src/app/(withAuth)/(dashboardLayout)/dashboard/user-activities/page.js
diff --git a/src/app/(withAuth)/infrastructure/toll-house/loading.jsx b/src/app/(withAuth)/(dashboardLayout)/infrastructure/toll-house/loading.jsx
similarity index 100%
rename from src/app/(withAuth)/infrastructure/toll-house/loading.jsx
rename to src/app/(withAuth)/(dashboardLayout)/infrastructure/toll-house/loading.jsx
diff --git a/src/app/(withAuth)/(dashboardLayout)/infrastructure/toll-house/map/page.js b/src/app/(withAuth)/(dashboardLayout)/infrastructure/toll-house/map/page.js
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/(withAuth)/infrastructure/toll-house/page.js b/src/app/(withAuth)/(dashboardLayout)/infrastructure/toll-house/page.js
similarity index 87%
rename from src/app/(withAuth)/infrastructure/toll-house/page.js
rename to src/app/(withAuth)/(dashboardLayout)/infrastructure/toll-house/page.js
index dec7c50..ca84816 100644
--- a/src/app/(withAuth)/infrastructure/toll-house/page.js
+++ b/src/app/(withAuth)/(dashboardLayout)/infrastructure/toll-house/page.js
@@ -2,7 +2,7 @@ import WithPermission from "@/core/middlewares/withPermission";
 import TollHousePage from "@/components/infrastructure/tollHouse";
 
 export const metadata = {
-    title: "فهرست راهدارخانه ها",
+    title: "لیست راهدارخانه ها",
 };
 
 const Page = () => {
diff --git a/src/app/(withAuth)/dashboard/layout.js b/src/app/(withAuth)/(dashboardLayout)/layout.js
similarity index 100%
rename from src/app/(withAuth)/dashboard/layout.js
rename to src/app/(withAuth)/(dashboardLayout)/layout.js
diff --git a/src/app/(withAuth)/infrastructure/layout.js b/src/app/(withAuth)/infrastructure/layout.js
deleted file mode 100644
index 219cee2..0000000
--- a/src/app/(withAuth)/infrastructure/layout.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import HeaderWithLogo from "@/components/layouts/dashboard/headerWithLogo";
-import HeaderWithSidebar from "@/components/layouts/dashboard/headerWithSidebar";
-import { Stack } from "@mui/material";
-
-const Layout = ({ children }) => {
-    return (
-        <Stack sx={{ width: "100%", height: "100%" }}>
-            <HeaderWithLogo />
-            <HeaderWithSidebar>{children}</HeaderWithSidebar>
-        </Stack>
-    );
-};
-export default Layout;
diff --git a/src/components/dashboard/roadPatrols/operator/OperatorList.jsx b/src/components/dashboard/roadPatrols/operator/OperatorList.jsx
index 4548072..2de63a8 100644
--- a/src/components/dashboard/roadPatrols/operator/OperatorList.jsx
+++ b/src/components/dashboard/roadPatrols/operator/OperatorList.jsx
@@ -71,15 +71,12 @@ const OperatorList = () => {
                         },
                     },
                 },
-                Cell: ({ renderedCellValue }) => {
-                    if (renderedCellValue) {
-                        return (
-                            <Stack alignItems={"center"} justifyContent={"center"}>
-                                <RahdaranDialog rahdarLists={renderedCellValue} />
-                            </Stack>
-                        );
-                    }
-                    return <Typography variant="body2">-</Typography>;
+                Cell: ({ renderedCellValue, row }) => {
+                    return (
+                        <Stack alignItems={"center"} justifyContent={"center"}>
+                            <RahdaranDialog rowId={row.original.id} />
+                        </Stack>
+                    );
                 },
             },
             {
diff --git a/src/components/dashboard/roadPatrols/operator/RowActions/RahdaranForm/RahdaranContent.jsx b/src/components/dashboard/roadPatrols/operator/RowActions/RahdaranForm/RahdaranContent.jsx
index d1e9b15..1a31ce8 100644
--- a/src/components/dashboard/roadPatrols/operator/RowActions/RahdaranForm/RahdaranContent.jsx
+++ b/src/components/dashboard/roadPatrols/operator/RowActions/RahdaranForm/RahdaranContent.jsx
@@ -1,22 +1,44 @@
-import { DialogContent, Paper, Table, TableBody, TableCell, TableContainer, TableHead, TableRow } from "@mui/material";
+import DialogLoading from "@/core/components/DialogLoading";
+import { GET_RAHDARAN_ROAD_POTROL } from "@/core/utils/routes";
+import useRequest from "@/lib/hooks/useRequest";
+import {
+    DialogContent,
+    Table,
+    TableBody,
+    TableCell,
+    TableContainer,
+    TableHead,
+    TableRow,
+    Typography,
+} from "@mui/material";
+import { useEffect, useState } from "react";
+
+const RahdaranContent = ({ rowId }) => {
+    const [loading, setLoading] = useState(true);
+    const [data, setData] = useState(null);
+    const request = useRequest();
+
+    useEffect(() => {
+        const fetchData = async () => {
+            try {
+                setLoading(true);
+                const response = await request(`${GET_RAHDARAN_ROAD_POTROL}/${rowId}`);
+                setData(response.data.data);
+            } catch (error) {
+            } finally {
+                setLoading(false);
+            }
+        };
+
+        fetchData();
+    }, [rowId]);
 
-const RahdaranContent = ({ rahdarLists }) => {
     return (
         <>
             <DialogContent>
-                <Paper
-                    elevation={0}
-                    sx={{
-                        width: "100%",
-                        overflow: "hidden",
-                        "*::-webkit-scrollbar": {
-                            width: "0.5em",
-                        },
-                        "*::-webkit-scrollbar-thumb": {
-                            backgroundColor: "primary.main",
-                        },
-                    }}
-                >
+                {loading ? (
+                    <DialogLoading />
+                ) : data ? (
                     <TableContainer sx={{ maxHeight: 600 }}>
                         <Table stickyHeader sx={{ minWidth: 800 }}>
                             <TableHead>
@@ -26,7 +48,7 @@ const RahdaranContent = ({ rahdarLists }) => {
                                 </TableRow>
                             </TableHead>
                             <TableBody>
-                                {rahdarLists.map((rahdar) => {
+                                {data.map((rahdar) => {
                                     return (
                                         <TableRow
                                             key={rahdar.id}
@@ -40,7 +62,9 @@ const RahdaranContent = ({ rahdarLists }) => {
                             </TableBody>
                         </Table>
                     </TableContainer>
-                </Paper>
+                ) : (
+                    <Typography textAlign={"center"}>اطلاعات راهداران در سامانه یافت نشد</Typography>
+                )}
             </DialogContent>
         </>
     );
diff --git a/src/components/dashboard/roadPatrols/operator/RowActions/RahdaranForm/index.jsx b/src/components/dashboard/roadPatrols/operator/RowActions/RahdaranForm/index.jsx
index 2c73d80..e3a2efc 100644
--- a/src/components/dashboard/roadPatrols/operator/RowActions/RahdaranForm/index.jsx
+++ b/src/components/dashboard/roadPatrols/operator/RowActions/RahdaranForm/index.jsx
@@ -3,7 +3,7 @@ import GroupsIcon from "@mui/icons-material/Groups";
 import { useState } from "react";
 import RahdaranContent from "./RahdaranContent";
 
-const RahdaranDialog = ({ rahdarLists }) => {
+const RahdaranDialog = ({ rowId }) => {
     const [openRahdaranDialog, setOpenRahdaranDialog] = useState(false);
     return (
         <>
@@ -25,7 +25,7 @@ const RahdaranDialog = ({ rahdarLists }) => {
                 maxWidth={"md"}
             >
                 <DialogTitle sx={{ fontSize: "large" }}>لیست راهداران</DialogTitle>
-                <RahdaranContent rahdarLists={rahdarLists} />
+                {openRahdaranDialog && <RahdaranContent rowId={rowId} />}
                 <DialogActions>
                     <Button onClick={() => setOpenRahdaranDialog(false)} variant="outlined" color="secondary" autoFocus>
                         بستن
diff --git a/src/components/infrastructure/tollHouse/index.jsx b/src/components/infrastructure/tollHouse/index.jsx
index c1d4172..9089a83 100644
--- a/src/components/infrastructure/tollHouse/index.jsx
+++ b/src/components/infrastructure/tollHouse/index.jsx
@@ -6,7 +6,7 @@ import TollHouseList from "./TollHouseList";
 const TollHousePage = () => {
     return (
         <Stack spacing={1}>
-            <PageTitle title={"فهرست راهدارخانه ها"} />
+            <PageTitle title={"لیست راهدارخانه ها"} />
             <TollHouseList />
         </Stack>
     );
diff --git a/src/core/utils/routes.js b/src/core/utils/routes.js
index 62e55ab..4fd9f13 100644
--- a/src/core/utils/routes.js
+++ b/src/core/utils/routes.js
@@ -39,6 +39,7 @@ export const DELETE_ROAD_PATROL_SUPERVISOR = api + "/api/v3/road_patrols/delete"
 export const GET_CMMS_MACHINE_ROAD_PATROL = api + "/api/v3/road_patrols/machines";
 export const GET_ROAD_PATROL_OPERATOR_REPORT = api + "/v2/road_patrols/operator/report";
 export const GET_ROAD_PATROL_SUPERVISOR_REPORT = api + "/v2/road_patrols/operator/report";
+export const GET_RAHDARAN_ROAD_POTROL = api + "/api/v3/road_patrols/rahdaran";
 export const CREATE_PATROL = api + "/api/v3/road_patrols/store";
 export const GET_FMS_DATA = api + "/api/v3/fms_vehicle/get_activity";
 export const GET_OTP_TOKEN = api + "/api/v3/otp/get_token";