diff --git a/dashboard/templates/unassigned_devices.html b/dashboard/templates/unassigned_devices.html
index c21a2be..8d894ed 100644
--- a/dashboard/templates/unassigned_devices.html
+++ b/dashboard/templates/unassigned_devices.html
@@ -33,7 +33,19 @@
     <thead>
       <tr>
         <th scope="col" data-sortable="">
-          <a class="dataTable-sorter" href="#">Title</a>
+          select
+        </th>
+        <th scope="col" data-sortable="">
+          shortid
+        </th>
+        <th scope="col" data-sortable="">
+          type
+        </th>
+        <th scope="col" data-sortable="">
+          manufacturer
+        </th>
+        <th scope="col" data-sortable="">
+          model
         </th>
       </tr>
     </thead>
@@ -45,9 +57,18 @@
         </td>
         <td>
           <a href="{% url 'device:details' dev.id %}">
-            {{ dev.type }} {{ dev.manufacturer }} {{ dev.model }}
+            {{ dev.shortid }}
           </a>
         </td>
+        <td>
+            {{ dev.type }}
+        </td>
+        <td>
+            {{ dev.manufacturer }}
+        </td>
+        <td>
+            {{ dev.model }}
+        </td>
       </tr>
     </tbody>
     {% endfor %}
diff --git a/device/models.py b/device/models.py
index 9972ef5..683da53 100644
--- a/device/models.py
+++ b/device/models.py
@@ -27,6 +27,7 @@ class Device:
         # the id is the chid of the device
         self.id = kwargs["id"]
         self.pk = self.id
+        self.shortid = self.pk[:6]
         self.algorithm = None
         self.owner = None
         self.annotations =  []
diff --git a/device/templates/details.html b/device/templates/details.html
index b757b1f..37f7487 100644
--- a/device/templates/details.html
+++ b/device/templates/details.html
@@ -4,7 +4,7 @@
 {% block content %}
 <div class="row">
   <div class="col">
-    <h3>{{ object.id }}</h3>
+    <h3>{{ object.shortid }}</h3>
   </div>
 </div>