diff --git a/Lux.UI/Components/Compo/WorkLoad/JobQueueDisplay.razor b/Lux.UI/Components/Compo/WorkLoad/JobQueueDisplay.razor
index c34570d7..f4e35978 100644
--- a/Lux.UI/Components/Compo/WorkLoad/JobQueueDisplay.razor
+++ b/Lux.UI/Components/Compo/WorkLoad/JobQueueDisplay.razor
@@ -1,7 +1,13 @@
 <div class="row">
     <div class="col-12">
         <ol class="list-group">
-            <li class="list-group-item align-items-lg-start text-bg-warning">Job in Attesa</li>
+            <li class="list-group-item align-items-lg-start text-bg-warning d-flex justify-content-between">
+                <div class="px-0">Job in Attesa</div>
+                @if (QueueWait.Count > 0)
+                {
+                    <button class="btn btn-sm btn-danger" @onclick="() => ResetWaitQueue()">Clear Queue <i class="fa-solid fa-xmark"></i></button>
+                }
+            </li>
             @if (QueueWait.Count == 0)
             {
                 <li class="list-group-item align-items-lg-start">Nessun job in Attesa!</li>
@@ -13,17 +19,19 @@
                     <li class="list-group-item align-items-lg-start">@item</li>
                 }
             }
-            @if (QueueWait.Count > 0)
-            {
-                <li class="list-group-item align-items-lg-start p-0">
-                    <button class="btn btn-warning w-100" @onclick="() => ResetWaitQueue()">Reset Queue</button>
-                </li>
-            }
         </ol>
     </div>
-    <div class="col-12 mb-2">
+    <div class="col-12 mt-2 mb-0">
         <ol class="list-group">
-            <li class="list-group-item align-items-lg-start bg-success text-light">Job Eseguiti</li>
+            <li class="list-group-item align-items-lg-start bg-success text-light d-flex justify-content-between">
+                <div class="px-0">Job Eseguiti</div>
+                @if (QueueRun.Count > 0)
+                {
+                    <div class="px-0">
+                        <button class="btn btn-sm btn-warning" @onclick="() => ResetRunQueue()">Reset All <i class="fa-solid fa-arrow-turn-up"></i></button>
+                    </div>
+                }
+            </li>
             @if (QueueRun.Count == 0)
             {
                 <li class="list-group-item align-items-lg-start">Nessun Job Eseguito!</li>
@@ -44,15 +52,9 @@
                     </li>
                 }
             }
-            @if (QueueRun.Count > 0)
-            {
-                <li class="list-group-item align-items-lg-start p-0">
-                    <button class="btn btn-warning w-100" @onclick="() => ResetRunQueue()">Reset Queue to Waiting</button>
-                </li>
-            }
         </ol>
         <nav>
-            <ul class="pagination mt-3">
+            <ul class="pagination mt-1">
 
                 <li class="page-item @(CurrentPage == 1 ? "disabled" : "")">
                     <button class="page-link" @onclick="() => GoToPage(CurrentPage - 1)">«</button>