diff --git a/include/thw.php b/include/thw.php
index 9d02439..bd7d1c3 100644
--- a/include/thw.php
+++ b/include/thw.php
@@ -15,37 +15,52 @@ $result = $conn->query("SELECT * FROM `thw_pi`");
 
 if ($result->num_rows > 0) {
     // output data of each row
-    while($row = $result->fetch_assoc()) {
+    while ($row = $result->fetch_assoc()) {
         ?>
         <section class="section--center mdl-grid mdl-grid--no-spacing mdl-shadow--2dp">
             <div class="mdl-card mdl-cell mdl-cell--12-col mdl-card--border mdl-card__supporting-text">
-                    <h4 style="text-align: center"><?php echo $row['Ort'] ." [". $row['id'];?></h4>
-                    <table style="margin-left: auto; margin-right: auto" class="mdl-data-table mdl-js-data-table mdl-shadow--2dp">
-                        <thead>
-                        <tr>
-                            <th class="mdl-data-table__cell--non-numeric">Fahrzeugtyp</th>
-                            <th>Funkrufnummer</th>
-                        </tr>
-                        </thead>
-                        <tbody>
+                <h4 style="text-align: center">Heros <?php echo $row['Ort']; ?></h4>
+                <table style="margin-left: auto; margin-right: auto"
+                       class="mdl-data-table mdl-js-data-table mdl-shadow--2dp">
+                    <thead>
+                    <tr>
+                        <th class="mdl-data-table__cell--non-numeric">Fahrzeugtyp</th>
+                        <th class="mdl-data-table__cell--non-numeric">Funkrufnummer</th>
+                        <th class="mdl-data-table__cell--non-numeric">Einheit</th>
+                    </tr>
+                    </thead>
+                    <tbody>
 
-                        <?php
+                    <?php
 
-                        $fahrzeuge = $conn->query("SELECT * FROM `thw` WHERE OrtID = ". $row['id'] );
+                    $fahrzeuge = $conn->query("SELECT * FROM `thw` WHERE OrtID = " . $row['id']);
 
-                        if($fahrzeuge->num_rows > 0) {
-                            while ($frow = $fahrzeuge->fetch_assoc()) {
-                                ?>
-                                <tr>
-                                    <td class="mdl-data-table__cell--non-numeric"><?php echo $frow['Fahrzeugtyp'] ?></td>
-                                    <td><?php echo $frow['Organistationskennung'] . " " . $row['id'] . "-" . $frow['Fahrzeugkennung'] ?></td>
-                                </tr>
-                                <?php
-                            }
+                    if ($fahrzeuge->num_rows > 0) {
+                        while ($frow = $fahrzeuge->fetch_assoc()) {
+                            ?>
+                            <tr>
+                                <td class="mdl-data-table__cell--non-numeric"><?php echo $frow['Fahrzeugtyp'] ?></td>
+                                <?php if ($frow['Fahrzeugkennung'] == 0) {
+                                    ?>
+                                    <td class="mdl-data-table__cell--non-numeric"><?php echo $frow['Organistationskennung'] ?></td>
+                                <?php } else if ($frow['Fahrzeugkennung'] > 0) { ?>
+                                    <td class="mdl-data-table__cell--non-numeric"><?php echo $frow['Organistationskennung'] . " " . $row['id'] . "-" . $frow['Fahrzeugkennung'] ?></td>
+                                <?php } ?>
+
+                                <td>
+                                    <?php
+                                    $einheit = $conn->query("SELECT `name` FROM `thw_einheit` WHERE id = " . $frow['Einheit']);
+                                    echo($einheit)
+                                    ?>
+                                </td>
+                            </tr>
+                            <?php
                         }
-                        ?>
-                        </tbody>
-                    </table>
-                </div>
+                    }
+                    ?>
+                    </tbody>
+                </table>
+            </div>
         </section>
-    <?php }}?>
\ No newline at end of file
+    <?php }
+} ?>
\ No newline at end of file