diff --git a/Blazor/Blazor/Pages/Admins/EditAdministrator.razor b/Blazor/Blazor/Pages/Admins/EditAdministrator.razor
index 5519141..e03994f 100644
--- a/Blazor/Blazor/Pages/Admins/EditAdministrator.razor
+++ b/Blazor/Blazor/Pages/Admins/EditAdministrator.razor
@@ -12,17 +12,21 @@
             <DataAnnotationsValidator />
             <ValidationSummary />
 
-            <div class="row mb-2">
-                <label for="username">
-                    @Localizer["Username"] :
-                    <InputText id="username" @bind-Value="administratorModel.Username" />
-                </label>
+            <div class="row mb-3">
+                <div class="col-5 text-end">
+                    <label for="username" class="col-form-label">@Localizer["Username"] :</label>
+                </div>
+                <div class="col-7">
+                    <InputText id="username" @bind-Value="administratorModel.Username" class="form-control"/>
+                </div>
             </div>
-            <div class="row mb-2">
-                <label for="hashedPassword">
-                    @Localizer["HashedPassword"] :
-                    <InputText id="hashedPassword" @bind-Value="administratorModel.HashedPassword" />
-                </label>
+            <div class="row mb-3">
+                <div class="col-5 text-end">
+                    <label for="hashedPassword" class="col-form-label">@Localizer["HashedPassword"] :</label>
+                </div>
+                <div class="col-7">
+                    <InputText id="hashedPassword" @bind-Value="administratorModel.HashedPassword" class="form-control" />
+                </div>
             </div>
 
             <button type="submit" class="btn btn-success mb-2">@Localizer["Submit"]</button>
diff --git a/Blazor/Blazor/Pages/Chapters/EditChapter.razor b/Blazor/Blazor/Pages/Chapters/EditChapter.razor
index dd94ce7..def6e32 100644
--- a/Blazor/Blazor/Pages/Chapters/EditChapter.razor
+++ b/Blazor/Blazor/Pages/Chapters/EditChapter.razor
@@ -12,12 +12,14 @@
             <DataAnnotationsValidator />
             <ValidationSummary />
 
-            <p>
-                <label for="name">
-                    @Localizer["Name"] : 
-                    <InputText id="name" @bind-Value="chapterModel.Name" />
-                </label>
-            </p>
+            <div class="row mb-3">
+                <div class="col-4 text-end">
+                    <label for="name" class="col-form-label">@Localizer["Name"] : </label>
+                </div>
+                <div class="col-8">
+                    <InputText id="name" @bind-Value="chapterModel.Name" class="form-control" />
+                </div>
+            </div>
 
             <button type="submit" class="btn btn-success mb-2">@Localizer["Submit"]</button>
         </EditForm>
diff --git a/Blazor/Blazor/Pages/Players/EditPlayer.razor b/Blazor/Blazor/Pages/Players/EditPlayer.razor
index b7abe8a..0621d5f 100644
--- a/Blazor/Blazor/Pages/Players/EditPlayer.razor
+++ b/Blazor/Blazor/Pages/Players/EditPlayer.razor
@@ -11,17 +11,21 @@
             <DataAnnotationsValidator />
             <ValidationSummary />
 
-            <div class="row mb-2">
-                <label for="nickname">
-                    @Localizer["Nickname"] :
-                    <InputText id="nickname" @bind-Value="playerModel.Nickname" />
-                </label>
+            <div class="row mb-3">
+                <div class="col-5 text-end">
+                    <label for="nickname" class="col-form-label">@Localizer["Nickname"] :</label>
+                </div>
+                <div class="col-7">
+                    <InputText id="nickname" @bind-Value="playerModel.Nickname" class="form-control" />
+                </div>
             </div>
-            <div class="row mb-2"
-                <label for="hashedPassword">
-                    @Localizer["HashedPassword"] :
-                    <InputText id="hashedPassword" @bind-Value="playerModel.HashedPassword" />
-                </label>
+            <div class="row mb-3">
+                <div class="col-5 text-end">
+                    <label for="hashedPassword" class="col-form-label">@Localizer["HashedPassword"] :</label>
+                </div>
+                <div class="col-7">
+                    <InputText id="hashedPassword" @bind-Value="playerModel.HashedPassword" class="form-control" />
+                </div>
             </div>
 
             <button type="submit" class="btn btn-success">@Localizer["Submit"]</button>
diff --git a/Blazor/Blazor/Pages/Questions/EditQuestion.razor b/Blazor/Blazor/Pages/Questions/EditQuestion.razor
index 929b287..dedc6dd 100644
--- a/Blazor/Blazor/Pages/Questions/EditQuestion.razor
+++ b/Blazor/Blazor/Pages/Questions/EditQuestion.razor
@@ -1,47 +1,60 @@
 @page "/editQuestion/{Id:int}"
 
-<h3>@Localizer["Title"]</h3>
 
+<BackButton RedirectionPage="/questions"></BackButton>
 
-<EditForm Model="@question" OnValidSubmit="@HandleValidSubmit">
-    <DataAnnotationsValidator />
-    <ValidationSummary />
-    <p>
-        <label for="content">
-            @Localizer["Content"] :
-            <InputText id="content" @bind-Value="question.Content" />
-        </label>
-    </p>
-    <p>
-        <label for="idChapter">
-            @Localizer["Chapter"] :
-            <InputSelect id="idChapter" @bind-Value="question.IdChapter">
-                @if (chapters != null)
-                {
-                    foreach (var chapter in chapters)
-                    {
-                        <option value="@chapter.Id">@chapter.Name</option>
-                    }
-                }
-            </InputSelect>
-        </label>
-    </p>
+<div class="container text-center">
+    <div class="border border-dark p-4 d-inline-block">
+        <h3>@Localizer["Title"]</h3>
 
-    @foreach (var index in Enumerable.Range(0, answers.Count))
-    {
-        var answer = answers[index];
-        var checkbox = checkboxs[index];
+        <EditForm Model="@question" OnValidSubmit="@HandleValidSubmit">
+            <DataAnnotationsValidator />
+            <ValidationSummary />
+            <div class="row mb-3">
+                <div class="col-4 text-end">
+                    <label for="content" class="col-form-label">@Localizer["Content"] :</label>
+                </div>
+                <div class="col-8">
+                    <InputText id="content" @bind-Value="question.Content" class="form-control" />
+                </div>
+            </div>
+            <div class="row mb-3">
+                <div class="col-4 text-end">
+                    <label for="idChapter" class="col-form-label">@Localizer["Chapter"] :</label>
+                </div>
+                <div class="col-8">
+                    <InputSelect id="idChapter" @bind-Value="question.IdChapter" class="form-select">
+                        @if (chapters != null)
+                        {
+                            foreach (var chapter in chapters)
+                            {
+                                <option value="@chapter.Id">@chapter.Name</option>
+                            }
+                        }
+                    </InputSelect>
+                </div>
+            </div>
 
-        <p>
-            <label for="@($"answer{answer.Id}")">
-                @Localizer["Answers"]@(index + 1) :
-                <InputText id="@($"answer{answer.Id}")" @bind-Value="answer.Content" />
-            </label>
-            <label for="@($"checkbox{checkbox.Id}")">
-                <input type="radio" name="radio" id="@($"checkbox{checkbox.Id}")" checked="@checkbox.IsCorrect" @onchange="() => SetCorrectAnswer(checkbox.Id)" />  @Localizer["Correct"]
-            </label>
-        </p>
-    }
-    <button type="submit">@Localizer["Submit"]</button>
-</EditForm>
+            @foreach (var index in Enumerable.Range(0, answers.Count))
+            {
+                var answer = answers[index];
+                var checkbox = checkboxs[index];
 
+                <div class="row mb-3">
+                    <div class="col-4 text-end">
+                        <label for="@($"answer{answer.Id}")" class="col-form-label">@Localizer["Answers"]@(index + 1) :</label>
+                    </div>
+                    <div class="col-5">
+                        <InputText id="@($"answer{answer.Id}")" @bind-Value="answer.Content" class="form-control" />
+                    </div>
+                    <div class="col-3">
+                        <label for="@($"checkbox{checkbox.Id}")" class="form-check-label">
+                            <input type="radio" name="radio" id="@($"checkbox{checkbox.Id}")" checked="@checkbox.IsCorrect" @onchange="() => SetCorrectAnswer(checkbox.Id)" class="form-check-input" />  @Localizer["Correct"]
+                        </label>
+                    </div>
+                </div>
+            }
+            <button type="submit" class="btn btn-success">@Localizer["Submit"]</button>
+        </EditForm>
+    </div>
+</div>