diff --git a/ServerManagement/Components/Controls/ServerComponent.razor b/ServerManagement/Components/Controls/ServerComponent.razor
index adf7476..56789b8 100755
--- a/ServerManagement/Components/Controls/ServerComponent.razor
+++ b/ServerManagement/Components/Controls/ServerComponent.razor
@@ -2,36 +2,22 @@
 
 @if (server != null)
 {
-  <EditForm Enhance="true" Model="server" FormName="serverComponentForm" OnSubmit="ChangeServerStatus">
-    <InputNumber @bind-Value="server.Id" hidden></InputNumber>
-    <InputText @bind-Value="server.Name" hidden></InputText>
-    <InputText @bind-Value="server.City" hidden></InputText>
-    <InputCheckbox @bind-Value="server.IsOnline" hidden></InputCheckbox>
-
-    <div
-      style="@($"color:{(server.IsOnline ? "green" : "red")}")">
-      @server.Name is in: @server.City @(server.IsOnline ? "online" : "offline")
-      &nbsp;
-      <button type="submit" class="btn btn-primary">Turn On/Off</button>
-    </div>
-
-  </EditForm>
+  <div
+    style="@($"color:{(server.IsOnline ? "green" : "red")}")">
+    @server.Name is in: @server.City @(server.IsOnline ? "online" : "offline")
+    &nbsp;
+    <button type="submit" class="btn btn-primary" @onclick="ChangeStatus">Turn On/Off</button>
+  </div>
 }
 
 @code {
-  [SupplyParameterFromForm]
-  private Server? server { get; set; } //= new Server { Name = "Server 1", City = "Einhoven" };
+  private Server? server { get; set; } = new Server { Name = "Server 1", City = "Einhoven" };
 
-  protected override void OnParametersSet()
-  {
-    server ??= new Server { Name = "Server 1", City = "Eindhoven" };
-  }
-
-  private void ChangeServerStatus()
+  private void ChangeStatus()
   {
     if (server != null)
     {
-      server.IsOnline = !server.IsOnline;
+      this.server.IsOnline = !this.server.IsOnline;
     }
   }
 }
\ No newline at end of file
diff --git a/ServerManagement/Components/Pages/Servers.razor b/ServerManagement/Components/Pages/Servers.razor
index 154a5cf..4a345dc 100644
--- a/ServerManagement/Components/Pages/Servers.razor
+++ b/ServerManagement/Components/Pages/Servers.razor
@@ -25,7 +25,7 @@
 </div>
 
 <br/>
-  <ServerComponent></ServerComponent>
+<ServerComponent @rendermode="InteractiveServer"></ServerComponent>
 <br/>
 <a href="@($"/servers/add")" class="btn btn-primary">Add</a>
 <br/>
diff --git a/ServerManagement/Program.cs b/ServerManagement/Program.cs
index 040ca80..a9fbd5e 100644
--- a/ServerManagement/Program.cs
+++ b/ServerManagement/Program.cs
@@ -4,7 +4,7 @@ var builder = WebApplication.CreateBuilder(args);
 
 // Add services to the container.
 builder.Services.AddRazorComponents()
-    .AddInteractiveServerComponents();
+    .AddInteractiveServerComponents(); // Provides server interactivity.
 
 var app = builder.Build();
 
@@ -22,6 +22,6 @@ app.UseStaticFiles();
 app.UseAntiforgery();
 
 app.MapRazorComponents<App>()
-    .AddInteractiveServerRenderMode();
+    .AddInteractiveServerRenderMode(); // Provides server interactivity.
 
 app.Run();