diff --git a/ui/app/templates/components/client-node-row.hbs b/ui/app/templates/components/client-node-row.hbs
index 9a28d6bc9..269e522a3 100644
--- a/ui/app/templates/components/client-node-row.hbs
+++ b/ui/app/templates/components/client-node-row.hbs
@@ -8,8 +8,20 @@
 <td data-test-client-id>{{#link-to "clients.client" node.id class="is-primary"}}{{node.shortId}}{{/link-to}}</td>
 <td data-test-client-name class="is-200px is-truncatable" title="{{node.name}}">{{node.name}}</td>
 <td data-test-client-status>{{node.status}}</td>
-<td data-test-client-drain>{{if node.isDraining "true" "false"}}</td>
-<td data-test-client-eligibility>{{node.schedulingEligibility}}</td>
+<td data-test-client-drain>
+  {{#if node.isDraining}}
+    <span class="status-text is-info">true</span>
+  {{else}}
+    false
+  {{/if}}
+</td>
+<td data-test-client-eligibility>
+  {{#if node.isEligible}}
+    {{node.schedulingEligibility}}
+  {{else}}
+    <span class="status-text is-warning">{{node.schedulingEligibility}}</span>
+  {{/if}}
+</td>
 <td data-test-client-address>{{node.httpAddr}}</td>
 <td data-test-client-datacenter>{{node.datacenter}}</td>
 <td data-test-client-allocations>