diff --git a/manager/templates/manager/edit.html b/manager/templates/manager/edit.html
index 6a765a2..aef83de 100644
--- a/manager/templates/manager/edit.html
+++ b/manager/templates/manager/edit.html
@@ -8,10 +8,18 @@
     <label for="serial">Serial Number</label>
     <input type="text" class="form-control" id="serial" disabled="disabled" value="{{ device.serial }}"></input>
   </div>
+{% if user.is_staff %}
+  <div class="form-group">
+    <label for="model">Device Model</label>
+    <input type="text" class="form-control" id="model" disabled="disabled" value="{{ device.model }}"></input>
+  </div>
+{% endif %}
 {% if user.is_superuser %}
   <div class="form-group">
     <label for="secret">Device Secret</label>
     <input type="text" class="form-control" id="secret" disabled="disabled" value="{{ device.secret }}"></input>
+{% endif %}
+{% if user.is_staff %}
   </div>
   <div class="form-group">
     <label for="password">Root Password</label>
diff --git a/manager/views.py b/manager/views.py
index d40d833..986d324 100644
--- a/manager/views.py
+++ b/manager/views.py
@@ -99,7 +99,7 @@ def devices(request):
                     "title": "Device Administration",
                     "user": user,
                     "organization": orga,
-                    "devices": devices
+                    "devices": sorted(devices, key=lambda x: x.__str__())
                     }
                 )
     else: