diff --git a/README.md b/README.md
index 5e0bf7f..57a9b89 100644
--- a/README.md
+++ b/README.md
@@ -71,3 +71,12 @@ CREATE src/app/pages/immo-manager/billing/billing.spec.ts (535 bytes)
 CREATE src/app/pages/immo-manager/billing/billing.ts (190 bytes)
 CREATE src/app/pages/immo-manager/billing/billing.html (22 bytes)
 ```
+
+### Create new service
+
+```bash
+ng generate s pages/service/organization.service     
+
+CREATE src/app/pages/service/organization.service.spec.ts (387 bytes)
+CREATE src/app/pages/service/organization.service.ts (123 bytes)
+```
diff --git a/public/logo-dark.png b/public/logo-dark.png
new file mode 100644
index 0000000..9ae5e93
Binary files /dev/null and b/public/logo-dark.png differ
diff --git a/public/logo-light.png b/public/logo-light.png
new file mode 100644
index 0000000..27d9b28
Binary files /dev/null and b/public/logo-light.png differ
diff --git a/src/app.routes.ts b/src/app.routes.ts
index fd038f9..ba55cce 100644
--- a/src/app.routes.ts
+++ b/src/app.routes.ts
@@ -11,6 +11,8 @@ import { canActivateAuthRole } from '@/guards/auth.guard';
 import { Projects } from '@/pages/projects/projects';
 import { ProjectDetails } from '@/pages/project-details/project-details';
 import { Contacts } from '@/pages/contacts/contacts';
+import { Organizations } from '@/pages/organizations/organizations';
+import { IndustryManager } from '@/pages/industry-manager/industry-manager';
 
 export const appRoutes: Routes = [
     {
@@ -26,6 +28,10 @@ export const appRoutes: Routes = [
                 path: 'projects', component: Projects,
                 data: { role: ['dev', 'admin', 'can-view-projects'] }, canActivate: [canActivateAuthRole]
             },
+            {
+                path: 'organizations', component: Organizations,
+                data: { role: ['dev', 'admin', 'can-view-organizations'] }, canActivate: [canActivateAuthRole]
+            },
             {
                 path: 'projects/:id', component: ProjectDetails,
                 data: { role: ['dev', 'admin', 'can-view-projects'] }, canActivate: [canActivateAuthRole]
@@ -37,6 +43,10 @@ export const appRoutes: Routes = [
             },
 
             // admin pages
+            {
+                path: 'admin/industries', component: IndustryManager,
+                data: { role: ['dev', 'admin', 'can-manage-industries'] }, canActivate: [canActivateAuthRole]
+            },
             {
                 path: 'properties', component: Properties,
                 data: { role: ['dev', 'admin', 'can-view-properties'] }, canActivate: [canActivateAuthRole]
diff --git a/src/app/layout/component/app.footer.ts b/src/app/layout/component/app.footer.ts
index 1ab5367..6ccb051 100644
--- a/src/app/layout/component/app.footer.ts
+++ b/src/app/layout/component/app.footer.ts
@@ -4,7 +4,7 @@ import { Component } from '@angular/core';
     standalone: true,
     selector: 'app-footer',
     template: `<div class="layout-footer">
-        PROPIFY by
+        ENERPORT by
         <a href="https://itworksonmymachine.de" target="_blank" rel="noopener noreferrer" class="text-primary font-bold hover:underline">itworksonmymachine.de</a>
     </div>`
 })
diff --git a/src/app/layout/component/app.menu.ts b/src/app/layout/component/app.menu.ts
index 9a10131..923b463 100644
--- a/src/app/layout/component/app.menu.ts
+++ b/src/app/layout/component/app.menu.ts
@@ -4,19 +4,20 @@ import { RouterModule } from '@angular/router';
 import { MenuItem } from 'primeng/api';
 import { AppMenuitem } from './app.menuitem';
 import Keycloak from 'keycloak-js';
-import { HasRolePipe } from '@/pipes/has-role-pipe';
+import { IsRoleAllowedPipe } from '@/pipes/is-role-allowed-pipe';
+
 
 @Component({
     selector: 'app-menu',
     standalone: true,
-    imports: [CommonModule, AppMenuitem, RouterModule, HasRolePipe],
+    imports: [CommonModule, AppMenuitem, RouterModule, IsRoleAllowedPipe, IsRoleAllowedPipe],
     template: `
         <ul class="layout-menu">
             @for (rootMenuItem of model; track $index) {
                 <ng-container>
                     @if (!rootMenuItem.separator) {
                         @if (rootMenuItem['roles']) {
-                            @if (rootMenuItem['roles'] | hasRole: 'any') {
+                            @if (rootMenuItem['roles'] | isRoleAllowed: 'any') {
                                 <li app-menuitem [item]="rootMenuItem" [index]="$index" [root]="true"></li>
                             }
                         }
@@ -72,6 +73,12 @@ export class AppMenu {
                         label: 'Gebäude Verwalten',
                         icon: 'pi pi-fw pi-home',
                         routerLink: ['/admin/properties']
+                    },
+                    {
+                        roles: ['dev', 'admin', 'can-manage-industries'],
+                        label: 'Branchen Verwalten',
+                        icon: 'pi pi-fw pi-home',
+                        routerLink: ['/admin/industries']
                     }
                 ]
             },
diff --git a/src/app/layout/component/app.menuitem.ts b/src/app/layout/component/app.menuitem.ts
index 92d9498..9a936d5 100644
--- a/src/app/layout/component/app.menuitem.ts
+++ b/src/app/layout/component/app.menuitem.ts
@@ -7,12 +7,12 @@ import { CommonModule } from '@angular/common';
 import { RippleModule } from 'primeng/ripple';
 import { MenuItem } from 'primeng/api';
 import { LayoutService } from '../service/layout.service';
-import { HasRolePipe } from '@/pipes/has-role-pipe';
+import { IsRoleAllowedPipe } from '@/pipes/is-role-allowed-pipe';
 
 @Component({
     // eslint-disable-next-line @angular-eslint/component-selector
     selector: '[app-menuitem]',
-    imports: [CommonModule, RouterModule, RippleModule, HasRolePipe],
+    imports: [CommonModule, RouterModule, RippleModule, IsRoleAllowedPipe],
     template: `
         <ng-container>
             <div *ngIf="root && item.visible !== false" class="layout-menuitem-root-text">{{ item.label }}</div>
@@ -47,7 +47,7 @@ import { HasRolePipe } from '@/pipes/has-role-pipe';
             <ul *ngIf="item.items && item.visible !== false" [@children]="submenuAnimation">
                 <ng-template ngFor let-child let-i="index" [ngForOf]="item.items">
                     @if (child['roles']) {
-                        @if (child['roles'] | hasRole: 'any') {
+                        @if (child['roles'] | isRoleAllowed: 'any') {
                             <li app-menuitem [item]="child" [index]="i" [parentKey]="key" [class]="child['badgeClass']"></li>
                         }
                     }
diff --git a/src/app/layout/component/app.topbar.ts b/src/app/layout/component/app.topbar.ts
index 00234af..4ab1253 100644
--- a/src/app/layout/component/app.topbar.ts
+++ b/src/app/layout/component/app.topbar.ts
@@ -1,4 +1,4 @@
-import { Component, inject } from '@angular/core';
+import { Component, inject, OnInit } from '@angular/core';
 import { MenuItem } from 'primeng/api';
 import { RouterModule } from '@angular/router';
 import { CommonModule } from '@angular/common';
@@ -15,113 +15,88 @@ import { Tag } from 'primeng/tag';
     selector: 'app-topbar',
     standalone: true,
     imports: [RouterModule, CommonModule, StyleClassModule, AppConfigurator, Popover, Button, Tag],
-    template: `
-        <div class="layout-topbar">
-            <div class="layout-topbar-logo-container">
-                <button class="layout-menu-button layout-topbar-action" (click)="layoutService.onMenuToggle()">
-                    <i class="pi pi-bars"></i>
+    template: ` <div class="layout-topbar">
+        <div class="layout-topbar-logo-container">
+            <button class="layout-menu-button layout-topbar-action" (click)="layoutService.onMenuToggle()">
+                <i class="pi pi-bars"></i>
+            </button>
+            <a class="layout-topbar-logo" routerLink="/">
+                <img [src]="logo" alt="App Logo" style="width: 1.3em;"/>
+            </a>
+
+            @if (keycloak.authenticated) {
+                <p-tag severity="success" value="Authenticated" />
+                @if (keycloak) {
+                    <p-tag severity="info" value="Realm: {{ keycloak.realm }}" />
+                }
+
+                @for (item of keycloak.realmAccess?.roles; track $index) {
+                    <p-tag severity="warn" value="{{ item }}" />
+                }
+            }
+            @if (!keycloak.authenticated) {
+                <p-tag severity="danger" value="Not authenticated" />
+            }
+        </div>
+
+        <div class="layout-topbar-actions">
+            <div class="layout-config-menu">
+                <button type="button" class="layout-topbar-action" (click)="toggleDarkMode()">
+                    <i [ngClass]="{ 'pi ': true, 'pi-moon': layoutService.isDarkTheme(), 'pi-sun': !layoutService.isDarkTheme() }"></i>
                 </button>
-                <a class="layout-topbar-logo" routerLink="/">
-                    <svg viewBox="0 0 54 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-                        <path
-                            fill-rule="evenodd"
-                            clip-rule="evenodd"
-                            d="M17.1637 19.2467C17.1566 19.4033 17.1529 19.561 17.1529 19.7194C17.1529 25.3503 21.7203 29.915 27.3546 29.915C32.9887 29.915 37.5561 25.3503 37.5561 19.7194C37.5561 19.5572 37.5524 19.3959 37.5449 19.2355C38.5617 19.0801 39.5759 18.9013 40.5867 18.6994L40.6926 18.6782C40.7191 19.0218 40.7326 19.369 40.7326 19.7194C40.7326 27.1036 34.743 33.0896 27.3546 33.0896C19.966 33.0896 13.9765 27.1036 13.9765 19.7194C13.9765 19.374 13.9896 19.0316 14.0154 18.6927L14.0486 18.6994C15.0837 18.9062 16.1223 19.0886 17.1637 19.2467ZM33.3284 11.4538C31.6493 10.2396 29.5855 9.52381 27.3546 9.52381C25.1195 9.52381 23.0524 10.2421 21.3717 11.4603C20.0078 11.3232 18.6475 11.1387 17.2933 10.907C19.7453 8.11308 23.3438 6.34921 27.3546 6.34921C31.36 6.34921 34.9543 8.10844 37.4061 10.896C36.0521 11.1292 34.692 11.3152 33.3284 11.4538ZM43.826 18.0518C43.881 18.6003 43.9091 19.1566 43.9091 19.7194C43.9091 28.8568 36.4973 36.2642 27.3546 36.2642C18.2117 36.2642 10.8 28.8568 10.8 19.7194C10.8 19.1615 10.8276 18.61 10.8816 18.0663L7.75383 17.4411C7.66775 18.1886 7.62354 18.9488 7.62354 19.7194C7.62354 30.6102 16.4574 39.4388 27.3546 39.4388C38.2517 39.4388 47.0855 30.6102 47.0855 19.7194C47.0855 18.9439 47.0407 18.1789 46.9536 17.4267L43.826 18.0518ZM44.2613 9.54743L40.9084 10.2176C37.9134 5.95821 32.9593 3.1746 27.3546 3.1746C21.7442 3.1746 16.7856 5.96385 13.7915 10.2305L10.4399 9.56057C13.892 3.83178 20.1756 0 27.3546 0C34.5281 0 40.8075 3.82591 44.2613 9.54743Z"
-                            fill="var(--primary-color)"
-                        />
-                        <mask id="mask0_1413_1551" style="mask-type: alpha" maskUnits="userSpaceOnUse" x="0" y="8"
-                              width="54" height="11">
-                            <path
-                                d="M27 18.3652C10.5114 19.1944 0 8.88892 0 8.88892C0 8.88892 16.5176 14.5866 27 14.5866C37.4824 14.5866 54 8.88892 54 8.88892C54 8.88892 43.4886 17.5361 27 18.3652Z"
-                                fill="var(--primary-color)" />
-                        </mask>
-                        <g mask="url(#mask0_1413_1551)">
-                            <path
-                                d="M-4.673e-05 8.88887L3.73084 -1.91434L-8.00806 17.0473L-4.673e-05 8.88887ZM27 18.3652L26.4253 6.95109L27 18.3652ZM54 8.88887L61.2673 17.7127L50.2691 -1.91434L54 8.88887ZM-4.673e-05 8.88887C-8.00806 17.0473 -8.00469 17.0505 -8.00132 17.0538C-8.00018 17.055 -7.99675 17.0583 -7.9944 17.0607C-7.98963 17.0653 -7.98474 17.0701 -7.97966 17.075C-7.96949 17.0849 -7.95863 17.0955 -7.94707 17.1066C-7.92401 17.129 -7.89809 17.1539 -7.86944 17.1812C-7.8122 17.236 -7.74377 17.3005 -7.66436 17.3743C-7.50567 17.5218 -7.30269 17.7063 -7.05645 17.9221C-6.56467 18.3532 -5.89662 18.9125 -5.06089 19.5534C-3.39603 20.83 -1.02575 22.4605 1.98012 24.0457C7.97874 27.2091 16.7723 30.3226 27.5746 29.7793L26.4253 6.95109C20.7391 7.23699 16.0326 5.61231 12.6534 3.83024C10.9703 2.94267 9.68222 2.04866 8.86091 1.41888C8.45356 1.10653 8.17155 0.867278 8.0241 0.738027C7.95072 0.673671 7.91178 0.637576 7.90841 0.634492C7.90682 0.63298 7.91419 0.639805 7.93071 0.65557C7.93897 0.663455 7.94952 0.673589 7.96235 0.686039C7.96883 0.692262 7.97582 0.699075 7.98338 0.706471C7.98719 0.710167 7.99113 0.714014 7.99526 0.718014C7.99729 0.720008 8.00047 0.723119 8.00148 0.724116C8.00466 0.727265 8.00796 0.730446 -4.673e-05 8.88887ZM27.5746 29.7793C37.6904 29.2706 45.9416 26.3684 51.6602 23.6054C54.5296 22.2191 56.8064 20.8465 58.4186 19.7784C59.2265 19.2431 59.873 18.7805 60.3494 18.4257C60.5878 18.2482 60.7841 18.0971 60.9374 17.977C61.014 17.9169 61.0799 17.8645 61.1349 17.8203C61.1624 17.7981 61.1872 17.7781 61.2093 17.7602C61.2203 17.7512 61.2307 17.7427 61.2403 17.7348C61.2452 17.7308 61.2499 17.727 61.2544 17.7233C61.2566 17.7215 61.2598 17.7188 61.261 17.7179C61.2642 17.7153 61.2673 17.7127 54 8.88887C46.7326 0.0650536 46.7357 0.0625219 46.7387 0.0600241C46.7397 0.0592345 46.7427 0.0567658 46.7446 0.0551857C46.7485 0.0520238 46.7521 0.0489887 46.7557 0.0460799C46.7628 0.0402623 46.7694 0.0349487 46.7753 0.0301318C46.7871 0.0204986 46.7966 0.0128495 46.8037 0.00712562C46.818 -0.00431848 46.8228 -0.00808311 46.8184 -0.00463784C46.8096 0.00228345 46.764 0.0378652 46.6828 0.0983779C46.5199 0.219675 46.2165 0.439161 45.7812 0.727519C44.9072 1.30663 43.5257 2.14765 41.7061 3.02677C38.0469 4.79468 32.7981 6.63058 26.4253 6.95109L27.5746 29.7793ZM54 8.88887C50.2691 -1.91433 50.27 -1.91467 50.271 -1.91498C50.2712 -1.91506 50.272 -1.91535 50.2724 -1.9155C50.2733 -1.91581 50.274 -1.91602 50.2743 -1.91616C50.2752 -1.91643 50.275 -1.91636 50.2738 -1.91595C50.2714 -1.91515 50.2652 -1.91302 50.2552 -1.9096C50.2351 -1.90276 50.1999 -1.89078 50.1503 -1.874C50.0509 -1.84043 49.8938 -1.78773 49.6844 -1.71863C49.2652 -1.58031 48.6387 -1.377 47.8481 -1.13035C46.2609 -0.635237 44.0427 0.0249875 41.5325 0.6823C36.215 2.07471 30.6736 3.15796 27 3.15796V26.0151C33.8087 26.0151 41.7672 24.2495 47.3292 22.7931C50.2586 22.026 52.825 21.2618 54.6625 20.6886C55.5842 20.4011 56.33 20.1593 56.8551 19.986C57.1178 19.8993 57.3258 19.8296 57.4735 19.7797C57.5474 19.7548 57.6062 19.7348 57.6493 19.72C57.6709 19.7127 57.6885 19.7066 57.7021 19.7019C57.7089 19.6996 57.7147 19.6976 57.7195 19.696C57.7219 19.6952 57.7241 19.6944 57.726 19.6938C57.7269 19.6934 57.7281 19.693 57.7286 19.6929C57.7298 19.6924 57.7309 19.692 54 8.88887ZM27 3.15796C23.3263 3.15796 17.7849 2.07471 12.4674 0.6823C9.95717 0.0249875 7.73904 -0.635237 6.15184 -1.13035C5.36118 -1.377 4.73467 -1.58031 4.3155 -1.71863C4.10609 -1.78773 3.94899 -1.84043 3.84961 -1.874C3.79994 -1.89078 3.76474 -1.90276 3.74471 -1.9096C3.73469 -1.91302 3.72848 -1.91515 3.72613 -1.91595C3.72496 -1.91636 3.72476 -1.91643 3.72554 -1.91616C3.72593 -1.91602 3.72657 -1.91581 3.72745 -1.9155C3.72789 -1.91535 3.72874 -1.91506 3.72896 -1.91498C3.72987 -1.91467 3.73084 -1.91433 -4.673e-05 8.88887C-3.73093 19.692 -3.72983 19.6924 -3.72868 19.6929C-3.72821 19.693 -3.72698 19.6934 -3.72603 19.6938C-3.72415 19.6944 -3.72201 19.6952 -3.71961 19.696C-3.71482 19.6976 -3.70901 19.6996 -3.7022 19.7019C-3.68858 19.7066 -3.67095 19.7127 -3.6494 19.72C-3.60629 19.7348 -3.54745 19.7548 -3.47359 19.7797C-3.32589 19.8296 -3.11788 19.8993 -2.85516 19.986C-2.33008 20.1593 -1.58425 20.4011 -0.662589 20.6886C1.17485 21.2618 3.74125 22.026 6.67073 22.7931C12.2327 24.2495 20.1913 26.0151 27 26.0151V3.15796Z"
-                                fill="var(--primary-color)"
-                            />
-                        </g>
-                    </svg>
-                    <span>PROPIFY</span>
-                </a>
-
-                @if (keycloak.authenticated) {
-                    <p-tag severity="success" value="Authenticated" />
-                    @if(keycloak) {
-                        <p-tag severity="info" value="Realm: {{ keycloak.realm }}" />
-                    }
-
-                    @for (item of keycloak.realmAccess?.roles; track $index) {
-                        <p-tag severity="warn" value="{{ item }}" />
-                    }
-                }
-                @if (!keycloak.authenticated) {
-                    <p-tag severity="danger" value="Not authenticated" />
-                }
-            </div>
-
-            <div class="layout-topbar-actions">
-                <div class="layout-config-menu">
-                    <button type="button" class="layout-topbar-action" (click)="toggleDarkMode()">
-                        <i [ngClass]="{ 'pi ': true, 'pi-moon': layoutService.isDarkTheme(), 'pi-sun': !layoutService.isDarkTheme() }"></i>
+                <div class="relative">
+                    <button
+                        class="layout-topbar-action layout-topbar-action-highlight"
+                        pStyleClass="@next"
+                        enterFromClass="hidden"
+                        enterActiveClass="animate-scalein"
+                        leaveToClass="hidden"
+                        leaveActiveClass="animate-fadeout"
+                        [hideOnOutsideClick]="true"
+                    >
+                        <i class="pi pi-palette"></i>
                     </button>
-                    <div class="relative">
-                        <button
-                            class="layout-topbar-action layout-topbar-action-highlight"
-                            pStyleClass="@next"
-                            enterFromClass="hidden"
-                            enterActiveClass="animate-scalein"
-                            leaveToClass="hidden"
-                            leaveActiveClass="animate-fadeout"
-                            [hideOnOutsideClick]="true"
-                        >
-                            <i class="pi pi-palette"></i>
-                        </button>
-                        <app-configurator />
-                    </div>
-                </div>
-
-                <button class="layout-topbar-menu-button layout-topbar-action" pStyleClass="@next"
-                        enterFromClass="hidden" enterActiveClass="animate-scalein" leaveToClass="hidden"
-                        leaveActiveClass="animate-fadeout" [hideOnOutsideClick]="true">
-                    <i class="pi pi-ellipsis-v"></i>
-                </button>
-
-                <div class="layout-topbar-menu hidden lg:block">
-                    <div class="layout-topbar-menu-content">
-                        <button type="button" class="layout-topbar-action">
-                            <i class="pi pi-calendar"></i>
-                            <span>Calendar</span>
-                        </button>
-                        <button type="button" class="layout-topbar-action">
-                            <i class="pi pi-inbox"></i>
-                            <span>Messages</span>
-                        </button>
-
-                        <button (click)="userpopover.toggle($event)" type="button" class="layout-topbar-action">
-                            <i class="pi pi-user"></i>
-                            <span>Profile</span>
-                        </button>
-                        <p-popover #userpopover>
-                            <div class="flex flex-col gap-4 w-[25rem]">
-                                @if (loggedIn) {
-                                    <div>
-                                        Logged in as <span
-                                        class="font-medium text-surface-900 dark:text-surface-0 block mb-2">{{ firstName }} {{ lastName }} <{{ email }}></span>
-                                    </div>
-                                    <div>
-                                        <p-button icon="pi pi-sign-out" label="Logout" severity="danger"
-                                                  (click)="logout()" />
-                                    </div>
-                                }
-                            </div>
-                        </p-popover>
-                    </div>
+                    <app-configurator />
                 </div>
             </div>
-        </div>`
+
+            <button class="layout-topbar-menu-button layout-topbar-action" pStyleClass="@next" enterFromClass="hidden" enterActiveClass="animate-scalein" leaveToClass="hidden" leaveActiveClass="animate-fadeout" [hideOnOutsideClick]="true">
+                <i class="pi pi-ellipsis-v"></i>
+            </button>
+
+            <div class="layout-topbar-menu hidden lg:block">
+                <div class="layout-topbar-menu-content">
+                    <button type="button" class="layout-topbar-action">
+                        <i class="pi pi-calendar"></i>
+                        <span>Calendar</span>
+                    </button>
+                    <button type="button" class="layout-topbar-action">
+                        <i class="pi pi-inbox"></i>
+                        <span>Messages</span>
+                    </button>
+
+                    <button (click)="userpopover.toggle($event)" type="button" class="layout-topbar-action">
+                        <i class="pi pi-user"></i>
+                        <span>Profile</span>
+                    </button>
+                    <p-popover #userpopover>
+                        <div class="flex flex-col gap-4 w-[25rem]">
+                            @if (loggedIn) {
+                                <div>
+                                    Logged in as <span class="font-medium text-surface-900 dark:text-surface-0 block mb-2">{{ firstName }} {{ lastName }} <{{ email }}></span>
+                                </div>
+                                <div>
+                                    <p-button icon="pi pi-sign-out" label="Logout" severity="danger" (click)="logout()" />
+                                </div>
+                            }
+                        </div>
+                    </p-popover>
+                </div>
+            </div>
+        </div>
+    </div>`
 })
-export class AppTopbar {
+export class AppTopbar implements OnInit {
     items!: MenuItem[];
 
     protected keycloak = inject(Keycloak);
@@ -130,7 +105,7 @@ export class AppTopbar {
     public firstName?: string = 'unknown';
     public lastName?: string = 'unknown';
     public email?: string = 'unknown';
-
+    protected logo: string = '';
 
     constructor(public layoutService: LayoutService) {
         if (this.keycloak.authenticated) {
@@ -145,6 +120,16 @@ export class AppTopbar {
         }
     }
 
+    ngOnInit(): void {
+        this.layoutService.configUpdate$.subscribe(() => {
+            this.setLogo();
+        });
+    }
+
+    setLogo() {
+        const isDarkTheme = this.layoutService._config.darkTheme;
+        this.logo = isDarkTheme? '/logo-dark.png' : '/logo-light.png';
+    }
     logout() {
         this.keycloak.logout();
     }
diff --git a/src/app/pages/industry-manager/industry-manager.html b/src/app/pages/industry-manager/industry-manager.html
new file mode 100644
index 0000000..5caeaf0
--- /dev/null
+++ b/src/app/pages/industry-manager/industry-manager.html
@@ -0,0 +1,91 @@
+<p-toast />
+
+<p-toolbar class="mb-6">
+    <ng-template #start>
+        <p-button  label="Neu" icon="pi pi-plus" severity="secondary" class="mr-2" (onClick)="openNew()" />
+        <p-button  label="Löschen" icon="pi pi-trash" severity="danger" outlined (onClick)="deleteSelected()" [disabled]="!selectedIndustries || !selectedIndustries.length" />
+    </ng-template>
+
+    <ng-template #end>
+        <p-button  label="Exportieren" icon="pi pi-upload" severity="secondary" (onClick)="exportCSV()" />
+    </ng-template>
+</p-toolbar>
+
+<p-table
+    #dt
+    [value]="industries()"
+    [rows]="10"
+    [columns]="cols"
+    [paginator]="true"
+    [globalFilterFields]="['name', 'street', 'houseNumber', 'zipCode', 'city', 'country', 'notes']"
+    [tableStyle]="{ 'min-width': '75rem' }"
+    [(selection)]="selectedIndustries"
+    [rowHover]="true"
+    dataKey="id"
+    currentPageReportTemplate="Zeige {first} bis {last} von {totalRecords} Einträgen"
+    [showCurrentPageReport]="true"
+    [rowsPerPageOptions]="[10, 20, 30]"
+>
+    <ng-template #caption>
+        <div class="flex items-center justify-between">
+            <h5 class="m-0" >Verwalte Branchen</h5>
+            <p-iconfield>
+                <p-inputicon class="pi pi-search" />
+                <input pInputText type="text" (input)="onGlobalFilter(dt, $event)" placeholder="Suche..." />
+            </p-iconfield>
+        </div>
+    </ng-template>
+
+    <ng-template #header>
+        <tr>
+            <th style="width: 3rem">
+                <p-tableHeaderCheckbox />
+            </th>
+            <th style="min-width:8rem" >
+                ID
+            </th>
+            <th pSortableColumn="name" style="min-width:8rem" >
+                Name
+                <p-sortIcon field="name" />
+            </th>
+            <th style="min-width: 12rem"></th>
+        </tr>
+    </ng-template>
+    <ng-template #body let-industry>
+        <tr>
+            <td>
+                <p-tableCheckbox [value]="industry" />
+            </td>
+            <td>{{ industry.id }}</td>
+            <td>{{ industry.name }}</td>
+            <td  class="text-center">
+                <p-button icon="pi pi-pencil" class="mr-2" [rounded]="true" [outlined]="true" (click)="editIndustry(industry)" />
+                <p-button icon="pi pi-trash" severity="danger" [rounded]="true" [outlined]="true" (click)="deleteIndustry(industry)" />
+            </td>
+        </tr>
+    </ng-template>
+</p-table>
+
+<p-dialog [(visible)]="industryDialog" [style]="{ width: '900px' }" i18n-header header="Branchen Details" [modal]="true">
+    <ng-template #content>
+
+        <div class="grid gap-4 max-w-3xl mx-auto p-4">
+            <!-- Name -->
+            <div class="flex flex-col">
+                <label for="name" class="block font-bold mb-3">Name</label>
+                <input type="text" pInputText id="name" [(ngModel)]="industry().name" required autofocus fluid />
+                @if (submitted && !industry().name) {
+                    <small class="text-red-500">Name is required.</small>
+                }
+            </div>
+
+        </div>
+    </ng-template>
+
+    <ng-template #footer>
+        <p-button  label="Abbrechen" icon="pi pi-times" text (click)="hideDialog()" />
+        <p-button  label="Speichern" icon="pi pi-check" (click)="saveIndustry()" />
+    </ng-template>
+</p-dialog>
+
+<p-confirmdialog [style]="{ width: '450px' }" />
diff --git a/src/app/pages/industry-manager/industry-manager.scss b/src/app/pages/industry-manager/industry-manager.scss
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/pages/industry-manager/industry-manager.spec.ts b/src/app/pages/industry-manager/industry-manager.spec.ts
new file mode 100644
index 0000000..e4451e8
--- /dev/null
+++ b/src/app/pages/industry-manager/industry-manager.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { IndustryManager } from './industry-manager';
+
+describe('IndustryManager', () => {
+  let component: IndustryManager;
+  let fixture: ComponentFixture<IndustryManager>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [IndustryManager]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(IndustryManager);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/pages/industry-manager/industry-manager.ts b/src/app/pages/industry-manager/industry-manager.ts
new file mode 100644
index 0000000..66f2a40
--- /dev/null
+++ b/src/app/pages/industry-manager/industry-manager.ts
@@ -0,0 +1,272 @@
+import { Component, signal, ViewChild } from '@angular/core';
+import { Button } from 'primeng/button';
+import { ConfirmDialog } from 'primeng/confirmdialog';
+import { Dialog } from 'primeng/dialog';
+import { FormsModule } from '@angular/forms';
+import { IconField } from 'primeng/iconfield';
+import { InputIcon } from 'primeng/inputicon';
+import { InputText } from 'primeng/inputtext';
+import { Table, TableModule } from 'primeng/table';
+import { Toolbar } from 'primeng/toolbar';
+import { Country, PropertyService } from '@/pages/service/property.service';
+import { ConfirmationService, MessageService } from 'primeng/api';
+import { CountryService } from '@/pages/service/country.service';
+import { AttachmentService } from '@/pages/service/attachment.service';
+import { environment } from '../../../environments/environments';
+import { Industry, IndustryService } from '@/pages/service/industry.service';
+import { Toast } from 'primeng/toast';
+import { Ripple } from 'primeng/ripple';
+
+interface Column {
+    field: string;
+    header: string;
+    customExportHeader?: string;
+}
+
+interface ExportColumn {
+    title: string;
+    dataKey: string;
+}
+
+@Component({
+  selector: 'app-industry-manager',
+  imports: [
+      Button,
+      ConfirmDialog,
+      Dialog,
+      FormsModule,
+      IconField,
+      InputIcon,
+      InputText,
+      TableModule,
+      Toolbar,
+      Toast
+  ],
+  templateUrl: './industry-manager.html',
+  styleUrl: './industry-manager.scss',
+  providers: [MessageService, ConfirmationService, PropertyService, CountryService, AttachmentService],
+})
+export class IndustryManager {
+    industryDialog: boolean = false;
+
+    industries = signal<Industry[]>([]);
+    industry = signal<Industry>({});
+
+    selectedIndustries!: Industry[] | null;
+
+    submitted: boolean = false;
+    statuses!: any[];
+
+    @ViewChild('dt') dt!: Table;
+
+    exportColumns!: ExportColumn[];
+
+    cols!: Column[];
+    countries: Country[] = [];
+
+    constructor(
+        private messageService: MessageService,
+        private confirmationService: ConfirmationService,
+        private industryService: IndustryService,
+        private countryService: CountryService,
+        private attachmentService: AttachmentService,
+    ) {}
+
+    exportCSV() {
+        // this.dt.exportCSV();
+        console.debug(this, ' -- ', this.dt);
+    }
+
+    ngOnInit() {
+        this.selectedIndustries = [];
+
+        this.industryService.getIndustries().subscribe((industries) => {
+            console.log('Industries', industries);
+            this.industries.set(industries);
+        });
+
+        this.countryService.getCountries().then((countries) => {
+            this.countries = countries;
+        });
+    }
+
+    loadDemoData() {
+        this.statuses = [
+            { label: 'INSTOCK', value: 'instock' },
+            { label: 'LOWSTOCK', value: 'lowstock' },
+            { label: 'OUTOFSTOCK', value: 'outofstock' }
+        ];
+
+        this.cols = [
+            { field: 'id', header: 'ID', customExportHeader: 'Branchen ID' },
+            { field: 'name', header: 'Name' }
+        ];
+
+        this.exportColumns = this.cols.map((col) => ({ title: col.header, dataKey: col.field }));
+    }
+
+    onGlobalFilter(table: Table, event: Event) {
+        table.filterGlobal((event.target as HTMLInputElement).value, 'contains');
+    }
+
+    openNew() {
+        this.industry.set({});
+        this.submitted = false;
+        this.industryDialog = true;
+    }
+
+    editIndustry(industry: Industry) {
+        this.industry.set({ ...industry });
+        this.industryDialog = true;
+    }
+
+    deleteSelected() {
+        this.confirmationService.confirm({
+            message: 'Sind Sie sicher, dass sie die angewählten Branchen endgültig löschen möchten?',
+            header: 'Bestätigung',
+            icon: 'pi pi-exclamation-triangle',
+            accept: () => {
+                console.log('properties to delete', this.selectedIndustries);
+
+                if (this.selectedIndustries === null) {
+                    return;
+                }
+
+                this.industryService.deleteIndustries(this.selectedIndustries).subscribe({
+                    next: () => {
+                        this.industries.set(this.industries().filter((val) => !this.selectedIndustries?.includes(val)));
+                        this.selectedIndustries = null;
+                        this.messageService.add({
+                            severity: 'success',
+                            summary: 'Successful',
+                            detail: 'Branche wurde erfolgreich gelöscht.',
+                            life: 3000
+                        });
+                    },
+                    error: (err) => {
+                        console.log('Error while deleting industries -- Error: ' + err + ' -- Industries: ', this.selectedIndustries);
+                        this.messageService.add({
+                            severity: 'error',
+                            summary: 'Fehler',
+                            detail: 'Beim Löschen der Branche ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut.',
+                            life: 3000
+                        });
+                    }
+                });
+            }
+        });
+    }
+
+    hideDialog() {
+        this.industryDialog = false;
+        this.submitted = false;
+    }
+
+    deleteIndustry(industry: Industry) {
+        this.confirmationService.confirm({
+            message: 'Sind Sie sicher, dass sie "' + industry.name + '" löschen möchten?',
+            acceptLabel: 'Ja',
+            acceptButtonStyleClass: 'p-button-danger',
+            rejectLabel: 'Nein',
+            header: 'Bitte bestätigen Sie',
+            icon: 'pi pi-exclamation-triangle',
+            accept: () => {
+                this.industryService.deleteIndustry(industry).subscribe({
+                    next: () => {
+                        this.industries.set(this.industries().filter((val) => val.id !== industry.id));
+                        this.industry.set({});
+                        this.messageService.add({
+                            severity: 'success',
+                            summary: 'Successful',
+                            detail: 'Branche erfolgreich gelöscht',
+                            life: 3000
+                        });
+                    },
+                    error: (err) => {
+                        console.log('Error while deleting industry -- Error: ' + err + ' -- Industry: ', industry);
+
+                        this.messageService.add({
+                            severity: 'error',
+                            summary: 'Fehler',
+                            detail: 'Beim Löschen der Branche ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut.',
+                            life: 3000
+                        });
+                    }
+                });
+            },
+            reject: () => {
+                this.messageService.add({
+                    severity: 'info',
+                    summary: 'Info',
+                    detail: 'Der Löschvorgang wurde abgebrochen.',
+                    life: 3000
+                })
+            }
+        });
+    }
+
+    findIndexById(id?: string): number {
+        let index = -1;
+        // console.log("Looking for id " + id);
+        for (let i = 0; i < this.industries().length; i++) {
+            // console.log("current item id: " + this.properties()[i].id)
+            if (this.industries()[i].id === id) {
+                // console.log("Index", this.properties()[i].id, i);
+                index = i;
+                break;
+            }
+        }
+
+        return index;
+    }
+
+    saveIndustry() {
+        this.submitted = true;
+        let _industry = this.industry();
+        let _industries = this.industries();
+
+        console.log('Saving Industry', _industry);
+
+        if (this.industry.name?.trim()) {
+            if (_industry.id) {
+                // update
+                this.industryService.updateIndustry(_industry).subscribe({
+                    next: (arg) => {
+                        this.messageService.add({
+                            severity: 'success',
+                            summary: 'Successful',
+                            detail: 'Branche aktualisiert',
+                            life: 3000
+                        });
+                        _industries[this.findIndexById(_industry.id)] = _industry;
+                        this.industries.set([..._industries]);
+                    },
+                    error: (err) => {
+                        console.log('Error while updating industry -- Error: ' + err + ' -- Industry: ', _industry);
+                    }
+                });
+            } else {
+                this.industryService.createIndustry(_industry).subscribe({
+                    next: (arg) => {
+                        this.messageService.add({
+                            severity: 'success',
+                            summary: 'Successful',
+                            detail: 'Branche angelegt',
+                            life: 3000
+                        });
+                        this.industries.set([..._industries, arg]);
+                    },
+                    error: (err) => {
+                        console.log('Error while creating industry -- Error: ' + err + ' -- Industry: ', _industry);
+                    }
+                });
+            }
+
+            this.industryDialog = false;
+            this.industry.set({});
+        }
+    }
+
+
+    protected readonly environment = environment;
+}
diff --git a/src/app/pages/organizations/organizations.html b/src/app/pages/organizations/organizations.html
new file mode 100644
index 0000000..311c8bd
--- /dev/null
+++ b/src/app/pages/organizations/organizations.html
@@ -0,0 +1,156 @@
+<div class="flex">
+    <div class="flex-1 text-left">
+        <div class="mb-5">
+            <h1>Organisationen</h1>
+            <p class="my-4 text-lg text-gray-500">Übersicht über Organisationen</p>
+        </div>
+    </div>
+
+    <div class="flex-1 text-right">
+
+        @if (['dev', 'admin', 'can-create-organizations'] | isRoleAllowed: 'any') {
+        <p-button (click)="showDialog()" label="Neue Organisation" class="p-button-outlined ml-4">
+            <span class="flex items-center gap-2">
+                <span class="material-icons !text-base">add</span>
+            </span>
+        </p-button>
+        }
+    </div>
+</div>
+
+
+<p-dialog header="Neue Organisation"
+          [modal]="true"
+          [(visible)]="addNewOrganizationDialogVisible" [style]="{ width: '50rem' }">
+
+    <div class="grid grid-cols-1 md:grid-cols-2 gap-6 mb-8">
+
+        <div class="flex flex-col">
+            <label for="organization_name" class="mb-2 font-semibold">Organisations Name</label>
+            <input [(ngModel)]="newOrganizationName"
+                   [required]="true"
+                   pInputText
+                   id="organization_name"
+                   class="w-full"
+                   autocomplete="on" />
+        </div>
+
+        <div class="flex flex-col">
+            <label for="organization_owner" class="mb-2 font-semibold">Organisations Owner</label>
+            <input [(ngModel)]="newOrganizationOwner"
+                   [required]="true"
+                   pInputText
+                   id="organization_owner"
+                   class="w-full"
+                   autocomplete="on" />
+        </div>
+
+        <div class="col-span-1 md:col-span-2 flex flex-col">
+            <label for="organization_industry" class="mb-2 font-semibold">Organisations-Branche</label>
+            <p-select [options]="organizationIndustryOptionsForNewOrganization"
+                      [(ngModel)]="newOrganizationIndustry"
+                      [required]="true"
+                      appendTo="body"
+                      optionLabel="name"
+                      id="organization_industry" class="w-full"></p-select>
+        </div>
+
+    </div>
+
+    <div class="flex justify-end gap-2">
+        <p-button label="Cancel" severity="secondary" (click)="addNewOrganizationDialogVisible = false" />
+        <p-button label="Save" (click)="createNewOrganization()" />
+    </div>
+</p-dialog>
+
+<!-- Main content -->
+<div class="grid grid-cols-12 gap-8 mb-8">
+    <div class="col-span-12 ">
+
+        <div class="card">
+            <p-table #dt1
+                     [value]="organizations"
+                     dataKey="id"
+                     [rows]="10"
+                     [rowsPerPageOptions]="[10, 25, 50, 100]"
+                     [loading]="loading"
+                     [paginator]="true"
+                     [globalFilterFields]="['name', 'country.name', 'representative.name', 'status']"
+            >
+                <ng-template #caption>
+                    <div class="flex">
+                        <p-button label="Clear" [outlined]="true" icon="pi pi-filter-slash" (click)="clear(dt1)" />
+                        <p-iconfield iconPosition="left" class="ml-auto">
+                            <p-inputicon>
+                                <i class="pi pi-search"></i>
+                            </p-inputicon>
+                            <input pInputText type="text" [(ngModel)]="searchValue" (input)="filterGlobal(dt1, $event.target)" placeholder="Suche nach..." />
+                        </p-iconfield>
+                    </div>
+                </ng-template>
+                <ng-template #header>
+                    <tr>
+                        <th pSortableColumn="name" style="width:50%;">
+                            <div class="flex items-center justify-between w-full">
+                                <!-- Linker Bereich: Text + SortIcon -->
+                                <div class="flex items-center gap-1">
+                                    <span>Name</span>
+                                    <p-sortIcon field="name"></p-sortIcon>
+                                </div>
+
+                                <!-- Rechter Bereich: Filter -->
+                                <p-columnFilter type="text" field="name" display="menu"></p-columnFilter>
+                            </div>
+                        </th>
+
+                        <th pSortableColumn="industry.name" style="width:35%;">
+                            <div class="flex items-center justify-between w-full">
+                                <!-- Linker Bereich: Text + SortIcon -->
+                                <div class="flex items-center gap-1">
+                                    <span>Branche</span>
+                                    <p-sortIcon field="industry.name"></p-sortIcon>
+                                </div>
+
+                                <!-- Rechter Bereich: Filter -->
+                                <p-columnFilter type="text" field="industry.name" display="menu"></p-columnFilter>
+                            </div>
+                        </th>
+
+                        <th pSortableColumn="owner" style="width:15%;">
+                            <div class="flex items-center justify-between w-full">
+                                <!-- Linker Bereich: Text + SortIcon -->
+                                <div class="flex items-center gap-1">
+                                    <span>Owner</span>
+                                    <p-sortIcon field="owner"></p-sortIcon>
+                                </div>
+
+                                <!-- Rechter Bereich: Filter -->
+                                <p-columnFilter type="text" field="owner" display="menu"></p-columnFilter>
+                            </div>
+                        </th>
+                    </tr>
+                </ng-template>
+                <ng-template #body let-organization>
+                    <tr>
+                        <td>
+                            {{ organization?.name }}
+                        </td>
+                        <td>
+                            {{ organization?.industry?.name }}
+                        </td>
+                        <td>
+                            {{ organization?.owner }}
+                        </td>
+                    </tr>
+                </ng-template>
+                <ng-template #emptymessage>
+                    <tr>
+                        <td colspan="7">Keine Einträge gefunden.</td>
+                    </tr>
+                </ng-template>
+            </p-table>
+        </div>
+
+    </div>
+</div>
+
diff --git a/src/app/pages/organizations/organizations.scss b/src/app/pages/organizations/organizations.scss
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/pages/organizations/organizations.spec.ts b/src/app/pages/organizations/organizations.spec.ts
new file mode 100644
index 0000000..620c570
--- /dev/null
+++ b/src/app/pages/organizations/organizations.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { Organizations } from './organizations';
+
+describe('Organizations', () => {
+  let component: Organizations;
+  let fixture: ComponentFixture<Organizations>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [Organizations]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(Organizations);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/pages/organizations/organizations.ts b/src/app/pages/organizations/organizations.ts
new file mode 100644
index 0000000..dbf2292
--- /dev/null
+++ b/src/app/pages/organizations/organizations.ts
@@ -0,0 +1,120 @@
+import { Component } from '@angular/core';
+import { Button } from 'primeng/button';
+import { Dialog } from 'primeng/dialog';
+import { IconField } from 'primeng/iconfield';
+import { InputIcon } from 'primeng/inputicon';
+import { InputText } from 'primeng/inputtext';
+import { MessageService } from 'primeng/api';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { Select } from 'primeng/select';
+import { ProjectStatus } from '@/pages/service/project-status.service';
+import { Router } from '@angular/router';
+import { Table, TableModule } from 'primeng/table';
+import { Organization, OrganizationService } from '@/pages/service/organization.service';
+import { Industry, IndustryService } from '@/pages/service/industry.service';
+import { IsRoleAllowedPipe } from '@/pipes/is-role-allowed-pipe';
+
+@Component({
+    selector: 'app-organizations',
+    imports: [Button, Dialog, IconField, InputIcon, InputText, ReactiveFormsModule, Select, FormsModule, TableModule, IsRoleAllowedPipe],
+    templateUrl: './organizations.html',
+    styleUrl: './organizations.scss',
+    providers: [MessageService]
+})
+export class Organizations {
+    organizations: Organization[] = [];
+    organizationIndustries: Industry[] = [];
+    projectStatuses: ProjectStatus[] = [];
+    addNewOrganizationDialogVisible = false;
+
+    statuses: any;
+    measures: any;
+
+    // for new organization dialog
+    organizationIndustryOptionsForNewOrganization: any = [];
+    newOrganizationName: string | undefined;
+    newOrganizationOwner: string | undefined;
+    newOrganizationIndustry: Industry | undefined;
+    protected loading: boolean = true;
+    protected searchValue: string | undefined;
+
+    constructor(
+        private router: Router,
+        private organizationService: OrganizationService,
+        private industryService: IndustryService,
+        private messageService: MessageService
+    ) {}
+
+    ngOnInit(): void {
+        this.statuses = [{ label: 'Alle', value: 'all' }, ...this.projectStatuses];
+
+        this.measures = [{ label: 'Alle', value: 'all' }, ...this.organizationIndustries];
+
+        this.organizationService.getOrganizations().subscribe((organizations) => {
+            console.debug('Organizations', organizations);
+            this.organizations = organizations;
+            this.loading = false;
+        });
+
+        this.industryService.getIndustries().subscribe((industries) => {
+            console.debug('Industries', industries);
+            this.organizationIndustries = industries;
+        });
+    }
+
+    navigateToDetails(id: string | undefined) {
+        this.router.navigate(['/projects', id]);
+    }
+
+    clear(table: Table) {
+        table.clear();
+        this.searchValue = '';
+    }
+
+    filterGlobal(table: Table, eventTarget: EventTarget | null) {
+        table.filterGlobal((eventTarget as HTMLInputElement).value, 'contains');
+    }
+
+    showDialog() {
+        this.industryService.getIndustries().subscribe((industries) => {
+            this.organizationIndustryOptionsForNewOrganization = [];
+            this.organizationIndustries.forEach((projectType) => {
+                this.organizationIndustryOptionsForNewOrganization.push({
+                    id: projectType.id,
+                    name: projectType.name
+                });
+            });
+        });
+
+        this.organizationIndustryOptionsForNewOrganization = this.organizationIndustries;
+        this.addNewOrganizationDialogVisible = true;
+    }
+
+    createNewOrganization() {
+        let newOrganization = this.organizationService.getOrganizationInstance(this.newOrganizationName, this.newOrganizationIndustry, this.newOrganizationOwner);
+
+        this.organizationService.create(newOrganization).subscribe({
+            next: (arg) => {
+                this.messageService.add({
+                    severity: 'success',
+                    summary: 'Erfolgreich',
+                    detail: 'Organisation erfolgreich angelegt',
+                    life: 3000
+                });
+
+                this.organizations = [...this.organizations, newOrganization];
+
+                this.addNewOrganizationDialogVisible = false;
+            },
+            error: (err) => {
+                this.messageService.add({
+                    severity: 'danger',
+                    summary: 'Fehler',
+                    detail: 'Beim Anlegen der Organisation ist ein Fehler aufgetreten.',
+                    life: 3000
+                });
+                console.log('Error while creating organization -- Error: ' + err + ' -- Organization: ', newOrganization);
+            }
+        });
+    }
+}
diff --git a/src/app/pages/project-details/project-details.html b/src/app/pages/project-details/project-details.html
index 85a43f5..0ce786e 100644
--- a/src/app/pages/project-details/project-details.html
+++ b/src/app/pages/project-details/project-details.html
@@ -2,8 +2,8 @@
     <div class="flex items-center gap-2">
         <div class="mb-5">
             <h1 >Projekt Details</h1>
-            <h4>{{ projectDetailsDTO?.name }}</h4>
-            <p class="my-4 text-lg text-gray-500">Erstellt: {{ projectDetailsDTO?.createdAt | date: 'dd.MM.yyyy HH:mm' }}</p>
+            <h4>{{ projectDetailsDTO.name }}</h4>
+            <p class="my-4 text-lg text-gray-500">Erstellt: {{ projectDetailsDTO.createdAt | date: 'dd.MM.yyyy HH:mm' }}</p>
         </div>
     </div>
     <p-button label="Bearbeiten" class="p-button-outlined">
@@ -16,6 +16,7 @@
 
 <div class="grid grid-cols-12 gap-8 mb-8">
     <div class="col-span-12 lg:col-span-6 xl:col-span-6">
+        <!-- project information -->
         <p-panel class="mb-8">
             <ng-template #header>
                 <div class="flex items-center gap-2">
@@ -80,7 +81,8 @@
 
         </p-panel>
 
-        <p-panel>
+        <!-- notes and documents -->
+        <p-panel class="mb-8">
             <ng-template #header>
                 <div class="flex items-center gap-2">
                     <span class="material-icons !text-md">apartment</span>
@@ -92,9 +94,23 @@
                 Hier können Projektnotizen und Dokumente verwaltet werden.
             </p-panel>
         </p-panel>
+
+        <!-- maps -->
+        <p-panel>
+            <iframe
+                [src]="getMapUrl(projectDetailsDTO.address) | safeUrl"
+                width="600"
+                height="450"
+                style="border:0;"
+                allowfullscreen=""
+                loading="lazy"
+                referrerpolicy="no-referrer-when-downgrade">
+            </iframe>
+        </p-panel>
     </div>
 
     <div class="col-span-12 lg:col-span-6 xl:col-span-6">
+        <!-- timeline -->
         <div class="card">
             <p-timeline [value]="projectDetailsDTO?.timelineEvents" align="alternate" class="customized-timeline">
                 <ng-template #marker let-event>
diff --git a/src/app/pages/project-details/project-details.ts b/src/app/pages/project-details/project-details.ts
index 7973891..f06844b 100644
--- a/src/app/pages/project-details/project-details.ts
+++ b/src/app/pages/project-details/project-details.ts
@@ -9,14 +9,13 @@ import { ActivatedRoute } from '@angular/router';
 import { CurrencyPipe, DatePipe } from '@angular/common';
 import { SafeHtmlPipe } from '@/pipes/safe-html-pipe';
 import { ProjectType } from '@/pages/service/project-type.service';
+import { SafeUrlPipe } from '@/pipes/safe-url.pipe';
 
 export interface ProjectTimelineEventDTO {
     id?: string; // UUID
     date?: Date;
     description?: string;
     documents?: string[];
-
-
     projectEventType?: string; // impact on icon and color
     title?: string;
 }
@@ -38,13 +37,17 @@ export interface ProjectDetailsDTO {
 
 @Component({
     selector: 'app-project-details',
-    imports: [Button, Panel, Timeline, Card, Divider, CurrencyPipe, DatePipe, SafeHtmlPipe, SafeHtmlPipe],
+    imports: [Button, Panel, Timeline, Card, Divider, CurrencyPipe, DatePipe, SafeHtmlPipe, SafeUrlPipe],
     templateUrl: './project-details.html',
     styleUrl: './project-details.scss'
 })
 export class ProjectDetails implements OnInit {
     events: any[] = [];
-    projectDetailsDTO: ProjectDetailsDTO | undefined;
+    projectDetailsDTO: ProjectDetailsDTO = {
+        address: "unknown",
+        amountRequested: -1,
+        timelineEvents: [],
+    };
 
     constructor(
         private projectService: ProjectService,
@@ -69,6 +72,17 @@ export class ProjectDetails implements OnInit {
     }
 
     protected readonly event = event;
+
+    getMapUrl(address: string | undefined): string {
+        if (address === undefined || address.trim().length === 0) {
+            return '';
+        }
+
+        let result = `https://www.google.com/maps?q=${encodeURIComponent(address)}&output=embed`;
+        console.debug('getMapUrl', result);
+
+        return result;
+    }
 }
 
 
diff --git a/src/app/pages/projects/projects.ts b/src/app/pages/projects/projects.ts
index a1e07b0..f643cd8 100644
--- a/src/app/pages/projects/projects.ts
+++ b/src/app/pages/projects/projects.ts
@@ -46,9 +46,6 @@ import { ProjectStatus, ProjectStatusService } from '@/pages/service/project-sta
         InputNumber,
         DatePipe,
         SafeHtmlPipe,
-        SafeHtmlPipe,
-        SafeHtmlPipe,
-        SafeHtmlPipe,
         CurrencyPipe
     ],
     templateUrl: './projects.html',
diff --git a/src/app/pages/property-manager/property-manager.html b/src/app/pages/property-manager/property-manager.html
index 1efa29c..dc2994a 100644
--- a/src/app/pages/property-manager/property-manager.html
+++ b/src/app/pages/property-manager/property-manager.html
@@ -29,7 +29,7 @@
             <h5 class="m-0" >Verwalte Liegenschaften</h5>
             <p-iconfield>
                 <p-inputicon styleClass="pi pi-search" />
-                <input pInputText type="text" (input)="onGlobalFilter(dt, $event)" i18n-placeholder placeholder="Suche..." />
+                <input pInputText type="text" (input)="onGlobalFilter(dt, $event)"  placeholder="Suche..." />
             </p-iconfield>
         </div>
     </ng-template>
diff --git a/src/app/pages/service/industry.service.spec.ts b/src/app/pages/service/industry.service.spec.ts
new file mode 100644
index 0000000..5b5dfe1
--- /dev/null
+++ b/src/app/pages/service/industry.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { IndustryService } from './industry.service';
+
+describe('IndustryService', () => {
+  let service: IndustryService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(IndustryService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/src/app/pages/service/industry.service.ts b/src/app/pages/service/industry.service.ts
new file mode 100644
index 0000000..b44d485
--- /dev/null
+++ b/src/app/pages/service/industry.service.ts
@@ -0,0 +1,63 @@
+import { inject, Injectable } from '@angular/core';
+import { environment } from '../../../environments/environments';
+import { HttpClient } from '@angular/common/http';
+import { EMPTY, Observable } from 'rxjs';
+import { Organization } from '@/pages/service/organization.service';
+import { BulkDeleteIds, Property } from '@/pages/service/property.service';
+
+export interface Industry {
+    id?: string; // UUID
+    name?: string;
+}
+
+@Injectable({
+  providedIn: 'root'
+})
+export class IndustryService {
+    apiEndpoint: string = environment.apiBaseUrl + '/industries';
+    private http = inject(HttpClient);
+
+    constructor() {}
+
+    getIndustries(params?: any): Observable<Industry[]> {
+        return this.http.get<Industry[]>(this.apiEndpoint);
+    }
+
+    deleteIndustry(industry: Industry): Observable<Industry> {
+        console.debug(this + " -- args: ", arguments);
+
+        return this.http.delete<Industry>(this.apiEndpoint + "/" + industry.id)
+    }
+
+    createIndustry(industry: Industry): Observable<Industry> {
+        console.debug(this + " -- args: ", arguments);
+
+        return this.http.post<Industry>(this.apiEndpoint, industry)
+    }
+
+    updateIndustry(industry: Industry): Observable<Industry> {
+        console.debug(this + " -- args: ", arguments);
+
+        return this.http.patch<Industry>(this.apiEndpoint + "/" + industry.id, industry)
+    }
+
+    deleteIndustries(industries: Industry[]): Observable<Industry> {
+        console.debug(this + " -- args: ", arguments);
+
+        if (!industries || industries.length === 0) {
+            return EMPTY; // Observable, which is "completed" immediately
+        }
+
+        let ids : BulkDeleteIds = {
+            "ids": []
+        };
+
+        industries.forEach(industry => {
+            if (industry.id !== undefined) {
+                ids.ids.push(industry.id);
+            }
+        });
+
+        return this.http.post<Industry>(this.apiEndpoint + "/bulk-delete", ids)
+    }
+}
diff --git a/src/app/pages/service/organization.service.spec.ts b/src/app/pages/service/organization.service.spec.ts
new file mode 100644
index 0000000..c6070f6
--- /dev/null
+++ b/src/app/pages/service/organization.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { OrganizationService } from './organization.service';
+
+describe('OrganizationService', () => {
+  let service: OrganizationService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(OrganizationService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/src/app/pages/service/organization.service.ts b/src/app/pages/service/organization.service.ts
new file mode 100644
index 0000000..78b9b40
--- /dev/null
+++ b/src/app/pages/service/organization.service.ts
@@ -0,0 +1,42 @@
+import { inject, Injectable } from '@angular/core';
+import { environment } from '../../../environments/environments';
+import { HttpClient } from '@angular/common/http';
+import { Observable } from 'rxjs';
+import { Industry } from '@/pages/service/industry.service';
+
+export interface Organization {
+    id?: string; // UUID
+    name?: string;
+    industry?: Industry;
+    owner?: string;
+}
+
+@Injectable({
+  providedIn: 'root'
+})
+export class OrganizationService {
+    apiEndpoint: string = environment.apiBaseUrl + '/organizations';
+    private http = inject(HttpClient);
+
+    constructor() {}
+
+    getOrganizations(params?: any): Observable<Organization[]> {
+        return this.http.get<Organization[]>(this.apiEndpoint);
+    }
+
+    create(organization: Organization): Observable<Organization> {
+        return this.http.post<Organization>(this.apiEndpoint, organization);
+    }
+
+    getOrganizationInstance(
+        newOrganizationName?: string,
+        newOrganizationIndustry?: Industry,
+        newOrganizationOwner?: string
+    ) {
+        return {
+            name: newOrganizationName,
+            industry: newOrganizationIndustry,
+            owner: newOrganizationOwner
+        };
+    }
+}
diff --git a/src/app/pages/service/property.service.ts b/src/app/pages/service/property.service.ts
index 693decd..6797fea 100644
--- a/src/app/pages/service/property.service.ts
+++ b/src/app/pages/service/property.service.ts
@@ -4,7 +4,7 @@ import { EMPTY, Observable } from 'rxjs';
 import { Attachment } from '@/pages/service/attachment.service';
 import { environment } from '../../../environments/environments';
 
-export interface BulkDeletePropertyIds {
+export interface BulkDeleteIds {
     ids: String[];
 }
 
@@ -237,7 +237,7 @@ export class PropertyService {
             return EMPTY; // Observable, which is "completed" immediately
         }
 
-        let ids : BulkDeletePropertyIds = {
+        let ids : BulkDeleteIds = {
             "ids": []
         };
 
diff --git a/src/app/pipes/has-role-pipe.spec.ts b/src/app/pipes/has-role-pipe.spec.ts
deleted file mode 100644
index a7660db..0000000
--- a/src/app/pipes/has-role-pipe.spec.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { HasRolePipe } from './has-role-pipe';
-
-describe('HasRolePipe', () => {
-  it('create an instance', () => {
-    const pipe = new HasRolePipe();
-    expect(pipe).toBeTruthy();
-  });
-});
diff --git a/src/app/pipes/has-role-pipe.ts b/src/app/pipes/is-role-allowed-pipe.ts
similarity index 87%
rename from src/app/pipes/has-role-pipe.ts
rename to src/app/pipes/is-role-allowed-pipe.ts
index 2ae7c6a..1af3319 100644
--- a/src/app/pipes/has-role-pipe.ts
+++ b/src/app/pipes/is-role-allowed-pipe.ts
@@ -2,10 +2,10 @@ import { Pipe, PipeTransform } from '@angular/core';
 import Keycloak from 'keycloak-js';
 
 @Pipe({
-    name: 'hasRole',
+    name: 'isRoleAllowed',
     standalone: true
 })
-export class HasRolePipe implements PipeTransform {
+export class IsRoleAllowedPipe implements PipeTransform {
     constructor(private keycloak: Keycloak) {}
 
     transform(allowed: string | string[], mode: 'any' | 'all' = 'any'): boolean {
diff --git a/src/app/pipes/safe-url.pipe.ts b/src/app/pipes/safe-url.pipe.ts
new file mode 100644
index 0000000..1690c47
--- /dev/null
+++ b/src/app/pipes/safe-url.pipe.ts
@@ -0,0 +1,11 @@
+import { Pipe, PipeTransform } from '@angular/core';
+import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
+
+@Pipe({ name: 'safeUrl' })
+export class SafeUrlPipe implements PipeTransform {
+    constructor(private sanitizer: DomSanitizer) {}
+
+    transform(url: string): SafeResourceUrl {
+        return this.sanitizer.bypassSecurityTrustResourceUrl(url);
+    }
+}