diff --git a/src/add_packing_list.php b/src/add_packing_list.php
index 459d22f..0520048 100644
--- a/src/add_packing_list.php
+++ b/src/add_packing_list.php
@@ -50,7 +50,7 @@ if ($household_id_for_user) {
     $stmt_u = $conn->prepare("SELECT id, username FROM users WHERE household_id = ?");
     $stmt_u->bind_param("i", $household_id_for_user);
 } else {
-    $stmt_u = $conn->prepare("SELECT id, username FROM users WHERE id = ?");
+    $stmt_u = $conn->prepare("SELECT id, COALESCE(display_name, username) AS username FROM users WHERE id = ?");
     $stmt_u->bind_param("i", $current_user_id);
 }
 $stmt_u->execute();
diff --git a/src/edit_packing_list_details.php b/src/edit_packing_list_details.php
index e464c60..ff8c013 100644
--- a/src/edit_packing_list_details.php
+++ b/src/edit_packing_list_details.php
@@ -61,7 +61,7 @@ if ($can_edit) {
         $stmt = $conn->prepare("SELECT id, username FROM users WHERE household_id = ?");
         $stmt->bind_param("i", $packing_list['household_id']);
     } else {
-        $stmt = $conn->prepare("SELECT id, username FROM users WHERE id = ?");
+        $stmt = $conn->prepare("SELECT id, COALESCE(display_name, username) AS username FROM users WHERE id = ?");
         $stmt->bind_param("i", $packing_list['user_id']);
     }
     $stmt->execute();
diff --git a/src/header.php b/src/header.php
index e0dd96c..fd9149d 100644
--- a/src/header.php
+++ b/src/header.php
@@ -72,7 +72,6 @@ if (isset($_SESSION['user_id'])) {
                 <li class="nav-item"><a class="nav-link" href="packing_lists.php"><i class="fas fa-clipboard-list fa-fw"></i>Packlisten</a></li>
                 <li class="nav-item"><a class="nav-link" href="storage_locations.php"><i class="fas fa-archive fa-fw"></i>Lagerorte</a></li>
                 <li class="nav-item"><a class="nav-link" href="todo_lists.php"><i class="fas fa-list-check fa-fw"></i>ToDo-Listen</a></li>
-                <li class="nav-item"><a class="nav-link" href="household.php"><i class="fas fa-users-cog fa-fw"></i>Haushalt</a></li>
                 <li class="nav-item"><a class="nav-link" href="manufacturers.php"><i class="fas fa-industry fa-fw"></i>Hersteller</a></li>
                 <li class="nav-item"><a class="nav-link" href="household.php"><i class="fas fa-users-cog fa-fw"></i>Haushalt</a></li>
                 <li class="nav-item"><a class="nav-link" href="user_profile.php"><i class="fas fa-user-cog fa-fw"></i>Profil</a></li>
diff --git a/src/manage_packing_list_items.php b/src/manage_packing_list_items.php
index 78ca44c..78ce917 100644
--- a/src/manage_packing_list_items.php
+++ b/src/manage_packing_list_items.php
@@ -509,7 +509,7 @@ $conn->close();
         packedItems.forEach(item => {
             const aid = String(item.article_id);
             const qty = parseInt(item.quantity || 1, 10);
-            const isTable = (item.carrier_user_id == null && !item.backpack_id && !item.backpack_compartment_id && !item.parent_packing_list_item_id);
+            const isTable = ((!item.carrier_user_id || item.carrier_user_id === "null") && !item.backpack_id && !item.backpack_compartment_id && !item.parent_packing_list_item_id);
             if (isTable) {
                 tableQuantities[aid] = (tableQuantities[aid] || 0) + qty;
             } else {
@@ -705,7 +705,7 @@ $conn->close();
         
         container.innerHTML = '';
         
-        const tableItems = packedItems.filter(item => item.carrier_user_id == null && !item.backpack_id && !item.backpack_compartment_id && !item.parent_packing_list_item_id);
+        const tableItems = packedItems.filter(item => (!item.carrier_user_id || item.carrier_user_id === "null") && !item.backpack_id && !item.backpack_compartment_id && !item.parent_packing_list_item_id);
         
         renderRecursive(tableItems, container, packedItems, 'table_');
 
diff --git a/src/packing_list_detail.php b/src/packing_list_detail.php
index 72d9286..ddc30e7 100644
--- a/src/packing_list_detail.php
+++ b/src/packing_list_detail.php
@@ -17,7 +17,7 @@ $packing_list_id = isset($_GET['id']) ? intval($_GET['id']) : 0;
 // Handle Todo Toggle
 if ($_SERVER['REQUEST_METHOD'] == 'POST' && isset($_POST['toggle_todo_item'])) {
     $item_id = intval($_POST['item_id']);
-    $status = intval($_POST['status']);
+    $status = isset($_POST['status']) ? intval($_POST['status']) : 0;
     $stmt = $conn->prepare("UPDATE todo_items SET is_completed = ? WHERE id = ?");
     $stmt->bind_param("ii", $status, $item_id);
     $stmt->execute();
diff --git a/src/packing_lists.php b/src/packing_lists.php
index 3db38f5..dc86885 100644
--- a/src/packing_lists.php
+++ b/src/packing_lists.php
@@ -45,7 +45,7 @@ $is_template_val = $is_template_view ? 1 : 0;
 $sql = "SELECT
             pl.id, pl.name, pl.description, pl.user_id, pl.household_id, pl.is_template,
             COALESCE(u.display_name, u.username) as creator_name,
-            COUNT(DISTINCT COALESCE(pli.carrier_user_id, 'sonstiges')) AS carrier_count,
+            COUNT(DISTINCT pli.carrier_user_id) AS carrier_count,
             SUM(pli.quantity * a.weight_grams) AS total_weight
         FROM packing_lists pl
         JOIN users u ON pl.user_id = u.id