diff --git a/ServerManagement/Components/Controls/Generic/RepeaterComponent.razor b/ServerManagement/Components/Controls/Generic/RepeaterComponent.razor
new file mode 100644
index 0000000..d4f1a5b
--- /dev/null
+++ b/ServerManagement/Components/Controls/Generic/RepeaterComponent.razor
@@ -0,0 +1,24 @@
+@typeparam TItem
+
+@Header
+@if (Items != null && Items.Count > 0 && Row != null)
+{
+  <Virtualize Items="this.Items" Context="item">
+    @Row(item)
+  </Virtualize>
+}
+@Footer
+
+@code {
+  [Parameter]
+  public List<TItem>? Items { get; set; }
+
+  [Parameter]
+  public RenderFragment<TItem>? Row { get; set; }
+  
+  [Parameter]
+  public RenderFragment? Header { get; set; }
+
+  [Parameter]
+  public RenderFragment? Footer { get; set; }
+}
\ No newline at end of file
diff --git a/ServerManagement/Components/Controls/ServerListComponent.razor b/ServerManagement/Components/Controls/ServerListComponent.razor
index 3372a3e..87fe56e 100644
--- a/ServerManagement/Components/Controls/ServerListComponent.razor
+++ b/ServerManagement/Components/Controls/ServerListComponent.razor
@@ -1,11 +1,10 @@
-@if (this.servers != null && this.servers.Count > 0)
-{
-  <ul class="list-unstyled">
-    <Virtualize Items="this.servers" Context="server">
+<ul class="list-unstyled">
+  <RepeaterComponent Items="this.servers">
+    <Row Context="server">
       <ServerComponent server="server"></ServerComponent>
-    </Virtualize>
-  </ul>
-}
+    </Row>
+  </RepeaterComponent>
+</ul>
 
 @code {
   private List<Server>? servers;