diff --git a/client/app/scripts/components/node-details/node-details-health-overflow-item.js b/client/app/scripts/components/node-details/node-details-health-overflow-item.js
index bcf861e12..bb1944765 100644
--- a/client/app/scripts/components/node-details/node-details-health-overflow-item.js
+++ b/client/app/scripts/components/node-details/node-details-health-overflow-item.js
@@ -1,8 +1,9 @@
 import React from 'react';
 
+import metricFeeder from '../../hoc/metric-feeder';
 import { formatMetric } from '../../utils/string-utils';
 
-export default class NodeDetailsHealthOverflowItem extends React.Component {
+class NodeDetailsHealthOverflowItem extends React.Component {
   render() {
     return (
       <div className="node-details-health-overflow-item">
@@ -12,3 +13,5 @@ export default class NodeDetailsHealthOverflowItem extends React.Component {
     );
   }
 }
+
+export default metricFeeder(NodeDetailsHealthOverflowItem);
diff --git a/client/app/scripts/components/node-details/node-details-table-node-metric.js b/client/app/scripts/components/node-details/node-details-table-node-metric.js
new file mode 100644
index 000000000..c27c12ab8
--- /dev/null
+++ b/client/app/scripts/components/node-details/node-details-table-node-metric.js
@@ -0,0 +1,15 @@
+import React from 'react';
+
+import { formatMetric } from '../../utils/string-utils';
+
+class NodeDetailsTableNodeMetric extends React.Component {
+  render() {
+    return (
+      <td className="node-details-table-node-metric">
+        {formatMetric(this.props.value, this.props)}
+      </td>
+    );
+  }
+}
+
+export default NodeDetailsTableNodeMetric;
diff --git a/client/app/scripts/components/node-details/node-details-table.js b/client/app/scripts/components/node-details/node-details-table.js
index ce0c9cc4f..062c82029 100644
--- a/client/app/scripts/components/node-details/node-details-table.js
+++ b/client/app/scripts/components/node-details/node-details-table.js
@@ -2,7 +2,7 @@ import _ from 'lodash';
 import React from 'react';
 
 import NodeDetailsTableNodeLink from './node-details-table-node-link';
-import { formatMetric } from '../../utils/string-utils';
+import NodeDetailsTableNodeMetric from './node-details-table-node-metric';
 
 export default class NodeDetailsTable extends React.Component {
 
@@ -117,11 +117,14 @@ export default class NodeDetailsTable extends React.Component {
     return this.props.columns.map(col => {
       const field = fields[col];
       if (field) {
-        return (
-          <td className="node-details-table-node-value" key={field.id}>
-            {field.valueType === 'metadata' ? field.value : formatMetric(field.value, field)}
-          </td>
-        );
+        if (field.valueType === 'metadata') {
+          return (
+            <td className="node-details-table-node-value" key={field.id}>
+              {field.value}
+            </td>
+          );
+        }
+        return <NodeDetailsTableNodeMetric key={field.id} {...field} />;
       }
     });
   }
diff --git a/client/app/scripts/hoc/metric-feeder.js b/client/app/scripts/hoc/metric-feeder.js
index 306d92899..5665f1303 100644
--- a/client/app/scripts/hoc/metric-feeder.js
+++ b/client/app/scripts/hoc/metric-feeder.js
@@ -149,6 +149,9 @@ export default ComposedComponent => class extends React.Component {
 
     const lastValue = samples.length > 0 ? samples[samples.length - 1].value : null;
     const slidingWindow = {first: movingFirstDate, last: movingLastDate, max, samples, value: lastValue};
+    if (this.props.label === 'CPU') {
+      console.log(lastValue, movingLastDate);
+    }
 
     return <ComposedComponent {...this.props} {...slidingWindow} />;
   }
diff --git a/client/app/styles/main.less b/client/app/styles/main.less
index 2d8054859..72840f73b 100644
--- a/client/app/styles/main.less
+++ b/client/app/styles/main.less
@@ -717,7 +717,7 @@ h2 {
         }
       }
 
-      &-value {
+      &-value, &-metric {
         flex: 1;
         margin-left: 0.5em;
         text-align: right;