diff --git a/src/packing_list_detail.php b/src/packing_list_detail.php
index 1ec7c56..2ed1356 100644
--- a/src/packing_list_detail.php
+++ b/src/packing_list_detail.php
@@ -10,11 +10,9 @@ if (!isset($_SESSION['user_id'])) {
     exit;
 }
 require_once 'db_connect.php';
-require_once 'header.php';
 
 $current_user_id = $_SESSION['user_id'];
 $packing_list_id = isset($_GET['id']) ? intval($_GET['id']) : 0;
-$packing_list = null;
 
 // Handle Todo Toggle
 if ($_SERVER['REQUEST_METHOD'] == 'POST' && isset($_POST['toggle_todo_item'])) {
@@ -28,6 +26,10 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST' && isset($_POST['toggle_todo_item'])) {
     header("Location: packing_list_detail.php?id=" . $packing_list_id);
     exit;
 }
+
+require_once 'header.php';
+
+$packing_list = null;
 $total_weight_grams = 0;
 $total_consumable_weight = 0;
 $weight_by_category = [];
@@ -88,6 +90,13 @@ if (!empty($packing_list['todo_list_id'])) {
     $stmt_td->close();
 }
 
+// Check for items on the table
+$stmt_table = $conn->prepare("SELECT COUNT(*) as table_count FROM packing_list_items WHERE packing_list_id = ? AND carrier_user_id IS NULL AND backpack_id IS NULL AND backpack_compartment_id IS NULL AND parent_packing_list_item_id IS NULL");
+$stmt_table->bind_param("i", $packing_list_id);
+$stmt_table->execute();
+$table_items_count = $stmt_table->get_result()->fetch_assoc()['table_count'];
+$stmt_table->close();
+
 $page_title = "Packliste: " . htmlspecialchars($packing_list['name']);
 
 // FIX: Join Categories also for Backpacks
@@ -110,6 +119,7 @@ $sql = "SELECT
         LEFT JOIN manufacturers AS m ON a.manufacturer_id = m.id 
         LEFT JOIN users AS u ON pli.carrier_user_id = u.id 
         WHERE pli.packing_list_id = ?
+        AND NOT (pli.carrier_user_id IS NULL AND pli.backpack_id IS NULL AND pli.backpack_compartment_id IS NULL AND pli.parent_packing_list_item_id IS NULL)
         ORDER BY pli.order_index ASC";
 
 $stmt = $conn->prepare($sql);
@@ -365,8 +375,8 @@ function render_item_row($item, $level, $items_by_parent) {
         </div>
         <div class="col-lg-4">
             <?php if (!empty($packing_list['todo_list_id'])): ?>
-            <div class="card mb-4 border-primary">
-                <div class="card-header bg-primary text-white"><h5 class="mb-0"><i class="fas fa-list-check me-2"></i>ToDo: <?php echo htmlspecialchars($todo_list_name); ?></h5></div>
+            <div class="card mb-4">
+                <div class="card-header d-flex justify-content-between align-items-center"><h5 class="mb-0"><i class="fas fa-list-check me-2"></i>ToDo: <?php echo htmlspecialchars($todo_list_name); ?></h5></div>
                 <div class="card-body p-0">
                     <ul class="list-group list-group-flush">
                         <?php foreach ($todo_items as $item): ?>
diff --git a/src/todo_lists.php b/src/todo_lists.php
index d1ff4ad..3213f09 100644
--- a/src/todo_lists.php
+++ b/src/todo_lists.php
@@ -89,8 +89,8 @@ $active_list_id = isset($_GET['list_id']) ? intval($_GET['list_id']) : (!empty($
         <!-- List Selection -->
         <div class="col-md-4 mb-4">
             <div class="card shadow-sm">
-                <div class="card-header bg-primary text-white">
-                    <h6 class="m-0 font-weight-bold">Meine Listen</h6>
+                <div class="card-header">
+                    <h5 class="mb-0"><i class="fas fa-list me-2"></i>Meine Listen</h5>
                 </div>
                 <div class="list-group list-group-flush">
                     <?php foreach ($todo_lists as $list): ?>