diff --git a/ui/app/templates/clients/index.hbs b/ui/app/templates/clients/index.hbs
index cb4eeb940..190fff4c3 100644
--- a/ui/app/templates/clients/index.hbs
+++ b/ui/app/templates/clients/index.hbs
@@ -20,6 +20,13 @@
       </div>
       <div class="toolbar-item is-right-aligned is-mobile-full-width">
         <div class="button-bar">
+          <MultiSelectDropdown
+            data-test-state-facet
+            @label="State"
+            @options={{this.optionsState}}
+            @selection={{this.selectionState}}
+            @onSelect={{action this.setFacetQueryParam "qpState"}}
+          />
           <MultiSelectDropdown
             data-test-node-pool-facet
             @label="Node Pool"
@@ -34,13 +41,6 @@
             @selection={{this.selectionClass}}
             @onSelect={{action this.setFacetQueryParam "qpClass"}}
           />
-          <MultiSelectDropdown
-            data-test-state-facet
-            @label="State"
-            @options={{this.optionsState}}
-            @selection={{this.selectionState}}
-            @onSelect={{action this.setFacetQueryParam "qpState"}}
-          />
           <MultiSelectDropdown
             data-test-datacenter-facet
             @label="Datacenter"
diff --git a/ui/app/templates/components/job-row.hbs b/ui/app/templates/components/job-row.hbs
index 35c34df7a..41bc464a7 100644
--- a/ui/app/templates/components/job-row.hbs
+++ b/ui/app/templates/components/job-row.hbs
@@ -31,9 +31,6 @@
       {{this.job.namespace.name}}
     </td>
   {{/if}}
-  <td data-test-job-node-pool>
-    {{this.job.nodePool}}
-  </td>
 {{/if}}
 {{#if (eq @context "child")}}
   <td data-test-job-submit-time>
@@ -49,6 +46,9 @@
   <td data-test-job-type>
     {{this.job.displayType.type}}
   </td>
+  <td data-test-job-node-pool>
+    {{this.job.nodePool}}
+  </td>
   <td data-test-job-priority>
     {{this.job.priority}}
   </td>
diff --git a/ui/app/templates/jobs/index.hbs b/ui/app/templates/jobs/index.hbs
index 6e1a7d1eb..edc5463f0 100644
--- a/ui/app/templates/jobs/index.hbs
+++ b/ui/app/templates/jobs/index.hbs
@@ -143,15 +143,15 @@
               Namespace
             </t.sort-by>
           {{/if}}
-          <t.sort-by @prop="nodePool">
-              Node Pool
-          </t.sort-by>
           <t.sort-by @prop="status">
             Status
           </t.sort-by>
           <t.sort-by @prop="type">
             Type
           </t.sort-by>
+          <t.sort-by @prop="nodePool">
+              Node Pool
+          </t.sort-by>
           <t.sort-by @prop="priority">
             Priority
           </t.sort-by>