diff --git a/ServerManagement/Components/Controls/ServerListComponent.razor b/ServerManagement/Components/Controls/ServerListComponent.razor
new file mode 100644
index 0000000..b5cae85
--- /dev/null
+++ b/ServerManagement/Components/Controls/ServerListComponent.razor
@@ -0,0 +1,34 @@
+@inject NavigationManager NavigationManager
+
+<ul>
+  <Virtualize Items="this.servers" Context="server">
+    <li @key="server.Id">
+      @server.Name in @server.City is
+      <span style="color:@(server.IsOnline ? "green" : "red")">
+        @(server.IsOnline ? "online" : "offline")
+      </span>;
+      &nbsp;
+      <a href="@($"/servers/{server.Id}")" class="btn btn-primary">Edit</a>
+      &nbsp;
+      <EditForm
+        Model="server"
+        FormName="@($"formDeleteServer{server.Id}")"
+        OnValidSubmit="@(() => { DeleteServer(server.Id); })">
+        <button type="submit" class="btn btn-danger">Delete</button>
+      </EditForm>
+    </li>
+  </Virtualize>
+</ul>
+
+@code {
+  private List<Server> servers = ServersRepository.GetServersByCity("Eindhoven");
+
+  private void DeleteServer(int serverId)
+  {
+    if (serverId > 0)
+    {
+      ServersRepository.DeleteServer(serverId);
+      NavigationManager.Refresh(forceReload: true);
+    }
+  }
+}
\ No newline at end of file
diff --git a/ServerManagement/Components/Pages/Servers.razor b/ServerManagement/Components/Pages/Servers.razor
index 34e5b0d..b87b2c4 100644
--- a/ServerManagement/Components/Pages/Servers.razor
+++ b/ServerManagement/Components/Pages/Servers.razor
@@ -1,8 +1,6 @@
 @page "/servers"
 @using ServerManagement.Components.Controls
 
-@inject NavigationManager NavigationManager
-
 <h3>Servers</h3>
 <br/>
 <br/>
@@ -35,29 +33,10 @@
 <a href="@($"/servers/add")" class="btn btn-primary">Add</a>
 <br/>
 
-<ul>
-  <Virtualize Items="this.servers" Context="server">
-    <li @key="server.Id">
-      @server.Name in @server.City is
-      <span style="color:@(server.IsOnline ? "green" : "red")">
-        @(server.IsOnline ? "online" : "offline")
-      </span>;
-      &nbsp;
-      <a href="@($"/servers/{server.Id}")" class="btn btn-primary">Edit</a>
-      &nbsp;
-      <EditForm
-        Model="server"
-        FormName="@($"formDeleteServer{server.Id}")"
-        OnValidSubmit="@(() => { DeleteServer(server.Id); })">
-        <button type="submit" class="btn btn-danger">Delete</button>
-      </EditForm>
-    </li>
-  </Virtualize>
-</ul>
+<ServerListComponent></ServerListComponent>
 
 @code {
   private List<string> cities = ServersRepository.GetCities();
-  private List<Server> servers = ServersRepository.GetServersByCity("Eindhoven");
   private string selectedCity = "Eindhoven";
   private string _serverFilter = "";
   private string serverFilter {
@@ -65,29 +44,20 @@
     set
     {
       _serverFilter = value;
-      this.servers = ServersRepository.SearchServers(_serverFilter);
+      //this.servers = ServersRepository.SearchServers(_serverFilter);
       this.selectedCity = string.Empty;
     }
   }
 
-  private void DeleteServer(int serverId)
-  {
-    if (serverId > 0)
-    {
-      ServersRepository.DeleteServer(serverId);
-      NavigationManager.Refresh();
-    }
-  }
-
   private void SelectCity(string cityName)
   {
     this.selectedCity = cityName;
-    this.servers = ServersRepository.GetServersByCity(this.selectedCity);
+    //this.servers = ServersRepository.GetServersByCity(this.selectedCity);
   }
 
   private void HandleSearch()
   {
-    this.servers = ServersRepository.SearchServers(serverFilter);
+    //this.servers = ServersRepository.SearchServers(serverFilter);
     this.selectedCity = string.Empty;
   }
 }
\ No newline at end of file