diff --git a/database.mwb b/database.mwb
index 4553fc8..d7562e4 100644
Binary files a/database.mwb and b/database.mwb differ
diff --git a/pages/components.php b/pages/components.php
index 20b91fe..90c9c36 100644
--- a/pages/components.php
+++ b/pages/components.php
@@ -35,9 +35,9 @@ if (!empty($VARS["attachto"]) && Machine::exists($VARS["attachto"])) {
             <th data-priority="1"><?php $Strings->get('Actions'); ?></th>
             <th data-priority="2"><i class="fas fa-memory hidden-sm"></i> <?php $Strings->get('ID'); ?></th>
             <th data-priority="3"><i class="fas fa-desktop hidden-sm"></i> <?php $Strings->get('Machine ID'); ?></th>
-            <th data-priority="1"><i class="fas fa-barcode hidden-sm"></i> <?php $Strings->get('Model'); ?></th>
+            <th data-priority="1"><i class="fas fa-hashtag hidden-sm"></i> <?php $Strings->get('Model'); ?></th>
             <th data-priority="2"><i class="fas fa-barcode hidden-sm"></i> <?php $Strings->get('Serial'); ?></th>
-            <th data-priority="2"><i class="fas fa-barcode hidden-sm"></i> <?php $Strings->get('Capacity'); ?></th>
+            <th data-priority="2"><i class="fas fa-database hidden-sm"></i> <?php $Strings->get('Capacity'); ?></th>
         </tr>
     </thead>
     <tbody>
@@ -59,7 +59,7 @@ if (!empty($VARS["attachto"]) && Machine::exists($VARS["attachto"])) {
                     }
                     ?>
                 </td>
-                <td><a href="./app.php?page=viewcomponent&id=<?php echo $c['compid']; ?>"><?php echo $c['compid']; ?></a></td>
+                <td><?php echo $c['compid']; ?></td>
                 <td><?php
                     if (!empty($c['machineid'])) {
                         ?>
@@ -79,12 +79,11 @@ if (!empty($VARS["attachto"]) && Machine::exists($VARS["attachto"])) {
         <tr>
             <th data-priority="0"></th>
             <th data-priority="1"><?php $Strings->get('Actions'); ?></th>
-            <th data-priority="3"><i class="fas fa-desktop hidden-sm"></i> <?php $Strings->get('ID'); ?></th>
-            <th data-priority="2"><i class="fas fa-user hidden-sm"></i> <?php $Strings->get('Client'); ?></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="3"><i class="fas fa-barcode hidden-sm"></i> <?php $Strings->get('Serial'); ?></th>
+            <th data-priority="2"><i class="fas fa-memory hidden-sm"></i> <?php $Strings->get('ID'); ?></th>
+            <th data-priority="3"><i class="fas fa-desktop hidden-sm"></i> <?php $Strings->get('Machine ID'); ?></th>
+            <th data-priority="1"><i class="fas fa-hashtag hidden-sm"></i> <?php $Strings->get('Model'); ?></th>
+            <th data-priority="2"><i class="fas fa-barcode hidden-sm"></i> <?php $Strings->get('Serial'); ?></th>
+            <th data-priority="2"><i class="fas fa-database hidden-sm"></i> <?php $Strings->get('Capacity'); ?></th>
         </tr>
     </tfoot>
 </table>
\ No newline at end of file
diff --git a/pages/editcomponent.php b/pages/editcomponent.php
index 13e4516..68a1075 100644
--- a/pages/editcomponent.php
+++ b/pages/editcomponent.php
@@ -15,6 +15,8 @@ if (!$user->hasPermission("MACHINEMANAGER_EDIT")) {
 
 $editing = false;
 
+$machine = null;
+
 if (!empty($VARS["arg"]) && Component::exists($VARS["arg"])) {
     $editing = true;
     $component = new Component($VARS["arg"]);