Make table less annoying

pages/machines.php

@@ -36,11 +36,11 @@ OR NOT EXISTS (SELECT * FROM events WHERE events.machineid = machines.machineid)
         <tr>
             <th data-priority="0"></th>
             <th data-priority="1"><?php $Strings->get('Actions'); ?></th>
-            <th data-priority="1"><i class="fas fa-desktop hidden-sm"></i> <?php $Strings->get('ID'); ?></th>
-            <th data-priority="2"><i class="fas fa-hdd hidden-sm"></i> <?php $Strings->get('OS/Software'); ?></th>
-            <th data-priority="3"><i class="fas fa-hashtag hidden-sm"></i> <?php $Strings->get('Model'); ?></th>
-            <th data-priority="3"><i class="fas fa-calendar hidden-sm"></i> <?php $Strings->get('Last Event'); ?></th>
-            <th data-priority="1"><i class="fas fa-barcode hidden-sm"></i> <?php $Strings->get('Serial'); ?></th>
+            <th data-priority="3"><i class="fas fa-desktop hidden-sm"></i> <?php $Strings->get('ID'); ?></th>
+            <th data-priority="4"><i class="fas fa-hdd hidden-sm"></i> <?php $Strings->get('OS/Software'); ?></th>
+            <th data-priority="2"><i class="fas fa-hashtag hidden-sm"></i> <?php $Strings->get('Model'); ?></th>
+            <th data-priority="1"><i class="fas fa-calendar hidden-sm"></i> <?php $Strings->get('Last Event'); ?></th>
+            <th data-priority="2"><i class="fas fa-barcode hidden-sm"></i> <?php $Strings->get('Serial'); ?></th>
         </tr>
     </thead>
     <tbody>
@@ -74,11 +74,11 @@ OR NOT EXISTS (SELECT * FROM events WHERE events.machineid = machines.machineid)
         <tr>
             <th data-priority="0"></th>
             <th data-priority="1"><?php $Strings->get('Actions'); ?></th>
-            <th data-priority="1"><i class="fas fa-desktop hidden-sm"></i> <?php $Strings->get('ID'); ?></th>
-            <th data-priority="2"><i class="fas fa-hdd hidden-sm"></i> <?php $Strings->get('OS/Software'); ?></th>
-            <th data-priority="3"><i class="fas fa-hashtag hidden-sm"></i> <?php $Strings->get('Model'); ?></th>
-            <th data-priority="3"><i class="fas fa-calendar hidden-sm"></i> <?php $Strings->get('Last Event'); ?></th>
-            <th data-priority="1"><i class="fas fa-barcode hidden-sm"></i> <?php $Strings->get('Serial'); ?></th>
+            <th data-priority="3"><i class="fas fa-desktop hidden-sm"></i> <?php $Strings->get('ID'); ?></th>
+            <th data-priority="4"><i class="fas fa-hdd hidden-sm"></i> <?php $Strings->get('OS/Software'); ?></th>
+            <th data-priority="2"><i class="fas fa-hashtag hidden-sm"></i> <?php $Strings->get('Model'); ?></th>
+            <th data-priority="1"><i class="fas fa-calendar hidden-sm"></i> <?php $Strings->get('Last Event'); ?></th>
+            <th data-priority="2"><i class="fas fa-barcode hidden-sm"></i> <?php $Strings->get('Serial'); ?></th>
         </tr>
     </tfoot>
 </table>

static/js/machines.js

@@ -29,6 +29,6 @@ $('#machinetable').DataTable({
         }
     ],
     order: [
-        [4, 'desc']
+        [5, 'desc']
     ]
 });