diff --git a/src/app/configuration/thingAttributesZWave.tpl.html b/src/app/configuration/thingAttributesZWave.tpl.html
index ebb62b86..7b756c92 100644
--- a/src/app/configuration/thingAttributesZWave.tpl.html
+++ b/src/app/configuration/thingAttributesZWave.tpl.html
@@ -81,10 +81,18 @@
 
 <div class="row" ng-if="selectedThing.properties['zwave_wakeup_time']">
     <div class="col-md-4" i18n="zwave.WakeupTime"></div>
-    <div class="col-md-8">{{selectedThing.properties['zwave_wakeup_time']}}</div>
+    <div class="col-md-8">
+        <span>{{selectedThing.properties['zwave_wakeup_time'] | amUtc | amLocal | amDateFormat:'dddd, MMMM Do YYYY, hh:mm:ss'}}</span>
+        <span class="fa fa-history text-muted"></span>
+        <span am-time-ago="selectedThing.properties['zwave_wakeup_time']"></span>
+    </div>
 </div>
 
 <div class="row" ng-if="selectedThing.properties['zwave_neighbours']">
     <div class="col-md-4" i18n="zwave.Neighbors"></div>
-    <div class="col-md-8">{{selectedThing.properties['zwave_neighbours'].split(",").join(", ")}}</div>
+    <div class="col-md-8">
+        {{selectedThing.properties['zwave_neighbours'].split(",").length}} nodes
+        <span class="fa fa-exchange text-muted"></span>
+        {{selectedThing.properties['zwave_neighbours'].split(",").join(", ")}}
+    </div>
 </div>
diff --git a/src/app/configuration/thingConfig.js b/src/app/configuration/thingConfig.js
index f5647c33..828d6f8a 100644
--- a/src/app/configuration/thingConfig.js
+++ b/src/app/configuration/thingConfig.js
@@ -28,7 +28,8 @@ angular.module('Config.Things', [
     'ngInputModified',
     'ngPromiseExtras',
     'sitemapSwitchWidget',
-    'bootstrapCombo'
+    'bootstrapCombo',
+    'angularMoment'
 ])
 
     .config(function config($stateProvider) {
diff --git a/src/app/configuration/thingConfig.tpl.html b/src/app/configuration/thingConfig.tpl.html
index 8d0130f0..36361152 100644
--- a/src/app/configuration/thingConfig.tpl.html
+++ b/src/app/configuration/thingConfig.tpl.html
@@ -235,8 +235,8 @@
                         </div>
                     </div>
 
-                    <div ng-if="selectedThing.channels.length">
-                        <button type="button" class="btn"
+                    <div ng-if="selectedThing.channels.length" class="pull-right">
+                        <button type="button" class="btn btn-xs"
                                 ng-click="refreshChannelItems()"
                                 tooltip-placement="top" tooltip="Refresh all items on this thing"
                                 tooltip-popup-delay="1500"
@@ -244,7 +244,7 @@
                                 tooltip-animation="false"
                                 tooltip-append-to-body="true">
                             <span class="fa fa-refresh"></span>
-                            <span>Refresh Items</span>
+                            <span i18n="thing.RefreshItems">Refresh Items</span>
                         </button>
                     </div>
                 </div>
diff --git a/src/languages/en-GB/thing.lang.json b/src/languages/en-GB/thing.lang.json
index 16c4e02d..5220ac63 100644
--- a/src/languages/en-GB/thing.lang.json
+++ b/src/languages/en-GB/thing.lang.json
@@ -50,5 +50,6 @@
   "ChannelUnlinkConfirm": "Are you sure you wish to unlink the item from the channel?<br>This will not delete the item, and you will be able to relink it later if you wish.",
   "ChannelDeleteTitle": "Delete Item from Channel",
   "ChannelDeleteConfirm": "Are you sure you wish to delete the item and unlink it from the channel?<br>This will completely delete the item!",
-  "Attributes": "Attributes"
+  "Attributes": "Attributes",
+  "RefreshItems": "Refresh Items"
 }