diff --git a/sysutils/smart/Makefile b/sysutils/smart/Makefile
index 9e9df5d5f..812f9d2db 100644
--- a/sysutils/smart/Makefile
+++ b/sysutils/smart/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		smart
-PLUGIN_VERSION=		2.0
+PLUGIN_VERSION=		2.1
 PLUGIN_COMMENT=		SMART tools
 PLUGIN_DEPENDS=		smartmontools
 PLUGIN_MAINTAINER=	franco@opnsense.org
diff --git a/sysutils/smart/src/www/widgets/widgets/smart_status.widget.php b/sysutils/smart/src/www/widgets/widgets/smart_status.widget.php
index 6467466e0..cdfcf9499 100644
--- a/sysutils/smart/src/www/widgets/widgets/smart_status.widget.php
+++ b/sysutils/smart/src/www/widgets/widgets/smart_status.widget.php
@@ -28,38 +28,47 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-require_once("guiconfig.inc");
-require_once("widgets/include/smart_status.inc");
+require_once('guiconfig.inc');
+require_once('widgets/include/smart_status.inc');
+
+$devs = json_decode(configd_run('smart detailed list'));
 
 ?>
 
-<table class="table table-striped" style="width:100%; border:0; cellpadding:0; cellspacing:0">
+<table class="table table-striped table-condensed">
+  <thead>
     <tr>
-        <td class="widgetsubheader" style="text-align:center"><b><?php echo gettext("Drive") ?></b></td>
-        <td class="widgetsubheader" style="text-align:center"><b><?php echo gettext("Ident") ?></b></td>
-        <td class="widgetsubheader" style="text-align:center"><b><?php echo gettext("SMART Status") ?></b></td>
+        <th><?= gettext('Drive') ?></td>
+        <th><?= gettext('Ident') ?></td>
+        <th><?= gettext('Status') ?></td>
+    </tr>
+  </thead>
+  <tbody>
+
+<?php foreach ($devs as $dev):
+
+    $dev_state_translated = gettext('Unknown');
+    $color = 'default';
+
+    if (isset($dev->state->smart_status->passed)) {
+        if ($dev->state->smart_status->passed) {
+            $dev_state_translated = gettext('OK');
+            $color = 'success';
+        } else {
+            $dev_state_translated = gettext('FAILED');
+            $color = 'danger';
+	}
+    }
+
+?>
+
+    <tr>
+      <td><?= html_safe($dev->device) ?></td>
+      <td><?= html_safe($dev->ident) ?></td>
+      <td><span class="label label-<?= $color ?>"><?= html_safe($dev_state_translated) ?></span></td>
     </tr>
 
-<?php
-$devs = json_decode (configd_run ("smart detailed list"));
+<?php endforeach ?>
 
-foreach ($devs as $dev) {
-    $dev_state_translated = "";
-
-    if ($dev->state->smart_status->passed) {
-        $dev_state_translated = gettext('OK');
-        $color = "success";
-    } else {
-        $dev_state_translated = gettext('Unknown');
-        $color = "warning";
-    }
-?>
-        <tr>
-            <td><?= $dev->device ?></td>
-            <td style="text-align:center"><?= $dev->ident ?></td>
-            <td style="text-align:center"><span class="label label-<?= $color ?>">&nbsp;<?= html_safe($dev_state_translated) ?>&nbsp;</span></td>
-        </tr>
-<?php
-}
-?>
+  </tbody>
 </table>