diff --git a/res/app/device-list/device-list.css b/res/app/device-list/device-list.css
index 1aafd2ee..512ff9d5 100644
--- a/res/app/device-list/device-list.css
+++ b/res/app/device-list/device-list.css
@@ -2,6 +2,10 @@
   color: deepskyblue;
 }
 
+.stf-device-list .filtering-buttons {
+  margin-top: -32px;
+}
+
 .stf-device-list .devices-not-available {
   background: #f6f6f6;
 }
diff --git a/res/app/device-list/device-list.jade b/res/app/device-list/device-list.jade
index a41156c5..08e2e9d0 100644
--- a/res/app/device-list/device-list.jade
+++ b/res/app/device-list/device-list.jade
@@ -39,7 +39,7 @@ div.stf-device-list
                 span(translate) Details
               nothing-to-show(message='{{"No devices connected"|translate}}', icon='fa-sitemap', ng-show='!tracker.devices.length')
 
-              div
+              .filtering-buttons
                 clear-button(ng-click="tableParams.sorting({}); tableParams.filter({})")
                 filter-button(ng-model='filterEnabled')
 
@@ -78,7 +78,7 @@ div.stf-device-list
                   filter-data="statusFilter($column)")
                     button(ng-class='{"btn-primary": device.state == "using", \
                     "btn-primary-outline": device.state == "available"}',
-                      ng-click='toggle(device)').btn.btn-xs.device-status {{statusName(device)}}
+                      ng-click='device.usable && toggle(device)').btn.btn-xs.device-status {{statusName(device)}}
                   td(data-title="'Model'", sortable='"model"', filter='{"model": "text"}')
                     span {{device.model}}
                   td(data-title="'Product'", sortable='"name"', filter='{"name": "text"}')
@@ -94,8 +94,8 @@ div.stf-device-list
                   td(data-title="'Location'", sortable='"provider.name"', filter='{"provider.name": "text"}')
                     span {{device.provider.name}}
                   td(data-title="'User'", sortable='"owner.name"', filter='{"owner.name": "text"}')
-                    span {{device.owner.name}}
-
+                    a(ng-if='device.owner', ng-href='mailto:{{device.owner.email}}', role='button') {{device.owner.name || "No name"}}
+                    a(ng-if='!device.owner') -
               //p
                 strong Sorting
                 pre {{tableParams.sorting() | json}}
@@ -130,7 +130,7 @@ div.stf-device-list
                       a(ng-href='{{deviceUser(device).link}}', target='_blank') {{ deviceUser(device).name }}
 
 
-//ul
+ul
   li(ng-repeat='device in tracker.devices track by device.serial')
     pre {{device|json}}