diff --git a/App.razor b/App.razor
index 111b4cd..beba7bf 100644
--- a/App.razor
+++ b/App.razor
@@ -1,4 +1,5 @@
-<Router AppAssembly="@typeof(Program).Assembly">
+<CascadingBlazoredModal>
+<Router AppAssembly="@typeof(Program).Assembly">
     <Found Context="routeData">
         <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
     </Found>
@@ -6,3 +7,4 @@
         <p>Sorry, there's nothing at this address.</p>
     </NotFound>
 </Router>
+</CascadingBlazoredModal>
\ No newline at end of file
diff --git a/Factories/ItemFactory.cs.cs b/Factories/ItemFactory.cs.cs
new file mode 100644
index 0000000..c07693f
--- /dev/null
+++ b/Factories/ItemFactory.cs.cs
@@ -0,0 +1,48 @@
+using ProjetBlaser.Models;
+
+namespace ProjetBlaser.Factories
+{
+    public static class ItemFactory
+    {
+        public static ItemModel ToModel(Item item, byte[] imageContent)
+        {
+            return new ItemModel
+            {
+                Id = item.Id,
+                DisplayName = item.DisplayName,
+                Name = item.Name,
+                RepairWith = item.RepairWith,
+                EnchantCategories = item.EnchantCategories,
+                MaxDurability = item.MaxDurability,
+                StackSize = item.StackSize,
+                ImageContent = imageContent
+            };
+        }
+
+        public static Item Create(ItemModel model)
+        {
+            return new Item
+            {
+                Id = model.Id,
+                DisplayName = model.DisplayName,
+                Name = model.Name,
+                RepairWith = model.RepairWith,
+                EnchantCategories = model.EnchantCategories,
+                MaxDurability = model.MaxDurability,
+                StackSize = model.StackSize,
+                CreatedDate = DateTime.Now
+            };
+        }
+
+        public static void Update(Item item, ItemModel model)
+        {
+            item.DisplayName = model.DisplayName;
+            item.Name = model.Name;
+            item.RepairWith = model.RepairWith;
+            item.EnchantCategories = model.EnchantCategories;
+            item.MaxDurability = model.MaxDurability;
+            item.StackSize = model.StackSize;
+            item.UpdatedDate = DateTime.Now;
+        }
+    }
+}
diff --git a/Pages/Edit.razor b/Pages/Edit.razor
index d201ae0..3512c00 100644
--- a/Pages/Edit.razor
+++ b/Pages/Edit.razor
@@ -1,3 +1,82 @@
 @page "/edit/{Id:int}"
+
 <h3>Edit</h3>
-<div>Mon paramètre: @Id</div>
+
+<EditForm Model="@itemModel" OnValidSubmit="@HandleValidSubmit">
+    <DataAnnotationsValidator />
+    <ValidationSummary />
+
+    <p>
+        <label for="display-name">
+            Display name:
+            <InputText id="display-name" @bind-Value="itemModel.DisplayName" />
+        </label>
+    </p>
+    <p>
+        <label for="name">
+            Name:
+            <InputText id="name" @bind-Value="itemModel.Name" />
+        </label>
+    </p>
+    <p>
+        <label for="stack-size">
+            Stack size:
+            <InputNumber id="stack-size" @bind-Value="itemModel.StackSize" />
+        </label>
+    </p>
+    <p>
+        <label for="max-durability">
+            Max durability:
+            <InputNumber id="max-durability" @bind-Value="itemModel.MaxDurability" />
+        </label>
+    </p>
+    <p>
+        Enchant categories:
+        <div>
+            @foreach (var item in enchantCategories)
+            {
+                <label>
+                    <input type="checkbox" @onchange="@(e => OnEnchantCategoriesChange(item, e.Value))" checked="@(itemModel.EnchantCategories.Contains(item) ? "checked" : null)" />@item
+                </label>
+            }
+        </div>
+    </p>
+    <p>
+        Repair with:
+        <div>
+            @foreach (var item in repairWith)
+            {
+                <label>
+                    <input type="checkbox" @onchange="@(e => OnRepairWithChange(item, e.Value))" checked="@(itemModel.RepairWith.Contains(item) ? "checked" : null)" />@item
+                </label>
+            }
+        </div>
+    </p>
+    <p>
+        <label>
+            Current Item image:
+            @if (File.Exists($"{WebHostEnvironment.WebRootPath}/images/{itemModel.Name}.png"))
+            {
+                <img src="images/@(itemModel.Name).png" class="img-thumbnail" title="@itemModel.DisplayName" alt="@itemModel.DisplayName" style="max-width: 150px"/>
+            }
+            else
+            {
+                <img src="images/default.png" class="img-thumbnail" title="@itemModel.DisplayName" alt="@itemModel.DisplayName" style="max-width: 150px"/>
+            }
+        </label>
+    </p>
+    <p>
+        <label>
+            Item image:
+            <InputFile OnChange="@LoadImage" accept=".png" />
+        </label>
+    </p>
+    <p>
+        <label>
+            Accept Condition:
+            <InputCheckbox @bind-Value="itemModel.AcceptCondition" />
+        </label>
+    </p>
+
+    <button type="submit">Submit</button>
+</EditForm>
diff --git a/Pages/Edit.razor.cs b/Pages/Edit.razor.cs
index 39df9c7..ff58b5f 100644
--- a/Pages/Edit.razor.cs
+++ b/Pages/Edit.razor.cs
@@ -1,10 +1,123 @@
 using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Forms;
+using ProjetBlaser.Factories;
+using ProjetBlaser.Models;
+using ProjetBlaser.Services;
 
 namespace ProjetBlaser.Pages
 {
+
+
     public partial class Edit
     {
         [Parameter]
         public int Id { get; set; }
+
+        /// <summary>
+        /// The default enchant categories.
+        /// </summary>
+        private List<string> enchantCategories = new List<string>() { "armor", "armor_head", "armor_chest", "weapon", "digger", "breakable", "vanishable" };
+
+        /// <summary>
+        /// The current item model
+        /// </summary>
+        private ItemModel itemModel = new()
+        {
+            EnchantCategories = new List<string>(),
+            RepairWith = new List<string>()
+        };
+
+        /// <summary>
+        /// The default repair with.
+        /// </summary>
+        private List<string> repairWith = new List<string>() { "oak_planks", "spruce_planks", "birch_planks", "jungle_planks", "acacia_planks", "dark_oak_planks", "crimson_planks", "warped_planks" };
+
+        [Inject]
+        public IDataService DataService { get; set; }
+
+        [Inject]
+        public NavigationManager NavigationManager { get; set; }
+
+        [Inject]
+        public IWebHostEnvironment WebHostEnvironment { get; set; }
+
+        protected override async Task OnInitializedAsync()
+        {
+            var item = await DataService.GetById(Id);
+
+            var fileContent = await File.ReadAllBytesAsync($"{WebHostEnvironment.WebRootPath}/images/default.png");
+
+            if (File.Exists($"{WebHostEnvironment.WebRootPath}/images/{itemModel.Name}.png"))
+            {
+                fileContent = await File.ReadAllBytesAsync($"{WebHostEnvironment.WebRootPath}/images/{item.Name}.png");
+            }
+
+            // Set the model with the item
+            itemModel = new ItemModel
+            {
+                Id = item.Id,
+                DisplayName = item.DisplayName,
+                Name = item.Name,
+                RepairWith = item.RepairWith,
+                EnchantCategories = item.EnchantCategories,
+                MaxDurability = item.MaxDurability,
+                StackSize = item.StackSize,
+                ImageContent = fileContent
+            };
+            itemModel = ItemFactory.ToModel(item, fileContent);
+        }
+
+        private async void HandleValidSubmit()
+        {
+            await DataService.Update(Id, itemModel);
+
+            NavigationManager.NavigateTo("list");
+        }
+
+        private async Task LoadImage(InputFileChangeEventArgs e)
+        {
+            // Set the content of the image to the model
+            using (var memoryStream = new MemoryStream())
+            {
+                await e.File.OpenReadStream().CopyToAsync(memoryStream);
+                itemModel.ImageContent = memoryStream.ToArray();
+            }
+        }
+
+        private void OnEnchantCategoriesChange(string item, object checkedValue)
+        {
+            if ((bool)checkedValue)
+            {
+                if (!itemModel.EnchantCategories.Contains(item))
+                {
+                    itemModel.EnchantCategories.Add(item);
+                }
+
+                return;
+            }
+
+            if (itemModel.EnchantCategories.Contains(item))
+            {
+                itemModel.EnchantCategories.Remove(item);
+            }
+        }
+
+        private void OnRepairWithChange(string item, object checkedValue)
+        {
+            if ((bool)checkedValue)
+            {
+                if (!itemModel.RepairWith.Contains(item))
+                {
+                    itemModel.RepairWith.Add(item);
+                }
+
+                return;
+            }
+
+            if (itemModel.RepairWith.Contains(item))
+            {
+                itemModel.RepairWith.Remove(item);
+            }
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/Pages/List.razor b/Pages/List.razor
index 7b223e8..4abdf7a 100644
--- a/Pages/List.razor
+++ b/Pages/List.razor
@@ -44,6 +44,7 @@
     <DataGridColumn TItem="Item" Field="@nameof(Item.Id)" Caption="Action">
         <DisplayTemplate>
             <a href="Edit/@(context.Id)" class="btn btn-primary"><i class="fa fa-edit"></i> Editer</a>
+            <button type="button" class="btn btn-primary" @onclick="() => OnDelete(context.Id)"><i class="fa fa-trash"></i> Supprimer</button>
         </DisplayTemplate>
     </DataGridColumn>
 </DataGrid>
\ No newline at end of file
diff --git a/Pages/List.razor.cs b/Pages/List.razor.cs
index c71334b..6c0e92e 100644
--- a/Pages/List.razor.cs
+++ b/Pages/List.razor.cs
@@ -31,5 +31,9 @@ namespace ProjetBlaser.Pages
                 totalItem = await DataService.Count();
             }
         }
+        private void OnDelete(int id)
+        {
+
+        }
     }
 }
diff --git a/Pages/ParameterParen.razor b/Pages/ParameterParen.razor
index 7b5ae80..66aacb0 100644
--- a/Pages/ParameterParen.razor
+++ b/Pages/ParameterParen.razor
@@ -1,4 +1,5 @@
 @page "/parameter-parent"
+@using ProjetBlaser.Models
 
 <h1>Child component (without attribute values)</h1>
 
diff --git a/Pages/User.razor b/Pages/User.razor
index 907e345..d08987f 100644
--- a/Pages/User.razor
+++ b/Pages/User.razor
@@ -1,4 +1,4 @@
-@page "/user/{Id:int}/{Option:bool?}"
+@page "/user/{Id:int}"
 
 <p>
     Id: @Id
diff --git a/Pages/_Layout.cshtml b/Pages/_Layout.cshtml
index 73357e2..b7ebeb0 100644
--- a/Pages/_Layout.cshtml
+++ b/Pages/_Layout.cshtml
@@ -29,7 +29,9 @@
 
     <script src="_framework/blazor.server.js"></script>
     <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.15.4/css/all.css">
+    <link href="_content/Blazored.Modal/blazored-modal.css" rel="stylesheet" />
     <link href="_content/Blazorise/blazorise.css" rel="stylesheet" />
     <link href="_content/Blazorise.Bootstrap/blazorise.bootstrap.css" rel="stylesheet" />
+    <script src="_content/Blazored.Modal/blazored.modal.js"></script>
 </body>
 </html>
diff --git a/Program.cs b/Program.cs
index 98dbedc..052e2f8 100644
--- a/Program.cs
+++ b/Program.cs
@@ -6,6 +6,7 @@ using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Web;
 using ProjetBlaser.Data;
 using ProjetBlaser.Services;
+using Blazored.Modal;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -15,6 +16,7 @@ builder.Services.AddServerSideBlazor();
 builder.Services.AddSingleton<WeatherForecastService>();
 builder.Services.AddHttpClient();
 builder.Services.AddScoped<IDataService, DataLocalService>();
+builder.Services.AddBlazoredModal();
 builder.Services
    .AddBlazorise()
    .AddBootstrapProviders()
diff --git a/ProjetBlaser.csproj b/ProjetBlaser.csproj
index c0eacf6..6c93f4c 100644
--- a/ProjetBlaser.csproj
+++ b/ProjetBlaser.csproj
@@ -8,9 +8,14 @@
 
   <ItemGroup>
     <PackageReference Include="Blazored.LocalStorage" Version="4.2.0" />
+    <PackageReference Include="Blazored.Modal" Version="7.1.0" />
     <PackageReference Include="Blazorise.Bootstrap" Version="1.1.2" />
     <PackageReference Include="Blazorise.DataGrid" Version="1.1.2" />
     <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.1.2" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Modals\" />
+  </ItemGroup>
+
 </Project>
diff --git a/Services/DataLocalService.cs b/Services/DataLocalService.cs
index 0309c4d..f80a4c9 100644
--- a/Services/DataLocalService.cs
+++ b/Services/DataLocalService.cs
@@ -1,5 +1,6 @@
 using Blazored.LocalStorage;
 using Microsoft.AspNetCore.Components;
+using ProjetBlaser.Factories;
 using ProjetBlaser.Models;
 
 namespace ProjetBlaser.Services
@@ -30,6 +31,7 @@ namespace ProjetBlaser.Services
 
             // Simulate the Id
             model.Id = currentData.Max(s => s.Id) + 1;
+            currentData.Add(ItemFactory.Create(model));
 
             // Add the item to the current data
             currentData.Add(new Item
@@ -107,6 +109,7 @@ namespace ProjetBlaser.Services
 
             // Get the item int the list
             var item = currentData.FirstOrDefault(w => w.Id == id);
+            ItemFactory.Update(item, model);
 
             // Check if item exist
             if (item == null)
@@ -152,5 +155,29 @@ namespace ProjetBlaser.Services
             // Save the data
             await _localStorage.SetItemAsync("data", currentData);
         }
+
+        public async Task Delete(int id)
+        {
+            // Get the current data
+            var currentData = await _localStorage.GetItemAsync<List<Item>>("data");
+
+            // Get the item int the list
+            var item = currentData.FirstOrDefault(w => w.Id == id);
+
+            // Delete item in
+            currentData.Remove(item);
+
+            // Delete the image
+            var imagePathInfo = new DirectoryInfo($"{_webHostEnvironment.WebRootPath}/images");
+            var fileName = new FileInfo($"{imagePathInfo}/{item.Name}.png");
+
+            if (fileName.Exists)
+            {
+                File.Delete(fileName.FullName);
+            }
+
+            // Save the data
+            await _localStorage.SetItemAsync("data", currentData);
+        }
     }
 }
diff --git a/Services/IDataService.cs b/Services/IDataService.cs
index 01c9c6b..db5f8fb 100644
--- a/Services/IDataService.cs
+++ b/Services/IDataService.cs
@@ -13,5 +13,6 @@ namespace ProjetBlaser.Services
         Task<Item> GetById(int id);
 
         Task Update(int id, ItemModel model);
+        Task Delete(int id);
     }
 }
diff --git a/wwwroot/images/furnafix.png b/wwwroot/images/furnafix.png
new file mode 100644
index 0000000..2b391df
Binary files /dev/null and b/wwwroot/images/furnafix.png differ
diff --git a/wwwroot/images/noe.png b/wwwroot/images/noe.png
new file mode 100644
index 0000000..2b391df
Binary files /dev/null and b/wwwroot/images/noe.png differ