diff --git a/ui/app/templates/clients/index.hbs b/ui/app/templates/clients/index.hbs
index 1b43c78c3..888c05634 100644
--- a/ui/app/templates/clients/index.hbs
+++ b/ui/app/templates/clients/index.hbs
@@ -23,6 +23,7 @@
sortDescending=sortDescending
class="with-foot" as |t|}}
{{#t.head}}
+
|
{{#t.sort-by prop="id"}}ID{{/t.sort-by}}
{{#t.sort-by class="is-200px is-truncatable" prop="name"}}Name{{/t.sort-by}}
{{#t.sort-by prop="status"}}Status{{/t.sort-by}}
diff --git a/ui/app/templates/components/client-node-row.hbs b/ui/app/templates/components/client-node-row.hbs
index 184a00e2b..9a946006d 100644
--- a/ui/app/templates/components/client-node-row.hbs
+++ b/ui/app/templates/components/client-node-row.hbs
@@ -1,3 +1,10 @@
+
+ {{#if node.unhealthyDrivers.length}}
+
+ {{x-icon "warning" class="is-warning"}}
+
+ {{/if}}
+ |
{{#link-to "clients.client" node.id class="is-primary"}}{{node.shortId}}{{/link-to}} |
{{node.name}} |
{{node.status}} |