diff --git a/CheckDrive.Web/CheckDrive.Web/Controllers/AccountsController.cs b/CheckDrive.Web/CheckDrive.Web/Controllers/AccountsController.cs
index 1269cfc2..4fca51a4 100644
--- a/CheckDrive.Web/CheckDrive.Web/Controllers/AccountsController.cs
+++ b/CheckDrive.Web/CheckDrive.Web/Controllers/AccountsController.cs
@@ -27,7 +27,7 @@ public async Task<IActionResult> Index(string? searchString, int? roleId, DateTi
         {
             var accounts = await _accountDataStore.GetAccountsAsync(searchString, roleId, birthDate, pageNumber);
 
-            var roles = await GETRoles();
+            var roles = await GetRolesAsync();
 
             roles.Insert(0, new RoleDto
             {
@@ -88,7 +88,7 @@ public async Task<IActionResult> Details(int id)
         }
         public async Task<IActionResult> Create()
         {
-            var roles = await GETRoles();
+            var roles = await GetRolesAsync();
             ViewBag.Roles = new SelectList(roles, "Id", "Name");
             return View();
         }
@@ -102,7 +102,7 @@ public async Task<IActionResult> Create([Bind("Login,Password,PhoneNumber,FirstN
                 var newAccount = await _accountDataStore.CreateAccountAsync(account);
                 return RedirectToAction("Details", new {id = newAccount.Id});
             }
-            var roles = await GETRoles();
+            var roles = await GetRolesAsync();
             ViewBag.Roles = new SelectList(roles, "Id", "Name");
             return View(account);
         }
@@ -110,7 +110,9 @@ public async Task<IActionResult> Create([Bind("Login,Password,PhoneNumber,FirstN
         public async Task<IActionResult> Edit(int id)
         {
             var account = await _accountDataStore.GetAccountAsync(id);
-
+            var roles = await GetRolesAsync();
+            ViewBag.Roles = new SelectList(roles, "Id", "Name");
+            
             return View(account);
         }
 
@@ -122,7 +124,7 @@ public async Task<IActionResult> Edit(int id, [Bind("Id,Login,Password,PhoneNumb
             if (ModelState.IsValid)
             {
                 var newAccount = await _accountDataStore.UpdateAccountAsync(id, account);
-                return RedirectToAction("Details", new { id = newAccount.Id });
+                return RedirectToAction(nameof(Index));
             }
             return View(account);
         }
@@ -145,7 +147,7 @@ public async Task<IActionResult> DeleteConfirmed(int id)
             return RedirectToAction(nameof(Index));
         }
 
-        private async Task<List<RoleDto>> GETRoles()
+        private async Task<List<RoleDto>> GetRolesAsync()
         {
             var roleResponse = await _roleStore.GetRoles();
             var roles = roleResponse.Data.ToList();
diff --git a/CheckDrive.Web/CheckDrive.Web/Controllers/CarsController.cs b/CheckDrive.Web/CheckDrive.Web/Controllers/CarsController.cs
index 0b6f308f..5b43280b 100644
--- a/CheckDrive.Web/CheckDrive.Web/Controllers/CarsController.cs
+++ b/CheckDrive.Web/CheckDrive.Web/Controllers/CarsController.cs
@@ -109,7 +109,7 @@ public async Task<IActionResult> Create([Bind("Model,Color,Number,RemainingFuel,
             if (ModelState.IsValid)
             {
                 var newCar = await _carDataStore.CreateCarAsync(car);
-                return RedirectToAction("Details", new { id = newCar.Id });
+                return RedirectToAction(nameof(Index));
             }
             return View(car);
         }
@@ -131,7 +131,7 @@ public async Task<IActionResult> Edit(int id, [Bind("Id,Model,Color,Number,Remai
             if (ModelState.IsValid)
             {
                 var newCar = await _carDataStore.UpdateCarAsync(id, car);
-                return RedirectToAction("Details", new { id = newCar.Id });
+                return RedirectToAction(nameof(Index));
             }
             return View(car);
         }
diff --git a/CheckDrive.Web/CheckDrive.Web/Stores/Menu/MenuService.cs b/CheckDrive.Web/CheckDrive.Web/Stores/Menu/MenuService.cs
index 33b94cda..cb05c540 100644
--- a/CheckDrive.Web/CheckDrive.Web/Stores/Menu/MenuService.cs
+++ b/CheckDrive.Web/CheckDrive.Web/Stores/Menu/MenuService.cs
@@ -46,7 +46,7 @@ public List<Object> GetMenuItems(string role)
             {
                 text = "Yoqilg'ilar",
                 iconCss = "fa-solid fa-gas-pump",
-                url = "/#"
+                url = "/oilMarks"
             });
             
             menuItems.Add(new
diff --git a/CheckDrive.Web/CheckDrive.Web/Views/Accounts/Create.cshtml b/CheckDrive.Web/CheckDrive.Web/Views/Accounts/Create.cshtml
index 956cf7c5..f01a01ce 100644
--- a/CheckDrive.Web/CheckDrive.Web/Views/Accounts/Create.cshtml
+++ b/CheckDrive.Web/CheckDrive.Web/Views/Accounts/Create.cshtml
@@ -2,7 +2,7 @@
 
 @{
     ViewData["Title"] = "Create";
-    Layout = null;
+    Layout = "~/Views/Shared/_LayoutForModal.cshtml";
 }
 <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
 
diff --git a/CheckDrive.Web/CheckDrive.Web/Views/Accounts/Delete.cshtml b/CheckDrive.Web/CheckDrive.Web/Views/Accounts/Delete.cshtml
index c631311c..6d2b14f7 100644
--- a/CheckDrive.Web/CheckDrive.Web/Views/Accounts/Delete.cshtml
+++ b/CheckDrive.Web/CheckDrive.Web/Views/Accounts/Delete.cshtml
@@ -2,78 +2,25 @@
 
 @{
     ViewData["Title"] = "Delete";
-    Layout = "~/Views/Shared/_Layout.cshtml";
+    Layout = "~/Views/Shared/_LayoutForModal.cshtml";
 }
-
-<h1 class="align-items-baseline" style="margin-top: 100px">O'chirish</h1>
-<hr />
-
-<h3 style="color:grey;">Haqiqatan ham buni oʻchirib tashlamoqchimisiz? 
-     O'chirsangiz bu shaxs ishtirok etgan barcha ma'lumotlar ham o'chiriladi!!!
-</h3>
+<h1 class="text-center mb-5 text-danger"><i class="fa fa-exclamation-circle" style="font-size:100px"></i></h1>
+<h4 style="color:grey;">
+    Haqiqatan ham <b style="color:black;">@Model.FirstName @Model.LastName</b>ni oʻchirib tashlamoqchimisiz?
+    O'chirsangiz bu shaxs ishtirok etgan barcha ma'lumotlar ham o'chiriladi!!!
+</h4>
 <div>
-    <hr/>
-    <dl class="row">
-        <dt class="col-sm-2">
-            Id:
-        </dt>
-        <dd class="col-sm-10">
-            @Html.DisplayFor(model => model.Id)
-        </dd>
-        <dt class="col-sm-2">
-            Ism:
-        </dt>
-        <dd class="col-sm-10">
-            @Html.DisplayFor(model => model.FirstName)
-        </dd>
-        <dt class="col-sm-2">
-            Familiya:
-        </dt>
-        <dd class="col-sm-10">
-            @Html.DisplayFor(model => model.LastName)
-        </dd>
-        <dt class="col-sm-2">
-            Tug'ilgan kun:
-        </dt>
-        <dd class="col-sm-10">
-            @(Model.Bithdate.ToString("yyyy-MM-dd"))
-        </dd>
-        <dt class="col-sm-2">
-            Telefon raqam:
-        </dt>
-        <dd class="col-sm-10">
-            @Html.DisplayFor(model => model.PhoneNumber)
-        </dd>
-        <dt class="col-sm-2">
-            Login:
-        </dt>
-        <dd class="col-sm-10">
-            @Html.DisplayFor(model => model.Login)
-        </dd>
-        <dt class="col-sm-2">
-            Parol:
-        </dt>
-        <dd class="col-sm-10">
-            @Html.DisplayFor(model => model.Password)
-        </dd>
-        <dt class="col-sm-2">
-            Kasb:
-        </dt>
-        <dd class="col-sm-10">
-            @Html.DisplayFor(model => model.RoleName)
-        </dd>
-    </dl>
-    <!-- Buttons -->
-    <form asp-action="Delete">
-        <div class="form-group">
-            <a asp-action="Index" class="btn btn-outline-info">
-                <i class="fa-solid fa-arrow-left-long"></i>
-                Orqaga
-            </a>
-            <button asp-route-itemid="@Model.Id" class="btn btn-outline-danger">
-                <i class="fa-solid fa-trash"></i>
-                O'chirish
+    <hr />
+    <form asp-action="Delete" asp-controller="Accounts">
+        <div class="d-flex justify-content-center mt-5 m-2" style="gap: 10px;">
+            <button asp-action="Index" class="btn btn-secondary" style="width:120px">
+                Yo'q
+            </button>
+            <button asp-route-itemid="@Model.Id" class="btn btn-danger" style="width:120px">
+                Ha
             </button>
         </div>
     </form>
 </div>
+<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
diff --git a/CheckDrive.Web/CheckDrive.Web/Views/Accounts/Details.cshtml b/CheckDrive.Web/CheckDrive.Web/Views/Accounts/Details.cshtml
index 7fec05d8..c71fc614 100644
--- a/CheckDrive.Web/CheckDrive.Web/Views/Accounts/Details.cshtml
+++ b/CheckDrive.Web/CheckDrive.Web/Views/Accounts/Details.cshtml
@@ -3,7 +3,7 @@
 
 @{
     ViewData["Title"] = "Details";
-    Layout = null;
+    Layout = "~/Views/Shared/_LayoutForModal.cshtml";
 }
 
 <div class="nav nav-pills nav-fill" id="nav-tab" role="tablist">
diff --git a/CheckDrive.Web/CheckDrive.Web/Views/Accounts/Edit.cshtml b/CheckDrive.Web/CheckDrive.Web/Views/Accounts/Edit.cshtml
index 3e5e46d2..bee5e072 100644
--- a/CheckDrive.Web/CheckDrive.Web/Views/Accounts/Edit.cshtml
+++ b/CheckDrive.Web/CheckDrive.Web/Views/Accounts/Edit.cshtml
@@ -1,58 +1,76 @@
 @model CheckDrive.ApiContracts.Account.AccountDto
 
 @{
-    ViewData["Title"] = "Edit";
-    Layout = "~/Views/Shared/_Layout.cshtml";
+    ViewData["Title"] = "Edit";    
+    Layout = "~/Views/Shared/_LayoutForModal.cshtml";
 }
-
-<h4>Ishchi ma`lumoti</h4>
-<hr />
-<div class="row">
-    <div class="col-md-4">
-        <form asp-action="Edit">
-            <div asp-validation-summary="ModelOnly" class="text-danger"></div>
-            <div class="form-group">
+<form id="editAccountForm" asp-action="Edit" method="post" asp-controller="Accounts">
+    @Html.AntiForgeryToken()
+    <div asp-validation-summary="ModelOnly" class="text-danger"></div>
+    <div class="row gap-5 ms-4 mb-3">
+        <div class="col-md-5">
+            <div>
                 <label asp-for="FirstName" class="control-label">Ism</label>
-                <input asp-for="FirstName" class="form-control" />
-                <span asp-validation-for="FirstName" class="text-danger"></span>
             </div>
-            <div class="form-group">
+            <input asp-for="FirstName" class="form-control" />
+            <span asp-validation-for="FirstName" class="text-danger"></span>
+        </div>
+        <div class="col-md-5">
+            <div>
                 <label asp-for="LastName" class="control-label">Familiya</label>
-                <input asp-for="LastName" class="form-control" />
-                <span asp-validation-for="LastName" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="Bithdate" class="control-label">Tug'ilgan yil</label>
-                <input asp-for="Bithdate" type="date" class="form-control" />
-                <span asp-validation-for="Bithdate" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="PhoneNumber" class="control-label">Telefon raqam</label>
-                <input asp-for="PhoneNumber" class="form-control" />
-                <span asp-validation-for="PhoneNumber" class="text-danger"></span>
             </div>
-            <div class="form-group">
+            <input asp-for="LastName" class="form-control" />
+            <span asp-validation-for="LastName" class="text-danger"></span>
+        </div>
+    </div>
+    <div class="row gap-5 ms-4 mb-3">
+        <div class="col-md-5">
+            <div>
                 <label asp-for="Login" class="control-label">Login</label>
-                <input asp-for="Login" class="form-control" />
-                <span asp-validation-for="Login" class="text-danger"></span>
             </div>
-            <div class="form-group">
+            <input asp-for="Login" class="form-control" />
+            <span asp-validation-for="Login" class="text-danger"></span>
+        </div>
+        <div class="col-md-5">
+            <div>
                 <label asp-for="Password" class="control-label">Parol</label>
-                <input asp-for="Password" class="form-control" />
-                <span asp-validation-for="Password" class="text-danger"></span>
             </div>
-            <input asp-for="RoleId" type="hidden" />
-            <div class="form-group mt-3">
-                <a asp-action="Details" asp-route-id="@Model?.Id" class="btn btn-outline-info">
-                    <i class="fa-solid fa-arrow-left-long"></i>
-                    Orqaga
-                </a>
-                <button class="btn btn-outline-success">
-                    <i class="fa fa-pencil"></i> Saqlash
-                </button>
+            <input asp-for="Password" class="form-control" />
+            <span asp-validation-for="Password" class="text-danger"></span>
+        </div>
+    </div>
+    <div class="row gap-1 ms-4">
+        <div class="col-md-4">
+            <div>
+                <label asp-for="PhoneNumber" class="control-label">Telefon raqam</label>
+            </div>
+            <input id="phoneNumberId" class="form-control" asp-for="PhoneNumber" style="height:37.6px; width:160px" />
+            <span asp-validation-for="PhoneNumber" class="text-danger"></span>
+        </div>
+        <div class="col-md-3">
+            <div>
+                <label asp-for="Bithdate" class="control-label">Tug'ilgan kun</label>
+            </div>
+            <ejs-datepicker id="birthdateId"
+                            class="background"
+                            format="dd/MM/yyyy"
+                            ejs-for="Bithdate"
+                            style="height:36.6px">
+            </ejs-datepicker>           
+            <span asp-validation-for="Bithdate" class="text-danger"></span>
+        </div>
+        <div class="col-md-4">
+            <div>
+                <label asp-for="RoleId" class=" control-label">Kasb tanlang</label>
+                <select name="roleId" asp-for="RoleId" class="form-select form-control border" asp-items="@ViewBag.Roles"></select>
             </div>
-        </form>
+        </div>
     </div>
-</div>
-
-
+    <div class="d-flex justify-content-center mb-3 mt-5">
+        <div class="d-grid w-50">
+            <button type="submit" id="saveButtonId" class="btn btn-success mr-auto" style="font-size: 14px;">
+                Saqlash
+            </button>
+        </div>
+    </div>
+</form>
diff --git a/CheckDrive.Web/CheckDrive.Web/Views/Accounts/Index.cshtml b/CheckDrive.Web/CheckDrive.Web/Views/Accounts/Index.cshtml
index 6e9d299b..ff7d3093 100644
--- a/CheckDrive.Web/CheckDrive.Web/Views/Accounts/Index.cshtml
+++ b/CheckDrive.Web/CheckDrive.Web/Views/Accounts/Index.cshtml
@@ -161,8 +161,8 @@
     });
 
     $('#createModal').on('hidden.bs.modal', function () {
-        $(this).find('#accountModalContent').empty(); // Modal kontentini tozalash
-        $(this).off('hidden.bs.modal'); // Hodisani tozalash, har safar qayta yuklamaslik uchun
+        $(this).find('#accountModalContent').empty();
+        $(this).off('hidden.bs.modal');
     });
 </script>
 
@@ -203,4 +203,72 @@
     $('#detailsModal').on('hidden.bs.modal', function () {
         $(this).find('#detailsContent').empty();
     });
-</script>
\ No newline at end of file
+</script>
+
+<div class="modal fade" id="deleteModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-body" id="deleteContent">
+            </div>
+        </div>
+    </div>
+</div>
+
+<script>
+    function onDeleteClick(id) {
+        $('#deleteContent').empty();
+        $.ajax({
+            url: "/accounts/delete/" + id,
+            type: 'GET',
+            success: function (data) {
+                $('#deleteContent').html(data);
+                $('#deleteModal').modal('show');
+            },
+            error: function () {
+                $('#deleteContent').html('<p>Error loading details</p>');
+            }
+        });
+        $(this).find('#deleteContent').empty();
+        $(this).off('hidden.bs.modal');
+    }
+</script>
+
+<div class="modal fade" id="accountEditModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-header d-flex justify-content-center">
+                <h4 class="modal-title">Ishchi ma'lumotini o'zgartirish</h4>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" data-target="#">
+                    <span aria-hidden="true"></span>
+                </button>
+            </div>
+            <div class="modal-body" id="accountEditModalContent">
+            </div>
+        </div>
+    </div>
+</div>
+
+<script type="text/javascript">
+    function onEditClick(id) {
+        $('#accountEditModalContent').empty();
+        $.ajax({
+            url: "/accounts/edit/" + id,
+            type: 'GET',
+            success: function (data) {
+                $('#accountEditModalContent').html(data);
+                $('#accountEditModal').modal({
+                    backdrop: 'static',
+                    keyboard: false
+                }).modal('show');
+
+                var birthdateValue = $('#birthdateId').val();
+                console.log(birthdateValue);
+            },
+            error: function (error) {
+                alert("Tahrirlash oynasini ochishda muommo bo'ldi \n" + error);
+            }
+        });
+        $(this).find('#accountEditModalContent').empty();
+        $(this).off('hidden.bs.modal');
+    }
+</script>
diff --git a/CheckDrive.Web/CheckDrive.Web/Views/Cars/Create.cshtml b/CheckDrive.Web/CheckDrive.Web/Views/Cars/Create.cshtml
index db7aedee..3905a3d9 100644
--- a/CheckDrive.Web/CheckDrive.Web/Views/Cars/Create.cshtml
+++ b/CheckDrive.Web/CheckDrive.Web/Views/Cars/Create.cshtml
@@ -2,7 +2,7 @@
 
 @{
     ViewData["Title"] = "Create";
-    Layout = null;   
+    Layout = "~/Views/Shared/_LayoutForModal.cshtml";
 }
 <form asp-action="Create" method="post" id="createCarForm" onsubmit="return validateForm()">
     @Html.AntiForgeryToken()
diff --git a/CheckDrive.Web/CheckDrive.Web/Views/Cars/Delete.cshtml b/CheckDrive.Web/CheckDrive.Web/Views/Cars/Delete.cshtml
index fad8d2f1..62d7ce3e 100644
--- a/CheckDrive.Web/CheckDrive.Web/Views/Cars/Delete.cshtml
+++ b/CheckDrive.Web/CheckDrive.Web/Views/Cars/Delete.cshtml
@@ -2,108 +2,22 @@
 
 @{
     ViewData["Title"] = "Delete";
-    Layout = "~/Views/Shared/_Layout.cshtml";
+    Layout = "~/Views/Shared/_LayoutForModal.cshtml";
 }
-
-<h1 class="align-items-baseline" style="margin-top: 100px">O'chirish</h1>
-<hr />
-
-<h3 style="color:grey;">
-    Haqiqatan ham buni oʻchirib tashlamoqchimisiz?
-    O'chirsangiz bu mashina ishtirok etgan barcha ma'lumotlar ham o'chiriladi!!!
-</h3>
+<h1 class="text-center mb-5 text-danger"><i class="fa fa-exclamation-circle" style="font-size:100px"></i></h1>
+<h4 style="color:grey;">
+    Haqiqatan ham <b style="color:black"> @Model.Model</b> rusumli <b style="color:black">@Model.Number</b> raqamli avtomobilni oʻchirib tashlamoqchimisiz?
+    O'chirsangiz bu avtomobil ishtirok etgan barcha ma'lumotlar ham o'chiriladi!!!
+</h4>
 <div>
     <hr />
-    <dl class="row">
-        <dt class="col-sm-2">
-            ID:
-        </dt>
-        <dd class="col-sm-10">
-            @Html.DisplayFor(model => model.Id)
-        </dd>
-        <dt class="col-sm-2">
-            Model:
-        </dt>
-        <dd class="col-sm-10">
-            @Html.DisplayFor(model => model.Model)
-        </dd>
-        <dt class="col-sm-2">
-            Rangi:
-        </dt>
-        <dd class="col-sm-10">
-            @Html.DisplayFor(model => model.Color)
-        </dd>
-        <dt class="col-sm-2">
-            Davlat raqami:
-        </dt>
-        <dd class="col-sm-10">
-            @Html.DisplayFor(model => model.Number)
-        </dd>
-        <dt class="col-sm-2">
-            Ishlab chiqarilgan yili:
-        </dt>
-        <dd class="col-sm-10">
-            @Html.DisplayFor(model => model.ManufacturedYear)
-        </dd>
-        <dt class="col-sm-2">
-            Bosib o'tgan masofasi:
-        </dt>
-        <dd class="col-sm-10">
-            @Html.DisplayFor(model => model.Mileage)
-        </dd>
-        <dt class="col-sm-2">
-            Avtomobildagi yoqilg'i qoldig`i:
-        </dt>
-        <dd class="col-sm-10">
-            @Html.DisplayFor(model => model.RemainingFuel)
-        </dd>
-        <dt class="col-sm-2">
-            O'rtacha yoqilg'i sarfi:
-        </dt>
-        <dd class="col-sm-10">
-            @Html.DisplayFor(model => model.MeduimFuelConsumption)
-        </dd>
-        <dt class="col-sm-2">
-            Yoqilg'i baki sig'imi:
-        </dt>
-        <dd class="col-sm-10">
-            @Html.DisplayFor(model => model.FuelTankCapacity)
-        </dd>
-        <dt class="col-sm-2">
-            1 yillik bosib o'tish me'yori:
-        </dt>
-        <dd class="col-sm-10">
-            @Html.DisplayFor(model => model.OneYearMediumDistance)
-        </dd>
-        <dt class="col-sm-2">
-            1 oylik bosib o'tish me'yori:
-        </dt>
-        <dd class="col-sm-10">
-            @Html.DisplayFor(model => model.OneMonthMediumDistance)
-        </dd>
-        <dt class="col-sm-2">
-            1 yillik yoqilg'i me'yori:
-        </dt>
-        <dd class="col-sm-10">
-            @Html.DisplayFor(model => model.OneYearMeduimFuelConsumption)
-        </dd>
-        <dt class="col-sm-2">
-            1 oylik yoqilg'i me'yori:
-        </dt>
-        <dd class="col-sm-10">
-            @Html.DisplayFor(model => model.OneMonthMeduimFuelConsumption)
-        </dd>
-    </dl>
-    <!-- Tugmalar -->
     <form asp-action="Delete">
-        <div class="form-group">
-            <a asp-action="Index" class="btn btn-outline-info">
-                <i class="fa-solid fa-arrow-left-long"></i>
-                Orqaga
-            </a>
-            <button asp-route-itemid="@Model.Id" class="btn btn-outline-danger">
-                <i class="fa-solid fa-trash"></i>
-                O'chirish
+        <div class="d-flex justify-content-center mt-5 m-2" style="gap: 10px;">
+            <button asp-action="Index" class="btn btn-secondary" style="width:120px">
+                Yo'q
+            </button>
+            <button type="submit" asp-route-itemid="@Model.Id" class="btn btn-danger" style="width:120px">
+                Ha
             </button>
         </div>
     </form>
diff --git a/CheckDrive.Web/CheckDrive.Web/Views/Cars/Details.cshtml b/CheckDrive.Web/CheckDrive.Web/Views/Cars/Details.cshtml
index 0d99632b..1a82be47 100644
--- a/CheckDrive.Web/CheckDrive.Web/Views/Cars/Details.cshtml
+++ b/CheckDrive.Web/CheckDrive.Web/Views/Cars/Details.cshtml
@@ -2,7 +2,7 @@
 
 @{
     ViewData["Title"] = "Details";
-    Layout = null;
+    Layout = "~/Views/Shared/_LayoutForModal.cshtml";
 }
 
 <div class="grid-container mt-3">
diff --git a/CheckDrive.Web/CheckDrive.Web/Views/Cars/Edit.cshtml b/CheckDrive.Web/CheckDrive.Web/Views/Cars/Edit.cshtml
index 0610f760..a6d89807 100644
--- a/CheckDrive.Web/CheckDrive.Web/Views/Cars/Edit.cshtml
+++ b/CheckDrive.Web/CheckDrive.Web/Views/Cars/Edit.cshtml
@@ -2,7 +2,7 @@
 
 @{
     ViewData["Title"] = "Edit";
-    Layout = null;
+    Layout = "~/Views/Shared/_LayoutForModal.cshtml";
 }
 <form asp-action="edit" method="post" id="editCarForm" onsubmit="return validateForm()">
     @Html.AntiForgeryToken()
diff --git a/CheckDrive.Web/CheckDrive.Web/Views/Cars/Index.cshtml b/CheckDrive.Web/CheckDrive.Web/Views/Cars/Index.cshtml
index e1f2c6cc..e0448ea8 100644
--- a/CheckDrive.Web/CheckDrive.Web/Views/Cars/Index.cshtml
+++ b/CheckDrive.Web/CheckDrive.Web/Views/Cars/Index.cshtml
@@ -27,10 +27,7 @@
                 <div class="d-flex" style="gap: 15px;">
                     <div class="mr-2">
                         <a class="btn btn-secondary" href="@Url.Action("CarHistoryIndex", "Cars")">Tarixni ko`rish</a>
-                    </div>
-                    <div class="mr-2">
-                        <a class="btn btn-info" href="@Url.Action("Index", "oilMarks")">Yoqilg`ilar</a>
-                    </div>
+                    </div>                   
                     <div>
                         <button id="openCarCreateModal" type="button" data-toggle="modal" class="btn btn-success">
                             <i  class="fa fa-plus"></i> Yaratish
@@ -44,7 +41,7 @@
                 <ejs-grid id="cars-list"
                           dataSource="@ViewBag.Cars"
                           gridLines="Vertical"
-                          allowSorting="true">
+                          allowSorting="true">                            
                     <e-grid-columns>
                         <e-grid-column headerText="Model" field="Model" typeof="Text"></e-grid-column>
                         <e-grid-column headerText="Davlat raqami" field="Number" typeof="text"></e-grid-column>
@@ -138,6 +135,78 @@
     </div>
 </div>
 
+<div class="modal fade" id="deleteModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-body" id="deleteContent">
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="modal fade" id="carEditModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-lg ">
+        <div class="modal-content">
+            <div class="modal-header d-flex justify-content-center">
+                <h4>Avtomobil ma'lumotlarini o'zgartirish</h4>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">
+                    </span>
+                </button>
+            </div>
+            <div class="modal-body" id="carEditModalContent">
+            </div>
+        </div>
+    </div>
+</div>
+
+<script type="text/javascript">
+    function onEditClick(id) {
+        $('#carEditModalContent').empty();
+        $.ajax({
+            url: "/cars/edit/" + id,
+            type: 'GET',
+            contentType: 'application/x-www-form-urlencoded; charset=UTF-8',
+            headers: {
+                'RequestVerificationToken': $('input[name="__RequestVerificationToken"]').val()
+            },
+            success: function (data) {
+                $('#carEditModalContent').html(data);
+                $('#carEditModal').modal({
+                    backdrop: 'static', 
+                    keyboard: false
+                }).modal('show');
+
+            },
+            error: function (error) {
+                alert("Tahrirlash oynasini ochishda muommo bo'ldi \n" + error);
+            }
+        });
+        $(this).find('#carEditModalContent').empty();
+        $(this).off('hidden.bs.modal');
+
+    }
+</script>
+
+<script type="text/javascript">
+    function onDeleteClick(id) {
+        $('#deleteContent').empty();
+        $.ajax({
+            url: "/cars/delete/" + id,
+            type: 'GET',
+            success: function (data) {
+                $('#deleteContent').html(data);
+                $('#deleteModal').modal('show');
+            },
+            error: function (error) {
+                alert("O'chirish oynasini ochishda muommo bo'ldi \n" + error);
+            }
+        });
+        $(this).find('#deleteContent').empty();
+        $(this).off('hidden.bs.modal');
+    }
+</script>
+
 <script>
     function onDetailsClick(id) {
         $('#detailsContent').empty();
diff --git a/CheckDrive.Web/CheckDrive.Web/Views/DispatcherReviews/Create.cshtml b/CheckDrive.Web/CheckDrive.Web/Views/DispatcherReviews/Create.cshtml
index cb1b28a3..37179224 100644
--- a/CheckDrive.Web/CheckDrive.Web/Views/DispatcherReviews/Create.cshtml
+++ b/CheckDrive.Web/CheckDrive.Web/Views/DispatcherReviews/Create.cshtml
@@ -1,8 +1,7 @@
 @model CheckDrive.ApiContracts.DispatcherReview.DispatcherReviewForCreateDto
 
 @{
-    ViewData["Title"] = "Create";
-    Layout = null;
+    ViewData["Title"] = "Create";    
 }
 
 <div class="row mt-custom">
@@ -53,12 +52,9 @@
             <div class="form-group w-50">
                 <input asp-for="OperatorReviewId" type="hidden" />
             </div>
-            <div class="form-group mt-3 w-50">
-                <a asp-action="PersonalIndex" class="btn btn-outline-info">
-                    <i class="fa-solid fa-arrow-left-long"></i> Orqaga
-                </a>
+            <div class="form-group mt-3 w-50 ">               
                 <button class="btn btn-outline-success" type="submit">
-                    <i class="fa fa-plus"></i> Yaratish
+                    Saqlash
                 </button>
             </div>
         </form>
diff --git a/CheckDrive.Web/CheckDrive.Web/Views/DispatcherReviews/PersonalIndex.cshtml b/CheckDrive.Web/CheckDrive.Web/Views/DispatcherReviews/PersonalIndex.cshtml
index bc240a7e..3e727b0d 100644
--- a/CheckDrive.Web/CheckDrive.Web/Views/DispatcherReviews/PersonalIndex.cshtml
+++ b/CheckDrive.Web/CheckDrive.Web/Views/DispatcherReviews/PersonalIndex.cshtml
@@ -8,17 +8,13 @@
 
 <div class="container mt-5" style="max-width: 100%;">
     <div class="mb-4 d-flex justify-content-between align-items-center">
-        <div class="gap-2">
-            <a class="btn btn-primary" href="@Url.Action("CarHistoryIndex", "Cars")">Moshina tarixi</a>
-            <!-- Dropdown Menu for File Download -->
-            <div class="dropdown d-inline-block">
-                <button class="btn btn-outline-info dropdown-toggle" type="button" id="dropdownMenuButton" data-bs-toggle="dropdown" aria-expanded="false">
-                    <i class="fa-solid fa-download"></i> Yuklab olish
-                </button>
-                <div class="dropdown-menu p-3" id="dropdownMenu" aria-labelledby="dropdownMenuButton" data-bs-auto-close="outside">
-                    <ejs-calendar id="calendar" change="valueChange" Start="Year" Depth="Year"></ejs-calendar>
-                    <a class="dropdown-item mt-2 btn btn-info" href="#" id="downloadButton">Yuklash</a>
-                </div>
+        <div class="gap-2">                  
+            <button class="btn btn-outline-info dropdown-toggle" type="button" id="dropdownMenuButton" data-bs-toggle="dropdown" aria-expanded="false">
+                <i class="fa-solid fa-download"></i> Yuklab olish
+            </button>
+            <div class="dropdown-menu p-3" id="dropdownMenu" aria-labelledby="dropdownMenuButton" data-bs-auto-close="outside">
+                <ejs-calendar id="calendar" change="valueChange" Start="Year" Depth="Year"></ejs-calendar>
+                <a class="dropdown-item mt-2 btn btn-info" href="#" id="downloadButton">Yuklash</a>
             </div>
         </div>
     </div>
diff --git a/CheckDrive.Web/CheckDrive.Web/Views/DoctorReviews/Create.cshtml b/CheckDrive.Web/CheckDrive.Web/Views/DoctorReviews/Create.cshtml
index 41e955f5..e1ad2e41 100644
--- a/CheckDrive.Web/CheckDrive.Web/Views/DoctorReviews/Create.cshtml
+++ b/CheckDrive.Web/CheckDrive.Web/Views/DoctorReviews/Create.cshtml
@@ -2,7 +2,7 @@
 
 @{
     ViewData["Title"] = "Create";
-    Layout = null;
+    Layout = "~/Views/Shared/_LayoutForModal.cshtml";
     bool noDriversAvailable = ViewBag.Drivers == null || !((IEnumerable<SelectListItem>)ViewBag.Drivers.Items).Any();
 }
 <form asp-action="Create" method="post" id="createDoctorReviewForm">        
diff --git a/CheckDrive.Web/CheckDrive.Web/Views/DoctorReviews/PersonalIndex.cshtml b/CheckDrive.Web/CheckDrive.Web/Views/DoctorReviews/PersonalIndex.cshtml
index afd2e4f4..33a78bd1 100644
--- a/CheckDrive.Web/CheckDrive.Web/Views/DoctorReviews/PersonalIndex.cshtml
+++ b/CheckDrive.Web/CheckDrive.Web/Views/DoctorReviews/PersonalIndex.cshtml
@@ -115,7 +115,7 @@
 <!-- Modal oyna -->
 <div class="modal fade" id="createDoctorReviewModal" tabindex="-1" aria-labelledby="createDoctorReviewModalLabel" aria-hidden="true" >
     <div class="modal-dialog modal-lg ">
-        <div class="modal-content">
+        <div class="modal-content" style="width:60%">
             <div class="modal-header d-flex justify-content-center">
                 <h5  id="createDoctorReviewModalLabel">Ro'yxatga olish</h5>
                 <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close">
diff --git a/CheckDrive.Web/CheckDrive.Web/Views/MechanicAcceptances/PersonalIndex.cshtml b/CheckDrive.Web/CheckDrive.Web/Views/MechanicAcceptances/PersonalIndex.cshtml
index 0efcb560..696b4a50 100644
--- a/CheckDrive.Web/CheckDrive.Web/Views/MechanicAcceptances/PersonalIndex.cshtml
+++ b/CheckDrive.Web/CheckDrive.Web/Views/MechanicAcceptances/PersonalIndex.cshtml
@@ -21,21 +21,19 @@
                     </div>
                 </div>
             </div>
-            <div class="col-md-8 d-flex justify-content-end align-items-center">
+            <div class="col-md-8 d-flex justify-content-end align-items-center gap-2">
+                <button class="btn btn-outline-info dropdown-toggle" type="button" id="dropdownMenuButton" data-bs-toggle="dropdown" aria-expanded="false">
+                    <i class="fa-solid fa-download"></i> Yuklab olish
+                </button>
+                <div class="dropdown-menu p-3" id="dropdownMenu" aria-labelledby="dropdownMenuButton" data-bs-auto-close="outside">
+                    <ejs-calendar id="calendar" change="valueChange" Start="Year" Depth="Year"></ejs-calendar>
+                    <a class="dropdown-item mt-2 btn btn-info" href="#" id="downloadButton">Yuklash</a>
+                </div>                
                 <button id="openCreteMechanicAcceptancesModal" 
                         class="btn btn-success"
                         type="button">
                     <i class="fa fa-plus"></i> Yaratish
                 </button>
-                <div class="dropdown d-inline-block me-2">
-                    <button class="btn btn-outline-info dropdown-toggle" type="button" id="dropdownMenuButton" data-bs-toggle="dropdown" aria-expanded="false">
-                        <i class="fa-solid fa-download"></i> Yuklab olish
-                    </button>
-                    <div class="dropdown-menu p-3" id="dropdownMenu" aria-labelledby="dropdownMenuButton" data-bs-auto-close="outside">
-                        <ejs-calendar id="calendar" change="valueChange" Start="Year" Depth="Year"></ejs-calendar>
-                        <a class="dropdown-item mt-2 btn btn-info" href="#" id="downloadButton">Yuklash</a>
-                    </div>
-                </div>
             </div>
         </div>
 
diff --git a/CheckDrive.Web/CheckDrive.Web/Views/MechanicHandovers/Create.cshtml b/CheckDrive.Web/CheckDrive.Web/Views/MechanicHandovers/Create.cshtml
index bba7492e..3789a6fa 100644
--- a/CheckDrive.Web/CheckDrive.Web/Views/MechanicHandovers/Create.cshtml
+++ b/CheckDrive.Web/CheckDrive.Web/Views/MechanicHandovers/Create.cshtml
@@ -11,7 +11,7 @@
         <div class="col-md-4 offset-md-1 mt-1" style="width:580px">
         @if (noDriversAvailable)
         {
-            <div class="alert alert-warning">
+            <div class="alert alert-warning form-group w-50 mt-2">
                 <strong>Diqqat!</strong> Hozirda mavjud haydovchilar yo'q. Iltimos, keyinroq qayta urinib ko'ring.
             </div>
         }
diff --git a/CheckDrive.Web/CheckDrive.Web/Views/MechanicHandovers/PersonalIndex.cshtml b/CheckDrive.Web/CheckDrive.Web/Views/MechanicHandovers/PersonalIndex.cshtml
index b73d4671..f8ed38e4 100644
--- a/CheckDrive.Web/CheckDrive.Web/Views/MechanicHandovers/PersonalIndex.cshtml
+++ b/CheckDrive.Web/CheckDrive.Web/Views/MechanicHandovers/PersonalIndex.cshtml
@@ -20,16 +20,14 @@
                     </div>
                 </div>
             </div>
-            <div class="col-md-8 d-flex justify-content-end align-items-center gap-2">
-                <div class="dropdown d-inline-block">
+            <div class="col-md-8 d-flex justify-content-end align-items-center gap-2">                
                     <button class="btn btn-outline-info dropdown-toggle" type="button" id="dropdownMenuButton" data-bs-toggle="dropdown" aria-expanded="false">
                         <i class="fa-solid fa-download"></i> Yuklab olish
                     </button>
                     <div class="dropdown-menu p-3" id="dropdownMenu" aria-labelledby="dropdownMenuButton" data-bs-auto-close="outside">
                         <ejs-calendar id="calendar" change="valueChange" Start="Year" Depth="Year"></ejs-calendar>
                         <a class="dropdown-item mt-2 btn btn-info" href="#" id="downloadButton">Yuklash</a>
-                    </div>
-                </div>            
+                    </div>                        
                 <a class="btn btn-primary" href="@Url.Action("CarHistoryIndex", "Cars")">Moshina tarixi</a>                
                 <button  type="button" id="openCreteMechanicHandoverModal" class="btn btn-success">
                     <i class="fa fa-plus"></i> Yaratish
diff --git a/CheckDrive.Web/CheckDrive.Web/Views/OilMarks/Delete.cshtml b/CheckDrive.Web/CheckDrive.Web/Views/OilMarks/Delete.cshtml
index 799b523a..a6995e50 100644
--- a/CheckDrive.Web/CheckDrive.Web/Views/OilMarks/Delete.cshtml
+++ b/CheckDrive.Web/CheckDrive.Web/Views/OilMarks/Delete.cshtml
@@ -2,43 +2,24 @@
 
 @{
     ViewData["Title"] = "Delete";
-    Layout = "~/Views/Shared/_Layout.cshtml";
+    Layout = "~/Views/Shared/_LayoutForModal.cshtml";
 }
-
-<h1 class="align-items-baseline" style="margin-top: 100px">O'chirish</h1>
-
-<h3 style="color:grey;">
-    Haqiqatan ham buni oʻchirib tashlamoqchimisiz?
+<h1 class="text-center mb-5 text-danger"><i class="fa fa-exclamation-circle" style="font-size:100px"></i></h1>
+<h4 style="color:grey;">
+    Haqiqatan ham <b style="color:black;">@Model.OilMark</b> ni  oʻchirib tashlamoqchimisiz?
     O'chirsangiz bu yoqilg'i turidan foydalangan barcha ma'lumotlar ham o'chiriladi!!!
-</h3>
+</h4>
 
 <div>
-    <hr />
-    <dl class="row">
-        <dt class = "col-sm-2">
-            @Html.DisplayNameFor(model => model.Id)
-        </dt>
-        <dd class = "col-sm-10">
-            @Html.DisplayFor(model => model.Id)
-        </dd>
-        <dt class = "col-sm-2">
-            @Html.DisplayNameFor(model => model.OilMark)
-        </dt>
-        <dd class = "col-sm-10">
-            @Html.DisplayFor(model => model.OilMark)
-        </dd>
-    </dl>
-  
+    <hr /> 
     <form asp-action="Delete">
-        <div class="form-group">
-            <a asp-action="Index" class="btn btn-outline-info">
-                <i class="fa-solid fa-arrow-left-long"></i>
-                Orqaga
-            </a>
-            <button asp-route-itemid="@Model.Id" class="btn btn-outline-danger">
-                <i class="fa-solid fa-trash"></i>
-                O'chirish
+        <div class="d-flex justify-content-center mt-5 m-2" style="gap: 10px;">
+            <button asp-action="Index" class="btn btn-secondary" style="width:120px">
+                Yo'q
+            </button>
+            <button type="submit" asp-route-itemid="@Model.Id" class="btn btn-danger" style="width:120px">
+                Ha
             </button>
         </div>
     </form>
-</div>
+</div>
\ No newline at end of file
diff --git a/CheckDrive.Web/CheckDrive.Web/Views/OilMarks/Edit.cshtml b/CheckDrive.Web/CheckDrive.Web/Views/OilMarks/Edit.cshtml
index e482fb66..55b80d2b 100644
--- a/CheckDrive.Web/CheckDrive.Web/Views/OilMarks/Edit.cshtml
+++ b/CheckDrive.Web/CheckDrive.Web/Views/OilMarks/Edit.cshtml
@@ -2,27 +2,20 @@
 
 @{
     ViewData["Title"] = "Edit";
+    Layout = "~/Views/Shared/_LayoutForModal.cshtml";
 }
-
-<h4>Yoqilg'i ma`lumotini o`zgartirish</h4>
-
-<hr />
-<div class="row">
-    <div class="col-md-4">
+<div style="width : 1000px">
+    <div class="col-md-5 mb-3">
         <form asp-action="Edit">
             <div asp-validation-summary="ModelOnly" class="text-danger"></div>
-            <div class="form-group">
+            <div class="">
                 <label asp-for="OilMark" class="control-label"></label>
                 <input asp-for="OilMark" class="form-control" />
                 <span asp-validation-for="OilMark" class="text-danger"></span>
             </div>
-            <div class="form-group mt-3">
-                <a asp-action="Index" asp-route-id="@Model?.Id" class="btn btn-info">
-                    <i class="fa-solid falong"></i>
-                    Orqaga
-                </a>
-                <button class="btn btn-success">
-                     Saqlash
+            <div class="form-group mt-3 d-flex justify-content-center">
+                <button type="submit" class="btn btn-success" style="width:200px">
+                    Saqlash
                 </button>
             </div>
         </form>
diff --git a/CheckDrive.Web/CheckDrive.Web/Views/OilMarks/Index.cshtml b/CheckDrive.Web/CheckDrive.Web/Views/OilMarks/Index.cshtml
index b81815dc..69bc77d5 100644
--- a/CheckDrive.Web/CheckDrive.Web/Views/OilMarks/Index.cshtml
+++ b/CheckDrive.Web/CheckDrive.Web/Views/OilMarks/Index.cshtml
@@ -3,7 +3,6 @@
 
 @{
     ViewData["Title"] = "Index";
-    // Layout = "~/Views/Shared/_Layout.cshtml";
 }
 
 <h1>Yoqilg'i turlari</h1>
@@ -26,34 +25,34 @@
 
 <table class="table">
     <thead>
-        <tr>
-            <th>
-                @Html.DisplayNameFor(model => model.First().Id)
-            </th>
+        <tr>            
             <th>
                 Yoqilg'i nomi
             </th>
-            <th>Amallar</th>
+            <th></th>
         </tr>
     </thead>
     <tbody>
         @foreach (var item in Model)
         {
-            <tr>
-                <td>
-                    @Html.DisplayFor(modelItem => item.Id)
-                </td>
+            <tr>                
                 <td>
                     @Html.DisplayFor(modelItem => item.OilMark)
                 </td>
                 <td>
-                    <div class="btn-group" role="group">
-                        <a class="e-btn e-flat" asp-action="Edit" asp-route-id="@item.Id" style="margin-right: 5px;">
+                    <div class="btn-group" role="group">                        
+                        <button type="button" 
+                                class="shadow-sm  bg-white rounded e-btn e-flat" 
+                                title="Tahrirlash" 
+                                onclick="onEditClick(@item.Id)">
                             <i class="fa-solid fa-pen fa-lg text-warning"></i>
-                        </a>
-                        <a class="e-btn e-flat " asp-action="Delete" asp-route-id="@item.Id">
+                        </button>
+                        <button type="button" 
+                                class="shadow-sm bg-white rounded e-btn e-flat mx-2" 
+                                title="O&#39;chirish" 
+                                onclick="onDeleteClick(@item.Id)">
                             <i class="fa-solid fa-trash-can fa-lg text-danger"></i>
-                        </a>
+                        </button>
                     </div>
                 </td>
             </tr>
@@ -61,6 +60,76 @@
     </tbody>
 </table>
 
+<div class="modal fade" id="deleteOilModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-body" id="deleteOilContent">
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="modal fade" id="oilEditModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-lg ">
+        <div class="modal-content" style="height: 250px; width: 500px ">
+            <div class="modal-header d-flex justify-content-center">
+                <h4>Yoqilg'i ma`lumotini o`zgartirish</h4>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">
+                    </span>
+                </button>
+            </div>
+            <div class="modal-body" id="oilEditModalContent">
+            </div>
+        </div>
+    </div>
+</div>
+
+<script type="text/javascript">
+    function onEditClick(id) {
+        $('#oilEditModalContent').empty();
+        $.ajax({
+            url: "/oilmarks/edit/" + id,
+            type: 'GET',            
+            success: function (data) {
+                $('#oilEditModalContent').html(data);
+                $('#oilEditModal').modal({
+                    backdrop: 'static',
+                    keyboard: false
+                }).modal('show');
+
+            },
+            error: function (error) {
+                alert("Tahrirlash oynasini ochishda muommo bo'ldi \n" + error);
+            }
+        });
+        $(this).find('#oilEditModalContent').empty();
+        $(this).off('hidden.bs.modal');
+
+    }
+</script>
+
+
+<script>
+    function onDeleteClick(id) {
+        $('#deleteOilContent').empty();
+        $.ajax({
+            url: "/oilmarks/delete/" + id,
+            type: 'GET',
+            success: function (data) {
+                $('#deleteOilContent').html(data);
+                $('#deleteOilModal').modal('show');
+            },
+            error: function () {
+                $('#deleteOilContent').html('<p>Error loading details</p>');
+            }
+        });
+
+        $(this).find('#deleteOilContent').empty();
+        $(this).off('hidden.bs.modal');
+    }
+</script>
+
 <script>
     var modal = document.getElementById("createoilModal");
     var btn = document.getElementById("createoilBtn");
diff --git a/CheckDrive.Web/CheckDrive.Web/Views/OperatorReviews/Create.cshtml b/CheckDrive.Web/CheckDrive.Web/Views/OperatorReviews/Create.cshtml
index 28303764..12c15c24 100644
--- a/CheckDrive.Web/CheckDrive.Web/Views/OperatorReviews/Create.cshtml
+++ b/CheckDrive.Web/CheckDrive.Web/Views/OperatorReviews/Create.cshtml
@@ -4,7 +4,7 @@
 
 @{
     ViewData["Title"] = "Create";
-    Layout = null;
+    Layout = "~/Views/Shared/_LayoutForModal.cshtml";
     bool noDriversAvailable = ViewBag.NoDriversAvailable ?? false;
 }
 
diff --git a/CheckDrive.Web/CheckDrive.Web/Views/OperatorReviews/PersonalIndex.cshtml b/CheckDrive.Web/CheckDrive.Web/Views/OperatorReviews/PersonalIndex.cshtml
index 86e44c27..d41d6d8c 100644
--- a/CheckDrive.Web/CheckDrive.Web/Views/OperatorReviews/PersonalIndex.cshtml
+++ b/CheckDrive.Web/CheckDrive.Web/Views/OperatorReviews/PersonalIndex.cshtml
@@ -22,17 +22,15 @@
                 </div>
             </div>
 
-            <div class="col-md-8 d-flex justify-content-end align-items-center gap-2">
-                <a class="btn btn-primary" href="@Url.Action("CarHistoryIndex", "Cars")">Moshina tarixi</a>
-                <div class="dropdown d-inline-block">
-                    <button class="btn btn-outline-info dropdown-toggle" type="button" id="dropdownMenuButton" data-bs-toggle="dropdown" aria-expanded="false">
-                        <i class="fa-solid fa-download"></i> Yuklab olish
-                    </button>
-                     <div class="dropdown-menu p-3" id="dropdownMenu" aria-labelledby="dropdownMenuButton" data-bs-auto-close="outside">
-                        <ejs-calendar id="calendar" change="valueChange" Start="Year" Depth="Year"></ejs-calendar>
-                        <a class="dropdown-item mt-2 btn btn-info" href="#" id="downloadButton">Yuklash</a>
-                    </div>
+            <div class="col-md-8 d-flex justify-content-end align-items-center gap-2">                
+                <button class="btn btn-outline-info dropdown-toggle" type="button" id="dropdownMenuButton" data-bs-toggle="dropdown" aria-expanded="false">
+                    <i class="fa-solid fa-download"></i> Yuklab olish
+                </button>
+                 <div class="dropdown-menu p-3" id="dropdownMenu" aria-labelledby="dropdownMenuButton" data-bs-auto-close="outside">
+                    <ejs-calendar id="calendar" change="valueChange" Start="Year" Depth="Year"></ejs-calendar>
+                    <a class="dropdown-item mt-2 btn btn-info" href="#" id="downloadButton">Yuklash</a>
                 </div>
+                <a class="btn btn-primary" href="@Url.Action("CarHistoryIndex", "Cars")">Moshina tarixi</a>   
                 <button id="openCreateOperatorModal" type="button" class="btn btn-success">
                     <i class="fa fa-plus"></i> Yaratish
                 </button>
diff --git a/CheckDrive.Web/CheckDrive.Web/Views/Shared/_LayoutForModal.cshtml b/CheckDrive.Web/CheckDrive.Web/Views/Shared/_LayoutForModal.cshtml
new file mode 100644
index 00000000..9240be15
--- /dev/null
+++ b/CheckDrive.Web/CheckDrive.Web/Views/Shared/_LayoutForModal.cshtml
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <!-- jQuery -->
+    <title>@ViewData["Title"] - CheckDrive.Web</title>
+    <link href="https://cdn.syncfusion.com/ej2/25.2.3/bootstrap5.css" rel="stylesheet" />
+    <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-icons/1.8.1/font/bootstrap-icons.min.css">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.2/css/all.min.css" integrity="sha512-SnH5WK+bZxgPHs44uWIX+LLJAJ9/2PkPKZ5QiAj6Ta86w+fsb2TkcmfRyVX3pBnMFcV7oQPJkl9QevSCWr3W6A==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+    <link rel="stylesheet" href="~/css/site.css" asp-append-version="true" />
+    <link rel="stylesheet" href="~/css/LogOutButtun.css" asp-append-version="true" />
+    <link rel="stylesheet" href="~/CheckDrive.Web.styles.css" asp-append-version="true" />
+    <link rel="stylesheet" href="~/font-awesome/css/all.css">
+    <link href="https://use.fontawesome.com/releases/v5.6.1/css/all.css" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css2?family=Lato&display=swap" rel="stylesheet">
+    <!-- Include JsRender Library -->
+    <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/jsrender"></script>
+    <script src="https://cdn.syncfusion.com/ej2/26.2.4/dist/ej2.min.js"></script>
+
+</head>
+<body>
+    @RenderBody()
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.3/jquery.validate.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.11/jquery.validate.unobtrusive.min.js"></script>
+    <script src="~/lib/jquery/dist/jquery.min.js"></script>
+    <script src="~/lib/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
+    <script src="~/lib/jquery-validation/dist/jquery.validate.min.js"></script>
+    <script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"></script>
+    <script src="~/js/site.js" asp-append-version="true"></script>
+    @RenderSection("Scripts", required: false)
+    <ejs-scripts></ejs-scripts>
+</body>
+</html>