diff --git a/Moonlight/Core/UI/Components/Partials/StatCard.razor b/Moonlight/Core/UI/Components/Partials/StatCard.razor
index 3cf844d..dd5f143 100644
--- a/Moonlight/Core/UI/Components/Partials/StatCard.razor
+++ b/Moonlight/Core/UI/Components/Partials/StatCard.razor
@@ -11,14 +11,14 @@
     else
     {
         <div class="row">
-            <div class="col-3 text-center d-flex align-items-center">
+            <div class="col-auto text-center d-flex align-items-center px-5">
                 <i class="bx bx-lg text-white align-middle @(Icon)"></i>
             </div>
-            <div class="col-9">
+            <div class="col">
                 <div class="fw-semibold text-primary fs-2">
                     @Value
                 </div>
-                <div class="fs-4 mt-2">
+                <div class="fs-4 mt-2 text-white">
                     @Description
                 </div>
             </div>
diff --git a/Moonlight/Core/UI/Views/Admin/Index.razor b/Moonlight/Core/UI/Views/Admin/Index.razor
index 2cb5718..9a648b4 100644
--- a/Moonlight/Core/UI/Views/Admin/Index.razor
+++ b/Moonlight/Core/UI/Views/Admin/Index.razor
@@ -9,47 +9,17 @@
 @attribute [RequirePermission(999)]
 
 <LazyLoader Load="Load">
-    <div class="row">
+    <div class="row g-4">
         <div class="col-12 col-lg-6 col-xl">
-            <a class="mt-4 card" href="/admin/servers">
-                <div class="card-body">
-                    <div class="row align-items-center gx-0">
-                        <div class="col">
-                            <h6 class="text-uppercase text-muted mb-2">
-                                Users
-                            </h6>
-                            <span class="h2 mb-0">
-                                @UserCount
-                            </span>
-                        </div>
-                        <div class="col-auto">
-                            <span class="h2 text-muted mb-0">
-                                <i class="text-primary bx bxs-group bx-lg"></i>
-                            </span>
-                        </div>
-                    </div>
-                </div>
+            <a href="/admin/servers">
+                <StatCard Value="@UserCount.ToString()" Description="Users" Icon="bxs-group">
+                </StatCard>
             </a>
         </div>
         <div class="col-12 col-lg-6 col-xl">
-            <a class="mt-4 card" href="/admin/users">
-                <div class="card-body">
-                    <div class="row align-items-center gx-0">
-                        <div class="col">
-                            <h6 class="text-uppercase text-muted mb-2">
-                                Servers
-                            </h6>
-                            <span class="h2 mb-0">
-                                @ServerCount
-                            </span>
-                        </div>
-                        <div class="col-auto">
-                            <span class="h2 text-muted mb-0">
-                                <i class="text-primary bx bx-server bx-lg"></i>
-                            </span>
-                        </div>
-                    </div>
-                </div>
+            <a href="/admin/servers">
+                <StatCard Value="@ServerCount.ToString()" Description="Servers"  Icon="bxs-server">
+                </StatCard>
             </a>
         </div>  
     </div>