diff --git a/LANCommander/Components/ActionEditor.razor b/LANCommander/Components/ActionEditor.razor
index 18de7bc..22e7572 100644
--- a/LANCommander/Components/ActionEditor.razor
+++ b/LANCommander/Components/ActionEditor.razor
@@ -2,8 +2,6 @@
 @using LANCommander.Extensions
 @inject IDialogService DialogService
 
-<MudText Typo="Typo.h6">Actions</MudText>
-
 <MudTable Items="@OrderedActions" Elevation="0" Dense="true">
     <HeaderContent>
         <MudTh>Name</MudTh>
diff --git a/LANCommander/Components/MultiplayerModeEditor.razor b/LANCommander/Components/MultiplayerModeEditor.razor
index 0578060..1bffb45 100644
--- a/LANCommander/Components/MultiplayerModeEditor.razor
+++ b/LANCommander/Components/MultiplayerModeEditor.razor
@@ -1,8 +1,6 @@
 @using LANCommander.Data.Enums
 @using LANCommander.Data.Models
 
-<MudText Typo="Typo.h6">Multiplayer Modes</MudText>
-
 <MudTable Items="@Game.MultiplayerModes" Elevation="0" Dense="true">
     <HeaderContent>
         <MudTh>Type</MudTh>
diff --git a/LANCommander/Pages/Games/Edit.razor b/LANCommander/Pages/Games/Edit.razor
index 299c57b..8fe0b5c 100644
--- a/LANCommander/Pages/Games/Edit.razor
+++ b/LANCommander/Pages/Games/Edit.razor
@@ -41,15 +41,34 @@
                         <MudChip>@tags.Name</MudChip>
                     }
                 </MudChipSet>
-
-                <ActionEditor Actions="Game.Actions" ArchiveId="Game.Archives.OrderByDescending(a => a.CreatedOn).First().Id" />
-
-                <MultiplayerModeEditor Game="Game" />
             </MudForm>
         </MudPaper>
     </MudItem>
 </MudGrid>
 
+<MudCard Class="mt-4">
+    <MudCardHeader>
+        <CardHeaderContent>
+            <MudText Typo="Typo.h6">Actions</MudText>
+        </CardHeaderContent>
+    </MudCardHeader>
+
+    <MudCardContent>
+        <ActionEditor Actions="Game.Actions" ArchiveId="Game.Archives.OrderByDescending(a => a.CreatedOn).First().Id" />
+    </MudCardContent>
+</MudCard>
+
+<MudCard Class="mt-4">
+    <MudCardHeader>
+        <CardHeaderContent>
+            <MudText Typo="Typo.h6">Multiplayer Modes</MudText>
+        </CardHeaderContent>
+    </MudCardHeader>
+
+    <MudCardContent>
+        <MultiplayerModeEditor Game="Game" />
+    </MudCardContent>
+</MudCard>
 <MudFab Color="Color.Primary" Disabled="@(!Success)" OnClick="Save" StartIcon="@Icons.Material.Filled.Save" Style="position: fixed; right: 32px; bottom: 32px;" />
 
 @code {