diff --git a/app/assets/css/app.css b/app/assets/css/app.css
index d1fe7c9..fa37a8f 100644
--- a/app/assets/css/app.css
+++ b/app/assets/css/app.css
@@ -74,6 +74,7 @@ body {
 
 main {
     padding: 24px 32px 48px;
+    min-height: calc(100vh - 200px);
 }
 
 /* Shared components -------------------------------------------------- */
@@ -188,3 +189,7 @@ main {
         flex-wrap: wrap;
     }
 }
+
+footer>p {
+    margin-bottom: 0;
+}
\ No newline at end of file
diff --git a/app/modules/buildings/edit.php b/app/modules/buildings/edit.php
index bece049..f315e43 100644
--- a/app/modules/buildings/edit.php
+++ b/app/modules/buildings/edit.php
@@ -19,11 +19,13 @@ if ($buildingId > 0) {
 
 $isEdit = !empty($building);
 $pageTitle = $isEdit ? "Gebäude bearbeiten: " . htmlspecialchars($building['name']) : "Neues Gebäude";
+$prefillLocationId = (int)($_GET['location_id'] ?? 0);
 
 // =========================
 // Standorte laden
 // =========================
 $locations = $sql->get("SELECT id, name FROM locations ORDER BY name", "", []);
+$selectedLocationId = $building['location_id'] ?? $prefillLocationId;
 
 ?>
 
@@ -55,7 +57,7 @@ $locations = $sql->get("SELECT id, name FROM locations ORDER BY name", "", []);
                     <option value="">- Wählen -</option>
                     <?php foreach ($locations as $location): ?>
                     <option value="<?php echo $location['id']; ?>"
-                        <?php echo ($building['location_id'] ?? 0) == $location['id'] ? 'selected' : ''; ?>>
+                        <?php echo ((int)$selectedLocationId === (int)$location['id']) ? 'selected' : ''; ?>>
                         <?php echo htmlspecialchars($location['name']); ?>
                     </option>
                     <?php endforeach; ?>
diff --git a/app/modules/devices/list.php b/app/modules/devices/list.php
index fb4512e..fbe2986 100644
--- a/app/modules/devices/list.php
+++ b/app/modules/devices/list.php
@@ -202,6 +202,9 @@ $racks       = $sql->get("SELECT id, name FROM racks ORDER BY name", "", []);
                 <td class="actions">
                     <a href="?module=devices&action=edit&id=<?php echo $d['id']; ?>" class="button button-small">Bearbeiten</a>
                     <a href="#" class="button button-small button-danger" onclick="confirmDelete(<?php echo $d['id']; ?>)">Löschen</a>
+                    <?php
+                    //TODO löschen geht nicht
+                    ?>
                 </td>
             </tr>
             <?php endforeach; ?>
diff --git a/app/modules/floors/edit.php b/app/modules/floors/edit.php
index 4c6b280..34d0a48 100644
--- a/app/modules/floors/edit.php
+++ b/app/modules/floors/edit.php
@@ -22,6 +22,8 @@ if ($floorId > 0) {
 $isEdit = !empty($floor);
 $pageTitle = $isEdit ? "Stockwerk bearbeiten: " . htmlspecialchars($floor['name']) : "Neues Stockwerk";
 $buildings = $sql->get("SELECT id, name FROM buildings ORDER BY name", "", []);
+$prefillBuildingId = (int)($_GET['building_id'] ?? 0);
+$selectedBuildingId = $floor['building_id'] ?? $prefillBuildingId;
 
 $existingSvgContent = '';
 if (!empty($floor['svg_path'])) {
@@ -73,7 +75,7 @@ if (!empty($floor['svg_path'])) {
                     <option value="">- Wählen -</option>
                     <?php foreach ($buildings as $building): ?>
                     <option value="<?php echo (int)$building['id']; ?>"
-                        <?php echo ((int)($floor['building_id'] ?? 0) === (int)$building['id']) ? 'selected' : ''; ?>>
+                        <?php echo ((int)$selectedBuildingId === (int)$building['id']) ? 'selected' : ''; ?>>
                         <?php echo htmlspecialchars($building['name']); ?>
                     </option>
                     <?php endforeach; ?>
diff --git a/app/modules/locations/list.php b/app/modules/locations/list.php
index e08a50a..f0e78fb 100644
--- a/app/modules/locations/list.php
+++ b/app/modules/locations/list.php
@@ -34,6 +34,32 @@ $locations = $sql->get(
     $params
 );
 
+$buildings = $sql->get(
+    "SELECT b.id, b.location_id, b.name, b.comment
+     FROM buildings b
+     ORDER BY b.location_id, b.name",
+    "",
+    []
+);
+
+$buildingsByLocation = [];
+foreach ($buildings as $building) {
+    $buildingsByLocation[$building['location_id']][] = $building;
+}
+
+$floors = $sql->get(
+    "SELECT f.id, f.building_id, f.name, f.level
+     FROM floors f
+     ORDER BY f.building_id, f.level",
+    "",
+    []
+);
+
+$floorsByBuilding = [];
+foreach ($floors as $floor) {
+    $floorsByBuilding[$floor['building_id']][] = $floor;
+}
+
 ?>
 
 <div class="locations-container">
@@ -104,7 +130,83 @@ $locations = $sql->get(
     </div>
     <?php endif; ?>
 </div>
+<?php
+//TODO design schlecht, mach es hübscher
+?>
 
+<section class="hierarchy-section">
+    <h2>Gebäude &amp; Stockwerke nach Standorten</h2>
+    <?php if (!empty($locations)): ?>
+        <ul class="hierarchy-list">
+            <?php foreach ($locations as $location): ?>
+                <li class="hierarchy-list__item">
+                    <div class="hierarchy-location">
+                        <div class="hierarchy-location__info">
+                            <span class="hierarchy-location__name"><?php echo htmlspecialchars($location['name']); ?></span>
+                            <span class="hierarchy-location__meta"><?php echo $location['building_count']; ?> Gebäude</span>
+                        </div>
+                        <div class="hierarchy-actions">
+                            <a href="?module=buildings&action=edit&location_id=<?php echo $location['id']; ?>" class="button button-small">+ Gebäude</a>
+                        </div>
+                    </div>
+                    <?php $locationBuildings = $buildingsByLocation[$location['id']] ?? []; ?>
+                    <?php if (!empty($locationBuildings)): ?>
+                        <ul class="hierarchy-sublist">
+                            <?php foreach ($locationBuildings as $building): ?>
+                                <li class="hierarchy-sublist__item">
+                                    <div class="hierarchy-building">
+                                        <div class="hierarchy-building__info">
+                                            <span class="hierarchy-building__name"><?php echo htmlspecialchars($building['name']); ?></span>
+                                            <?php if (!empty($building['comment'])): ?>
+                                                <span class="hierarchy-building__meta"><?php echo htmlspecialchars($building['comment']); ?></span>
+                                            <?php endif; ?>
+                                        </div>
+                                        <div class="hierarchy-actions">
+                                            <a href="?module=buildings&action=edit&id=<?php echo $building['id']; ?>" class="button button-small">Bearbeiten</a>
+                                            <a href="#" class="button button-small button-danger" onclick="confirmBuildingDelete(<?php echo $building['id']; ?>)">Löschen</a>
+                                            <a href="?module=floors&action=edit&building_id=<?php echo $building['id']; ?>" class="button button-small">+ Stockwerk</a>
+                                        </div>
+                                    </div>
+                                    <?php $buildingFloors = $floorsByBuilding[$building['id']] ?? []; ?>
+                                    <?php if (!empty($buildingFloors)): ?>
+                                        <ul class="hierarchy-sublist hierarchy-sublist--nested">
+                                            <?php foreach ($buildingFloors as $floor): ?>
+                                                <li>
+                                                    <div class="hierarchy-floor">
+                                                        <div class="hierarchy-floor__info">
+                                                            <span class="hierarchy-floor__name"><?php echo htmlspecialchars($floor['name']); ?></span>
+                                                            <?php if ($floor['level'] !== null): ?>
+                                                                <span class="hierarchy-floor__meta">Ebene <?php echo htmlspecialchars($floor['level']); ?></span>
+                                                            <?php endif; ?>
+                                                        </div>
+                                                        <div class="hierarchy-actions">
+                                                            <a href="?module=floors&action=edit&id=<?php echo $floor['id']; ?>" class="button button-small">Bearbeiten</a>
+                                                            <a href="#" class="button button-small button-danger" onclick="confirmFloorDelete(<?php echo $floor['id']; ?>)">Löschen</a>
+                                                        </div>
+                                                    </div>
+                                                </li>
+                                            <?php endforeach; ?>
+                                        </ul>
+                                    <?php else: ?>
+                                        <p class="hierarchy-empty">Keine Stockwerke für dieses Gebäude.</p>
+                                    <?php endif; ?>
+                                </li>
+                            <?php endforeach; ?>
+                        </ul>
+                    <?php else: ?>
+                        <p class="hierarchy-empty">Für diesen Standort sind noch keine Gebäude hinterlegt.</p>
+                    <?php endif; ?>
+                </li>
+            <?php endforeach; ?>
+        </ul>
+    <?php else: ?>
+        <p>Keine Standorte gefunden.</p>
+    <?php endif; ?>
+</section>
+
+<?php
+ //TODO style in css file
+?>
 <style>
 .locations-container {
     padding: 20px;
@@ -205,6 +307,97 @@ $locations = $sql->get(
     border: 1px solid #eee;
     border-radius: 8px;
 }
+
+.hierarchy-section {
+    padding: 20px;
+    max-width: 1000px;
+    margin: 30px auto;
+    border-top: 1px solid #ddd;
+}
+
+.hierarchy-section h2 {
+    margin-bottom: 15px;
+    font-size: 1.3rem;
+}
+
+.hierarchy-list {
+    list-style: none;
+    padding: 0;
+    margin: 0;
+    display: flex;
+    flex-direction: column;
+    gap: 15px;
+}
+
+.hierarchy-list__item {
+    padding: 15px;
+    border: 1px solid #e0e0e0;
+    border-radius: 8px;
+    background: #fafafa;
+}
+
+.hierarchy-location,
+.hierarchy-building,
+.hierarchy-floor {
+    display: flex;
+    justify-content: space-between;
+    align-items: flex-start;
+    gap: 10px;
+}
+
+.hierarchy-location__info,
+.hierarchy-building__info,
+.hierarchy-floor__info {
+    display: flex;
+    flex-direction: column;
+    gap: 4px;
+}
+
+.hierarchy-location__name,
+.hierarchy-building__name,
+.hierarchy-floor__name {
+    font-weight: 600;
+}
+
+.hierarchy-location__meta,
+.hierarchy-building__meta,
+.hierarchy-floor__meta {
+    color: #666;
+    font-size: 0.9rem;
+}
+
+.hierarchy-sublist {
+    list-style: none;
+    margin: 10px 0 0 20px;
+    padding: 0;
+    display: flex;
+    flex-direction: column;
+    gap: 10px;
+}
+
+.hierarchy-sublist--nested {
+    margin-left: 20px;
+}
+
+.hierarchy-empty {
+    margin: 10px 0 0 20px;
+    color: #888;
+    font-size: 0.9rem;
+}
+.hierarchy-actions {
+    display: flex;
+    gap: 6px;
+    flex-wrap: wrap;
+}
+
+.hierarchy-actions .button {
+    padding: 4px 10px;
+    font-size: 0.8rem;
+}
+
+.hierarchy-actions .button-danger {
+    background: #dc3545;
+}
 </style>
 
 <script>
@@ -214,4 +407,16 @@ function confirmDelete(id) {
         alert('Löschen noch nicht implementiert');
     }
 }
+
+function confirmBuildingDelete(id) {
+    if (confirm('Dieses Gebäude wirklich löschen? Alle Stockwerke werden gelöscht.')) {
+        alert('Löschen noch nicht implementiert');
+    }
+}
+
+function confirmFloorDelete(id) {
+    if (confirm('Dieses Stockwerk wirklich löschen? Alle Räume und Racks werden gelöscht.')) {
+        alert('Löschen noch nicht implementiert');
+    }
+}
 </script>
diff --git a/app/templates/header.php b/app/templates/header.php
index 12e8879..51abd6f 100644
--- a/app/templates/header.php
+++ b/app/templates/header.php
@@ -36,12 +36,10 @@
     $navItems = [
         'dashboard' => 'Dashboard',
         'locations' => 'Standorte',
-        'buildings' => 'Gebäude',
         'device_types' => 'Gerätetypen',
         'port_types' => 'Porttypen',
         'devices' => 'Geräte',
         'racks' => 'Racks',
-        'floors' => 'Stockwerke',
         'connections' => 'Verbindungen',
     ];
     ?>