diff --git a/Blazor/Blazor/Pages/Admins/AddAdministrators.razor b/Blazor/Blazor/Pages/Admins/AddAdministrators.razor
index 944bb4d..1d2d431 100644
--- a/Blazor/Blazor/Pages/Admins/AddAdministrators.razor
+++ b/Blazor/Blazor/Pages/Admins/AddAdministrators.razor
@@ -12,9 +12,9 @@
             Username:
             <InputText id="username" @bind-Value="administratorsModel.Username" />
         </label>
-        <label>
+        <label for="hashedPassword">
             Password:
-            <InputText id="hashedpassword" @bind-Value="administratorsModel.hashedPassword" />
+            <InputText id="hashedPassword" @bind-Value="administratorsModel.hashedPassword" />
         </label>
     </p>
 
diff --git a/Blazor/Blazor/Pages/Admins/Administrators.razor b/Blazor/Blazor/Pages/Admins/Administrators.razor
index c4b1c77..53b79bf 100644
--- a/Blazor/Blazor/Pages/Admins/Administrators.razor
+++ b/Blazor/Blazor/Pages/Admins/Administrators.razor
@@ -4,6 +4,11 @@
 
 <h3>Administrators</h3>
 
+<div>
+    <NavLink class="btn btn-primary" href="addAdministrators" Match="NavLinkMatch.All">
+        <i class="fa fa-plus"></i> Ajouter
+    </NavLink>
+</div>
 <DataGrid TItem="Administrator"
           Data="@administrators"
           ReadData="@OnReadData"
@@ -13,5 +18,11 @@
           Responsive>
     <DataGridColumn TItem="Administrator" Field="@nameof(Administrator.Id)" Caption="#" />
     <DataGridColumn TItem="Administrator" Field="@nameof(Administrator.Username)" Caption="Display userName" />
+    <DataGridColumn TItem="Administrator" Field="@nameof(Administrator.Id)" Caption="Action">
+        <DisplayTemplate>
+            <a href="editAdministrator/@(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>
 
diff --git a/Blazor/Blazor/Pages/EditAdministrator.razor b/Blazor/Blazor/Pages/EditAdministrator.razor
new file mode 100644
index 0000000..660b5d1
--- /dev/null
+++ b/Blazor/Blazor/Pages/EditAdministrator.razor
@@ -0,0 +1,21 @@
+@page "/editAdministrator/{Id:int}"
+
+<h3>EditAdministrator</h3>
+
+<EditForm Model="@administratorsModel" OnValidSubmit="@HandleValidSubmit">
+    <DataAnnotationsValidator />
+    <ValidationSummary />
+
+    <p>
+        <label for="username">
+            Username:
+            <InputText id="username" @bind-Value="administratorsModel.Username" />
+        </label>
+        <label for="hashedPassword">
+            Password:
+            <InputText id="hashedPassword" @bind-Value="administratorsModel.hashedPassword" />
+        </label>
+    </p>
+
+    <button type="submit">Submit</button>
+</EditForm>
diff --git a/Blazor/Blazor/Pages/EditAdministrator.razor.cs b/Blazor/Blazor/Pages/EditAdministrator.razor.cs
new file mode 100644
index 0000000..7d0d876
--- /dev/null
+++ b/Blazor/Blazor/Pages/EditAdministrator.razor.cs
@@ -0,0 +1,43 @@
+using Blazor.Models;
+using Blazor.Services;
+using Microsoft.AspNetCore.Components;
+
+namespace Blazor.Pages
+{
+    public partial class EditAdministrator
+    {
+
+        [Parameter]
+        public int Id { get; set; }
+
+        private AdministratorsModel administratorsModel = new();
+
+        [Inject]
+        public IDataService DataService { get; set; }
+
+        [Inject]
+        public NavigationManager NavigationManager { get; set; }
+
+        [Inject]
+        public IWebHostEnvironment WebHostEnvironment { get; set; }
+
+        protected override async Task OnInitializedAsync()
+        {
+            var administrator = await DataService.GetAdminById(Id);
+
+            // Set the model with the admin
+            administratorsModel = new AdministratorsModel
+            {
+                Id = administrator.Id,
+                Username = administrator.Username
+            };
+        }
+
+        private async void HandleValidSubmit()
+        {
+            await DataService.Update(Id, administratorsModel);
+
+            NavigationManager.NavigateTo("administrators");
+        }
+    }
+}
diff --git a/Blazor/Blazor/Services/IDataService.cs b/Blazor/Blazor/Services/IDataService.cs
index cb9ae80..8093eff 100644
--- a/Blazor/Blazor/Services/IDataService.cs
+++ b/Blazor/Blazor/Services/IDataService.cs
@@ -25,5 +25,6 @@ namespace Blazor.Services
         Task<List<Administrator>> ListAdmin(int currentPage, int pageSize);
 
         Task Delete(int id);
+
     }
 }
diff --git a/Blazor/Blazor/Shared/NavMenu.razor b/Blazor/Blazor/Shared/NavMenu.razor
index 7e7e6f5..dcca51c 100644
--- a/Blazor/Blazor/Shared/NavMenu.razor
+++ b/Blazor/Blazor/Shared/NavMenu.razor
@@ -25,7 +25,7 @@
             </NavLink>
         </div>
         <div class="nav-item px-3">
-            <NavLink class="nav-link" href="chapters">
+            <NavLink class="nav-link" href="questions">
                 <span class="oi oi-plus" aria-hidden="true"></span> Questions
             </NavLink>
         </div>