diff --git a/res/app/components/stf/device/device-service.js b/res/app/components/stf/device/device-service.js
index 6e9d873c..029264e3 100644
--- a/res/app/components/stf/device/device-service.js
+++ b/res/app/components/stf/device/device-service.js
@@ -99,16 +99,16 @@ module.exports = function DeviceServiceFactory($http, socket) {
     // For convenience, add the sorting priority to each state
     function getStateSorting(state) {
       return {
-        'using': 10,
-        'available': 9,
-        'ready': 8,
-        'present': 7,
-        'busy': 6,
-        'unauthorized': 5,
-        'offline': 4,
-        'preparing': 3,
-        'absent': 2
-      }[state] || 1
+        'using': 1,
+        'available': 2,
+        'ready': 3,
+        'present': 4,
+        'busy': 5,
+        'unauthorized': 6,
+        'offline': 7,
+        'preparing': 8,
+        'absent': 9
+      }[state] || 10
     }
 
     function get(data) {
diff --git a/res/app/device-list/device-list-details-controller.js b/res/app/device-list/device-list-details-controller.js
index 31e433d6..bfbfe756 100644
--- a/res/app/device-list/device-list-details-controller.js
+++ b/res/app/device-list/device-list-details-controller.js
@@ -30,7 +30,8 @@ module.exports = function DeviceListCtrlDetails($scope, DeviceService, GroupServ
 //  })
 
   $scope.tableSorting = {
-    stateSorting: 'desc'     // initial sorting
+    stateSorting: 'asc',     // initial sorting
+    name: 'asc'     // initial sorting
   }
 //  SettingsService.bind($scope, {
 //    key: 'tableSorting',
diff --git a/res/app/device-list/device-list.jade b/res/app/device-list/device-list.jade
index 28d89817..50758a04 100644
--- a/res/app/device-list/device-list.jade
+++ b/res/app/device-list/device-list.jade
@@ -27,34 +27,26 @@ div.stf-device-list
                   li(ng-repeat='device in tracker.devices | filter:{usable:true} | filter:{name:deviceSearch} | orderBy:"name" track by device.serial',
                   ng-click='device.usable && toggle(device)',
                   popover='{{ "Model: " | translate }}{{ device.model }}', popover-trigger='mouseenter', popover-popup-delay='0',
-                  popover-title='{{ device.name || device.model }}', popover-placement='top'
+                  popover-title='{{ device.name || device.model }}', popover-placement='top', ng-hide='!device.model'
                   ).cursor-select.pointer.thumbnail
                     .device-photo-small
                       img(ng-src='/static/devices/icon/x120/{{ device.image || "_default.jpg" }}')
                     .device-name {{ device.name || device.model }}
-                    button(ng-class='{\
-                      "btn-primary": device.state == "using",\
-                      "btn-primary-outline": device.state == "available",\
-                      "btn-warning": device.state == "busy"\
-                      }'
+                    button(ng-class='controlButtonClass(device.state)'
                     ).btn.btn-xs.device-status {{device.state|statusName|translate}}
                   .clear-fix
                 .clear-fix
                 .line
                 ul.devices-icon-view
                   li(ng-repeat='device in tracker.devices | filter:{usable:false} | filter:{name:deviceSearch} | orderBy:"name" track by device.serial',
-                  ng-disabled='true',
+                  ng-disabled='true', ng-hide='!device.model'
                   ).cursor-select.pointer.thumbnail.device-is-busy
                     .device-photo-small
                       img(ng-src='/static/devices/icon/x120/{{ device.image || "_default.jpg" }}')
                     .device-name(title='{{device.serial}} - {{device.model}}') {{ device.name || device.model }}
                     //raphael-status-icon.device-status-button(status='{{ deviceStatus(device) }}', title="{{ deviceStatusText(device) }}", tooltip='{{ deviceStatusText(device)|translate }}')
                     //button.btn.btn-default.btn-xs.device-status {{statusName(device)}}
-                    button(ng-class='{\
-                      "btn-primary": device.state == "using",\
-                      "btn-primary-outline": device.state == "available",\
-                      "btn-warning": device.state == "busy"\
-                      }',
+                    button(ng-class='controlButtonClass(device.state)',
                     ng-dblclick='tryToKick(device)',
                     ).btn.btn-xs.device-status {{device.state|statusName|translate}}
                   .clear-fix
@@ -87,14 +79,10 @@ div.stf-device-list
                         span {{ device[column.field] }}
 
                 table.table.table-hover.dataTable(ng-table='tableParams', show-filter='filterEnabled', ng-show='tracker.devices.length').device-list-details
-                  tr(ng-repeat='device in $data', ng-class='{ "device-not-usable": !device.usable }')
+                  tr(ng-repeat='device in $data', ng-class='{ "device-not-usable": !device.usable }', ng-hide='!device.model')
 
-                    td
-                      pre {{device.state}}
                     td(data-title="'Status'|translate", sortable='"stateSorting"', filter="{ 'usable': 'select' }", filter-data="statusFilter($column)")
 
-
-
                       button(ng-class='controlButtonClass(device.state)',
                         ng-dblclick='tryToKick(device)',
                         ng-click='device.usable && toggle(device)').btn.btn-xs.device-status {{device.state|statusName|translate}}