diff --git a/CheckDrive.Web/CheckDrive.Web/Controllers/CarsController.cs b/CheckDrive.Web/CheckDrive.Web/Controllers/CarsController.cs
index 3c3e21a8..d21a721e 100644
--- a/CheckDrive.Web/CheckDrive.Web/Controllers/CarsController.cs
+++ b/CheckDrive.Web/CheckDrive.Web/Controllers/CarsController.cs
@@ -1,85 +1,32 @@
-using CheckDrive.ApiContracts;
-using CheckDrive.ApiContracts.Car;
+using CheckDrive.Web.Mappings;
+using CheckDrive.Web.Requests.Cars;
 using CheckDrive.Web.Stores.Cars;
+using CheckDrive.Web.Stores.OilMarks;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Rendering;
 
 namespace CheckDrive.Web.Controllers;
 
-public class CarsController : Controller
+public class CarsController(ICarStore carStore, IOilMarkStore oilMarkStore) : Controller
 {
-    private readonly ICarDataStore _carDataStore;
-
-    public CarsController(ICarDataStore carDataStore)
+    public async Task<IActionResult> Index()
     {
-        _carDataStore = carDataStore;
-    }
-
-    public async Task<IActionResult> Index(string? searchString, int? pageNumber)
-    {
-        var cars = await _carDataStore.GetCarsAsync(searchString, pageNumber);
-
-        ViewBag.SearchString = searchString;
+        var cars = await carStore.GetAsync();
 
-        ViewBag.PageSize = cars.PageSize;
-        ViewBag.PageCount = cars.TotalPages;
-        ViewBag.TotalCount = cars.TotalCount;
-        ViewBag.CurrentPage = cars.PageNumber;
-        ViewBag.HasPreviousPage = cars.HasPreviousPage;
-        ViewBag.HasNextPage = cars.HasNextPage;
-
-        var _cars = cars.Data.Select(c => new
-        {
-            c.Id,
-            c.Model,
-            c.Number,
-            c.Mileage,
-            c.Color,
-            c.RemainingFuel,
-            c.MeduimFuelConsumption,
-            c.FuelTankCapacity,
-            c.ManufacturedYear,
-            Status = ((CarStatusDto)c.CarStatus) switch
-            {
-                CarStatusDto.Free => "Bo'sh",
-                CarStatusDto.Busy => "Band",
-                CarStatusDto.Limited => "Limit tugagan",
-                _ => "No`malum holat"
-            }
-        }).ToList();
-
-        ViewBag.Cars = _cars;
-        return View();
-    }
-
-    public async Task<IActionResult> CarHistoryIndex(string? searchString, int? pageNumber, int? year, int? month)
-    {
-        var cars = await _carDataStore.GetCarsHistoryAsync(searchString, pageNumber, year, month);
-
-        ViewBag.SearchString = searchString;
-        ViewBag.Cars = cars.Data;
-
-        ViewBag.PageSize = cars.PageSize;
-        ViewBag.PageCount = cars.TotalPages;
-        ViewBag.TotalCount = cars.TotalCount;
-        ViewBag.CurrentPage = cars.PageNumber;
-        ViewBag.HasPreviousPage = cars.HasPreviousPage;
-        ViewBag.HasNextPage = cars.HasNextPage;
+        ViewBag.Cars = cars;
         return View();
     }
 
     public async Task<IActionResult> Details(int id)
     {
-        var car = await _carDataStore.GetCarAsync(id);
-        if (car == null)
-        {
-            return NotFound();
-        }
+        var car = await carStore.GetByIdAsync(id);
+
         return View(car);
     }
 
     public async Task<IActionResult> DetailsForMechanicAcceptance(int id)
     {
-        var car = await _carDataStore.GetCarAsync(id);
+        var car = await carStore.GetByIdAsync(id);
         if (car == null)
         {
             return NotFound();
@@ -89,7 +36,7 @@ public async Task<IActionResult> DetailsForMechanicAcceptance(int id)
 
     public async Task<IActionResult> DetailsForMechanicHandover(int id)
     {
-        var car = await _carDataStore.GetCarAsync(id);
+        var car = await carStore.GetByIdAsync(id);
         if (car == null)
         {
             return NotFound();
@@ -97,48 +44,55 @@ public async Task<IActionResult> DetailsForMechanicHandover(int id)
         return PartialView("_CarDetailsForMechanicHandover", car);
     }
 
-    public IActionResult Create()
+    public async Task<IActionResult> Create()
     {
+        var oilMarks = await GetOilMarkAsync();
+        ViewBag.OilMarks = oilMarks;
+
         return View();
     }
 
     [HttpPost]
     [ValidateAntiForgeryToken]
-    public async Task<IActionResult> Create([Bind("Model,Color,Number,RemainingFuel,Mileage, MeduimFuelConsumption,FuelTankCapacity,ManufacturedYear, OneYearMediumDistance")] CarForCreateDto car)
+    public async Task<IActionResult> Create([FromForm] CreateCarRequest request)
     {
         if (ModelState.IsValid)
         {
-            var newCar = await _carDataStore.CreateCarAsync(car);
+            var newCar = await carStore.CreateAsync(request);
             return RedirectToAction(nameof(Index));
         }
-        return View(car);
+        return BadRequest(ModelState);
     }
 
     public async Task<IActionResult> Edit(int id)
     {
-        var car = await _carDataStore.GetCarAsync(id);
-        if (car == null)
-        {
-            return NotFound();
-        }
-        return View(car);
+        var car = await carStore.GetByIdAsync(id);
+        var oilMarks = await GetOilMarkAsync();
+
+        ViewBag.OilMarks = oilMarks;
+        var carRequest = car.ToUpdateViewModel();
+
+        return View(carRequest);
     }
 
     [HttpPost]
     [ValidateAntiForgeryToken]
-    public async Task<IActionResult> Edit(int id, [Bind("Id,Model,Color,Number,RemainingFuel,Mileage, MeduimFuelConsumption,FuelTankCapacity,ManufacturedYear, OneYearMediumDistance")] CarForUpdateDto car)
+    public async Task<IActionResult> Edit([FromForm] UpdateCarRequest request)
     {
-        if (ModelState.IsValid)
+        try
         {
-            var newCar = await _carDataStore.UpdateCarAsync(id, car);
+            await carStore.UpdateAsync(request);
             return RedirectToAction(nameof(Index));
         }
-        return View(car);
+        catch(Exception ex)
+        {
+            return BadRequest();
+        }
     }
 
     public async Task<IActionResult> Delete(int id)
     {
-        var car = await _carDataStore.GetCarAsync(id);
+        var car = await carStore.GetByIdAsync(id);
         if (car == null)
         {
             return NotFound();
@@ -150,7 +104,20 @@ public async Task<IActionResult> Delete(int id)
     [ValidateAntiForgeryToken]
     public async Task<IActionResult> DeleteConfirmed(int id)
     {
-        await _carDataStore.DeleteCarAsync(id);
+        await carStore.DeleteAsync(id);
         return RedirectToAction(nameof(Index));
     }
-}
+
+    private async Task<List<SelectListItem>> GetOilMarkAsync()
+    {
+        var oilMarks = await oilMarkStore.GetAsync();
+
+        return oilMarks
+            .Select(e => new SelectListItem()
+            {
+                Value = e.Id.ToString(),
+                Text = e.Name.ToString()
+            })
+            .ToList();
+    }
+}
\ No newline at end of file
diff --git a/CheckDrive.Web/CheckDrive.Web/Controllers/EmployeesController.cs b/CheckDrive.Web/CheckDrive.Web/Controllers/EmployeesController.cs
index 1c10bacc..ab302c67 100644
--- a/CheckDrive.Web/CheckDrive.Web/Controllers/EmployeesController.cs
+++ b/CheckDrive.Web/CheckDrive.Web/Controllers/EmployeesController.cs
@@ -10,20 +10,11 @@
 
 namespace CheckDrive.Web.Controllers;
 
-public class EmployeesController : Controller
+public class EmployeesController(IEmployeeStore employeeStore, ICarStore carStore) : Controller
 {
-    private readonly IEmployeeStore _employeeStore;
-    private readonly ICarDataStore _carStore;
-
-    public EmployeesController(IEmployeeStore employeeStore, ICarDataStore carStore)
-    {
-        _employeeStore = employeeStore ?? throw new ArgumentNullException(nameof(employeeStore));
-        _carStore = carStore ?? throw new ArgumentNullException(nameof(carStore));
-    }
-
     public async Task<ActionResult> Index()
     {
-        var employees = await _employeeStore.GetAsync();
+        var employees = await employeeStore.GetAsync();
         ViewBag.Positions = GetPositions();
 
         return View(employees);
@@ -31,7 +22,7 @@ public async Task<ActionResult> Index()
 
     public async Task<ActionResult> Details(int id)
     {
-        var employee = await _employeeStore.GetByIdAsync(id);
+        var employee = await employeeStore.GetByIdAsync(id);
 
         return View(employee);
     }
@@ -50,9 +41,9 @@ public async Task<ActionResult> Create(CreateEmployeeRequest request)
     {
         try
         {
-            var createdEmployee = await _employeeStore.CreateAsync(request);
-
-            return RedirectToAction(nameof(Details), new { id = createdEmployee.Id });
+            var createdEmployee = await employeeStore.CreateAsync(request);
+            
+            return RedirectToAction(nameof(Index));
         }
         catch
         {
@@ -62,7 +53,7 @@ public async Task<ActionResult> Create(CreateEmployeeRequest request)
 
     public async Task<ActionResult> Edit(int id)
     {
-        var employee = await _employeeStore.GetByIdAsync(id);
+        var employee = await employeeStore.GetByIdAsync(id);
         ViewBag.Positions = GetPositions();
         ViewBag.Cars = await GetCarsAsync();
 
@@ -77,8 +68,7 @@ public async Task<ActionResult> Edit(UpdateEmployeeRequest request)
     {
         try
         {
-            await _employeeStore.UpdateAsync(request);
-
+            await employeeStore.UpdateAsync(request);
             return RedirectToAction(nameof(Index));
         }
         catch
@@ -89,7 +79,7 @@ public async Task<ActionResult> Edit(UpdateEmployeeRequest request)
 
     public async Task<ActionResult> Delete(int id)
     {
-        var employee = await _employeeStore.GetByIdAsync(id);
+        var employee = await employeeStore.GetByIdAsync(id);
 
         return View(employee);
     }
@@ -100,7 +90,7 @@ public async Task<ActionResult> Delete(int id, IFormCollection _)
     {
         try
         {
-            await _employeeStore.DeleteAsync(id);
+            await employeeStore.DeleteAsync(id);
             return RedirectToAction(nameof(Index));
         }
         catch
@@ -127,7 +117,7 @@ private static List<SelectListItem> GetPositions()
 
     private async Task<List<SelectListItem>> GetCarsAsync()
     {
-        var cars = await _carStore.GetAsync();
+        var cars = await carStore.GetAsync();
 
         return cars
             .Select(e => new SelectListItem()
diff --git a/CheckDrive.Web/CheckDrive.Web/Controllers/OilMarksController.cs b/CheckDrive.Web/CheckDrive.Web/Controllers/OilMarksController.cs
index f1eaf329..573135b8 100644
--- a/CheckDrive.Web/CheckDrive.Web/Controllers/OilMarksController.cs
+++ b/CheckDrive.Web/CheckDrive.Web/Controllers/OilMarksController.cs
@@ -1,76 +1,73 @@
-using CheckDrive.ApiContracts.OilMark;
+using CheckDrive.Web.Requests.OilMark;
 using CheckDrive.Web.Stores.OilMarks;
 using Microsoft.AspNetCore.Mvc;
 
-namespace CheckDrive.Web.Controllers
+namespace CheckDrive.Web.Controllers;
+
+public class OilMarksController(IOilMarkStore oilMarkDataStore) : Controller
 {
-    public class OilMarksController(IOilMarkDataStore oilMarkDataStore) : Controller
+    public async Task<IActionResult> Index()
     {
-        private readonly IOilMarkDataStore _oilMarkDataStore = oilMarkDataStore;
+        var oilMarks = await oilMarkDataStore.GetAsync();
 
-        public async Task<IActionResult> Index()
-        {
-            var oilMarks = await _oilMarkDataStore.GetOilMarksAsync();
-            var oilMarkss = oilMarks.Data.ToList();
-            return View(oilMarkss);
-        }
+        return View(oilMarks);
+    }
 
-        public async Task<IActionResult> Details(int id)
-        {
-            var oilMark = await _oilMarkDataStore.GetOilMarkByIdAsync(id);
+    public async Task<IActionResult> Details(int id)
+    {
+        var oilMark = await oilMarkDataStore.GetByIdAsync(id);
 
-            return View(oilMark);
-        }
+        return View(oilMark);
+    }
 
-        public IActionResult Create()
-        {
-            return View();
-        }
+    public IActionResult Create()
+    {
+        return View();
+    }
 
-        [HttpPost]
-        [ValidateAntiForgeryToken]
-        public async Task<IActionResult> Create([Bind("OilMark")] OilMarkForCreateDto _oilmark)
+    [HttpPost]
+    [ValidateAntiForgeryToken]
+    public async Task<IActionResult> Create([FromForm] CreateOilMarkRequest request)
+    {
+        if (ModelState.IsValid)
         {
-            if (ModelState.IsValid)
-            {
-                await _oilMarkDataStore.CreateOilMarkAsync(_oilmark);
-                return RedirectToAction(nameof(Index));
-            }
-            return View(_oilmark);
+            await oilMarkDataStore.CreateAsync(request);
+            return RedirectToAction(nameof(Index));
         }
+        return View(request);
+    }
 
-        public async Task<IActionResult> Edit(int id)
-        {
-            var oilMark = await _oilMarkDataStore.GetOilMarkByIdAsync(id);
+    public async Task<IActionResult> Edit(int id)
+    {
+        var oilMark = await oilMarkDataStore.GetByIdAsync(id);
 
-            return View(oilMark);
-        }
+        return View(oilMark);
+    }
 
-        [HttpPost]
-        [ValidateAntiForgeryToken]
-        public async Task<IActionResult> Edit(int id, [Bind("Id,OilMark")] OilMarkForUpdateDto _oilMark)
+    [HttpPost]
+    [ValidateAntiForgeryToken]
+    public async Task<IActionResult> Edit([FromForm] UpdateOilMarkRequest request)
+    {
+        if (ModelState.IsValid)
         {
-            if (ModelState.IsValid)
-            {
-                await _oilMarkDataStore.UpdateOilMarkAsync(id, _oilMark);
-                return RedirectToAction(nameof(Index));
-            }
-            return View(_oilMark);
+            await oilMarkDataStore.UpdateAsync(request);
+            return RedirectToAction(nameof(Index));
         }
+        return View(request);
+    }
 
-        public async Task<IActionResult> Delete(int id)
-        {
-            var oilMark = await _oilMarkDataStore.GetOilMarkByIdAsync(id);
-  
-            return View(oilMark);
-        }
+    public async Task<IActionResult> Delete(int id)
+    {
+        var oilMark = await oilMarkDataStore.GetByIdAsync(id);
 
-        [HttpPost, ActionName("Delete")]
-        [ValidateAntiForgeryToken]
-        public async Task<IActionResult> DeleteConfirmed(int id)
-        {
-            await _oilMarkDataStore.DeleteOilMarkAsync(id);
-            return RedirectToAction(nameof(Index));
-        }
+        return View(oilMark);
+    }
+
+    [HttpPost, ActionName("Delete")]
+    [ValidateAntiForgeryToken]
+    public async Task<IActionResult> DeleteConfirmed(int id)
+    {
+        await oilMarkDataStore.DeleteAsync(id);
+        return RedirectToAction(nameof(Index));
     }
 }
diff --git a/CheckDrive.Web/CheckDrive.Web/Extensions/DependencyInjection.cs b/CheckDrive.Web/CheckDrive.Web/Extensions/DependencyInjection.cs
index 2cdb85d6..8b324f60 100644
--- a/CheckDrive.Web/CheckDrive.Web/Extensions/DependencyInjection.cs
+++ b/CheckDrive.Web/CheckDrive.Web/Extensions/DependencyInjection.cs
@@ -59,7 +59,7 @@ private static void AddConfigurations(IServiceCollection services, IConfiguratio
     private static void AddStores(IServiceCollection services)
     {
         services.AddScoped<IAccountDataStore, AccountDataStore>();
-        services.AddScoped<ICarDataStore, CarDataStore>();
+        services.AddScoped<ICarStore, CarStore>();
         services.AddScoped<IDispatcherReviewDataStore, DispatcherReviewDataStore>();
         services.AddScoped<IDispatcherDataStore, DispatcherDataStore>();
         services.AddScoped<IDoctorDataStore, DoctorDataStore>();
@@ -68,7 +68,7 @@ private static void AddStores(IServiceCollection services)
         services.AddScoped<IMechanicAcceptanceDataStore, MechanicAcceptanceDataStore>();
         services.AddScoped<IMechanicHandoverDataStore, MechanicHandoverDataStore>();
         services.AddScoped<IMechanicDataStore, MechanicDataStore>();
-        services.AddScoped<IOilMarkDataStore, OilMarkDataStore>();
+        services.AddScoped<IOilMarkStore, OilMarkStore>();
         services.AddScoped<IOperatorReviewDataStore, OperatorReviewDataStore>();
         services.AddScoped<IOperatorDataStore, OperatorDataStore>();
         services.AddScoped<IRoleDataStore, RoleDataStore>();
diff --git a/CheckDrive.Web/CheckDrive.Web/Mappings/CarMappings.cs b/CheckDrive.Web/CheckDrive.Web/Mappings/CarMappings.cs
new file mode 100644
index 00000000..9d24ff56
--- /dev/null
+++ b/CheckDrive.Web/CheckDrive.Web/Mappings/CarMappings.cs
@@ -0,0 +1,30 @@
+using CheckDrive.Web.Requests.Cars;
+using CheckDrive.Web.ViewModels.Car;
+
+namespace CheckDrive.Web.Mappings;
+
+public static class CarMappings
+{
+    public static UpdateCarRequest ToUpdateViewModel(this CarViewModel car) =>
+        new()
+        {
+            Id = car.Id,
+            OilMarkId = car.OilMarkId,
+            Model = car.Model,
+            Number = car.Number,
+            ManufacturedYear = car.ManufacturedYear,
+            Mileage = car.Mileage,
+            CurrentMonthMileage = car.CurrentMonthMileage,
+            CurrentYearMileage = car.CurrentYearMileage,
+            MonthlyDistanceLimit = car.MonthlyDistanceLimit,
+            YearlyDistanceLimit = car.YearlyDistanceLimit,
+            CurrentMonthFuelConsumption = car.CurrentMonthFuelConsumption,
+            CurrentYearFuelConsumption = car.CurrentYearFuelConsumption,
+            MonthlyFuelConsumptionLimit = car.MonthlyFuelConsumptionLimit,
+            YearlyFuelConsumptionLimit = car.YearlyFuelConsumptionLimit,
+            AverageFuelConsumption = car.AverageFuelConsumption,
+            FuelCapacity = car.FuelCapacity,
+            RemainingFuel = car.RemainingFuel,
+            Status = car.Status
+        };
+}
diff --git a/CheckDrive.Web/CheckDrive.Web/Requests/Cars/CreateCarRequest.cs b/CheckDrive.Web/CheckDrive.Web/Requests/Cars/CreateCarRequest.cs
new file mode 100644
index 00000000..1ecfe239
--- /dev/null
+++ b/CheckDrive.Web/CheckDrive.Web/Requests/Cars/CreateCarRequest.cs
@@ -0,0 +1,24 @@
+using CheckDrive.Web.Models.Enums;
+
+namespace CheckDrive.Web.Requests.Cars;
+
+public class CreateCarRequest
+{
+    public int OilMarkId { get; set; }
+    public required string Model { get; set; }
+    public required string Number { get; set; }
+    public int ManufacturedYear { get; set; }
+    public decimal Mileage { get; set; }
+    public decimal CurrentMonthMileage { get; set; }
+    public decimal CurrentYearMileage { get; set; }
+    public decimal YearlyDistanceLimit { get; set; }
+    public decimal MonthlyDistanceLimit { get; set; }
+    public decimal CurrentMonthFuelConsumption { get; set; }
+    public decimal CurrentYearFuelConsumption { get; set; }
+    public decimal MonthlyFuelConsumptionLimit { get; set; }
+    public decimal YearlyFuelConsumptionLimit { get; set; }
+    public decimal AverageFuelConsumption { get; set; }
+    public decimal FuelCapacity { get; set; }
+    public decimal RemainingFuel { get; set; }
+    public CarStatus Status { get; set; }
+}
diff --git a/CheckDrive.Web/CheckDrive.Web/Requests/Cars/UpdateCarRequest.cs b/CheckDrive.Web/CheckDrive.Web/Requests/Cars/UpdateCarRequest.cs
new file mode 100644
index 00000000..87de0df9
--- /dev/null
+++ b/CheckDrive.Web/CheckDrive.Web/Requests/Cars/UpdateCarRequest.cs
@@ -0,0 +1,6 @@
+namespace CheckDrive.Web.Requests.Cars;
+
+public class UpdateCarRequest : CreateCarRequest
+{
+    public int Id { get; set; }
+}
\ No newline at end of file
diff --git a/CheckDrive.Web/CheckDrive.Web/Requests/OilMark/CreateOilMarkRequest.cs b/CheckDrive.Web/CheckDrive.Web/Requests/OilMark/CreateOilMarkRequest.cs
new file mode 100644
index 00000000..38b85248
--- /dev/null
+++ b/CheckDrive.Web/CheckDrive.Web/Requests/OilMark/CreateOilMarkRequest.cs
@@ -0,0 +1,6 @@
+namespace CheckDrive.Web.Requests.OilMark;
+
+public class CreateOilMarkRequest
+{
+    public required string Name { get; set; }
+}
diff --git a/CheckDrive.Web/CheckDrive.Web/Requests/OilMark/UpdateOilMarkRequest.cs b/CheckDrive.Web/CheckDrive.Web/Requests/OilMark/UpdateOilMarkRequest.cs
new file mode 100644
index 00000000..cdd9852e
--- /dev/null
+++ b/CheckDrive.Web/CheckDrive.Web/Requests/OilMark/UpdateOilMarkRequest.cs
@@ -0,0 +1,6 @@
+namespace CheckDrive.Web.Requests.OilMark;
+
+public class UpdateOilMarkRequest : CreateOilMarkRequest
+{
+    public int Id { get; set; }
+}
diff --git a/CheckDrive.Web/CheckDrive.Web/Services/CheckDriveApi.cs b/CheckDrive.Web/CheckDrive.Web/Services/CheckDriveApi.cs
index 331a1f3f..4499d45b 100644
--- a/CheckDrive.Web/CheckDrive.Web/Services/CheckDriveApi.cs
+++ b/CheckDrive.Web/CheckDrive.Web/Services/CheckDriveApi.cs
@@ -2,20 +2,11 @@
 
 namespace CheckDrive.Web.Services;
 
-public class CheckDriveApi
+public class CheckDriveApi(HttpClient client, ILogger<CheckDriveApi> logger)
 {
-    private readonly HttpClient _client;
-    private readonly ILogger<CheckDriveApi> _logger;
-
-    public CheckDriveApi(HttpClient client, ILogger<CheckDriveApi> logger)
-    {
-        _client = client ?? throw new ArgumentNullException(nameof(client));
-        _logger = logger ?? throw new ArgumentNullException(nameof(logger));
-    }
-
     public async Task<TResult> GetAsync<TResult>(string url)
     {
-        var response = await _client.GetAsync(url);
+        var response = await client.GetAsync(url);
         response.EnsureSuccessStatusCode();
 
         var json = await response.Content.ReadAsStringAsync();
@@ -23,7 +14,7 @@ public async Task<TResult> GetAsync<TResult>(string url)
 
         if (result is null)
         {
-            _logger.LogWarning(
+            logger.LogWarning(
                 "Response deserialization returned null for type {Type} from resource {Url} and method GET",
                 typeof(TResult),
                 url);
@@ -36,7 +27,7 @@ public async Task<TResult> GetAsync<TResult>(string url)
 
     public async Task<TResult> PostAsync<TBody, TResult>(string url, TBody data)
     {
-        var response = await _client.PostAsJsonAsync(url, data);
+        var response = await client.PostAsJsonAsync(url, data);
         response.EnsureSuccessStatusCode();
 
         var json = await response.Content.ReadAsStringAsync();
@@ -44,7 +35,7 @@ public async Task<TResult> PostAsync<TBody, TResult>(string url, TBody data)
 
         if (result is null)
         {
-            _logger.LogWarning(
+            logger.LogWarning(
                 "Response deserialization returned null for type {Type} from resource {Url} and method POST",
                 typeof(TResult),
                 url);
@@ -57,13 +48,13 @@ public async Task<TResult> PostAsync<TBody, TResult>(string url, TBody data)
 
     public async Task PutAsync<TBody>(string url, TBody data)
     {
-        var response = await _client.PutAsJsonAsync(url, data);
+        var response = await client.PutAsJsonAsync(url, data);
         response.EnsureSuccessStatusCode();
     }
 
     public async Task DeleteAsync(string url)
     {
-        var response = await _client.DeleteAsync(url);
+        var response = await client.DeleteAsync(url);
         response.EnsureSuccessStatusCode();
     }
 }
diff --git a/CheckDrive.Web/CheckDrive.Web/Stores/Cars/CarDataStore.cs b/CheckDrive.Web/CheckDrive.Web/Stores/Cars/CarDataStore.cs
deleted file mode 100644
index f2614353..00000000
--- a/CheckDrive.Web/CheckDrive.Web/Stores/Cars/CarDataStore.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using CheckDrive.ApiContracts.Car;
-using CheckDrive.Web.Models;
-using CheckDrive.Web.Responses;
-using CheckDrive.Web.Services;
-
-namespace CheckDrive.Web.Stores.Cars;
-
-public class CarDataStore : ICarDataStore
-{
-    private readonly CheckDriveApi _apiClient;
-
-    public CarDataStore(CheckDriveApi apiClient)
-    {
-        _apiClient = apiClient;
-    }
-
-    public Task<List<Car>> GetAsync()
-        => _apiClient.GetAsync<List<Car>>("cars");
-
-    public Task<CarDto> CreateCarAsync(CarForCreateDto carForCreate)
-    {
-        throw new NotImplementedException();
-    }
-
-    public Task DeleteCarAsync(int id)
-    {
-        throw new NotImplementedException();
-    }
-
-    public Task<CarDto> GetCarAsync(int id)
-    {
-        throw new NotImplementedException();
-    }
-
-    public Task<GetCarResponse> GetCarsAsync(string? searchString, int? pageNumber)
-    {
-        throw new NotImplementedException();
-    }
-
-    public Task<GetCarResponse> GetCarsAsync(int? roleId, bool? isBusy)
-    {
-        throw new NotImplementedException();
-    }
-
-    public Task<GetCarHistoryResponse> GetCarsHistoryAsync(string? searchString, int? pageNumber, int? year, int? month)
-    {
-        throw new NotImplementedException();
-    }
-
-    public Task<CarDto> UpdateCarAsync(int id, CarForUpdateDto car)
-    {
-        throw new NotImplementedException();
-    }
-
-    public Task<DTOs.Car.CarDto> CreateCarAsync(DTOs.Car.CarForCreateDto carForCreate)
-    {
-        throw new NotImplementedException();
-    }
-
-    public Task<DTOs.Car.CarDto> UpdateCarAsync(int id, DTOs.Car.CarForUpdateDto car)
-    {
-        throw new NotImplementedException();
-    }
-}
diff --git a/CheckDrive.Web/CheckDrive.Web/Stores/Cars/CarStore.cs b/CheckDrive.Web/CheckDrive.Web/Stores/Cars/CarStore.cs
new file mode 100644
index 00000000..1da88691
--- /dev/null
+++ b/CheckDrive.Web/CheckDrive.Web/Stores/Cars/CarStore.cs
@@ -0,0 +1,25 @@
+using CheckDrive.Web.Requests.Cars;
+using CheckDrive.Web.Services;
+using CheckDrive.Web.ViewModels.Car;
+
+namespace CheckDrive.Web.Stores.Cars;
+
+internal sealed class CarStore(CheckDriveApi apiClient) : ICarStore
+{
+    private static readonly string resourceUrl = "cars";
+
+    public Task<List<CarViewModel>> GetAsync()
+        => apiClient.GetAsync<List<CarViewModel>>(resourceUrl);
+
+    public Task<CarViewModel> GetByIdAsync(int id)
+        => apiClient.GetAsync<CarViewModel>($"{resourceUrl}/{id}");
+
+    public Task<CarViewModel> CreateAsync(CreateCarRequest request)
+        => apiClient.PostAsync<CreateCarRequest, CarViewModel>(resourceUrl, request);
+
+    public Task UpdateAsync(UpdateCarRequest request)
+        => apiClient.PutAsync($"{resourceUrl}/{request.Id}", request);
+
+    public Task DeleteAsync(int id)
+        => apiClient.DeleteAsync($"{resourceUrl}/{id}");
+}
\ No newline at end of file
diff --git a/CheckDrive.Web/CheckDrive.Web/Stores/Cars/ICarDataStore.cs b/CheckDrive.Web/CheckDrive.Web/Stores/Cars/ICarDataStore.cs
deleted file mode 100644
index c774dc82..00000000
--- a/CheckDrive.Web/CheckDrive.Web/Stores/Cars/ICarDataStore.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using CheckDrive.ApiContracts.Car;
-using CheckDrive.Web.Models;
-using CheckDrive.Web.Responses;
-
-namespace CheckDrive.Web.Stores.Cars;
-
-public interface ICarDataStore
-{
-    Task<List<Car>> GetAsync();
-    Task<GetCarResponse> GetCarsAsync(string? searchString, int? pageNumber);
-    Task<GetCarResponse> GetCarsAsync(int? roleId, bool? isBusy);
-    Task<CarDto> GetCarAsync(int id);
-    Task<GetCarHistoryResponse> GetCarsHistoryAsync(string? searchString, int? pageNumber, int? year, int? month);
-    Task<CarDto> CreateCarAsync(CarForCreateDto carForCreate);
-    Task<CarDto> UpdateCarAsync(int id, CarForUpdateDto car);
-    Task DeleteCarAsync(int id);
-}
diff --git a/CheckDrive.Web/CheckDrive.Web/Stores/Cars/ICarStore.cs b/CheckDrive.Web/CheckDrive.Web/Stores/Cars/ICarStore.cs
new file mode 100644
index 00000000..f69bb1d0
--- /dev/null
+++ b/CheckDrive.Web/CheckDrive.Web/Stores/Cars/ICarStore.cs
@@ -0,0 +1,13 @@
+using CheckDrive.Web.Requests.Cars;
+using CheckDrive.Web.ViewModels.Car;
+
+namespace CheckDrive.Web.Stores.Cars;
+
+public interface ICarStore
+{
+    Task<List<CarViewModel>> GetAsync();
+    Task<CarViewModel> GetByIdAsync(int id);
+    Task<CarViewModel> CreateAsync(CreateCarRequest request);
+    Task UpdateAsync(UpdateCarRequest request);
+    Task DeleteAsync(int id);
+}
diff --git a/CheckDrive.Web/CheckDrive.Web/Stores/Employee/EmployeeStore.cs b/CheckDrive.Web/CheckDrive.Web/Stores/Employee/EmployeeStore.cs
index 292bec7f..d6e14b96 100644
--- a/CheckDrive.Web/CheckDrive.Web/Stores/Employee/EmployeeStore.cs
+++ b/CheckDrive.Web/CheckDrive.Web/Stores/Employee/EmployeeStore.cs
@@ -4,28 +4,22 @@
 
 namespace CheckDrive.Web.Stores.Employee;
 
-internal sealed class EmployeeStore : IEmployeeStore
+internal sealed class EmployeeStore(CheckDriveApi apiClient) : IEmployeeStore
 {
     private static readonly string resourceUrl = "employees";
-    private readonly CheckDriveApi _apiClient;
-
-    public EmployeeStore(CheckDriveApi apiClient)
-    {
-        _apiClient = apiClient ?? throw new ArgumentNullException(nameof(apiClient));
-    }
 
     public Task<List<EmployeeViewModel>> GetAsync()
-        => _apiClient.GetAsync<List<EmployeeViewModel>>(resourceUrl);
+        => apiClient.GetAsync<List<EmployeeViewModel>>(resourceUrl);
 
     public Task<EmployeeViewModel> GetByIdAsync(int id)
-        => _apiClient.GetAsync<EmployeeViewModel>($"{resourceUrl}/{id}");
+        => apiClient.GetAsync<EmployeeViewModel>($"{resourceUrl}/{id}");
 
     public Task<EmployeeViewModel> CreateAsync(CreateEmployeeRequest request)
-        => _apiClient.PostAsync<CreateEmployeeRequest, EmployeeViewModel>(resourceUrl, request);
+        => apiClient.PostAsync<CreateEmployeeRequest, EmployeeViewModel>(resourceUrl, request);
 
     public Task UpdateAsync(UpdateEmployeeRequest request)
-        => _apiClient.PutAsync($"{resourceUrl}/{request.Id}", request);
+        => apiClient.PutAsync($"{resourceUrl}/{request.Id}", request);
 
     public Task DeleteAsync(int id)
-        => _apiClient.DeleteAsync($"{resourceUrl}/{id}");
+        => apiClient.DeleteAsync($"{resourceUrl}/{id}");
 }
diff --git a/CheckDrive.Web/CheckDrive.Web/Stores/OilMarks/IOilMarkDataStore.cs b/CheckDrive.Web/CheckDrive.Web/Stores/OilMarks/IOilMarkDataStore.cs
deleted file mode 100644
index 4adf0de9..00000000
--- a/CheckDrive.Web/CheckDrive.Web/Stores/OilMarks/IOilMarkDataStore.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using CheckDrive.ApiContracts.OilMark;
-using CheckDrive.Web.Responses;
-using Microsoft.AspNetCore.Mvc;
-
-namespace CheckDrive.Web.Stores.OilMarks
-{
-    public interface IOilMarkDataStore
-    {
-        Task<GetOilMarkResponse> GetOilMarksAsync();
-        Task<OilMarkDto> GetOilMarkByIdAsync(int id);
-        Task<OilMarkDto> CreateOilMarkAsync(OilMarkForCreateDto review);
-        Task<OilMarkDto> UpdateOilMarkAsync(int id, OilMarkForUpdateDto review);
-        Task DeleteOilMarkAsync(int id);
-    }
-}
diff --git a/CheckDrive.Web/CheckDrive.Web/Stores/OilMarks/IOilMarkStore.cs b/CheckDrive.Web/CheckDrive.Web/Stores/OilMarks/IOilMarkStore.cs
new file mode 100644
index 00000000..d347c297
--- /dev/null
+++ b/CheckDrive.Web/CheckDrive.Web/Stores/OilMarks/IOilMarkStore.cs
@@ -0,0 +1,13 @@
+using CheckDrive.Web.Requests.OilMark;
+using CheckDrive.Web.ViewModels.OilMark;
+
+namespace CheckDrive.Web.Stores.OilMarks;
+
+public interface IOilMarkStore
+{
+    Task<List<OilMarkViewModel>> GetAsync();
+    Task<OilMarkViewModel> GetByIdAsync(int id);
+    Task<OilMarkViewModel> CreateAsync(CreateOilMarkRequest request);
+    Task UpdateAsync(UpdateOilMarkRequest request);
+    Task DeleteAsync(int id);
+}
diff --git a/CheckDrive.Web/CheckDrive.Web/Stores/OilMarks/OilMarkDataStore.cs b/CheckDrive.Web/CheckDrive.Web/Stores/OilMarks/OilMarkDataStore.cs
deleted file mode 100644
index ddd5dc96..00000000
--- a/CheckDrive.Web/CheckDrive.Web/Stores/OilMarks/OilMarkDataStore.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using CheckDrive.ApiContracts.OilMark;
-using CheckDrive.Web.Responses;
-using CheckDrive.Web.Services;
-
-namespace CheckDrive.Web.Stores.OilMarks;
-
-public class OilMarkDataStore : IOilMarkDataStore
-{
-    private readonly CheckDriveApi _apiClient;
-
-    public OilMarkDataStore(CheckDriveApi apiClient)
-    {
-        _apiClient = apiClient;
-    }
-
-    public Task<OilMarkDto> CreateOilMarkAsync(OilMarkForCreateDto review)
-    {
-        throw new NotImplementedException();
-    }
-
-    public Task DeleteOilMarkAsync(int id)
-    {
-        throw new NotImplementedException();
-    }
-
-    public Task<OilMarkDto> GetOilMarkByIdAsync(int id)
-    {
-        throw new NotImplementedException();
-    }
-
-    public Task<GetOilMarkResponse> GetOilMarksAsync()
-    {
-        throw new NotImplementedException();
-    }
-
-    public Task<OilMarkDto> UpdateOilMarkAsync(int id, OilMarkForUpdateDto review)
-    {
-        throw new NotImplementedException();
-    }
-}
diff --git a/CheckDrive.Web/CheckDrive.Web/Stores/OilMarks/OilMarkStore.cs b/CheckDrive.Web/CheckDrive.Web/Stores/OilMarks/OilMarkStore.cs
new file mode 100644
index 00000000..a7bac00d
--- /dev/null
+++ b/CheckDrive.Web/CheckDrive.Web/Stores/OilMarks/OilMarkStore.cs
@@ -0,0 +1,25 @@
+using CheckDrive.Web.Requests.OilMark;
+using CheckDrive.Web.Services;
+using CheckDrive.Web.ViewModels.OilMark;
+
+namespace CheckDrive.Web.Stores.OilMarks;
+
+public class OilMarkStore(CheckDriveApi apiClient) : IOilMarkStore
+{
+    private static readonly string resourceUrl = "oilMarks";
+    
+    public Task<List<OilMarkViewModel>> GetAsync()
+        => apiClient.GetAsync<List<OilMarkViewModel>>(resourceUrl);
+
+    public Task<OilMarkViewModel> GetByIdAsync(int id)
+        => apiClient.GetAsync<OilMarkViewModel>($"{resourceUrl}/{id}");
+
+    public Task<OilMarkViewModel> CreateAsync(CreateOilMarkRequest request)
+        => apiClient.PostAsync<CreateOilMarkRequest, OilMarkViewModel>(resourceUrl, request);
+
+    public Task UpdateAsync(UpdateOilMarkRequest request)
+        => apiClient.PutAsync($"{resourceUrl}/{request.Id}", request);
+
+    public Task DeleteAsync(int id)
+        => apiClient.DeleteAsync($"{resourceUrl}/{id}");
+}
diff --git a/CheckDrive.Web/CheckDrive.Web/ViewModels/Car/CarViewModel.cs b/CheckDrive.Web/CheckDrive.Web/ViewModels/Car/CarViewModel.cs
new file mode 100644
index 00000000..5cae826c
--- /dev/null
+++ b/CheckDrive.Web/CheckDrive.Web/ViewModels/Car/CarViewModel.cs
@@ -0,0 +1,25 @@
+using CheckDrive.Web.Models.Enums;
+
+namespace CheckDrive.Web.ViewModels.Car;
+
+public class CarViewModel
+{
+    public int Id { get; set; }
+    public int OilMarkId { get; set; }
+    public required string Model { get; set; }
+    public required string Number { get; set; }
+    public int ManufacturedYear { get; set; }
+    public decimal Mileage { get; set; }
+    public decimal CurrentMonthMileage { get; set; }
+    public decimal CurrentYearMileage { get; set; }
+    public decimal MonthlyDistanceLimit { get; set; }
+    public decimal YearlyDistanceLimit { get; set; }
+    public decimal CurrentMonthFuelConsumption     { get; set; }
+    public decimal CurrentYearFuelConsumption { get; set; }
+    public decimal MonthlyFuelConsumptionLimit { get; set; }
+    public decimal YearlyFuelConsumptionLimit { get; set; }
+    public decimal AverageFuelConsumption { get; set; }
+    public decimal FuelCapacity { get; set; }
+    public decimal RemainingFuel { get; set; }
+    public CarStatus Status { get; set; }
+}
diff --git a/CheckDrive.Web/CheckDrive.Web/ViewModels/OilMark/OilMarkViewModel.cs b/CheckDrive.Web/CheckDrive.Web/ViewModels/OilMark/OilMarkViewModel.cs
new file mode 100644
index 00000000..eca8aa9b
--- /dev/null
+++ b/CheckDrive.Web/CheckDrive.Web/ViewModels/OilMark/OilMarkViewModel.cs
@@ -0,0 +1,7 @@
+namespace CheckDrive.Web.ViewModels.OilMark;
+
+public class OilMarkViewModel
+{
+    public int Id { get; set; }
+    public required string Name { get; set; }
+}
diff --git a/CheckDrive.Web/CheckDrive.Web/Views/Cars/Create.cshtml b/CheckDrive.Web/CheckDrive.Web/Views/Cars/Create.cshtml
index 3905a3d9..368eb606 100644
--- a/CheckDrive.Web/CheckDrive.Web/Views/Cars/Create.cshtml
+++ b/CheckDrive.Web/CheckDrive.Web/Views/Cars/Create.cshtml
@@ -1,4 +1,5 @@
-@model CheckDrive.ApiContracts.Car.CarForCreateDto
+@using CheckDrive.Web.Requests.Cars
+@model CreateCarRequest
 
 @{
     ViewData["Title"] = "Create";
@@ -18,11 +19,6 @@
             <input asp-for="Number" class="form-control" />
             <span asp-validation-for="Number" class="text-danger"></span>
         </div>
-        <div class="col-md-6 mb-3">
-            <label asp-for="Color" class="control-label">Rangi</label>
-            <input asp-for="Color" class="form-control" />
-            <span asp-validation-for="Color" class="text-danger"></span>
-        </div>
         <div class="col-md-6 mb-3">
             <label asp-for="ManufacturedYear" class="control-label">Ishlab chiqarilgan yili</label>
             <input asp-for="ManufacturedYear" class="form-control" />
@@ -34,14 +30,19 @@
             <span asp-validation-for="Mileage" class="text-danger"></span>
         </div>
         <div class="col-md-6 mb-3">
-            <label asp-for="FuelTankCapacity" class="control-label">Yoqilg'i baki sig'imi</label>
-            <input asp-for="FuelTankCapacity" class="form-control" id="fuelTankCapacity" />
-            <span asp-validation-for="FuelTankCapacity" class="text-danger"></span>
+            <label asp-for="OilMarkId" class=" control-label">Yoqilg'i turi</label>
+            <select id="oil-mark-select" class="form-select form-control border" name="OilMarkId" asp-for="OilMarkId" asp-items="@ViewBag.OilMarks"></select>
+            <span asp-validation-for="OilMarkId" class="text-danger"></span>
+        </div>
+        <div class="col-md-6 mb-3">
+            <label asp-for="FuelCapacity" class="control-label">Yoqilg'i baki sig'imi</label>
+            <input asp-for="FuelCapacity" class="form-control" id="fuelTankCapacity" />
+            <span asp-validation-for="FuelCapacity" class="text-danger"></span>
         </div>
         <div class="col-md-6 mb-3">
-            <label asp-for="MeduimFuelConsumption" class="control-label">100 km uchun yoqilg'i me'yori [litr]</label>
-            <input asp-for="MeduimFuelConsumption" class="form-control" id="meduimFuelConsumption" />
-            <span asp-validation-for="MeduimFuelConsumption" class="text-danger"></span>
+            <label asp-for="AverageFuelConsumption" class="control-label">100 km uchun yoqilg'i me'yori [litr]</label>
+            <input asp-for="AverageFuelConsumption" class="form-control" id="meduimFuelConsumption" />
+            <span asp-validation-for="AverageFuelConsumption" class="text-danger"></span>
         </div>
         <div class="col-md-6 mb-3">
             <label asp-for="RemainingFuel" class="control-label">Avtomobildagi yoqilg'i qoldig'i [litr]</label>
@@ -49,21 +50,21 @@
             <span asp-validation-for="RemainingFuel" class="text-danger"></span>
         </div>
         <div class="col-md-6 mb-3">
-            <label asp-for="OneYearMediumDistance" class="control-label">1 yillik bosib o'tish me'yori [km]</label>
-            <input asp-for="OneYearMediumDistance" class="form-control" id="oneYearMediumDistance" oninput="calculateMonthlyDistance()" />
-            <span asp-validation-for="OneYearMediumDistance" class="text-danger"></span>
+            <label asp-for="YearlyDistanceLimit" class="control-label">1 yillik bosib o'tish me'yori [km]</label>
+            <input asp-for="YearlyDistanceLimit" class="form-control" id="oneYearMediumDistance" oninput="calculateMonthlyDistance()" />
+            <span asp-validation-for="YearlyDistanceLimit" class="text-danger"></span>
         </div>
         <div class="col-md-6 mb-3">
             <label for="monthlyDistance" class="control-label">1 oylik bosib o'tish me'yori [km]</label>
-            <input type="text" id="monthlyDistance" class="form-control" readonly />
+            <input asp-for="MonthlyDistanceLimit" type="text" id="monthlyDistance" class="form-control" readonly />
         </div>
         <div class="col-md-6 mb-3">
             <label for="yearlyMediumFuel" class="control-label">1 yillik yoqilg'i me'yori [litr]</label>
-            <input type="text" id="yearlyMediumFuel" class="form-control" readonly />
+            <input asp-for="YearlyFuelConsumptionLimit" type="text" id="yearlyMediumFuel" class="form-control" readonly />
         </div>
         <div class="col-md-6 mb-3">
             <label for="monthlyMediumFuel" class="control-label">1 oylik yoqilg'i me'yori [litr]</label>
-            <input type="text" id="monthlyMediumFuel" class="form-control" readonly />
+            <input asp-for="MonthlyFuelConsumptionLimit" type="text" id="monthlyMediumFuel" class="form-control" readonly />
         </div>
     </div>
     <div class="modal-footer d-flex justify-content-center ">
@@ -74,54 +75,3 @@
 </form>
 
 <script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"></script>
-@section Scripts {
-    <script>
-        function validateForm() {
-            var fuelTankCapacity = document.getElementById("fuelTankCapacity").value;
-            var remainingFuel = document.getElementById("remainingFuel").value;
-
-            if (parseFloat(remainingFuel) > parseFloat(fuelTankCapacity)) {
-                alert("Avtomobil yoqilg'i qoldig'i yoqilg'i baki sig'imidan katta bo'lmaydi.");
-                return false;
-            }
-            return true;
-        }
-
-        function validateRemainingFuel() {
-            var fuelTankCapacity = document.getElementById("fuelTankCapacity").value;
-            var remainingFuel = document.getElementById("remainingFuel").value;
-
-            if (fuelTankCapacity === "") {
-                alert("Siz avval 'Yoqilg'i baki sig'imi' ga qiymat kiritishingiz kerak");
-                document.getElementById("remainingFuel").value = "";
-                return false;
-            }
-
-            if (parseFloat(remainingFuel) > parseFloat(fuelTankCapacity)) {
-                alert("Avtomobil yoqilg'i qoldig'i yoqilg'i baki sig'imidan katta bo'lmaydi.");
-                return false;
-            }
-            return true;
-        }
-
-        function calculateMonthlyDistance() {
-            var oneYearMediumDistance = document.getElementById("oneYearMediumDistance").value;
-            var meduimFuelConsumption = document.getElementById("meduimFuelConsumption").value;
-
-            if (meduimFuelConsumption === "") {
-                alert("Siz avval '100 km uchun yoqilg'i me'yori [litr]' ga qiymat kiritishingiz kerak");
-                document.getElementById("oneYearMediumDistance").value = "";
-                return;
-            }
-
-            var monthlyDistance = oneYearMediumDistance / 12;
-            document.getElementById("monthlyDistance").value = monthlyDistance.toFixed(1);
-
-            var yearlyMediumFuel = oneYearMediumDistance * (meduimFuelConsumption / 100);
-            document.getElementById("yearlyMediumFuel").value = yearlyMediumFuel.toFixed(1);
-
-            var monthlyMediumFuel = yearlyMediumFuel / 12;
-            document.getElementById("monthlyMediumFuel").value = monthlyMediumFuel.toFixed(1);
-        }
-    </script>
-}
diff --git a/CheckDrive.Web/CheckDrive.Web/Views/Cars/Delete.cshtml b/CheckDrive.Web/CheckDrive.Web/Views/Cars/Delete.cshtml
index 62d7ce3e..284b9388 100644
--- a/CheckDrive.Web/CheckDrive.Web/Views/Cars/Delete.cshtml
+++ b/CheckDrive.Web/CheckDrive.Web/Views/Cars/Delete.cshtml
@@ -1,4 +1,5 @@
-@model CheckDrive.ApiContracts.Car.CarDto
+@using CheckDrive.Web.ViewModels.Car
+@model CarViewModel
 
 @{
     ViewData["Title"] = "Delete";
diff --git a/CheckDrive.Web/CheckDrive.Web/Views/Cars/Details.cshtml b/CheckDrive.Web/CheckDrive.Web/Views/Cars/Details.cshtml
index 1a82be47..0c4dda7c 100644
--- a/CheckDrive.Web/CheckDrive.Web/Views/Cars/Details.cshtml
+++ b/CheckDrive.Web/CheckDrive.Web/Views/Cars/Details.cshtml
@@ -1,4 +1,5 @@
-@model CheckDrive.ApiContracts.Car.CarDto
+@using CheckDrive.Web.ViewModels.Car
+@model CarViewModel
 
 @{
     ViewData["Title"] = "Details";
@@ -11,7 +12,7 @@
             Model
         </div>
         <div class="col text-center">
-            Rangi
+            Ishlab chiqarilgan yil
         </div>
         <div class="col text-center">
             Davlat raqami
@@ -22,16 +23,13 @@
             @Model.Model
         </div>
         <div class="col text-center">
-            @Model.Color
+            @Model.ManufacturedYear
         </div>
         <div class="col text-center">
             @Model.Number
         </div>
     </div>
     <div class="row content">
-        <div class="col text-center">
-            Ishlab chiqarilgan yil
-        </div>
         <div class="col text-center">
             Bosib o'tgan masofasi
         </div>
@@ -40,9 +38,6 @@
         </div>
     </div>
     <div class="row value">
-        <div class="col text-center">
-            @Model.ManufacturedYear
-        </div>
         <div class="col text-center">
             @Model.Mileage
         </div>
@@ -60,10 +55,10 @@
     </div>
     <div class="row value">
         <div class="col text-center">
-            @Model.MeduimFuelConsumption
+            @Model.AverageFuelConsumption
         </div>
         <div class="col text-center">
-            @Model.FuelTankCapacity
+            @Model.FuelCapacity
         </div>
     </div>
     <div class="row content">
@@ -76,10 +71,10 @@
     </div>
     <div class="row value">
         <div class="col text-center">
-            @Model.OneYearMediumDistance
+            @Model.YearlyDistanceLimit
         </div>
         <div class="col text-center">
-            @Model.OneMonthMediumDistance
+            @Model.MonthlyDistanceLimit
         </div>
     </div>
     <div class="row content">
@@ -92,124 +87,10 @@
     </div>
     <div class="row value">
         <div class="col text-center bottom-style">
-            @Model.OneYearMeduimFuelConsumption
+            @Model.YearlyFuelConsumptionLimit
         </div>
         <div class="col text-center bottom-style">
-            @Model.OneMonthMeduimFuelConsumption
-        </div>
-    </div>
-</div>
-
-<div class="modal fade" id="carModal" 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="carmodalContent">
-                
-            </div>
+            @Model.MonthlyFuelConsumptionLimit
         </div>
     </div>
-</div>
-
-@section Scripts {
-    <script>
-        $(document).ready(function () {
-            $('#openCarModal').on('click', function () {
-                $('#carmodalContent').empty();
-                $.ajax({
-                    url: "/cars/edit/"+@Model?.Id,
-                    type: 'GET',
-                    contentType: 'application/x-www-form-urlencoded; charset=UTF-8',
-                    headers: {
-                        'RequestVerificationToken': $('input[name="__RequestVerificationToken"]').val()
-                    },
-                    success: function (data) {
-                        $('#carmodalContent').html(data);
-                        console.log("Ajax muvaffaqqiyatli bajarildi");
-                        $('#carModal').modal('show');
-                        $.getScript('/lib/jquery-validation/dist/jquery.validate.min.js', function () {
-                            $.getScript('/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js');
-                        });
-
-                    },
-                    error: function (error) {
-                        alert("Tahrirlash oynasini ochishda muommo bo'ldi \n" + error );
-                    }
-                });
-            });
-            $('#carModal').on('hidden.bs.modal', function () {
-                $(this).find('#carmodalContent').empty(); // Modal yopilganda ichki kontentni tozalash
-                $(this).off('click');
-            });
-            $('#carModal').on('click', '.btn-close', function () {
-                $('#carModal').modal('hide');
-            });
-        });
-        function validateForm() {
-            var fuelTankCapacity = document.getElementById("fuelTankCapacity").value;
-            var remainingFuel = document.getElementById("remainingFuel").value;
-
-            if (parseFloat(remainingFuel) > parseFloat(fuelTankCapacity)) {
-                alert("Avtomobil yoqilg'i qoldig'i yoqilg'i baki sig'imidan katta bo'lmaydi.");
-                return false;
-            }
-            return true;
-        }
-
-        function validateRemainingFuel() {
-            var fuelTankCapacity = document.getElementById("fuelTankCapacity").value;
-            var remainingFuel = document.getElementById("remainingFuel").value;
-
-            if (fuelTankCapacity === "") {
-                alert("Siz avval 'Yoqilg'i baki sig'imi' ga qiymat kiritishingiz kerak");
-                document.getElementById("remainingFuel").value = "";
-                return false;
-            }
-
-            if (parseFloat(remainingFuel) > parseFloat(fuelTankCapacity)) {
-                alert("Avtomobil yoqilg'i qoldig'i yoqilg'i baki sig'imidan katta bo'lmaydi.");
-                return false;
-            }
-            return true;
-        }
-
-        function calculateMonthlyDistance() {
-            var oneYearMediumDistance = document.getElementById("oneYearMediumDistance").value;
-            var meduimFuelConsumption = document.getElementById("meduimFuelConsumption").value;
-
-            if (meduimFuelConsumption === "") {
-                alert("Siz avval '100 km uchun yoqilg'i me'yori [litr]' ga qiymat kiritishingiz kerak");
-                document.getElementById("oneYearMediumDistance").value = "";
-                return;
-            }
-
-            var monthlyDistance = oneYearMediumDistance / 12;
-            document.getElementById("monthlyDistance").value = monthlyDistance.toFixed(1);
-
-            var yearlyMediumFuel = oneYearMediumDistance * (meduimFuelConsumption / 100);
-            document.getElementById("yearlyMediumFuel").value = yearlyMediumFuel.toFixed(1);
-
-            var monthlyMediumFuel = yearlyMediumFuel / 12;
-            document.getElementById("monthlyMediumFuel").value = monthlyMediumFuel.toFixed(1);
-        }
-
-    </script>
-}
-<style>
-    .modal-lg {
-        max-width: 100%;
-        margin: auto; /* Ekranning 90% qismini egallaydi */
-    }
-
-    .modal-content {
-        width: 60%; /* Modal o'lchamini 80% qiling */
-        max-width: 700px; /* Maksimal o'lcham */
-    }
-
-</style>
+</div>
\ No newline at end of file
diff --git a/CheckDrive.Web/CheckDrive.Web/Views/Cars/Edit.cshtml b/CheckDrive.Web/CheckDrive.Web/Views/Cars/Edit.cshtml
index a6d89807..384f87d5 100644
--- a/CheckDrive.Web/CheckDrive.Web/Views/Cars/Edit.cshtml
+++ b/CheckDrive.Web/CheckDrive.Web/Views/Cars/Edit.cshtml
@@ -1,14 +1,16 @@
-@model CheckDrive.ApiContracts.Car.CarDto
+@using CheckDrive.Web.Requests.Cars
+@model UpdateCarRequest
 
 @{
     ViewData["Title"] = "Edit";
     Layout = "~/Views/Shared/_LayoutForModal.cshtml";
 }
-<form asp-action="edit" method="post" id="editCarForm" onsubmit="return validateForm()">
+<form asp-action="edit" method="post" id="editCarForm" onsubmit="validateForm()">
     @Html.AntiForgeryToken()
     <div asp-validation-summary="ModelOnly" class="text-danger"></div>
+    <input asp-for="Id" value="@Model.Id" hidden />
     <div class="row">
-        <div class=" col-md-6 mb-3">
+        <div class="col-md-6 mb-3">
             <label asp-for="Model" class="control-label">Model</label>
             <input asp-for="Model" class="form-control" />
             <span asp-validation-for="Model" class="text-danger"></span>
@@ -18,11 +20,6 @@
             <input asp-for="Number" class="form-control" />
             <span asp-validation-for="Number" class="text-danger"></span>
         </div>
-        <div class="col-md-6 mb-3">
-            <label asp-for="Color" class="control-label">Rangi</label>
-            <input asp-for="Color" class="form-control" />
-            <span asp-validation-for="Color" class="text-danger"></span>
-        </div>
         <div class="col-md-6 mb-3">
             <label asp-for="ManufacturedYear" class="control-label">Ishlab chiqarilgan yili</label>
             <input asp-for="ManufacturedYear" class="form-control" />
@@ -34,14 +31,19 @@
             <span asp-validation-for="Mileage" class="text-danger"></span>
         </div>
         <div class="col-md-6 mb-3">
-            <label asp-for="FuelTankCapacity" class="control-label">Yoqilg'i baki sig'imi</label>
-            <input asp-for="FuelTankCapacity" class="form-control" id="fuelTankCapacity" />
-            <span asp-validation-for="FuelTankCapacity" class="text-danger"></span>
+            <label asp-for="OilMarkId" class=" control-label">Yoqilg'i turi</label>
+            <select id="oil-mark-select" class="form-select form-control border" name="OilMarkId" asp-for="OilMarkId" asp-items="@ViewBag.OilMarks"></select>
+            <span asp-validation-for="OilMarkId" class="text-danger"></span>
+        </div>
+        <div class="col-md-6 mb-3">
+            <label asp-for="FuelCapacity" class="control-label">Yoqilg'i baki sig'imi</label>
+            <input asp-for="FuelCapacity" class="form-control" id="fuelTankCapacity" />
+            <span asp-validation-for="FuelCapacity" class="text-danger"></span>
         </div>
         <div class="col-md-6 mb-3">
-            <label asp-for="MeduimFuelConsumption" class="control-label">100 km uchun yoqilg'i me'yori [litr]</label>
-            <input asp-for="MeduimFuelConsumption" class="form-control" id="meduimFuelConsumption" />
-            <span asp-validation-for="MeduimFuelConsumption" class="text-danger"></span>
+            <label asp-for="AverageFuelConsumption" class="control-label">100 km uchun yoqilg'i me'yori [litr]</label>
+            <input asp-for="AverageFuelConsumption" class="form-control" id="meduimFuelConsumption" />
+            <span asp-validation-for="AverageFuelConsumption" class="text-danger"></span>
         </div>
         <div class="col-md-6 mb-3">
             <label asp-for="RemainingFuel" class="control-label">Avtomobildagi yoqilg'i qoldig'i [litr]</label>
@@ -49,21 +51,22 @@
             <span asp-validation-for="RemainingFuel" class="text-danger"></span>
         </div>
         <div class="col-md-6 mb-3">
-            <label asp-for="OneYearMediumDistance" class="control-label">1 yillik bosib o'tish me'yori [km]</label>
-            <input asp-for="OneYearMediumDistance" class="form-control" id="oneYearMediumDistance" oninput="calculateMonthlyDistance()" />
-            <span asp-validation-for="OneYearMediumDistance" class="text-danger"></span>
+            <label asp-for="YearlyDistanceLimit" class="control-label">1 yillik bosib o'tish me'yori [km]</label>
+            <input asp-for="YearlyDistanceLimit" class="form-control" id="oneYearMediumDistance" oninput="calculateMonthlyDistance()" />
+            <span asp-validation-for="YearlyDistanceLimit" class="text-danger"></span>
         </div>
         <div class="col-md-6 mb-3">
-            <label for="monthlyDistance" class="control-label">1 oylik bosib o'tish me'yori [km]</label>
-            <input type="text" id="monthlyDistance" class="form-control" readonly />
+            <label asp-for="MonthlyDistanceLimit" class="control-label">1 oylik bosib o'tish me'yori [km]</label>
+            <input asp-for="MonthlyDistanceLimit" type="text" id="monthlyDistance" class="form-control" readonly />
+            <span asp-validation-for="MonthlyDistanceLimit" class="text-danger"></span>
         </div>
         <div class="col-md-6 mb-3">
-            <label for="yearlyMediumFuel" class="control-label">1 yillik yoqilg'i me'yori [litr]</label>
-            <input type="text" id="yearlyMediumFuel" class="form-control" readonly />
+            <label asp-for="YearlyFuelConsumptionLimit" class="control-label">1 yillik yoqilg'i me'yori [litr]</label>
+            <input asp-for="YearlyFuelConsumptionLimit" type="text" id="yearlyMediumFuel" class="form-control" readonly />
         </div>
         <div class="col-md-6 mb-3">
-            <label for="monthlyMediumFuel" class="control-label">1 oylik yoqilg'i me'yori [litr]</label>
-            <input type="text" id="monthlyMediumFuel" class="form-control" readonly />
+            <label asp-for="MonthlyFuelConsumptionLimit" class="control-label">1 oylik yoqilg'i me'yori [litr]</label>
+            <input asp-for="MonthlyFuelConsumptionLimit" type="text" id="monthlyMediumFuel" class="form-control" readonly />
         </div>
     </div>
     <div class="modal-footer d-flex justify-content-center ">
@@ -73,56 +76,3 @@
     </div>
 </form>
 
-@section Scripts {
-    <script>
-        function validateForm() {
-            var fuelTankCapacity = document.getElementById("fuelTankCapacity").value;
-            var remainingFuel = document.getElementById("remainingFuel").value;
-
-            if (parseFloat(remainingFuel) > parseFloat(fuelTankCapacity)) {
-                alert("Avtomobil yoqilg'i qoldig'i yoqilg'i baki sig'imidan katta bo'lmaydi.");
-                return false;
-            }
-            return true;
-        }
-
-        function validateRemainingFuel() {
-            var fuelTankCapacity = document.getElementById("fuelTankCapacity").value;
-            var remainingFuel = document.getElementById("remainingFuel").value;
-
-            if (fuelTankCapacity === "") {
-                alert("Siz avval 'Yoqilg'i baki sig'imi' ga qiymat kiritishingiz kerak");
-                document.getElementById("remainingFuel").value = "";
-                return false;
-            }
-
-            if (parseFloat(remainingFuel) > parseFloat(fuelTankCapacity)) {
-                alert("Avtomobil yoqilg'i qoldig'i yoqilg'i baki sig'imidan katta bo'lmaydi.");
-                return false;
-            }
-            return true;
-        }
-
-        function calculateMonthlyDistance() {
-            var oneYearMediumDistance = document.getElementById("oneYearMediumDistance").value;
-            var meduimFuelConsumption = document.getElementById("meduimFuelConsumption").value;
-
-            if (meduimFuelConsumption === "") {
-                alert("Siz avval '100 km uchun yoqilg'i me'yori [litr]' ga qiymat kiritishingiz kerak");
-                document.getElementById("oneYearMediumDistance").value = "";
-                return;
-            }
-
-            var monthlyDistance = oneYearMediumDistance / 12;
-            document.getElementById("monthlyDistance").value = monthlyDistance.toFixed(1);
-
-            var yearlyMediumFuel = oneYearMediumDistance * (meduimFuelConsumption / 100);
-            document.getElementById("yearlyMediumFuel").value = yearlyMediumFuel.toFixed(1);
-
-            var monthlyMediumFuel = yearlyMediumFuel / 12;
-            document.getElementById("monthlyMediumFuel").value = monthlyMediumFuel.toFixed(1);
-        }
-    </script>
-}
-
-
diff --git a/CheckDrive.Web/CheckDrive.Web/Views/Cars/Index.cshtml b/CheckDrive.Web/CheckDrive.Web/Views/Cars/Index.cshtml
index 936c993a..2b9748e6 100644
--- a/CheckDrive.Web/CheckDrive.Web/Views/Cars/Index.cshtml
+++ b/CheckDrive.Web/CheckDrive.Web/Views/Cars/Index.cshtml
@@ -1,22 +1,30 @@
-@using CheckDrive.ApiContracts.Car
-@model CheckDrive.ApiContracts.Car.CarDto
+@using CheckDrive.Web.ViewModels.Car
+@model CarViewModel
 
 @{
-    ViewData["Title"] = "Index";
+    ViewData["Title"] = "Cars";
     Layout = "~/Views/Shared/_Layout.cshtml";
 } 
 
+@section Styles {
+	<link href="~/css/car.css" rel="stylesheet" />
+}
+
+@section Scripts {
+    <script src="~/js/car.js"></script>
+}
+
 <form asp-controller="Cars" asp-action="Index">
-        <div class="row mt-4">
-            <div class="d-flex justify-content-between mb-4 ">
+        <div class="row mt-3">
+            <div class="d-flex justify-content-between">
                 <!-- Search -->
                 <div class="col-md-4 filter-bar position-relative">
                     <div class="position-relative w-100">
-                        <i class="fa-solid fa-magnifying-glass position-absolute top-50 start-0 translate-middle-y ms-3" style="color: dimgray;"></i>
+                        <i class="fa-solid fa-magnifying-glass search-icon"></i>
                         <ejs-textbox id="search-box"
                                      name="search"
                                      class="search-box ps-5"
-                                     placeholder="Avtomobilni izlash..."
+                                     placeholder="Izlash..."
                                      floatLabelType="Never"
                                      value="@ViewBag.SearchString"
                                      input="onChangeSearch">
@@ -31,7 +39,7 @@
                     </div>                   
                     <div>
                         <button id="openCarCreateModal" type="button" data-toggle="modal" class="btn btn-success">
-                            <i  class="fa fa-plus"></i> Yaratish
+                            <i  class="fa fa-plus"></i> Yangi
                         </button>                                   
                     </div>
                 </div>
@@ -49,11 +57,10 @@
                   <e-grid-pagesettings pageSize="10"></e-grid-pagesettings>
             <e-grid-columns>
                 <e-grid-column headerText="Model" field="Model" textAlign="Center" headerTextAlign="Center" typeof="Text"></e-grid-column>
-                <e-grid-column headerText="Davlat raqami" field="Number" textAlign="Center" headerTextAlign="Center" typeof="text"></e-grid-column>
-                <e-grid-column headerText="Bosib o'tgan masofasi'" field="Mileage" textAlign="Center" headerTextAlign="Center" typeof="text"></e-grid-column>
-                <e-grid-column headerText="Rangi" field="Color" textAlign="Center" headerTextAlign="Center" typeof="text"></e-grid-column>
+                <e-grid-column width="130" headerText="Davlat raqami" field="Number" textAlign="Center" headerTextAlign="Center" typeof="text"></e-grid-column>
+                <e-grid-column headerText="Bosib o'tgan masofasi [km]" field="Mileage" textAlign="Center" headerTextAlign="Center" typeof="text"></e-grid-column>
                 <e-grid-column headerText="Ishlab chiqarilgan yili" field="ManufacturedYear" textAlign="Center" headerTextAlign="Center" typeof="text"></e-grid-column>
-                <e-grid-column headerText="Status" field="Status" textAlign="Center" headerTextAlign="Center" type="string"></e-grid-column>
+                <e-grid-column width="110" headerText="Status" textAlign="Center" headerTextAlign="Center" template="#statusTemplate"></e-grid-column>
                 <e-grid-column width="180" type="text" textAlign="Center" template="#actionTemplate"></e-grid-column>
             </e-grid-columns>
         </ejs-grid>
@@ -62,7 +69,7 @@
 
 <!--  Create Modal Structure -->
 <div class="modal fade" id="carModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
-    <div class="modal-dialog modal-lg ">
+    <div class="modal-dialog modal-xl ">
         <div class="modal-content">
             <div class="modal-header d-flex justify-content-center">
                 <h4>Yangi avtomobil yaratish</h4>
@@ -78,6 +85,18 @@
     </div>
 </div>
 
+<script id="statusTemplate" type="text/x-template">
+    ${if(Status == 0)}
+        <span class="badge bg-success">Bo'sh</span>
+    ${else if(Status == 1)}
+        <span class="badge bg-warning">Band</span>
+    ${else if(Status == 2)}
+        <span class="badge bg-danger">Limitdan oshgan</span>
+    ${else if(Status == 3)}
+        <span class="badge bg-secondary">Nosoz</span>
+    ${/if}
+</script>
+
 <script type="text/x-template" id="actionTemplate">
     <button type="button" class="shadow-sm  bg-white rounded e-btn e-flat mx-2" title="Tafsilot" onclick="onDetailsClick(${Id})">
         <i class="bi bi-card-list text-info" style="font-size: 19px;"></i>
@@ -91,7 +110,7 @@
 </script>
 
 <div class="modal fade" id="detailsModal" tabindex="-1" aria-labelledby="detailsModalLabel" aria-hidden="true">
-    <div class="modal-dialog modal-lg modal-dialog-centered">
+    <div class="modal-dialog modal-xl modal-dialog-centered">
         <div class="modal-content">
             <div class="modal-header d-flex justify-content-center">
                 <h3 class="modal-title" id="detailsModalLabel">Avtomobil ma'lumotlari</h3>
@@ -113,7 +132,7 @@
 </div>
 
 <div class="modal fade" id="carEditModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
-    <div class="modal-dialog modal-lg modal-dialog-centered ">
+    <div class="modal-dialog modal-xl modal-dialog-centered ">
         <div class="modal-content">
             <div class="modal-header d-flex justify-content-center">
                 <h4>Avtomobil ma'lumotlarini o'zgartirish</h4>
@@ -126,207 +145,4 @@
             </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();
-        $.ajax({
-            url: `/cars/details/${id}`,
-            type: 'GET',
-            contentType: 'application/x-www-form-urlencoded; charset=UTF-8',
-            success: function (data) {
-                $('#detailsContent').html(data);
-                var detailsModal = new bootstrap.Modal(document.getElementById('detailsModal'), {
-                    backdrop: 'static',
-                    keyboard: false
-                });
-                detailsModal.show();
-            },
-            error: function (error) {
-                alert("Ma'lumotlarni yuklashda muammo yuz berdi.");
-            }
-        });
-    }
-
-    $('#detailsModal').on('hidden.bs.modal', function () {
-        $(this).find('#detailsContent').empty();
-    });
-</script>
-
-@section Scripts {
-  <script>
-     $(document).ready(function () {
-        $('#openCarCreateModal').on('click',function () {
-            $('#carmodalContent').empty();          
-            $.ajax({
-                url: '/cars/create',
-                type: 'GET',                
-                contentType: 'application/x-www-form-urlencoded; charset=UTF-8',
-                headers: {
-                    'RequestVerificationToken': $('input[name="__RequestVerificationToken"]').val()
-                },
-                success: function (data) {
-                    $('#carmodalContent').html(data);                  
-                    $('#carModal').modal({
-                        backdrop: 'static',
-                        keyboard: false
-                    }).modal('show');                    
-                        $.getScript('/lib/jquery-validation/dist/jquery.validate.min.js', function () {
-                            $.getScript('/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js');
-                        });
-                       
-                },
-                error: function (error) {
-                    alert("Error occurred while saving car.");
-                }
-            });
-        });
-        $('#carModal').on('hidden.bs.modal', function () {
-            $(this).find('#carmodalContent').empty();
-            $(this).off('click');
-        });
-        $('#carModal').on('click', '.btn-close', function () {
-            $('#carModal').modal('hide');
-        });
-     });
-        function validateForm() {
-            var fuelTankCapacity = document.getElementById("fuelTankCapacity").value;
-            var remainingFuel = document.getElementById("remainingFuel").value;
-
-            if (parseFloat(remainingFuel) > parseFloat(fuelTankCapacity)) {
-                alert("Avtomobil yoqilg'i qoldig'i yoqilg'i baki sig'imidan katta bo'lmaydi.");
-                return false;
-            }
-            return true;
-        }
-
-        function validateRemainingFuel() {
-            var fuelTankCapacity = document.getElementById("fuelTankCapacity").value;
-            var remainingFuel = document.getElementById("remainingFuel").value;
-
-            if (fuelTankCapacity === "") {
-                alert("Siz avval 'Yoqilg'i baki sig'imi' ga qiymat kiritishingiz kerak");
-                document.getElementById("remainingFuel").value = "";
-                return false;
-            }
-
-            if (parseFloat(remainingFuel) > parseFloat(fuelTankCapacity)) {
-                alert("Avtomobil yoqilg'i qoldig'i yoqilg'i baki sig'imidan katta bo'lmaydi.");
-                return false;
-            }
-            return true;
-        }
-
-        function calculateMonthlyDistance() {
-            var oneYearMediumDistance = document.getElementById("oneYearMediumDistance").value;
-            var meduimFuelConsumption = document.getElementById("meduimFuelConsumption").value;
-
-            if (meduimFuelConsumption === "") {
-                alert("Siz avval '100 km uchun yoqilg'i me'yori [litr]' ga qiymat kiritishingiz kerak");
-                document.getElementById("oneYearMediumDistance").value = "";
-                return;
-            }
-
-            var monthlyDistance = oneYearMediumDistance / 12;
-            document.getElementById("monthlyDistance").value = monthlyDistance.toFixed(1);
-
-            var yearlyMediumFuel = oneYearMediumDistance * (meduimFuelConsumption / 100);
-            document.getElementById("yearlyMediumFuel").value = yearlyMediumFuel.toFixed(1);
-
-            var monthlyMediumFuel = yearlyMediumFuel / 12;
-            document.getElementById("monthlyMediumFuel").value = monthlyMediumFuel.toFixed(1);
-        }
-  </script>
-} 
-
-<script>
-    function onChangeSearch() {
-        const searchInput = document.getElementById("search-box").value.trim();
-        const gridElement = document.getElementById("cars-list");
-        const gridInstance = gridElement?.ej2_instances?.[0];
-
-        if (!gridInstance) {
-            console.error("Grid instance not found.");
-            return;
-        }
-
-        if (searchInput) {
-            gridInstance.search(searchInput);
-        } else {
-            gridInstance.searchSettings.key = "";
-        }
-
-        gridInstance.refresh();
-    }
-</script>
-
-<style>
-    .e-input-group input {
-        height: 35px !important;
-    }
-
-    .search-box {
-        padding-left: 2rem;
-    }
-
-    .position-relative .fa-magnifying-glass {
-        pointer-events: none;
-        z-index: 1;
-    }
-
-    button {
-        height: 37px;
-    }
-
-    .e-pager .e-pagerexternalmsg {
-        display: none;
-    }
-</style>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/CheckDrive.Web/CheckDrive.Web/Views/Employees/Create.cshtml b/CheckDrive.Web/CheckDrive.Web/Views/Employees/Create.cshtml
index bceeaa86..b2e1c98b 100644
--- a/CheckDrive.Web/CheckDrive.Web/Views/Employees/Create.cshtml
+++ b/CheckDrive.Web/CheckDrive.Web/Views/Employees/Create.cshtml
@@ -6,10 +6,6 @@
     Layout = "~/Views/Shared/_LayoutForModal.cshtml";
 }
 
-@section Scripts {
-    <script src="~/js/employees/create.js"></script>
-}
-
 <form id="create-employee-form" method="post" asp-action="Create" asp-controller="Employees">
     @Html.AntiForgeryToken()
     <div asp-validation-summary="ModelOnly" class="text-danger"></div>
diff --git a/CheckDrive.Web/CheckDrive.Web/Views/Employees/Edit.cshtml b/CheckDrive.Web/CheckDrive.Web/Views/Employees/Edit.cshtml
index 7eb1d361..77d7413e 100644
--- a/CheckDrive.Web/CheckDrive.Web/Views/Employees/Edit.cshtml
+++ b/CheckDrive.Web/CheckDrive.Web/Views/Employees/Edit.cshtml
@@ -6,13 +6,9 @@
     Layout = "~/Views/Shared/_LayoutForModal.cshtml";
 }
 
-@section Scripts {
-    <script src="~/js/employees/create.js"></script>
-}
-
 <form id="create-employee-form" method="post" asp-action="Edit" asp-controller="Employees">
     @Html.AntiForgeryToken()
-    <div asp-validation-summary="ModelOnly" class="text-danger"></div>
+    <div asp-validation-summary="ModelOnly" class="text-danger"></div> 
     <input asp-for="AccountId" value="@Model.AccountId" hidden />
     <div class="row gap-1 ms-4 mb-4">
         <div class="col-md">
diff --git a/CheckDrive.Web/CheckDrive.Web/Views/Employees/Index.cshtml b/CheckDrive.Web/CheckDrive.Web/Views/Employees/Index.cshtml
index 2babfca4..a22a7999 100644
--- a/CheckDrive.Web/CheckDrive.Web/Views/Employees/Index.cshtml
+++ b/CheckDrive.Web/CheckDrive.Web/Views/Employees/Index.cshtml
@@ -97,7 +97,7 @@
     <button type="button"  class="shadow-sm bg-white rounded e-btn e-flat" title="Tahrirlash" onclick="onEditClick(${Id})">
         <i class="fa-solid fa-pen fa-lg text-warning" ></i>
     </button>
-    <button type="button" class="shadow-sm bg-white rounded e-btn e-flat mx-2"  title="O'chirish" onclick="onDeleteClick(${Id})">
+    <button type="button" class="shadow-sm bg-white rounded e-btn e-flat mx-2"  title="O&#39;chirish" onclick="onDeleteClick(${Id})">
         <i class="fa-solid fa-trash-can fa-lg text-danger" ></i>
     </button>
 </script>
diff --git a/CheckDrive.Web/CheckDrive.Web/wwwroot/css/car.css b/CheckDrive.Web/CheckDrive.Web/wwwroot/css/car.css
new file mode 100644
index 00000000..88e39007
--- /dev/null
+++ b/CheckDrive.Web/CheckDrive.Web/wwwroot/css/car.css
@@ -0,0 +1,21 @@
+.e-input-group input {
+    height: 35px !important;
+}
+
+.search-box {
+    padding-left: 2rem;
+}
+
+.position-relative .fa-magnifying-glass {
+    pointer-events: none;
+    z-index: 1;
+}
+
+button {
+    height: 37px;
+}
+
+.e-pager .e-pagerexternalmsg {
+    display: none;
+}
+    
\ No newline at end of file
diff --git a/CheckDrive.Web/CheckDrive.Web/wwwroot/js/car.js b/CheckDrive.Web/CheckDrive.Web/wwwroot/js/car.js
new file mode 100644
index 00000000..1a764ba3
--- /dev/null
+++ b/CheckDrive.Web/CheckDrive.Web/wwwroot/js/car.js
@@ -0,0 +1,181 @@
+function onEditClick(id) {
+    $('#carEditModalContent').empty();
+    console.log(id);
+    $.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');
+
+}
+
+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');
+}
+
+function onDetailsClick(id) {
+    $('#detailsContent').empty();
+    console.log(id);
+    $.ajax({
+        url: `/cars/details/${id}`,
+        type: 'GET',
+        contentType: 'application/x-www-form-urlencoded; charset=UTF-8',
+        success: function (data) {
+            $('#detailsContent').html(data);
+            var detailsModal = new bootstrap.Modal(document.getElementById('detailsModal'), {
+                backdrop: 'static',
+                keyboard: false
+            });
+            detailsModal.show();
+        },
+        error: function (error) {
+            alert("Ma'lumotlarni yuklashda muammo yuz berdi.");
+        }
+    });
+}
+
+$('#detailsModal').on('hidden.bs.modal', function () {
+    $(this).find('#detailsContent').empty();
+});
+
+$(document).ready(function () {
+    $('#openCarCreateModal').on('click', function () {
+        $('#carmodalContent').empty();
+        $.ajax({
+            url: '/cars/create',
+            type: 'GET',
+            contentType: 'application/x-www-form-urlencoded; charset=UTF-8',
+            headers: {
+                'RequestVerificationToken': $('input[name="__RequestVerificationToken"]').val()
+            },
+            success: function (data) {
+                $('#carmodalContent').html(data);
+                $('#carModal').modal({
+                    backdrop: 'static',
+                    keyboard: false
+                }).modal('show');
+                $.getScript('/lib/jquery-validation/dist/jquery.validate.min.js', function () {
+                    $.getScript('/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js');
+                });
+
+            },
+            error: function (error) {
+                alert("Error occurred while saving car.");
+            }
+        });
+    });
+    $('#carModal').on('hidden.bs.modal', function () {
+        $(this).find('#carmodalContent').empty();
+        $(this).off('click');
+    });
+    $('#carModal').on('click', '.btn-close', function () {
+        $('#carModal').modal('hide');
+    });
+});
+
+function validateForm() {
+    var fuelTankCapacity = document.getElementById("fuelTankCapacity").value;
+    var remainingFuel = document.getElementById("remainingFuel").value;
+
+    if (parseFloat(remainingFuel) > parseFloat(fuelTankCapacity)) {
+        alert("Avtomobil yoqilg'i qoldig'i yoqilg'i baki sig'imidan katta bo'lmaydi.");
+        return false;
+    }
+    return true;
+}
+
+function validateRemainingFuel() {
+    var fuelTankCapacity = document.getElementById("fuelTankCapacity").value;
+    var remainingFuel = document.getElementById("remainingFuel").value;
+
+    if (fuelTankCapacity === "") {
+        alert("Siz avval 'Yoqilg'i baki sig'imi' ga qiymat kiritishingiz kerak");
+        document.getElementById("remainingFuel").value = "";
+        return false;
+    }
+
+    if (parseFloat(remainingFuel) > parseFloat(fuelTankCapacity)) {
+        alert("Avtomobil yoqilg'i qoldig'i yoqilg'i baki sig'imidan katta bo'lmaydi.");
+        return false;
+    }
+    return true;
+}
+
+function calculateMonthlyDistance() {
+    var oneYearMediumDistance = document.getElementById("oneYearMediumDistance").value;
+    var meduimFuelConsumption = document.getElementById("meduimFuelConsumption").value;
+
+    if (oneYearMediumDistance === "" || isNaN(oneYearMediumDistance) || parseFloat(oneYearMediumDistance) <= 0) {
+        document.getElementById("monthlyDistance").value = "";
+        document.getElementById("yearlyMediumFuel").value = "";
+        document.getElementById("monthlyMediumFuel").value = "";
+        return;
+    }
+
+    if (meduimFuelConsumption === "" || isNaN(meduimFuelConsumption) || parseFloat(meduimFuelConsumption) <= 0) {
+        alert("Siz avval '100 km uchun yoqilg'i me'yori [litr]' ga qiymat kiritishingiz kerak");
+        document.getElementById("oneYearMediumDistance").value = "";
+        return;
+    }
+
+    oneYearMediumDistance = parseFloat(oneYearMediumDistance);
+    meduimFuelConsumption = parseFloat(meduimFuelConsumption);
+
+    var monthlyDistance = oneYearMediumDistance / 12;
+    document.getElementById("monthlyDistance").value = monthlyDistance.toFixed(1);
+
+    var yearlyMediumFuel = oneYearMediumDistance * (meduimFuelConsumption / 100);
+    document.getElementById("yearlyMediumFuel").value = yearlyMediumFuel.toFixed(1);
+
+    var monthlyMediumFuel = yearlyMediumFuel / 12;
+    document.getElementById("monthlyMediumFuel").value = monthlyMediumFuel.toFixed(1);
+}
+
+
+function onChangeSearch() {
+    const searchInput = document.getElementById("search-box").value.trim();
+    const gridElement = document.getElementById("cars-list");
+    const gridInstance = gridElement?.ej2_instances?.[0];
+
+    if (!gridInstance) {
+        console.error("Grid instance not found.");
+        return;
+    }
+
+    if (searchInput) {
+        gridInstance.search(searchInput);
+    } else {
+        gridInstance.searchSettings.key = "";
+    }
+
+    gridInstance.refresh();
+}
\ No newline at end of file
diff --git a/CheckDrive.Web/CheckDrive.Web/wwwroot/js/employees.js b/CheckDrive.Web/CheckDrive.Web/wwwroot/js/employees.js
index e39eff78..83db5ecf 100644
--- a/CheckDrive.Web/CheckDrive.Web/wwwroot/js/employees.js
+++ b/CheckDrive.Web/CheckDrive.Web/wwwroot/js/employees.js
@@ -28,9 +28,23 @@
     gridInstance.refresh();
 }
 
+function onPositionChange() {
+    const positionSelect = document.getElementById("position-select");
+    const assignedCarSelect = document.getElementById("assigned-car-select");
+
+    const selectedPosition = positionSelect.value;
+
+    if (selectedPosition === "Driver") {
+        assignedCarSelect.disabled = false;
+    } else {
+        assignedCarSelect.disabled = true;
+        assignedCarSelect.value = "";
+    }
+}
+
 function onEditClick(id) {
-    console.log(id);
     $('#accountEditModalContent').empty();
+
     $.ajax({
         url: `/employees/edit/${id}`,
         type: 'GET',
@@ -77,7 +91,6 @@ function onDetailsClick(id) {
         type: 'GET',
         contentType: 'application/x-www-form-urlencoded; charset=UTF-8',
         success: function (data) {
-            console.log(data);
             $('#detailsContent').html(data);
             var detailsModal = new bootstrap.Modal(document.getElementById('detailsModal'), {
                 backdrop: 'static',
@@ -86,7 +99,6 @@ function onDetailsClick(id) {
             detailsModal.show();
         },
         error: function (error) {
-            console.log(error);
             alert("Ma'lumotlarni yuklashda muammo yuz berdi.");
         }
     });
diff --git a/CheckDrive.Web/CheckDrive.Web/wwwroot/js/employees/create.js b/CheckDrive.Web/CheckDrive.Web/wwwroot/js/employees/create.js
deleted file mode 100644
index d3c7eb04..00000000
--- a/CheckDrive.Web/CheckDrive.Web/wwwroot/js/employees/create.js
+++ /dev/null
@@ -1,13 +0,0 @@
-function onPositionChange() {
-    const positionSelect = document.getElementById("position-select");
-    const assignedCarSelect = document.getElementById("assigned-car-select");
-
-    const selectedPosition = positionSelect.value;
-
-    if (selectedPosition === "Driver") {
-        assignedCarSelect.disabled = false;
-    } else {
-        assignedCarSelect.disabled = true;
-        assignedCarSelect.value = "";
-    }
-}
\ No newline at end of file