diff --git a/res/app/device-list/device-list.css b/res/app/device-list/device-list.css
index 460aed9a..93a5c26e 100644
--- a/res/app/device-list/device-list.css
+++ b/res/app/device-list/device-list.css
@@ -160,8 +160,10 @@ ul.devices-icon-view .device-is-busy .device-photo-small img {
 }
 
 .stf-stats-container.ng-enter {
-  -webkit-transition: 2000ms ease 1s;
-  transition: 2000ms ease 1s;
+  /*-webkit-transition: 2000ms ease 1s;*/
+  /*transition: 2000ms ease 1s;*/
+  -webkit-transition: 550ms ease 0ms;
+  transition: 550ms ease 0ms;
   opacity: 0;
 }
 
diff --git a/res/app/device-list/device-list.jade b/res/app/device-list/device-list.jade
index d0033085..45c47fa6 100644
--- a/res/app/device-list/device-list.jade
+++ b/res/app/device-list/device-list.jade
@@ -1,4 +1,29 @@
 div.stf-device-list
+  .row.stf-stats-container(ng-show='tracker.devices.length')
+    .col-md-12
+      .widget-container.stats-container
+        .col-md-3
+          .number
+            .icon.fa.fa-globe.visitors
+            span(ng-bind='tracker.devices.length')
+          .text(translate) Total devices
+        .col-md-3
+          .number
+            .icon.fa.fa-check.visitors
+            span(ng-bind='(tracker.devices | filter:{usable:true}).length')
+          .text(translate) Usable devices
+        .col-md-3
+          .number
+            .icon.fa.fa-users.visitors
+            span(ng-bind='(tracker.devices | filter:{state:"busy"}).length')
+          .text(translate) Busy devices
+        .col-md-3
+          .number
+            .icon.fa.fa-user.visitors
+            span(ng-bind='(tracker.devices | filter:{using:true}).length')
+          //.text(translate) Using
+          .text(ng-bind='currentUser.name')
+
   .row
     .col-md-12
       .widget-container.fluid-height
@@ -156,21 +181,3 @@ div.stf-device-list
                 strong Sorting
                 pre {{tableParams.sorting() | json}}
                 pre {{tableParams.filter() | json}}
-  .row.stf-stats-container(ng-if='tracker.devices.length')
-    .col-md-12
-      .widget-container.stats-container
-        .col-md-4
-          .number
-            .icon.fa.fa-globe.visitors
-            span {{ tracker.devices.length }}
-          .text(translate) Total devices
-        .col-md-4
-          .number
-            .icon.fa.fa-check.visitors
-            span {{ (tracker.devices | filter:{usable:true}).length }}
-          .text(translate) Usable devices
-        .col-md-4
-          .number
-            .icon.fa.fa-users.visitors
-            span {{ (tracker.devices | filter:{state:"busy"}).length }}
-          .text(translate) Busy devices