diff --git a/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.html b/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.html
new file mode 100644
index 000000000..fa279c019
--- /dev/null
+++ b/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.html
@@ -0,0 +1,17 @@
+<redaction-side-nav title="type">
+    <ng-container *ngFor="let item of items[type]">
+        <div
+            *ngIf="
+                (!item.onlyAdmin || permissionsService.isAdmin()) &&
+                (!item.onlyDevMode || userPreferenceService.areDevFeaturesEnabled) &&
+                (!item.userManagerOnly || permissionsService.canManageUsers())
+            "
+            [routerLinkActiveOptions]="{ exact: false }"
+            [routerLink]="prefix + item.screen"
+            class="item"
+            routerLinkActive="active"
+        >
+            {{ item.label || item.screen | translate }}
+        </div>
+    </ng-container>
+</redaction-side-nav>
diff --git a/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.scss b/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/apps/red-ui/src/app/modules/admin/components/side-nav/side-nav.component.ts b/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.ts
similarity index 90%
rename from apps/red-ui/src/app/modules/admin/components/side-nav/side-nav.component.ts
rename to apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.ts
index 17bc80440..ef5dd63ea 100644
--- a/apps/red-ui/src/app/modules/admin/components/side-nav/side-nav.component.ts
+++ b/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.ts
@@ -4,11 +4,11 @@ import { UserPreferenceService } from '@services/user-preference.service';
 import { AppStateService } from '@state/app-state.service';
 
 @Component({
-    selector: 'redaction-side-nav',
-    templateUrl: './side-nav.component.html',
-    styleUrls: ['./side-nav.component.scss']
+    selector: 'redaction-admin-side-nav',
+    templateUrl: './admin-side-nav.component.html',
+    styleUrls: ['./admin-side-nav.component.scss']
 })
-export class SideNavComponent {
+export class AdminSideNavComponent {
     @Input() type: 'settings' | 'project-templates';
 
     items: {
diff --git a/apps/red-ui/src/app/modules/admin/admin.module.ts b/apps/red-ui/src/app/modules/admin/admin.module.ts
index 843569443..a4e541468 100644
--- a/apps/red-ui/src/app/modules/admin/admin.module.ts
+++ b/apps/red-ui/src/app/modules/admin/admin.module.ts
@@ -32,7 +32,7 @@ import { UsersStatsComponent } from './components/users-stats/users-stats.compon
 import { ConfirmDeleteUsersDialogComponent } from './dialogs/confirm-delete-users-dialog/confirm-delete-users-dialog.component';
 import { FileAttributesCsvImportDialogComponent } from './dialogs/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component';
 import { ActiveFieldsListingComponent } from './dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component';
-import { SideNavComponent } from './components/side-nav/side-nav.component';
+import { AdminSideNavComponent } from './admin-side-nav/admin-side-nav.component';
 
 const dialogs = [
     AddEditRuleSetDialogComponent,
@@ -43,7 +43,8 @@ const dialogs = [
     SmtpAuthDialogComponent,
     AddEditUserDialogComponent,
     ConfirmDeleteUsersDialogComponent,
-    FileAttributesCsvImportDialogComponent
+    FileAttributesCsvImportDialogComponent,
+    AdminSideNavComponent
 ];
 
 const screens = [
@@ -68,7 +69,6 @@ const components = [
     ComboSeriesVerticalComponent,
     UsersStatsComponent,
     ActiveFieldsListingComponent,
-    SideNavComponent,
 
     ...dialogs,
     ...screens
diff --git a/apps/red-ui/src/app/modules/admin/components/side-nav/side-nav.component.html b/apps/red-ui/src/app/modules/admin/components/side-nav/side-nav.component.html
deleted file mode 100644
index 4ff6bb202..000000000
--- a/apps/red-ui/src/app/modules/admin/components/side-nav/side-nav.component.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<div [translate]="type" class="all-caps-label"></div>
-
-<ng-container *ngFor="let item of items[type]">
-    <div
-        *ngIf="
-            (!item.onlyAdmin || permissionsService.isAdmin()) &&
-            (!item.onlyDevMode || userPreferenceService.areDevFeaturesEnabled) &&
-            (!item.userManagerOnly || permissionsService.canManageUsers())
-        "
-        [routerLinkActiveOptions]="{ exact: false }"
-        [routerLink]="prefix + item.screen"
-        class="item"
-        routerLinkActive="active"
-    >
-        {{ item.label || item.screen | translate }}
-    </div>
-</ng-container>
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-rule-set-dialog/add-edit-rule-set-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-rule-set-dialog/add-edit-rule-set-dialog.component.html
index bb26db86a..b17a80f9e 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-rule-set-dialog/add-edit-rule-set-dialog.component.html
+++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-rule-set-dialog/add-edit-rule-set-dialog.component.html
@@ -88,7 +88,7 @@
             </div>
 
             <p class="download-includes">{{ 'download-includes' | translate }}</p>
-            <div class="space-between">
+            <div class="d-flex">
                 <redaction-select
                     [label]="
                         'report-type.label'
@@ -97,7 +97,7 @@
                     "
                     [options]="reportTypesEnum"
                     [translatePrefix]="'report-type.'"
-                    class="w-410"
+                    class="mr-16"
                     formControlName="reportTypes"
                 ></redaction-select>
                 <redaction-select
@@ -111,7 +111,6 @@
                     "
                     [options]="downloadTypesEnum"
                     [translatePrefix]="'download-type.'"
-                    class="w-410"
                     formControlName="downloadFileTypes"
                 ></redaction-select>
             </div>
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-rule-set-dialog/add-edit-rule-set-dialog.component.scss b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-rule-set-dialog/add-edit-rule-set-dialog.component.scss
index 4c179d996..b5fcaf6e8 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-rule-set-dialog/add-edit-rule-set-dialog.component.scss
+++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-rule-set-dialog/add-edit-rule-set-dialog.component.scss
@@ -22,8 +22,8 @@
     }
 }
 
-.w-410 {
-    width: 410px;
+redaction-select {
+    flex: 1;
 }
 
 .download-includes {
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.html b/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.html
index 6a2674d3f..a10024c60 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.html
+++ b/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.html
@@ -37,7 +37,7 @@
             text="file-attributes-csv-import.table-header.actions.type"
         ></redaction-chevron-button>
 
-        <mat-menu #readOnlyMenu="matMenu" class="no-padding-bottom">
+        <mat-menu #readOnlyMenu="matMenu" class="padding-bottom-8">
             <button
                 (click)="setAttributeForSelection('readonly', true)"
                 mat-menu-item
@@ -50,7 +50,7 @@
             ></button>
         </mat-menu>
 
-        <mat-menu #typeMenu="matMenu" class="no-padding-bottom">
+        <mat-menu #typeMenu="matMenu" class="padding-bottom-8">
             <button
                 (click)="setAttributeForSelection('type', type)"
                 *ngFor="let type of typeOptions"
diff --git a/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.html
index c09f65c50..8dde51fe2 100644
--- a/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.html
@@ -1,7 +1,7 @@
 <section class="settings">
     <div class="overlay-shadow"></div>
 
-    <redaction-side-nav type="settings"></redaction-side-nav>
+    <redaction-admin-side-nav type="settings"></redaction-admin-side-nav>
 
     <div>
         <div class="page-header">
diff --git a/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.html
index b4e23db7a..7a9514dd2 100644
--- a/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.html
@@ -17,7 +17,7 @@
     <div class="red-content-inner">
         <div class="overlay-shadow"></div>
 
-        <redaction-side-nav type="project-templates"></redaction-side-nav>
+        <redaction-admin-side-nav type="project-templates"></redaction-admin-side-nav>
 
         <div class="content-container">
             <div class="header-item">
diff --git a/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.html
index a8c8201e9..89b842d01 100644
--- a/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.html
@@ -17,7 +17,7 @@
     <div class="red-content-inner">
         <div class="overlay-shadow"></div>
 
-        <redaction-side-nav type="project-templates"></redaction-side-nav>
+        <redaction-admin-side-nav type="project-templates"></redaction-admin-side-nav>
 
         <div class="content-container">
             <div class="header-item">
diff --git a/apps/red-ui/src/app/modules/admin/screens/dictionary-overview/dictionary-overview-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/dictionary-overview/dictionary-overview-screen.component.html
index 09940b750..91f14e497 100644
--- a/apps/red-ui/src/app/modules/admin/screens/dictionary-overview/dictionary-overview-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/dictionary-overview/dictionary-overview-screen.component.html
@@ -60,7 +60,7 @@
     <div class="flex red-content-inner">
         <div class="overlay-shadow"></div>
 
-        <redaction-side-nav type="project-templates"></redaction-side-nav>
+        <redaction-admin-side-nav type="project-templates"></redaction-admin-side-nav>
 
         <redaction-dictionary-manager
             [initialDictionaryEntries]="entries"
diff --git a/apps/red-ui/src/app/modules/admin/screens/dictionary-overview/dictionary-overview-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/dictionary-overview/dictionary-overview-screen.component.scss
index 4d87564aa..70de05190 100644
--- a/apps/red-ui/src/app/modules/admin/screens/dictionary-overview/dictionary-overview-screen.component.scss
+++ b/apps/red-ui/src/app/modules/admin/screens/dictionary-overview/dictionary-overview-screen.component.scss
@@ -28,3 +28,7 @@
         margin-right: 8px;
     }
 }
+
+redaction-dictionary-manager {
+    padding: 15px;
+}
diff --git a/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.html
index 40f512e2e..4dcd2727d 100644
--- a/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.html
@@ -1,7 +1,7 @@
 <section class="settings">
     <div class="overlay-shadow"></div>
 
-    <redaction-side-nav type="settings"></redaction-side-nav>
+    <redaction-admin-side-nav type="settings"></redaction-admin-side-nav>
 
     <div>
         <div class="page-header">
diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html
index d4f6afcef..534485a2d 100644
--- a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html
@@ -15,7 +15,7 @@
     <div class="red-content-inner">
         <div class="overlay-shadow"></div>
 
-        <redaction-side-nav type="project-templates"></redaction-side-nav>
+        <redaction-admin-side-nav type="project-templates"></redaction-admin-side-nav>
 
         <div class="content-container">
             <div class="header-item">
diff --git a/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.html
index b2ea2231b..dd4692bc2 100644
--- a/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/license-information/license-information-screen.component.html
@@ -1,7 +1,7 @@
 <section class="settings">
     <div class="overlay-shadow"></div>
 
-    <redaction-side-nav type="settings"></redaction-side-nav>
+    <redaction-admin-side-nav type="settings"></redaction-admin-side-nav>
 
     <div *ngIf="viewReady">
         <div class="page-header">
diff --git a/apps/red-ui/src/app/modules/admin/screens/rule-sets-listing/rule-sets-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/rule-sets-listing/rule-sets-listing-screen.component.html
index 80e07c98c..d4d946aff 100644
--- a/apps/red-ui/src/app/modules/admin/screens/rule-sets-listing/rule-sets-listing-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/rule-sets-listing/rule-sets-listing-screen.component.html
@@ -1,7 +1,7 @@
 <section class="settings">
     <div class="overlay-shadow"></div>
 
-    <redaction-side-nav type="settings"></redaction-side-nav>
+    <redaction-admin-side-nav type="settings"></redaction-admin-side-nav>
 
     <div>
         <div class="page-header">
diff --git a/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen.component.html
index 8a4495749..dcac0f4c7 100644
--- a/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen.component.html
@@ -17,7 +17,7 @@
     <div class="red-content-inner">
         <div class="overlay-shadow"></div>
 
-        <redaction-side-nav type="project-templates"></redaction-side-nav>
+        <redaction-admin-side-nav type="project-templates"></redaction-admin-side-nav>
 
         <div class="editor-container">
             <ace-editor
diff --git a/apps/red-ui/src/app/modules/admin/screens/smtp-config/smtp-config-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/smtp-config/smtp-config-screen.component.html
index 7d294e8a6..ebb986f5f 100644
--- a/apps/red-ui/src/app/modules/admin/screens/smtp-config/smtp-config-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/smtp-config/smtp-config-screen.component.html
@@ -1,7 +1,7 @@
 <section class="settings">
     <div class="overlay-shadow"></div>
 
-    <redaction-side-nav type="settings"></redaction-side-nav>
+    <redaction-admin-side-nav type="settings"></redaction-admin-side-nav>
 
     <div>
         <div class="page-header">
diff --git a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html
index 733292754..297852b3c 100644
--- a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html
@@ -1,7 +1,7 @@
 <section class="settings">
     <div class="overlay-shadow"></div>
 
-    <redaction-side-nav type="settings"></redaction-side-nav>
+    <redaction-admin-side-nav type="settings"></redaction-admin-side-nav>
 
     <div>
         <div class="page-header">
diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.html
index 950e118b1..5ad2ec3a3 100644
--- a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.html
@@ -15,7 +15,7 @@
     <div class="red-content-inner">
         <div class="overlay-shadow"></div>
 
-        <redaction-side-nav type="project-templates"></redaction-side-nav>
+        <redaction-admin-side-nav type="project-templates"></redaction-admin-side-nav>
 
         <div class="content-container">
             <div #viewer class="viewer"></div>
diff --git a/apps/red-ui/src/app/modules/projects/components/project-listing-actions/project-listing-actions.component.html b/apps/red-ui/src/app/modules/projects/components/project-listing-actions/project-listing-actions.component.html
index 199708e26..1e5d886e0 100644
--- a/apps/red-ui/src/app/modules/projects/components/project-listing-actions/project-listing-actions.component.html
+++ b/apps/red-ui/src/app/modules/projects/components/project-listing-actions/project-listing-actions.component.html
@@ -18,15 +18,6 @@
     >
     </redaction-circle-button>
 
-    <redaction-circle-button
-        (action)="openAssignProjectOwnerDialog($event, project)"
-        *ngIf="permissionsService.isManager()"
-        icon="red:assign"
-        tooltip="project-listing.assign.action"
-        type="dark-bg"
-    >
-    </redaction-circle-button>
-
     <redaction-circle-button
         (action)="reanalyseProject($event, project)"
         *ngIf="permissionsService.displayReanalyseBtn(project)"
diff --git a/apps/red-ui/src/app/modules/projects/components/project-listing-actions/project-listing-actions.component.ts b/apps/red-ui/src/app/modules/projects/components/project-listing-actions/project-listing-actions.component.ts
index 86213eace..82c0f20e7 100644
--- a/apps/red-ui/src/app/modules/projects/components/project-listing-actions/project-listing-actions.component.ts
+++ b/apps/red-ui/src/app/modules/projects/components/project-listing-actions/project-listing-actions.component.ts
@@ -25,16 +25,6 @@ export class ProjectListingActionsComponent {
         private readonly _fileManagementControllerService: FileManagementControllerService
     ) {}
 
-    openAssignProjectOwnerDialog($event: MouseEvent, project: ProjectWrapper) {
-        this._dialogService.openAssignProjectMembersAndOwnerDialog(
-            $event,
-            project,
-            (pw: ProjectWrapper) => {
-                this.actionPerformed.emit(pw);
-            }
-        );
-    }
-
     openDeleteProjectDialog($event: MouseEvent, project: ProjectWrapper) {
         this._dialogService.openDeleteProjectDialog($event, project, () => {
             this.actionPerformed.emit();
diff --git a/apps/red-ui/src/app/modules/projects/components/team-members-manager/team-members-manager.component.html b/apps/red-ui/src/app/modules/projects/components/team-members-manager/team-members-manager.component.html
new file mode 100644
index 000000000..c1569318c
--- /dev/null
+++ b/apps/red-ui/src/app/modules/projects/components/team-members-manager/team-members-manager.component.html
@@ -0,0 +1,80 @@
+<form (submit)="saveMembers()" [formGroup]="teamForm">
+    <div class="red-input-group w-300">
+        <mat-form-field floatLabel="always">
+            <mat-label>{{ 'assign-project-owner.dialog.single-user' | translate }}</mat-label>
+            <mat-select formControlName="owner">
+                <mat-option *ngFor="let userId of ownersSelectOptions" [value]="userId">
+                    {{ userService.getNameForId(userId) }}
+                </mat-option>
+            </mat-select>
+        </mat-form-field>
+    </div>
+    <div [translate]="'assign-project-owner.dialog.approvers'" class="all-caps-label mt-16"></div>
+    <redaction-team-members
+        (remove)="toggleSelected($event)"
+        [canAdd]="false"
+        [canRemove]="true"
+        [largeSpacing]="true"
+        [memberIds]="selectedApproversList"
+        [perLine]="13"
+        [unremovableMembers]="[selectedOwnerId]"
+    ></redaction-team-members>
+
+    <pre
+        *ngIf="selectedApproversList.length === 0"
+        [innerHTML]="'assign-project-owner.dialog.no-approvers' | translate"
+        class="info"
+    ></pre>
+
+    <div [translate]="'assign-project-owner.dialog.reviewers'" class="all-caps-label mt-16"></div>
+    <redaction-team-members
+        (remove)="toggleSelected($event)"
+        [canAdd]="false"
+        [canRemove]="true"
+        [largeSpacing]="true"
+        [memberIds]="selectedReviewersList"
+        [perLine]="13"
+        [unremovableMembers]="[selectedOwnerId]"
+    ></redaction-team-members>
+
+    <pre
+        *ngIf="selectedReviewersList.length === 0"
+        [innerHTML]="'assign-project-owner.dialog.no-reviewers' | translate"
+        class="info"
+    ></pre>
+
+    <redaction-search-input
+        [form]="searchForm"
+        [placeholder]="'assign-project-owner.dialog.search' | translate"
+        [width]="560"
+        class="search-container"
+    ></redaction-search-input>
+
+    <div class="members-list">
+        <div
+            (click)="!isOwner(userId) && toggleSelected(userId)"
+            *ngFor="let userId of membersSelectOptions"
+            [class.selected]="isMemberSelected(userId)"
+        >
+            <redaction-initials-avatar
+                [userId]="userId"
+                [withName]="true"
+                size="large"
+            ></redaction-initials-avatar>
+            <div class="actions">
+                <div
+                    (click)="toggleApprover(userId, $event)"
+                    *ngIf="!isOwner(userId)"
+                    class="make-approver"
+                >
+                    <redaction-round-checkbox
+                        [active]="isApprover(userId)"
+                        class="mr-8"
+                    ></redaction-round-checkbox>
+                    <span [translate]="'assign-project-owner.dialog.make-approver'"></span>
+                </div>
+                <mat-icon *ngIf="!isOwner(userId)" svgIcon="red:check"></mat-icon>
+            </div>
+        </div>
+    </div>
+</form>
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/assign-owner-dialog/assign-owner-dialog.component.scss b/apps/red-ui/src/app/modules/projects/components/team-members-manager/team-members-manager.component.scss
similarity index 93%
rename from apps/red-ui/src/app/modules/projects/dialogs/assign-owner-dialog/assign-owner-dialog.component.scss
rename to apps/red-ui/src/app/modules/projects/components/team-members-manager/team-members-manager.component.scss
index af18d0899..4fe9ada25 100644
--- a/apps/red-ui/src/app/modules/projects/dialogs/assign-owner-dialog/assign-owner-dialog.component.scss
+++ b/apps/red-ui/src/app/modules/projects/components/team-members-manager/team-members-manager.component.scss
@@ -1,9 +1,5 @@
 @import '../../../../../assets/styles/red-mixins';
 
-.no-padding-bottom {
-    padding-bottom: 0;
-}
-
 .search-container {
     margin-top: 16px;
 }
@@ -14,8 +10,6 @@ redaction-team-members {
 }
 
 .members-list {
-    max-height: 220px;
-    height: 220px;
     margin-top: 16px;
     overflow-y: hidden;
     width: 587px;
@@ -58,6 +52,7 @@ redaction-team-members {
         &.selected,
         &:hover {
             background-color: $grey-2;
+
             .actions {
                 display: flex;
             }
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/assign-owner-dialog/assign-owner-dialog.component.ts b/apps/red-ui/src/app/modules/projects/components/team-members-manager/team-members-manager.component.ts
similarity index 58%
rename from apps/red-ui/src/app/modules/projects/dialogs/assign-owner-dialog/assign-owner-dialog.component.ts
rename to apps/red-ui/src/app/modules/projects/components/team-members-manager/team-members-manager.component.ts
index 8911d0a3a..a3fdcb81c 100644
--- a/apps/red-ui/src/app/modules/projects/dialogs/assign-owner-dialog/assign-owner-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/projects/components/team-members-manager/team-members-manager.component.ts
@@ -1,62 +1,54 @@
-import { Component, Inject } from '@angular/core';
-import { ProjectControllerService, StatusControllerService } from '@redaction/red-ui-http';
-import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { Project, ProjectControllerService, StatusControllerService } from '@redaction/red-ui-http';
 import { AppStateService } from '@state/app-state.service';
 import { UserService } from '@services/user.service';
 import { NotificationService, NotificationType } from '@services/notification.service';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-import { FileStatusWrapper } from '@models/file/file-status.wrapper';
 import { ProjectWrapper } from '@state/model/project.wrapper';
 
-class DialogData {
-    project?: ProjectWrapper;
-    files?: FileStatusWrapper[];
-    ignoreChanged?: boolean;
-}
-
 @Component({
-    selector: 'redaction-project-details-dialog',
-    templateUrl: './assign-owner-dialog.component.html',
-    styleUrls: ['./assign-owner-dialog.component.scss']
+    selector: 'redaction-team-members-manager',
+    templateUrl: './team-members-manager.component.html',
+    styleUrls: ['./team-members-manager.component.scss']
 })
-export class AssignOwnerDialogComponent {
-    usersForm: FormGroup;
+export class TeamMembersManagerComponent implements OnInit {
+    teamForm: FormGroup;
     searchForm: FormGroup;
 
+    @Input() projectWrapper: ProjectWrapper;
+
+    @Output() save = new EventEmitter<Project>();
+
     constructor(
         readonly userService: UserService,
         private readonly _projectControllerService: ProjectControllerService,
         private readonly _notificationService: NotificationService,
         private readonly _formBuilder: FormBuilder,
         private readonly _statusControllerService: StatusControllerService,
-        private readonly _appStateService: AppStateService,
-        public dialogRef: MatDialogRef<AssignOwnerDialogComponent>,
-        @Inject(MAT_DIALOG_DATA) public data: DialogData
-    ) {
-        this._loadData();
-    }
+        private readonly _appStateService: AppStateService
+    ) {}
 
-    get selectedSingleUser(): string {
-        return this.usersForm.get('singleUser').value;
+    get selectedOwnerId(): string {
+        return this.teamForm.get('owner').value;
     }
 
     get selectedApproversList(): string[] {
-        return this.usersForm.get('approvers').value;
+        return this.teamForm.get('approvers').value;
     }
 
     get selectedReviewersList(): string[] {
-        return this.selectedUsersList.filter((m) => this.selectedApproversList.indexOf(m) === -1);
+        return this.selectedMembersList.filter((m) => this.selectedApproversList.indexOf(m) === -1);
     }
 
-    get selectedUsersList(): string[] {
-        return this.usersForm.get('members').value;
+    get selectedMembersList(): string[] {
+        return this.teamForm.get('members').value;
     }
 
-    get singleUsersSelectOptions() {
+    get ownersSelectOptions() {
         return this.userService.managerUsers.map((m) => m.userId);
     }
 
-    get multiUsersSelectOptions() {
+    get membersSelectOptions() {
         const searchQuery = this.searchForm.get('query').value;
         return this.userService.eligibleUsers
             .filter((user) =>
@@ -65,50 +57,47 @@ export class AssignOwnerDialogComponent {
                     .toLowerCase()
                     .includes(searchQuery.toLowerCase())
             )
-            .filter((user) => this.selectedSingleUser !== user.userId)
+            .filter((user) => this.selectedOwnerId !== user.userId)
             .map((user) => user.userId);
     }
 
+    get valid(): boolean {
+        return this.teamForm.valid;
+    }
+
     get changed(): boolean {
-        if (this.data.ignoreChanged) {
+        if (this.projectWrapper.ownerId !== this.selectedOwnerId) {
             return true;
         }
 
-        if (this.data.project.ownerId !== this.selectedSingleUser) {
-            return true;
-        }
+        const initialMembers = this.projectWrapper.memberIds.sort();
+        const currentMembers = this.selectedMembersList.sort();
 
-        const initialMembers = this.data.project.memberIds.sort();
-        const currentMembers = this.selectedUsersList.sort();
-
-        const initialApprovers = this.data.project.approverIds.sort();
+        const initialApprovers = this.projectWrapper.approverIds.sort();
         const currentApprovers = this.selectedApproversList.sort();
 
-        if (
+        return (
             this._compareLists(initialMembers, currentMembers) ||
             this._compareLists(initialApprovers, currentApprovers)
-        ) {
-            return true;
-        }
-
-        return false;
+        );
     }
 
     isOwner(userId: string): boolean {
-        return userId === this.selectedSingleUser;
+        return userId === this.selectedOwnerId;
     }
 
-    async saveUsers() {
+    async saveMembers() {
         let result;
         try {
-            const ownerId = this.selectedSingleUser;
-            const memberIds = this.selectedUsersList;
+            const ownerId = this.selectedOwnerId;
+            const memberIds = this.selectedMembersList;
             const approverIds = this.selectedApproversList;
-            const pw = Object.assign({}, this.data.project);
+            const pw = Object.assign({}, this.projectWrapper);
             pw.project.memberIds = memberIds;
             pw.project.approverIds = approverIds;
             pw.project.ownerId = ownerId;
             result = await this._appStateService.addOrUpdateProject(pw.project);
+            this.save.emit(result);
         } catch (error) {
             this._notificationService.showToastNotification(
                 'Failed: ' + error.error ? error.error.message : error,
@@ -116,12 +105,10 @@ export class AssignOwnerDialogComponent {
                 NotificationType.ERROR
             );
         }
-
-        this.dialogRef.close(result);
     }
 
     isMemberSelected(userId: string): boolean {
-        return this.selectedUsersList.indexOf(userId) !== -1;
+        return this.selectedMembersList.indexOf(userId) !== -1;
     }
 
     isApprover(userId: string): boolean {
@@ -147,29 +134,36 @@ export class AssignOwnerDialogComponent {
 
     toggleSelected(userId: string) {
         if (this.isMemberSelected(userId)) {
-            this.selectedUsersList.splice(this.selectedUsersList.indexOf(userId), 1);
+            this.selectedMembersList.splice(this.selectedMembersList.indexOf(userId), 1);
 
             if (this.isApprover(userId)) {
                 this.selectedApproversList.splice(this.selectedApproversList.indexOf(userId), 1);
             }
         } else {
-            this.selectedUsersList.push(userId);
+            this.selectedMembersList.push(userId);
         }
     }
 
+    async ngOnInit() {
+        this._loadData();
+    }
+
+    revert() {
+        this._loadData();
+    }
+
     private _loadData() {
-        const project = this.data.project;
-        this.usersForm = this._formBuilder.group({
-            singleUser: [project?.ownerId, Validators.required],
-            approvers: [[...project?.approverIds]],
-            members: [[...project?.memberIds]]
+        this.teamForm = this._formBuilder.group({
+            owner: [this.projectWrapper?.ownerId, Validators.required],
+            approvers: [[...this.projectWrapper?.approverIds]],
+            members: [[...this.projectWrapper?.memberIds]]
         });
         this.searchForm = this._formBuilder.group({
             query: ['']
         });
-        this.usersForm.get('singleUser').valueChanges.subscribe((singleUser) => {
-            if (!this.isApprover(singleUser)) {
-                this.toggleApprover(singleUser);
+        this.teamForm.get('owner').valueChanges.subscribe((owner) => {
+            if (!this.isApprover(owner)) {
+                this.toggleApprover(owner);
             }
             // If it is an approver, it is already a member, no need to check
         });
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/add-edit-project-dialog/add-edit-project-dialog.component.html b/apps/red-ui/src/app/modules/projects/dialogs/add-project-dialog/add-project-dialog.component.html
similarity index 70%
rename from apps/red-ui/src/app/modules/projects/dialogs/add-edit-project-dialog/add-edit-project-dialog.component.html
rename to apps/red-ui/src/app/modules/projects/dialogs/add-project-dialog/add-project-dialog.component.html
index 552740c92..c543779b5 100644
--- a/apps/red-ui/src/app/modules/projects/dialogs/add-edit-project-dialog/add-edit-project-dialog.component.html
+++ b/apps/red-ui/src/app/modules/projects/dialogs/add-project-dialog/add-project-dialog.component.html
@@ -1,21 +1,12 @@
 <section class="dialog">
     <form (submit)="saveProject()" [formGroup]="projectForm">
-        <div
-            [translate]="
-                project?.projectId
-                    ? 'project-listing.add-edit-dialog.header-edit'
-                    : 'project-listing.add-edit-dialog.header-new'
-            "
-            class="dialog-header heading-l"
-        ></div>
+        <div class="dialog-header heading-l" translate="add-project-dialog.header-new"></div>
 
         <div class="dialog-content">
             <div class="red-input-group required w-300">
-                <label translate="project-listing.add-edit-dialog.form.name.label"></label>
+                <label translate="add-project-dialog.form.name.label"></label>
                 <input
-                    [placeholder]="
-                        'project-listing.add-edit-dialog.form.name.placeholder' | translate
-                    "
+                    [placeholder]="'add-project-dialog.form.name.placeholder' | translate"
                     formControlName="projectName"
                     name="projectName"
                     type="text"
@@ -24,9 +15,7 @@
 
             <div class="red-input-group required w-400">
                 <mat-form-field floatLabel="always">
-                    <mat-label>{{
-                        'project-listing.add-edit-dialog.form.template' | translate
-                    }}</mat-label>
+                    <mat-label>{{ 'add-project-dialog.form.template' | translate }}</mat-label>
                     <mat-select
                         (valueChange)="ruleSetChanged($event)"
                         formControlName="ruleSetId"
@@ -45,11 +34,9 @@
             </div>
 
             <div class="red-input-group w-400">
-                <label translate="project-listing.add-edit-dialog.form.description.label"></label>
+                <label translate="add-project-dialog.form.description.label"></label>
                 <textarea
-                    [placeholder]="
-                        'project-listing.add-edit-dialog.form.description.placeholder' | translate
-                    "
+                    [placeholder]="'add-project-dialog.form.description.placeholder' | translate"
                     formControlName="description"
                     name="description"
                     redactionHasScrollbar
@@ -65,7 +52,7 @@
                     class="filter-menu-checkbox"
                     color="primary"
                 >
-                    {{ 'project-listing.add-edit-dialog.form.due-date' | translate }}
+                    {{ 'add-project-dialog.form.due-date' | translate }}
                 </mat-checkbox>
 
                 <div *ngIf="hasDueDate" class="red-input-group datepicker-wrapper">
@@ -82,35 +69,33 @@
             </div>
 
             <p class="download-includes">{{ 'download-includes' | translate }}</p>
-            <div class="space-between">
+            <div class="d-flex">
                 <redaction-select
                     [label]="'report-type.label' | translate: { length: reportTypesLength }"
                     [options]="reportTypesEnum"
                     [translatePrefix]="'report-type.'"
-                    class="w-410"
+                    class="mr-16"
                     formControlName="reportTypes"
                 ></redaction-select>
                 <redaction-select
                     [label]="'download-type.label' | translate: { length: downloadFileTypesLength }"
                     [options]="downloadTypesEnum"
                     [translatePrefix]="'download-type.'"
-                    class="w-410"
                     formControlName="downloadFileTypes"
                 ></redaction-select>
             </div>
         </div>
 
         <div class="dialog-actions">
-            <button [disabled]="disabled || !changed" color="primary" mat-flat-button type="submit">
-                {{ 'project-listing.add-edit-dialog.actions.save' | translate }}
+            <button [disabled]="disabled" color="primary" mat-flat-button type="submit">
+                {{ 'add-project-dialog.actions.save' | translate }}
             </button>
 
             <redaction-icon-button
                 (action)="saveProjectAndAddMembers()"
-                *ngIf="!project?.projectId"
-                [disabled]="disabled || !changed"
+                [disabled]="disabled"
                 icon="red:assign"
-                text="project-listing.add-edit-dialog.actions.save-and-add-members"
+                text="add-project-dialog.actions.save-and-add-members"
                 type="show-bg"
             ></redaction-icon-button>
         </div>
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/add-edit-project-dialog/add-edit-project-dialog.component.scss b/apps/red-ui/src/app/modules/projects/dialogs/add-project-dialog/add-project-dialog.component.scss
similarity index 91%
rename from apps/red-ui/src/app/modules/projects/dialogs/add-edit-project-dialog/add-edit-project-dialog.component.scss
rename to apps/red-ui/src/app/modules/projects/dialogs/add-project-dialog/add-project-dialog.component.scss
index 788848341..df7daf698 100644
--- a/apps/red-ui/src/app/modules/projects/dialogs/add-edit-project-dialog/add-edit-project-dialog.component.scss
+++ b/apps/red-ui/src/app/modules/projects/dialogs/add-project-dialog/add-project-dialog.component.scss
@@ -13,11 +13,11 @@
     }
 }
 
-.w-410 {
-    width: 410px;
-}
-
 .download-includes {
     margin: 16px 0 10px;
     font-weight: 500;
 }
+
+redaction-select {
+    flex: 1;
+}
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/add-edit-project-dialog/add-edit-project-dialog.component.ts b/apps/red-ui/src/app/modules/projects/dialogs/add-project-dialog/add-project-dialog.component.ts
similarity index 51%
rename from apps/red-ui/src/app/modules/projects/dialogs/add-edit-project-dialog/add-edit-project-dialog.component.ts
rename to apps/red-ui/src/app/modules/projects/dialogs/add-project-dialog/add-project-dialog.component.ts
index a61c086f1..f233a44d6 100644
--- a/apps/red-ui/src/app/modules/projects/dialogs/add-edit-project-dialog/add-edit-project-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/projects/dialogs/add-project-dialog/add-project-dialog.component.ts
@@ -1,19 +1,18 @@
-import { Component, Inject } from '@angular/core';
-import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import { Component } from '@angular/core';
+import { MatDialogRef } from '@angular/material/dialog';
 import { Project, RuleSetModel } from '@redaction/red-ui-http';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { AppStateService } from '@state/app-state.service';
-import { ProjectWrapper } from '@state/model/project.wrapper';
 import * as moment from 'moment';
 
 @Component({
-    selector: 'redaction-add-edit-project-dialog',
-    templateUrl: './add-edit-project-dialog.component.html',
-    styleUrls: ['./add-edit-project-dialog.component.scss']
+    selector: 'redaction-add-project-dialog',
+    templateUrl: './add-project-dialog.component.html',
+    styleUrls: ['./add-project-dialog.component.scss']
 })
-export class AddEditProjectDialogComponent {
+export class AddProjectDialogComponent {
     projectForm: FormGroup;
-    hasDueDate: boolean;
+    hasDueDate = false;
     downloadTypesEnum = ['ORIGINAL', 'PREVIEW', 'REDACTED'];
     reportTypesEnum = Object.values(RuleSetModel.ReportTypesEnum);
     ruleSets: RuleSetModel[];
@@ -21,22 +20,17 @@ export class AddEditProjectDialogComponent {
     constructor(
         private readonly _appStateService: AppStateService,
         private readonly _formBuilder: FormBuilder,
-        public dialogRef: MatDialogRef<AddEditProjectDialogComponent>,
-        @Inject(MAT_DIALOG_DATA) public project: ProjectWrapper
+        public dialogRef: MatDialogRef<AddProjectDialogComponent>
     ) {
         this._filterInvalidRuleSets();
         this.projectForm = this._formBuilder.group({
-            projectName: [this.project?.projectName, Validators.required],
-            ruleSetId: [
-                { value: this.project?.ruleSetId, disabled: this.project?.hasFiles },
-                Validators.required
-            ],
-            downloadFileTypes: [this.project?.project?.downloadFileTypes],
-            reportTypes: [this.project?.project?.reportTypes, Validators.required],
-            description: [this.project?.description],
-            dueDate: [this.project?.dueDate]
+            projectName: [null, Validators.required],
+            ruleSetId: [null, Validators.required],
+            downloadFileTypes: [null],
+            reportTypes: [null, Validators.required],
+            description: [null],
+            dueDate: [null]
         });
-        this.hasDueDate = !!this.project?.dueDate;
     }
 
     get reportTypesLength() {
@@ -51,34 +45,6 @@ export class AddEditProjectDialogComponent {
             : 0;
     }
 
-    get changed() {
-        if (!this.project) {
-            return true;
-        }
-
-        for (const key of Object.keys(this.projectForm.getRawValue())) {
-            if (key === 'dueDate') {
-                if (this.hasDueDate !== !!this.project.dueDate) {
-                    return true;
-                }
-                if (
-                    this.hasDueDate &&
-                    !moment(this.project.dueDate).isSame(moment(this.projectForm.get(key).value))
-                ) {
-                    return true;
-                }
-            } else if (key === 'downloadFileTypes' || key === 'reportTypes') {
-                if (this.project.project[key] !== this.projectForm.get(key).value) {
-                    return true;
-                }
-            } else if (this.project[key] !== this.projectForm.get(key).value) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
     get disabled() {
         if (this.hasDueDate && this.projectForm.get('dueDate').value === null) {
             return true;
@@ -89,7 +55,6 @@ export class AddEditProjectDialogComponent {
 
     async saveProject() {
         const project: Project = this._formToObject();
-        project.projectId = this.project?.projectId;
 
         const foundProject = this._appStateService.allProjects.find(
             (p) => p.project.projectId === project.projectId
@@ -106,7 +71,6 @@ export class AddEditProjectDialogComponent {
 
     async saveProjectAndAddMembers() {
         const project: Project = this._formToObject();
-        project.projectId = this.project?.projectId;
         const savedProject = await this._appStateService.addOrUpdateProject(project);
         if (savedProject) {
             this.dialogRef.close({ addMembers: true, project: savedProject });
@@ -114,28 +78,22 @@ export class AddEditProjectDialogComponent {
     }
 
     ruleSetChanged(ruleSetId) {
-        // if project doesn't yet exist -> add mode
-        if (!this.project?.projectId) {
-            // get current selected ruleSet
-            const ruleSet = this.ruleSets.find((r) => r.ruleSetId === ruleSetId);
-            if (ruleSet) {
-                // update dropdown values
-                this.projectForm.patchValue(
-                    {
-                        downloadFileTypes: ruleSet.downloadFileTypes,
-                        reportTypes: ruleSet.reportTypes
-                    },
-                    { emitEvent: false }
-                );
-            }
+        // get current selected ruleSet
+        const ruleSet = this.ruleSets.find((r) => r.ruleSetId === ruleSetId);
+        if (ruleSet) {
+            // update dropdown values
+            this.projectForm.patchValue(
+                {
+                    downloadFileTypes: ruleSet.downloadFileTypes,
+                    reportTypes: ruleSet.reportTypes
+                },
+                { emitEvent: false }
+            );
         }
     }
 
     private _filterInvalidRuleSets() {
         this.ruleSets = this._appStateService.ruleSets.filter((r) => {
-            if (this.project?.ruleSetId === r.ruleSetId) {
-                return true;
-            }
             const notYetValid = !!r.validFrom && moment(r.validFrom).isAfter(moment());
             const notValidAnymore = !!r.validTo && moment(r.validTo).add(1, 'd').isBefore(moment());
             return !(notYetValid || notValidAnymore);
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/assign-owner-dialog/assign-owner-dialog.component.html b/apps/red-ui/src/app/modules/projects/dialogs/assign-owner-dialog/assign-owner-dialog.component.html
deleted file mode 100644
index 4ed0f2082..000000000
--- a/apps/red-ui/src/app/modules/projects/dialogs/assign-owner-dialog/assign-owner-dialog.component.html
+++ /dev/null
@@ -1,120 +0,0 @@
-<section class="dialog">
-    <div [translate]="'assign-project-owner.dialog.title'" class="dialog-header heading-l"></div>
-
-    <form (submit)="saveUsers()" [formGroup]="usersForm">
-        <div class="dialog-content no-padding-bottom">
-            <div class="red-input-group w-300">
-                <mat-form-field floatLabel="always">
-                    <mat-label>{{
-                        'assign-project-owner.dialog.single-user' | translate
-                    }}</mat-label>
-                    <mat-select formControlName="singleUser">
-                        <mat-option
-                            *ngFor="let userId of singleUsersSelectOptions"
-                            [value]="userId"
-                        >
-                            {{ userService.getNameForId(userId) }}
-                        </mat-option>
-                    </mat-select>
-                </mat-form-field>
-            </div>
-            <div
-                [translate]="'assign-project-owner.dialog.approvers'"
-                class="all-caps-label mt-16"
-            ></div>
-            <redaction-team-members
-                (remove)="toggleSelected($event)"
-                [canAdd]="false"
-                [canRemove]="true"
-                [largeSpacing]="true"
-                [memberIds]="selectedApproversList"
-                [perLine]="13"
-                [unremovableMembers]="[selectedSingleUser]"
-            ></redaction-team-members>
-
-            <pre
-                *ngIf="selectedApproversList.length === 0"
-                [innerHTML]="'assign-project-owner.dialog.no-approvers' | translate"
-                class="info"
-            ></pre>
-
-            <div
-                [translate]="'assign-project-owner.dialog.reviewers'"
-                class="all-caps-label mt-16"
-            ></div>
-            <redaction-team-members
-                (remove)="toggleSelected($event)"
-                [canAdd]="false"
-                [canRemove]="true"
-                [largeSpacing]="true"
-                [memberIds]="selectedReviewersList"
-                [perLine]="13"
-                [unremovableMembers]="[selectedSingleUser]"
-            ></redaction-team-members>
-
-            <pre
-                *ngIf="selectedReviewersList.length === 0"
-                [innerHTML]="'assign-project-owner.dialog.no-reviewers' | translate"
-                class="info"
-            ></pre>
-
-            <redaction-search-input
-                [form]="searchForm"
-                [placeholder]="'assign-project-owner.dialog.search' | translate"
-                [width]="560"
-                class="search-container"
-            ></redaction-search-input>
-
-            <div class="members-list">
-                <div
-                    (click)="!isOwner(userId) && toggleSelected(userId)"
-                    *ngFor="let userId of multiUsersSelectOptions"
-                    [class.selected]="isMemberSelected(userId)"
-                >
-                    <redaction-initials-avatar
-                        [userId]="userId"
-                        [withName]="true"
-                        size="large"
-                    ></redaction-initials-avatar>
-                    <div class="actions">
-                        <div
-                            *ngIf="!isOwner(userId)"
-                            (click)="toggleApprover(userId, $event)"
-                            class="make-approver"
-                        >
-                            <redaction-round-checkbox
-                                [active]="isApprover(userId)"
-                                class="mr-8"
-                            ></redaction-round-checkbox>
-                            <span [translate]="'assign-project-owner.dialog.make-approver'"></span>
-                        </div>
-                        <mat-icon *ngIf="!isOwner(userId)" svgIcon="red:check"></mat-icon>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div class="dialog-actions">
-            <button
-                [disabled]="!usersForm.valid || !changed"
-                color="primary"
-                mat-flat-button
-                type="submit"
-            >
-                {{ 'assign-project-owner.dialog.save' | translate }}
-            </button>
-
-            <div
-                [translate]="'assign-project-owner.dialog.cancel'"
-                class="all-caps-label pointer cancel"
-                mat-dialog-close
-            ></div>
-        </div>
-    </form>
-
-    <redaction-circle-button
-        class="dialog-close"
-        icon="red:close"
-        mat-dialog-close
-    ></redaction-circle-button>
-</section>
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.scss b/apps/red-ui/src/app/modules/projects/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.scss
index af18d0899..e69de29bb 100644
--- a/apps/red-ui/src/app/modules/projects/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.scss
+++ b/apps/red-ui/src/app/modules/projects/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.scss
@@ -1,70 +0,0 @@
-@import '../../../../../assets/styles/red-mixins';
-
-.no-padding-bottom {
-    padding-bottom: 0;
-}
-
-.search-container {
-    margin-top: 16px;
-}
-
-redaction-team-members {
-    margin-top: -4px;
-    display: block;
-}
-
-.members-list {
-    max-height: 220px;
-    height: 220px;
-    margin-top: 16px;
-    overflow-y: hidden;
-    width: 587px;
-
-    &:hover {
-        overflow-y: auto;
-        @include scroll-bar;
-    }
-
-    > div {
-        margin-bottom: 2px;
-        padding: 3px 5px;
-        border-radius: 4px;
-        cursor: pointer;
-        position: relative;
-        transition: background-color ease-in-out 0.1s;
-        width: 560px;
-        box-sizing: border-box;
-
-        .make-approver {
-            display: flex;
-            align-items: center;
-        }
-
-        .actions {
-            display: none;
-            position: absolute;
-            right: 13px;
-            top: 0;
-            height: 38px;
-            align-items: center;
-
-            mat-icon {
-                width: 14px;
-                height: 14px;
-                margin-left: 24px;
-            }
-        }
-
-        &.selected,
-        &:hover {
-            background-color: $grey-2;
-            .actions {
-                display: flex;
-            }
-        }
-    }
-}
-
-.info {
-    margin-top: 4px;
-}
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/dossier-dictionary-dialog/dossier-dictionary-dialog.component.scss b/apps/red-ui/src/app/modules/projects/dialogs/dossier-dictionary-dialog/dossier-dictionary-dialog.component.scss
index b02797090..0434c4524 100644
--- a/apps/red-ui/src/app/modules/projects/dialogs/dossier-dictionary-dialog/dossier-dictionary-dialog.component.scss
+++ b/apps/red-ui/src/app/modules/projects/dialogs/dossier-dictionary-dialog/dossier-dictionary-dialog.component.scss
@@ -1,4 +1,5 @@
 .dialog-content {
     height: calc(90vh - 160px);
-    padding: 12px 12px 0;
+    box-sizing: border-box;
+    padding-bottom: 24px;
 }
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/dossier-dictionary-dialog/dossier-dictionary-dialog.component.ts b/apps/red-ui/src/app/modules/projects/dialogs/dossier-dictionary-dialog/dossier-dictionary-dialog.component.ts
index d5224db13..8e45be118 100644
--- a/apps/red-ui/src/app/modules/projects/dialogs/dossier-dictionary-dialog/dossier-dictionary-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/projects/dialogs/dossier-dictionary-dialog/dossier-dictionary-dialog.component.ts
@@ -12,11 +12,10 @@ import { PermissionsService } from '../../../../services/permissions.service';
     styleUrls: ['./dossier-dictionary-dialog.component.scss']
 })
 export class DossierDictionaryDialogComponent {
+    canEdit = false;
     @ViewChild('dictionaryManager', { static: false })
     private _dictionaryManager: DictionaryManagerComponent;
 
-    canEdit = false;
-
     constructor(
         public permissionsService: PermissionsService,
         public dialogRef: MatDialogRef<DossierDictionaryDialogComponent>,
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/dictionary/edit-project-dictionary.component.html b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/dictionary/edit-project-dictionary.component.html
new file mode 100644
index 000000000..9a82a73a6
--- /dev/null
+++ b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/dictionary/edit-project-dictionary.component.html
@@ -0,0 +1,5 @@
+<redaction-dictionary-manager
+    [canEdit]="canEdit"
+    [initialDictionaryEntries]="projectWrapper.type?.entries || []"
+    [withFloatingActions]="false"
+></redaction-dictionary-manager>
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/dictionary/edit-project-dictionary.component.scss b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/dictionary/edit-project-dictionary.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/dictionary/edit-project-dictionary.component.ts b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/dictionary/edit-project-dictionary.component.ts
new file mode 100644
index 000000000..21a205fb5
--- /dev/null
+++ b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/dictionary/edit-project-dictionary.component.ts
@@ -0,0 +1,62 @@
+import { Component, EventEmitter, Input, Output, ViewChild } from '@angular/core';
+import { AppStateService } from '../../../../../state/app-state.service';
+import { ProjectWrapper } from '../../../../../state/model/project.wrapper';
+import { EditProjectSectionInterface } from '../edit-project-section.interface';
+import { DictionarySaveService } from '../../../../shared/services/dictionary-save.service';
+import { DictionaryManagerComponent } from '../../../../shared/components/dictionary-manager/dictionary-manager.component';
+import { PermissionsService } from '../../../../../services/permissions.service';
+
+@Component({
+    selector: 'redaction-edit-project-dictionary',
+    templateUrl: './edit-project-dictionary.component.html',
+    styleUrls: ['./edit-project-dictionary.component.scss']
+})
+export class EditProjectDictionaryComponent implements EditProjectSectionInterface {
+    @Input() projectWrapper: ProjectWrapper;
+    @Output() updateProject = new EventEmitter<any>();
+    canEdit = false;
+    @ViewChild(DictionaryManagerComponent, { static: false })
+    private _dictionaryManager: DictionaryManagerComponent;
+
+    constructor(
+        private readonly _appStateService: AppStateService,
+        private readonly _dictionarySaveService: DictionarySaveService,
+        private readonly _permissionsService: PermissionsService
+    ) {
+        this.canEdit =
+            this._permissionsService.isProjectMember(this.projectWrapper) ||
+            this._permissionsService.isAdmin();
+    }
+
+    get changed() {
+        return this._dictionaryManager.hasChanges;
+    }
+
+    get disabled() {
+        return !this.canEdit;
+    }
+
+    save() {
+        this._dictionarySaveService
+            .saveEntries(
+                this._dictionaryManager.currentDictionaryEntries,
+                this._dictionaryManager.initialDictionaryEntries,
+                this.projectWrapper.ruleSetId,
+                'dossier_redaction',
+                this.projectWrapper.projectId,
+                false
+            )
+            .subscribe(async () => {
+                await this._appStateService.updateProjectDictionaryVersion(this.projectWrapper);
+                this._appStateService.updateProjectDictionary(
+                    this.projectWrapper.ruleSetId,
+                    this.projectWrapper.projectId
+                );
+                this.updateProject.emit();
+            });
+    }
+
+    revert() {
+        this._dictionaryManager.revert();
+    }
+}
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/download-package/edit-project-download-package.component.html b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/download-package/edit-project-download-package.component.html
new file mode 100644
index 000000000..00aa63696
--- /dev/null
+++ b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/download-package/edit-project-download-package.component.html
@@ -0,0 +1,15 @@
+<form [formGroup]="projectForm">
+    <redaction-select
+        [label]="'report-type.label' | translate: { length: reportTypesLength }"
+        [options]="reportTypesEnum"
+        [translatePrefix]="'report-type.'"
+        class="mr-16"
+        formControlName="reportTypes"
+    ></redaction-select>
+    <redaction-select
+        [label]="'download-type.label' | translate: { length: downloadFileTypesLength }"
+        [options]="downloadTypesEnum"
+        [translatePrefix]="'download-type.'"
+        formControlName="downloadFileTypes"
+    ></redaction-select>
+</form>
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/download-package/edit-project-download-package.component.scss b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/download-package/edit-project-download-package.component.scss
new file mode 100644
index 000000000..d6a46a650
--- /dev/null
+++ b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/download-package/edit-project-download-package.component.scss
@@ -0,0 +1,15 @@
+@import '../../../../../../assets/styles/red-variables';
+
+.download-includes {
+    margin: 16px 0 10px;
+    font-weight: 500;
+}
+
+redaction-select {
+    flex: 1;
+}
+
+form {
+    height: calc(100% - 44px);
+    display: flex;
+}
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/download-package/edit-project-download-package.component.ts b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/download-package/edit-project-download-package.component.ts
new file mode 100644
index 000000000..812b3a0bc
--- /dev/null
+++ b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/download-package/edit-project-download-package.component.ts
@@ -0,0 +1,87 @@
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { RuleSetModel } from '@redaction/red-ui-http';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { AppStateService } from '../../../../../state/app-state.service';
+import { ProjectWrapper } from '../../../../../state/model/project.wrapper';
+import { EditProjectSectionInterface } from '../edit-project-section.interface';
+
+@Component({
+    selector: 'redaction-edit-project-download-package',
+    templateUrl: './edit-project-download-package.component.html',
+    styleUrls: ['./edit-project-download-package.component.scss']
+})
+export class EditProjectDownloadPackageComponent implements OnInit, EditProjectSectionInterface {
+    projectForm: FormGroup;
+    downloadTypesEnum = ['ORIGINAL', 'PREVIEW', 'REDACTED'];
+    reportTypesEnum = Object.values(RuleSetModel.ReportTypesEnum);
+    ruleSets: RuleSetModel[];
+
+    @Input() projectWrapper: ProjectWrapper;
+    @Output() updateProject = new EventEmitter<any>();
+
+    constructor(
+        private readonly _appStateService: AppStateService,
+        private readonly _formBuilder: FormBuilder
+    ) {}
+
+    get reportTypesLength() {
+        return this.projectForm.controls['reportTypes']?.value?.length
+            ? this.projectForm.controls['reportTypes'].value.length
+            : 0;
+    }
+
+    get downloadFileTypesLength() {
+        return this.projectForm.controls['downloadFileTypes']?.value?.length
+            ? this.projectForm.controls['downloadFileTypes'].value.length
+            : 0;
+    }
+
+    get changed() {
+        for (const key of Object.keys(this.projectForm.getRawValue())) {
+            if (
+                this.projectWrapper.project[key].length !== this.projectForm.get(key).value.length
+            ) {
+                return true;
+            }
+
+            const originalItems = [...this.projectWrapper.project[key]].sort();
+            const newItems = [...this.projectForm.get(key).value].sort();
+
+            for (let idx = 0; idx < originalItems.length; ++idx) {
+                if (originalItems[idx] !== newItems[idx]) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    get disabled() {
+        return this.projectForm.invalid;
+    }
+
+    ngOnInit() {
+        this.projectForm = this._formBuilder.group({
+            reportTypes: [this.projectWrapper.project.reportTypes, Validators.required],
+            downloadFileTypes: [this.projectWrapper.project.downloadFileTypes]
+        });
+    }
+
+    async save() {
+        const project = {
+            ...this.projectWrapper.project,
+            downloadFileTypes: this.projectForm.get('downloadFileTypes').value,
+            reportTypes: this.projectForm.get('reportTypes').value
+        };
+        const updatedProject = await this._appStateService.addOrUpdateProject(project);
+        this.updateProject.emit(updatedProject);
+    }
+
+    revert() {
+        this.projectForm.reset({
+            downloadFileTypes: this.projectWrapper.project.downloadFileTypes,
+            reportTypes: this.projectWrapper.project.reportTypes
+        });
+    }
+}
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/edit-project-dialog.component.html b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/edit-project-dialog.component.html
new file mode 100644
index 000000000..c7f99b98e
--- /dev/null
+++ b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/edit-project-dialog.component.html
@@ -0,0 +1,90 @@
+<section class="dialog">
+    <div class="dialog-header heading-l">
+        {{ 'edit-project-dialog.header' | translate: { projectName: projectWrapper.name } }}
+    </div>
+
+    <div class="dialog-content">
+        <redaction-side-nav title="configurations">
+            <div
+                (click)="changeTab(item.key)"
+                *ngFor="let item of navItems"
+                [class.active]="item.key === activeNav"
+                [translate]="'edit-project-dialog.nav-items.' + item.key"
+                class="item"
+            ></div>
+        </redaction-side-nav>
+        <div>
+            <div class="content">
+                <div class="heading">
+                    {{
+                        'edit-project-dialog.nav-items.' +
+                            (activeNavItem.title || activeNavItem.key) | translate
+                    }}
+
+                    <div
+                        *ngIf="activeNav === 'dossier-dictionary'"
+                        class="small-label stats-subtitle"
+                    >
+                        <div>
+                            <mat-icon svgIcon="red:entries"></mat-icon>
+                            {{
+                                'edit-project-dialog.dictionary.entries'
+                                    | translate
+                                        : { length: (projectWrapper.type?.entries || []).length }
+                            }}
+                        </div>
+                    </div>
+                </div>
+
+                <redaction-edit-project-general-info
+                    (updateProject)="updatedProject($event)"
+                    *ngIf="activeNav === 'dossier-info'"
+                    [projectWrapper]="projectWrapper"
+                ></redaction-edit-project-general-info>
+
+                <redaction-edit-project-download-package
+                    (updateProject)="updatedProject($event)"
+                    *ngIf="activeNav === 'download-package'"
+                    [projectWrapper]="projectWrapper"
+                ></redaction-edit-project-download-package>
+
+                <redaction-edit-project-dictionary
+                    (updateProject)="updatedProject($event)"
+                    *ngIf="activeNav === 'dossier-dictionary'"
+                    [projectWrapper]="projectWrapper"
+                >
+                </redaction-edit-project-dictionary>
+
+                <redaction-edit-project-team-members
+                    (updateProject)="updatedProject($event)"
+                    *ngIf="activeNav === 'members'"
+                    [projectWrapper]="projectWrapper"
+                >
+                </redaction-edit-project-team-members>
+            </div>
+
+            <div class="dialog-actions">
+                <button
+                    (click)="save()"
+                    [disabled]="activeComponent?.disabled || !activeComponent?.changed"
+                    color="primary"
+                    mat-flat-button
+                >
+                    {{ 'edit-project-dialog.actions.save' | translate }}
+                </button>
+
+                <div
+                    (click)="revert()"
+                    class="all-caps-label cancel"
+                    translate="edit-project-dialog.actions.revert"
+                ></div>
+            </div>
+        </div>
+    </div>
+
+    <redaction-circle-button
+        class="dialog-close"
+        icon="red:close"
+        mat-dialog-close
+    ></redaction-circle-button>
+</section>
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/edit-project-dialog.component.scss b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/edit-project-dialog.component.scss
new file mode 100644
index 000000000..676f1d919
--- /dev/null
+++ b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/edit-project-dialog.component.scss
@@ -0,0 +1,35 @@
+@import '../../../../../assets/styles/red-variables';
+@import '../../../../../assets/styles/red-mixins';
+
+.dialog-content {
+    padding: 0;
+    margin-top: 24px;
+    border-top: 1px solid $separator;
+    display: flex;
+    height: calc(90vh - 81px);
+
+    > div {
+        width: 100%;
+
+        .content {
+            padding: 24px 32px;
+            overflow: auto;
+            @include scroll-bar;
+            height: calc(100% - 81px);
+            box-sizing: border-box;
+
+            .heading {
+                margin-bottom: 24px;
+            }
+        }
+    }
+}
+
+redaction-edit-project-dictionary {
+    display: block;
+    height: calc(100% - 74px);
+}
+
+.stats-subtitle {
+    margin-top: 6px;
+}
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/edit-project-dialog.component.ts b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/edit-project-dialog.component.ts
new file mode 100644
index 000000000..771e9490f
--- /dev/null
+++ b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/edit-project-dialog.component.ts
@@ -0,0 +1,99 @@
+import { ChangeDetectorRef, Component, Inject, ViewChild } from '@angular/core';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import { FormBuilder } from '@angular/forms';
+import { AppStateService } from '@state/app-state.service';
+import { ProjectWrapper } from '../../../../state/model/project.wrapper';
+import { EditProjectGeneralInfoComponent } from './general-info/edit-project-general-info.component';
+import { EditProjectDownloadPackageComponent } from './download-package/edit-project-download-package.component';
+import { EditProjectSectionInterface } from './edit-project-section.interface';
+import { NotificationService, NotificationType } from '../../../../services/notification.service';
+import { TranslateService } from '@ngx-translate/core';
+import { EditProjectDictionaryComponent } from './dictionary/edit-project-dictionary.component';
+import { EditProjectTeamMembersComponent } from './team-members/edit-project-team-members.component';
+
+@Component({
+    selector: 'redaction-edit-project-dialog',
+    templateUrl: './edit-project-dialog.component.html',
+    styleUrls: ['./edit-project-dialog.component.scss']
+})
+export class EditProjectDialogComponent {
+    navItems: { key: string; title?: string }[] = [
+        { key: 'dossier-info', title: 'general-info' },
+        { key: 'download-package', title: 'choose-download' },
+        { key: 'dossier-dictionary', title: 'dossier-dictionary' },
+        { key: 'members', title: 'team-members' }
+        // TODO:
+        // { key: 'project-attributes' },
+        // { key: 'report-attributes' }
+    ];
+    activeNav = 'dossier-info';
+    projectWrapper: ProjectWrapper;
+
+    @ViewChild(EditProjectGeneralInfoComponent)
+    generalInfoComponent: EditProjectGeneralInfoComponent;
+    @ViewChild(EditProjectDownloadPackageComponent)
+    downloadPackageComponent: EditProjectDownloadPackageComponent;
+    @ViewChild(EditProjectDictionaryComponent) dictionaryComponent: EditProjectDictionaryComponent;
+    @ViewChild(EditProjectTeamMembersComponent) membersComponent: EditProjectTeamMembersComponent;
+
+    constructor(
+        private readonly _appStateService: AppStateService,
+        private readonly _formBuilder: FormBuilder,
+        private readonly _notificationService: NotificationService,
+        private readonly _translateService: TranslateService,
+        private readonly _changeRef: ChangeDetectorRef,
+        public dialogRef: MatDialogRef<EditProjectDialogComponent>,
+        @Inject(MAT_DIALOG_DATA)
+        public data: { projectWrapper: ProjectWrapper; afterSave: Function }
+    ) {
+        this.projectWrapper = data.projectWrapper;
+    }
+
+    get activeNavItem(): { key: string; title?: string } {
+        return this.navItems.find((item) => item.key === this.activeNav);
+    }
+
+    get activeComponent(): EditProjectSectionInterface {
+        return {
+            'dossier-info': this.generalInfoComponent,
+            'download-package': this.downloadPackageComponent,
+            'dossier-dictionary': this.dictionaryComponent,
+            members: this.membersComponent
+        }[this.activeNav];
+    }
+
+    updatedProject(updatedProject: ProjectWrapper) {
+        this._notificationService.showToastNotification(
+            this._translateService.instant('edit-project-dialog.change-successful'),
+            null,
+            NotificationType.SUCCESS
+        );
+        if (updatedProject) {
+            this.projectWrapper = updatedProject;
+        }
+        this._changeRef.detectChanges();
+        if (this.data.afterSave) {
+            this.data.afterSave();
+        }
+    }
+
+    async save() {
+        await this.activeComponent.save();
+    }
+
+    async revert() {
+        this.activeComponent.revert();
+    }
+
+    changeTab(key: string) {
+        if (this.activeComponent.changed) {
+            this._notificationService.showToastNotification(
+                this._translateService.instant('edit-project-dialog.unsaved-changes'),
+                null,
+                NotificationType.ERROR
+            );
+            return;
+        }
+        this.activeNav = key;
+    }
+}
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/edit-project-section.interface.ts b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/edit-project-section.interface.ts
new file mode 100644
index 000000000..d0cd6896d
--- /dev/null
+++ b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/edit-project-section.interface.ts
@@ -0,0 +1,6 @@
+export interface EditProjectSectionInterface {
+    changed: boolean;
+    disabled: boolean;
+    save: Function;
+    revert: Function;
+}
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/general-info/edit-project-general-info.component.html b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/general-info/edit-project-general-info.component.html
new file mode 100644
index 000000000..1a7984ec7
--- /dev/null
+++ b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/general-info/edit-project-general-info.component.html
@@ -0,0 +1,62 @@
+<form (submit)="save()" [formGroup]="projectForm">
+    <div class="red-input-group required w-300">
+        <label translate="edit-project-dialog.general-info.form.name.label"></label>
+        <input
+            [placeholder]="'edit-project-dialog.general-info.form.name.placeholder' | translate"
+            formControlName="projectName"
+            name="projectName"
+            type="text"
+        />
+    </div>
+
+    <div class="red-input-group required w-400">
+        <mat-form-field floatLabel="always">
+            <mat-label>{{
+                'edit-project-dialog.general-info.form.template' | translate
+            }}</mat-label>
+            <mat-select formControlName="ruleSetId" style="width: 100%">
+                <mat-option
+                    *ngFor="let ruleSet of ruleSets"
+                    [matTooltip]="ruleSet.description ? ruleSet.description : ruleSet.name"
+                    [value]="ruleSet.ruleSetId"
+                    matTooltipPosition="after"
+                >
+                    {{ ruleSet.name }}
+                </mat-option>
+            </mat-select>
+        </mat-form-field>
+    </div>
+
+    <div class="red-input-group w-400">
+        <label translate="edit-project-dialog.general-info.form.description.label"></label>
+        <textarea
+            [placeholder]="
+                'edit-project-dialog.general-info.form.description.placeholder' | translate
+            "
+            formControlName="description"
+            name="description"
+            redactionHasScrollbar
+            rows="5"
+            type="text"
+        ></textarea>
+    </div>
+
+    <div class="due-date">
+        <mat-checkbox
+            (change)="hasDueDate = !hasDueDate"
+            [checked]="hasDueDate"
+            class="filter-menu-checkbox"
+            color="primary"
+        >
+            {{ 'edit-project-dialog.general-info.form.due-date' | translate }}
+        </mat-checkbox>
+
+        <div *ngIf="hasDueDate" class="red-input-group datepicker-wrapper">
+            <input [matDatepicker]="picker" formControlName="dueDate" placeholder="dd/mm/yy" />
+            <mat-datepicker-toggle [for]="picker" matSuffix>
+                <mat-icon matDatepickerToggleIcon svgIcon="red:calendar"></mat-icon>
+            </mat-datepicker-toggle>
+            <mat-datepicker #picker></mat-datepicker>
+        </div>
+    </div>
+</form>
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/general-info/edit-project-general-info.component.scss b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/general-info/edit-project-general-info.component.scss
new file mode 100644
index 000000000..1169079cb
--- /dev/null
+++ b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/general-info/edit-project-general-info.component.scss
@@ -0,0 +1,14 @@
+@import '../../../../../../assets/styles/red-variables';
+
+.due-date {
+    margin-top: 16px;
+    min-height: 34px;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+
+    mat-checkbox {
+        width: fit-content;
+        margin-right: 16px;
+    }
+}
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/general-info/edit-project-general-info.component.ts b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/general-info/edit-project-general-info.component.ts
new file mode 100644
index 000000000..c1190a3c0
--- /dev/null
+++ b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/general-info/edit-project-general-info.component.ts
@@ -0,0 +1,106 @@
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { RuleSetModel } from '@redaction/red-ui-http';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { AppStateService } from '../../../../../state/app-state.service';
+import * as moment from 'moment';
+import { ProjectWrapper } from '../../../../../state/model/project.wrapper';
+import { EditProjectSectionInterface } from '../edit-project-section.interface';
+
+@Component({
+    selector: 'redaction-edit-project-general-info',
+    templateUrl: './edit-project-general-info.component.html',
+    styleUrls: ['./edit-project-general-info.component.scss']
+})
+export class EditProjectGeneralInfoComponent implements OnInit, EditProjectSectionInterface {
+    projectForm: FormGroup;
+    hasDueDate: boolean;
+    reportTypesEnum = Object.values(RuleSetModel.ReportTypesEnum);
+    ruleSets: RuleSetModel[];
+
+    @Input() projectWrapper: ProjectWrapper;
+    @Output() updateProject = new EventEmitter<any>();
+
+    constructor(
+        private readonly _appStateService: AppStateService,
+        private readonly _formBuilder: FormBuilder
+    ) {}
+
+    get changed() {
+        for (const key of Object.keys(this.projectForm.getRawValue())) {
+            if (key === 'dueDate') {
+                if (this.hasDueDate !== !!this.projectWrapper.dueDate) {
+                    return true;
+                }
+                if (
+                    this.hasDueDate &&
+                    !moment(this.projectWrapper.dueDate).isSame(
+                        moment(this.projectForm.get(key).value)
+                    )
+                ) {
+                    return true;
+                }
+            } else if (this.projectWrapper[key] !== this.projectForm.get(key).value) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    get disabled() {
+        if (this.hasDueDate && this.projectForm.get('dueDate').value === null) {
+            return true;
+        }
+
+        return this.projectForm.invalid;
+    }
+
+    ngOnInit() {
+        this._filterInvalidRuleSets();
+        this.projectForm = this._formBuilder.group({
+            projectName: [this.projectWrapper.projectName, Validators.required],
+            ruleSetId: [
+                {
+                    value: this.projectWrapper.ruleSetId,
+                    disabled: this.projectWrapper.hasFiles
+                },
+                Validators.required
+            ],
+            description: [this.projectWrapper.description],
+            dueDate: [this.projectWrapper.dueDate]
+        });
+        this.hasDueDate = !!this.projectWrapper.dueDate;
+    }
+
+    revert() {
+        this.projectForm.reset({
+            projectName: this.projectWrapper.projectName,
+            ruleSetId: this.projectWrapper.ruleSetId,
+            description: this.projectWrapper.description,
+            dueDate: this.projectWrapper.dueDate
+        });
+    }
+
+    async save() {
+        const project = {
+            ...this.projectWrapper.project,
+            projectName: this.projectForm.get('projectName').value,
+            description: this.projectForm.get('description').value,
+            dueDate: this.hasDueDate ? this.projectForm.get('dueDate').value : undefined,
+            ruleSetId: this.projectForm.get('ruleSetId').value
+        };
+        const updatedProject = await this._appStateService.addOrUpdateProject(project);
+        this.updateProject.emit(updatedProject);
+    }
+
+    private _filterInvalidRuleSets() {
+        this.ruleSets = this._appStateService.ruleSets.filter((r) => {
+            if (this.projectWrapper?.ruleSetId === r.ruleSetId) {
+                return true;
+            }
+            const notYetValid = !!r.validFrom && moment(r.validFrom).isAfter(moment());
+            const notValidAnymore = !!r.validTo && moment(r.validTo).add(1, 'd').isBefore(moment());
+            return !(notYetValid || notValidAnymore);
+        });
+    }
+}
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/team-members/edit-project-team-members.component.html b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/team-members/edit-project-team-members.component.html
new file mode 100644
index 000000000..50a0ae137
--- /dev/null
+++ b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/team-members/edit-project-team-members.component.html
@@ -0,0 +1,4 @@
+<redaction-team-members-manager
+    (save)="updatedProject($event)"
+    [projectWrapper]="projectWrapper"
+></redaction-team-members-manager>
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/team-members/edit-project-team-members.component.scss b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/team-members/edit-project-team-members.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/team-members/edit-project-team-members.component.ts b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/team-members/edit-project-team-members.component.ts
new file mode 100644
index 000000000..cedbd4c92
--- /dev/null
+++ b/apps/red-ui/src/app/modules/projects/dialogs/edit-project-dialog/team-members/edit-project-team-members.component.ts
@@ -0,0 +1,43 @@
+import { Component, EventEmitter, Input, Output, ViewChild } from '@angular/core';
+import { AppStateService } from '../../../../../state/app-state.service';
+import { ProjectWrapper } from '../../../../../state/model/project.wrapper';
+import { EditProjectSectionInterface } from '../edit-project-section.interface';
+import { PermissionsService } from '../../../../../services/permissions.service';
+import { TeamMembersManagerComponent } from '../../../components/team-members-manager/team-members-manager.component';
+
+@Component({
+    selector: 'redaction-edit-project-team-members',
+    templateUrl: './edit-project-team-members.component.html',
+    styleUrls: ['./edit-project-team-members.component.scss']
+})
+export class EditProjectTeamMembersComponent implements EditProjectSectionInterface {
+    @Input() projectWrapper: ProjectWrapper;
+    @Output() updateProject = new EventEmitter<any>();
+
+    @ViewChild(TeamMembersManagerComponent) managerComponent: TeamMembersManagerComponent;
+
+    constructor(
+        private readonly _appStateService: AppStateService,
+        private readonly _permissionsService: PermissionsService
+    ) {}
+
+    get changed() {
+        return this.managerComponent.changed;
+    }
+
+    get disabled() {
+        return !this._permissionsService.isManager();
+    }
+
+    async save() {
+        await this.managerComponent.saveMembers();
+    }
+
+    updatedProject($event) {
+        this.updateProject.emit($event);
+    }
+
+    revert() {
+        this.managerComponent.revert();
+    }
+}
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/team-members-dialog/team-members-dialog.component.html b/apps/red-ui/src/app/modules/projects/dialogs/team-members-dialog/team-members-dialog.component.html
new file mode 100644
index 000000000..6bd59da48
--- /dev/null
+++ b/apps/red-ui/src/app/modules/projects/dialogs/team-members-dialog/team-members-dialog.component.html
@@ -0,0 +1,32 @@
+<section class="dialog">
+    <div [translate]="'assign-project-owner.dialog.title'" class="dialog-header heading-l"></div>
+
+    <div class="dialog-content no-padding-bottom">
+        <redaction-team-members-manager
+            (save)="save($event)"
+            [projectWrapper]="data.projectWrapper"
+        ></redaction-team-members-manager>
+    </div>
+    <div class="dialog-actions">
+        <button
+            (click)="managerComponent.saveMembers()"
+            [disabled]="!managerComponent.valid || !managerComponent.changed"
+            color="primary"
+            mat-flat-button
+        >
+            {{ 'assign-project-owner.dialog.save' | translate }}
+        </button>
+
+        <div
+            [translate]="'assign-project-owner.dialog.cancel'"
+            class="all-caps-label pointer cancel"
+            mat-dialog-close
+        ></div>
+    </div>
+
+    <redaction-circle-button
+        class="dialog-close"
+        icon="red:close"
+        mat-dialog-close
+    ></redaction-circle-button>
+</section>
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/team-members-dialog/team-members-dialog.component.scss b/apps/red-ui/src/app/modules/projects/dialogs/team-members-dialog/team-members-dialog.component.scss
new file mode 100644
index 000000000..91e0f2a5d
--- /dev/null
+++ b/apps/red-ui/src/app/modules/projects/dialogs/team-members-dialog/team-members-dialog.component.scss
@@ -0,0 +1,8 @@
+.no-padding-bottom {
+    padding-bottom: 0;
+}
+
+::ng-deep redaction-team-members-manager .members-list {
+    max-height: 220px;
+    height: 220px;
+}
diff --git a/apps/red-ui/src/app/modules/projects/dialogs/team-members-dialog/team-members-dialog.component.ts b/apps/red-ui/src/app/modules/projects/dialogs/team-members-dialog/team-members-dialog.component.ts
new file mode 100644
index 000000000..2377e7d76
--- /dev/null
+++ b/apps/red-ui/src/app/modules/projects/dialogs/team-members-dialog/team-members-dialog.component.ts
@@ -0,0 +1,31 @@
+import { Component, Inject, ViewChild } from '@angular/core';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import { AppStateService } from '@state/app-state.service';
+import { NotificationService } from '@services/notification.service';
+import { ProjectWrapper } from '@state/model/project.wrapper';
+import { TeamMembersManagerComponent } from '../../components/team-members-manager/team-members-manager.component';
+
+class DialogData {
+    projectWrapper?: ProjectWrapper;
+}
+
+@Component({
+    selector: 'redaction-team-members-dialog',
+    templateUrl: './team-members-dialog.component.html',
+    styleUrls: ['./team-members-dialog.component.scss']
+})
+export class TeamMembersDialogComponent {
+    @ViewChild(TeamMembersManagerComponent, { static: true })
+    managerComponent: TeamMembersManagerComponent;
+
+    constructor(
+        private readonly _notificationService: NotificationService,
+        private readonly _appStateService: AppStateService,
+        public dialogRef: MatDialogRef<TeamMembersDialogComponent>,
+        @Inject(MAT_DIALOG_DATA) public data: DialogData
+    ) {}
+
+    async save(result) {
+        this.dialogRef.close(result);
+    }
+}
diff --git a/apps/red-ui/src/app/modules/projects/projects.module.ts b/apps/red-ui/src/app/modules/projects/projects.module.ts
index f615d9c1a..d82c8a7ef 100644
--- a/apps/red-ui/src/app/modules/projects/projects.module.ts
+++ b/apps/red-ui/src/app/modules/projects/projects.module.ts
@@ -3,8 +3,7 @@ import { CommonModule } from '@angular/common';
 import { ProjectListingScreenComponent } from './screens/project-listing-screen/project-listing-screen.component';
 import { ProjectOverviewScreenComponent } from './screens/project-overview-screen/project-overview-screen.component';
 import { FilePreviewScreenComponent } from './screens/file-preview-screen/file-preview-screen.component';
-import { AddEditProjectDialogComponent } from './dialogs/add-edit-project-dialog/add-edit-project-dialog.component';
-import { AssignOwnerDialogComponent } from './dialogs/assign-owner-dialog/assign-owner-dialog.component';
+import { AddProjectDialogComponent } from './dialogs/add-project-dialog/add-project-dialog.component';
 import { AssignReviewerApproverDialogComponent } from './dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component';
 import { ManualAnnotationDialogComponent } from './dialogs/manual-redaction-dialog/manual-annotation-dialog.component';
 import { ForceRedactionDialogComponent } from './dialogs/force-redaction-dialog/force-redaction-dialog.component';
@@ -37,7 +36,14 @@ import { AnnotationDrawService } from './services/annotation-draw.service';
 import { AnnotationProcessingService } from './services/annotation-processing.service';
 import { AnnotationRemoveActionsComponent } from './components/annotation-remove-actions/annotation-remove-actions.component';
 import { DossierDictionaryDialogComponent } from './dialogs/dossier-dictionary-dialog/dossier-dictionary-dialog.component';
+import { EditProjectDialogComponent } from './dialogs/edit-project-dialog/edit-project-dialog.component';
+import { EditProjectGeneralInfoComponent } from './dialogs/edit-project-dialog/general-info/edit-project-general-info.component';
+import { EditProjectDownloadPackageComponent } from './dialogs/edit-project-dialog/download-package/edit-project-download-package.component';
 import { UserPreferenceControllerService } from '@redaction/red-ui-http';
+import { EditProjectDictionaryComponent } from './dialogs/edit-project-dialog/dictionary/edit-project-dictionary.component';
+import { EditProjectTeamMembersComponent } from './dialogs/edit-project-dialog/team-members/edit-project-team-members.component';
+import { TeamMembersManagerComponent } from './components/team-members-manager/team-members-manager.component';
+import { TeamMembersDialogComponent } from './dialogs/team-members-dialog/team-members-dialog.component';
 
 const screens = [
     ProjectListingScreenComponent,
@@ -46,8 +52,9 @@ const screens = [
 ];
 
 const dialogs = [
-    AddEditProjectDialogComponent,
-    AssignOwnerDialogComponent,
+    AddProjectDialogComponent,
+    EditProjectDialogComponent,
+    TeamMembersDialogComponent,
     ManualAnnotationDialogComponent,
     ForceRedactionDialogComponent,
     RemoveAnnotationsDialogComponent,
@@ -72,6 +79,11 @@ const components = [
     DocumentInfoComponent,
     FileWorkloadComponent,
     AnnotationRemoveActionsComponent,
+    EditProjectGeneralInfoComponent,
+    EditProjectDownloadPackageComponent,
+    EditProjectDictionaryComponent,
+    EditProjectTeamMembersComponent,
+    TeamMembersManagerComponent,
 
     ...screens,
     ...dialogs
diff --git a/apps/red-ui/src/app/modules/projects/screens/file-preview-screen/file-preview-screen.component.scss b/apps/red-ui/src/app/modules/projects/screens/file-preview-screen/file-preview-screen.component.scss
index 2d8bc78a4..3b84f926d 100644
--- a/apps/red-ui/src/app/modules/projects/screens/file-preview-screen/file-preview-screen.component.scss
+++ b/apps/red-ui/src/app/modules/projects/screens/file-preview-screen/file-preview-screen.component.scss
@@ -68,10 +68,6 @@
     margin-right: 8px;
 }
 
-.mr-16 {
-    margin-right: 16px;
-}
-
 .ml-8 {
     margin-left: 8px;
 }
diff --git a/apps/red-ui/src/app/modules/projects/screens/project-listing-screen/project-listing-screen.component.ts b/apps/red-ui/src/app/modules/projects/screens/project-listing-screen/project-listing-screen.component.ts
index f861e72d9..e4f7f72fb 100644
--- a/apps/red-ui/src/app/modules/projects/screens/project-listing-screen/project-listing-screen.component.ts
+++ b/apps/red-ui/src/app/modules/projects/screens/project-listing-screen/project-listing-screen.component.ts
@@ -195,7 +195,7 @@ export class ProjectListingScreenComponent
     }
 
     openAssignProjectOwnerDialog($event: MouseEvent, project: ProjectWrapper) {
-        this._dialogService.openAssignProjectMembersAndOwnerDialog($event, project);
+        this._dialogService.openAssignTeamMembersDialog($event, project);
     }
 
     actionPerformed() {
diff --git a/apps/red-ui/src/app/modules/projects/screens/project-overview-screen/project-overview-screen.component.html b/apps/red-ui/src/app/modules/projects/screens/project-overview-screen/project-overview-screen.component.html
index 1cf231e76..46ce68abe 100644
--- a/apps/red-ui/src/app/modules/projects/screens/project-overview-screen/project-overview-screen.component.html
+++ b/apps/red-ui/src/app/modules/projects/screens/project-overview-screen/project-overview-screen.component.html
@@ -54,13 +54,6 @@
             <!--                tooltip="project-overview.header-actions.delete"-->
             <!--                tooltipPosition="below"-->
             <!--            ></redaction-circle-button>-->
-            <redaction-circle-button
-                (action)="openAssignProjectMembersDialog()"
-                *ngIf="permissionsService.isManager()"
-                icon="red:assign"
-                tooltip="project-overview.header-actions.assign"
-                tooltipPosition="below"
-            ></redaction-circle-button>
 
             <redaction-file-download-btn
                 [file]="allEntities"
@@ -199,8 +192,8 @@
                         trackBy: fileId
                     "
                     [class.disabled]="fileStatus.isExcluded"
-                    [class.pointer]="permissionsService.canOpenFile(fileStatus)"
                     [class.last-opened]="isLastOpenedFile(fileStatus)"
+                    [class.pointer]="permissionsService.canOpenFile(fileStatus)"
                     [routerLink]="fileLink(fileStatus)"
                     class="table-item"
                 >
@@ -322,8 +315,8 @@
             <redaction-project-details
                 #projectDetailsComponent
                 (filtersChanged)="filtersChanged($event)"
-                (openDossierDictionaryDialog)="openDossierDictionaryDialog()"
                 (openAssignProjectMembersDialog)="openAssignProjectMembersDialog()"
+                (openDossierDictionaryDialog)="openDossierDictionaryDialog()"
                 (toggleCollapse)="toggleCollapsedDetails()"
                 [filters]="detailsContainerFilters"
             ></redaction-project-details>
diff --git a/apps/red-ui/src/app/modules/projects/screens/project-overview-screen/project-overview-screen.component.ts b/apps/red-ui/src/app/modules/projects/screens/project-overview-screen/project-overview-screen.component.ts
index c82fdc20a..ff8e153db 100644
--- a/apps/red-ui/src/app/modules/projects/screens/project-overview-screen/project-overview-screen.component.ts
+++ b/apps/red-ui/src/app/modules/projects/screens/project-overview-screen/project-overview-screen.component.ts
@@ -87,10 +87,6 @@ export class ProjectOverviewScreenComponent
         return this._appStateService.activeProject;
     }
 
-    isLastOpenedFile(fileStatus: FileStatusWrapper): boolean {
-        return this._lastOpenedFileId === fileStatus.fileId;
-    }
-
     protected get _filterComponents(): FilterComponent[] {
         return [
             this._statusFilterComponent,
@@ -117,11 +113,17 @@ export class ProjectOverviewScreenComponent
         ];
     }
 
+    isLastOpenedFile(fileStatus: FileStatusWrapper): boolean {
+        return this._lastOpenedFileId === fileStatus.fileId;
+    }
+
     ngOnInit(): void {
         this._userPreferenceControllerService.getAllUserAttributes().subscribe((attributes) => {
             if (attributes === null || attributes === undefined) return;
             const key = 'Project-Recent-' + this.activeProject.projectId;
-            this._lastOpenedFileId = attributes[key][0];
+            if (attributes[key]?.length > 0) {
+                this._lastOpenedFileId = attributes[key][0];
+            }
         });
 
         this._fileDropOverlayService.initFileDropHandling();
@@ -266,7 +268,7 @@ export class ProjectOverviewScreenComponent
     }
 
     openAssignProjectMembersDialog(): void {
-        this._dialogService.openAssignProjectMembersAndOwnerDialog(null, this.activeProject, () => {
+        this._dialogService.openAssignTeamMembersDialog(null, this.activeProject, () => {
             this.reloadProjects();
         });
     }
diff --git a/apps/red-ui/src/app/modules/projects/services/projects-dialog.service.ts b/apps/red-ui/src/app/modules/projects/services/projects-dialog.service.ts
index 21e3fcf96..eebd4cbfd 100644
--- a/apps/red-ui/src/app/modules/projects/services/projects-dialog.service.ts
+++ b/apps/red-ui/src/app/modules/projects/services/projects-dialog.service.ts
@@ -7,7 +7,7 @@ import {
     ManualRedactionControllerService,
     RuleSetControllerService
 } from '@redaction/red-ui-http';
-import { AddEditProjectDialogComponent } from '../dialogs/add-edit-project-dialog/add-edit-project-dialog.component';
+import { AddProjectDialogComponent } from '../dialogs/add-project-dialog/add-project-dialog.component';
 import { RemoveAnnotationsDialogComponent } from '../dialogs/remove-annotations-dialog/remove-annotations-dialog.component';
 import { NotificationService, NotificationType } from '@services/notification.service';
 import { ForceRedactionDialogComponent } from '../dialogs/force-redaction-dialog/force-redaction-dialog.component';
@@ -23,10 +23,11 @@ import { ManualRedactionEntryWrapper } from '@models/file/manual-redaction-entry
 import { ManualAnnotationService } from './manual-annotation.service';
 import { TranslateService } from '@ngx-translate/core';
 import { ManualAnnotationDialogComponent } from '../dialogs/manual-redaction-dialog/manual-annotation-dialog.component';
-import { AssignOwnerDialogComponent } from '../dialogs/assign-owner-dialog/assign-owner-dialog.component';
 import { DossierDictionaryDialogComponent } from '../dialogs/dossier-dictionary-dialog/dossier-dictionary-dialog.component';
+import { EditProjectDialogComponent } from '../dialogs/edit-project-dialog/edit-project-dialog.component';
 import { FileStatusWrapper } from '../../../models/file/file-status.wrapper';
 import { AssignReviewerApproverDialogComponent } from '../dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component';
+import { TeamMembersDialogComponent } from '../dialogs/team-members-dialog/team-members-dialog.component';
 
 const dialogConfig = {
     width: '662px',
@@ -150,26 +151,6 @@ export class ProjectsDialogService {
         return ref;
     }
 
-    openEditProjectDialog(
-        $event: MouseEvent,
-        project: ProjectWrapper,
-        cb?: Function
-    ): MatDialogRef<AddEditProjectDialogComponent> {
-        $event.stopPropagation();
-        const ref = this._dialog.open(AddEditProjectDialogComponent, {
-            ...dialogConfig,
-            width: '900px',
-            autoFocus: true,
-            data: project
-        });
-        ref.afterClosed().subscribe(async (result) => {
-            if (result && cb) {
-                cb(result);
-            }
-        });
-        return ref;
-    }
-
     openForceRedactionDialog(
         $event: MouseEvent,
         cb?: Function
@@ -228,15 +209,15 @@ export class ProjectsDialogService {
         return ref;
     }
 
-    openAssignProjectMembersAndOwnerDialog(
+    openAssignTeamMembersDialog(
         $event: MouseEvent,
-        project: ProjectWrapper,
+        projectWrapper: ProjectWrapper,
         cb?: Function
-    ): MatDialogRef<AssignOwnerDialogComponent> {
+    ): MatDialogRef<TeamMembersDialogComponent> {
         $event?.stopPropagation();
-        const ref = this._dialog.open(AssignOwnerDialogComponent, {
+        const ref = this._dialog.open(TeamMembersDialogComponent, {
             ...dialogConfig,
-            data: { project: project }
+            data: { projectWrapper }
         });
         ref.afterClosed().subscribe((result) => {
             if (cb) {
@@ -298,9 +279,10 @@ export class ProjectsDialogService {
         return ref;
     }
 
-    openAddProjectDialog(cb?: Function): MatDialogRef<AddEditProjectDialogComponent> {
-        const ref = this._dialog.open(AddEditProjectDialogComponent, {
+    openAddProjectDialog(cb?: Function): MatDialogRef<AddProjectDialogComponent> {
+        const ref = this._dialog.open(AddProjectDialogComponent, {
             ...dialogConfig,
+            width: '900px',
             autoFocus: true
         });
 
@@ -311,6 +293,21 @@ export class ProjectsDialogService {
         return ref;
     }
 
+    openEditProjectDialog(
+        $event: MouseEvent,
+        projectWrapper: ProjectWrapper,
+        cb?: Function
+    ): MatDialogRef<EditProjectDialogComponent> {
+        $event.stopPropagation();
+        return this._dialog.open(EditProjectDialogComponent, {
+            ...dialogConfig,
+            width: '90vw',
+            height: '90vh',
+            autoFocus: true,
+            data: { projectWrapper, afterSave: cb }
+        });
+    }
+
     openDocumentInfoDialog(
         file: FileStatus,
         cb?: Function
diff --git a/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.html b/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.html
index 809d7d7ff..dcdd4db08 100644
--- a/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.html
+++ b/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.html
@@ -36,7 +36,7 @@
                 </div>
             </div>
         </div>
-        <form [formGroup]="compareForm" class="compare-form">
+        <form [formGroup]="compareForm">
             <div class="red-input-group mr-16">
                 <mat-checkbox color="primary" formControlName="active">
                     {{ 'dictionary-overview.compare.compare' | translate }}
diff --git a/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.scss b/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.scss
index 7a084f902..e887d39d4 100644
--- a/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.scss
+++ b/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.scss
@@ -4,13 +4,15 @@
 :host {
     width: 100%;
     height: 100%;
+    box-sizing: border-box;
 }
 
-.compare-form {
+form {
     display: flex;
     flex: 1;
     justify-content: flex-end;
     align-items: center;
+    height: 100%;
 
     .red-input-group {
         margin-top: 0;
@@ -18,7 +20,7 @@
 }
 
 .editor-container {
-    height: calc(100% - 50px);
+    height: calc(100% - 53px);
     display: flex;
 
     > *:not(:first-child:last-child) {
@@ -36,9 +38,7 @@
 }
 
 .content-container {
-    padding: 15px;
-    height: calc(100% - 30px);
-    width: calc(100% - 30px);
+    height: 100%;
 
     .actions-bar {
         display: flex;
@@ -49,11 +49,6 @@
             margin-right: 32px;
         }
 
-        .mr-16 {
-            margin-right: 16px;
-            //opacity: 0; // TODO: Hidden for now
-        }
-
         .red-input-group {
             input {
                 padding-right: 32px;
diff --git a/apps/red-ui/src/app/modules/shared/components/filter/filter.component.html b/apps/red-ui/src/app/modules/shared/components/filter/filter.component.html
index 84d13420b..924a1d038 100644
--- a/apps/red-ui/src/app/modules/shared/components/filter/filter.component.html
+++ b/apps/red-ui/src/app/modules/shared/components/filter/filter.component.html
@@ -13,12 +13,13 @@
     [text]="filterLabel"
 ></redaction-chevron-button>
 
-<mat-menu #filterMenu="matMenu" (closed)="applyFilters()" xPosition="before">
-    <div
-        (mouseenter)="filterMouseEnter()"
-        (mouseleave)="filterMouseLeave()"
-        [class.pb-24]="secondaryFilters?.length === 0"
-    >
+<mat-menu
+    #filterMenu="matMenu"
+    (closed)="applyFilters()"
+    [class]="secondaryFilters?.length > 0 ? 'padding-bottom-0' : ''"
+    xPosition="before"
+>
+    <div (mouseenter)="filterMouseEnter()" (mouseleave)="filterMouseLeave()">
         <div class="filter-menu-header">
             <div class="all-caps-label" translate="filter-menu.filter-types"></div>
             <div class="actions">
diff --git a/apps/red-ui/src/app/modules/shared/components/filter/filter.component.scss b/apps/red-ui/src/app/modules/shared/components/filter/filter.component.scss
index 9ea49fb32..f0b532ec5 100644
--- a/apps/red-ui/src/app/modules/shared/components/filter/filter.component.scss
+++ b/apps/red-ui/src/app/modules/shared/components/filter/filter.component.scss
@@ -26,10 +26,6 @@
     padding-bottom: 8px;
 }
 
-::ng-deep .mat-menu-panel .mat-menu-content:not(:empty) {
-    padding-bottom: 0;
-}
-
 ::ng-deep .filter-menu-checkbox {
     width: 100%;
 
diff --git a/apps/red-ui/src/app/modules/shared/components/select/select.component.html b/apps/red-ui/src/app/modules/shared/components/select/select.component.html
index ab2c056cf..647a68aef 100644
--- a/apps/red-ui/src/app/modules/shared/components/select/select.component.html
+++ b/apps/red-ui/src/app/modules/shared/components/select/select.component.html
@@ -1,33 +1,26 @@
-<div class="wrapper">
-    <div class="label-header space-between">
-        <div class="all-caps-label">{{ label }}</div>
-        <div class="actions">
-            <div
-                (click)="selectAll($event)"
-                [translate]="'actions.all'"
-                class="all-caps-label primary pointer"
-            ></div>
-            <div
-                (click)="deselectAll($event)"
-                [translate]="'actions.none'"
-                class="all-caps-label primary pointer"
-            ></div>
-        </div>
+<div class="label-header">
+    <div class="all-caps-label">{{ label }}</div>
+    <div class="actions">
+        <div
+            (click)="selectAll($event)"
+            [translate]="'actions.all'"
+            class="all-caps-label primary pointer"
+        ></div>
+        <div
+            (click)="deselectAll($event)"
+            [translate]="'actions.none'"
+            class="all-caps-label primary pointer"
+        ></div>
     </div>
-
-    <mat-chip-list
-        [disabled]="disabled"
-        [multiple]="multiple"
-        class="options flex-center"
-        selectable
-    >
-        <mat-chip
-            #chip="matChip"
-            (click)="toggleSelection(chip)"
-            *ngFor="let option of options"
-            [value]="option"
-        >
-            {{ translatePrefix + option | translate }}
-        </mat-chip>
-    </mat-chip-list>
 </div>
+
+<mat-chip-list [disabled]="disabled" [multiple]="multiple" class="options flex-center" selectable>
+    <mat-chip
+        #chip="matChip"
+        (click)="toggleSelection(chip)"
+        *ngFor="let option of options"
+        [value]="option"
+    >
+        {{ translatePrefix + option | translate }}
+    </mat-chip>
+</mat-chip-list>
diff --git a/apps/red-ui/src/app/modules/shared/components/select/select.component.scss b/apps/red-ui/src/app/modules/shared/components/select/select.component.scss
index a25196bef..ef7be607f 100644
--- a/apps/red-ui/src/app/modules/shared/components/select/select.component.scss
+++ b/apps/red-ui/src/app/modules/shared/components/select/select.component.scss
@@ -1,13 +1,20 @@
 @import 'apps/red-ui/src/assets/styles/red-variables';
 
-.wrapper {
+:host {
     border-radius: 8px;
     border: 1px solid $grey-5;
-    height: 100%;
+    min-height: 100%;
+    display: block;
+
+    &.ng-invalid {
+        border-color: rgba($red-1, 0.3);
+    }
 }
 
 .label-header {
     padding: 16px 16px 14px 16px;
+    display: flex;
+    justify-content: space-between;
 
     .actions {
         display: flex;
@@ -48,6 +55,7 @@ mat-chip {
     background-color: $white;
     color: $grey-1;
     margin: 0 0 2px 0;
+    transition: background-color 0.2s;
 
     &:hover {
         background-color: $grey-8;
diff --git a/apps/red-ui/src/app/modules/shared/components/select/select.component.ts b/apps/red-ui/src/app/modules/shared/components/select/select.component.ts
index 91d699fbe..bedd23877 100644
--- a/apps/red-ui/src/app/modules/shared/components/select/select.component.ts
+++ b/apps/red-ui/src/app/modules/shared/components/select/select.component.ts
@@ -23,6 +23,7 @@ export class SelectComponent implements AfterViewInit, ControlValueAccessor {
     @Input() multiple = true;
 
     @ViewChild(MatChipList) chipList: MatChipList;
+
     private _value: string[] = [];
     private _onChange: (value: string[]) => void;
 
diff --git a/apps/red-ui/src/app/modules/shared/components/side-nav/side-nav.component.html b/apps/red-ui/src/app/modules/shared/components/side-nav/side-nav.component.html
new file mode 100644
index 000000000..c2695417b
--- /dev/null
+++ b/apps/red-ui/src/app/modules/shared/components/side-nav/side-nav.component.html
@@ -0,0 +1,3 @@
+<div [translate]="title" class="all-caps-label"></div>
+
+<ng-content></ng-content>
diff --git a/apps/red-ui/src/app/modules/admin/components/side-nav/side-nav.component.scss b/apps/red-ui/src/app/modules/shared/components/side-nav/side-nav.component.scss
similarity index 91%
rename from apps/red-ui/src/app/modules/admin/components/side-nav/side-nav.component.scss
rename to apps/red-ui/src/app/modules/shared/components/side-nav/side-nav.component.scss
index fb3cba8fe..aad45863a 100644
--- a/apps/red-ui/src/app/modules/admin/components/side-nav/side-nav.component.scss
+++ b/apps/red-ui/src/app/modules/shared/components/side-nav/side-nav.component.scss
@@ -3,16 +3,18 @@
 :host {
     display: block;
     min-width: 200px;
+    max-width: 200px;
     background-color: $grey-2;
     border-right: 1px solid $separator;
     box-sizing: border-box;
     padding: 8px;
+    height: 100%;
 
     .all-caps-label {
         padding: 16px;
     }
 
-    .item {
+    ::ng-deep.item {
         margin-bottom: 4px;
         border-radius: 20px;
         padding: 9px 16px;
diff --git a/apps/red-ui/src/app/modules/shared/components/side-nav/side-nav.component.ts b/apps/red-ui/src/app/modules/shared/components/side-nav/side-nav.component.ts
new file mode 100644
index 000000000..ceb39fb1d
--- /dev/null
+++ b/apps/red-ui/src/app/modules/shared/components/side-nav/side-nav.component.ts
@@ -0,0 +1,12 @@
+import { Component, Input } from '@angular/core';
+
+@Component({
+    selector: 'redaction-side-nav',
+    templateUrl: './side-nav.component.html',
+    styleUrls: ['./side-nav.component.scss']
+})
+export class SideNavComponent {
+    @Input() title: string;
+
+    constructor() {}
+}
diff --git a/apps/red-ui/src/app/modules/shared/services/dictionary-save.service.ts b/apps/red-ui/src/app/modules/shared/services/dictionary-save.service.ts
index a6254f7a7..934d4d5a7 100644
--- a/apps/red-ui/src/app/modules/shared/services/dictionary-save.service.ts
+++ b/apps/red-ui/src/app/modules/shared/services/dictionary-save.service.ts
@@ -22,7 +22,8 @@ export class DictionarySaveService {
         initialEntries: string[],
         ruleSetId: string,
         type: string,
-        dossierId: string
+        dossierId: string,
+        showToast = true
     ): Observable<any> {
         let entriesToAdd = [];
         entries.forEach((currentEntry) => {
@@ -54,11 +55,15 @@ export class DictionarySaveService {
             return obs.pipe(
                 tap(
                     () => {
-                        this._notificationService.showToastNotification(
-                            this._translateService.instant('dictionary-overview.success.generic'),
-                            null,
-                            NotificationType.SUCCESS
-                        );
+                        if (showToast) {
+                            this._notificationService.showToastNotification(
+                                this._translateService.instant(
+                                    'dictionary-overview.success.generic'
+                                ),
+                                null,
+                                NotificationType.SUCCESS
+                            );
+                        }
                     },
                     () => {
                         this._notificationService.showToastNotification(
@@ -76,7 +81,7 @@ export class DictionarySaveService {
                 NotificationType.ERROR
             );
 
-            return throwError('Entries to short');
+            return throwError('Entries too short');
         }
     }
 }
diff --git a/apps/red-ui/src/app/modules/shared/shared.module.ts b/apps/red-ui/src/app/modules/shared/shared.module.ts
index 690e5f3ad..f9cee8881 100644
--- a/apps/red-ui/src/app/modules/shared/shared.module.ts
+++ b/apps/red-ui/src/app/modules/shared/shared.module.ts
@@ -34,6 +34,7 @@ import { SelectComponent } from './components/select/select.component';
 import { NavigateLastProjectsScreenDirective } from './directives/navigate-last-projects-screen.directive';
 import { DictionaryManagerComponent } from './components/dictionary-manager/dictionary-manager.component';
 import { AceEditorModule } from 'ng2-ace-editor';
+import { SideNavComponent } from '@shared/components/side-nav/side-nav.component';
 
 const buttons = [
     ChevronButtonComponent,
@@ -60,6 +61,7 @@ const components = [
     SortByPipe,
     RoundCheckboxComponent,
     SelectComponent,
+    SideNavComponent,
 
     ...buttons
 ];
diff --git a/apps/red-ui/src/app/state/app-state.service.ts b/apps/red-ui/src/app/state/app-state.service.ts
index d34171f20..fab9e8322 100644
--- a/apps/red-ui/src/app/state/app-state.service.ts
+++ b/apps/red-ui/src/app/state/app-state.service.ts
@@ -211,20 +211,6 @@ export class AppStateService {
         );
     }
 
-    private _dictionaryVersion(ruleSetId?: string) {
-        if (!ruleSetId) {
-            ruleSetId = this.activeProject.ruleSetId;
-        }
-        return this._appState.versions[ruleSetId].dictionaryVersion;
-    }
-
-    private _rulesVersion(ruleSetId?: string) {
-        if (!ruleSetId) {
-            ruleSetId = this.activeProject.ruleSetId;
-        }
-        return this._appState.versions[ruleSetId].rulesVersion;
-    }
-
     getDictionaryColor(type?: string, ruleSetId?: string) {
         if (!ruleSetId && this.activeProject) {
             ruleSetId = this.activeProject.ruleSetId;
@@ -457,8 +443,8 @@ export class AppStateService {
             this._notificationService.showToastNotification(
                 this._translateService.instant(
                     error.status === 409
-                        ? 'project-listing.add-edit-dialog.errors.project-already-exists'
-                        : 'project-listing.add-edit-dialog.errors.generic'
+                        ? 'add-project-dialog.errors.project-already-exists'
+                        : 'add-project-dialog.errors.generic'
                 ),
                 null,
                 NotificationType.ERROR
@@ -684,6 +670,20 @@ export class AppStateService {
             .toPromise();
     }
 
+    private _dictionaryVersion(ruleSetId?: string) {
+        if (!ruleSetId) {
+            ruleSetId = this.activeProject.ruleSetId;
+        }
+        return this._appState.versions[ruleSetId].dictionaryVersion;
+    }
+
+    private _rulesVersion(ruleSetId?: string) {
+        if (!ruleSetId) {
+            ruleSetId = this.activeProject.ruleSetId;
+        }
+        return this._appState.versions[ruleSetId].rulesVersion;
+    }
+
     private _getExistingFiles(projectId: string) {
         const found = this._appState.projects.find((p) => p.project.projectId === projectId);
         return found ? found.files : [];
diff --git a/apps/red-ui/src/assets/i18n/de.json b/apps/red-ui/src/assets/i18n/de.json
index cc2704e91..7fc1370e6 100644
--- a/apps/red-ui/src/assets/i18n/de.json
+++ b/apps/red-ui/src/assets/i18n/de.json
@@ -100,9 +100,6 @@
     "reanalyse": {
       "action": "Analysieren Sie das gesamte Dossier"
     },
-    "assign": {
-      "action": "Eigentümer zuweisen"
-    },
     "download-files": {
       "action": "Laden Sie redigierte Dateien herunter"
     },
diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json
index a6442e658..ceb03f77d 100644
--- a/apps/red-ui/src/assets/i18n/en.json
+++ b/apps/red-ui/src/assets/i18n/en.json
@@ -100,9 +100,6 @@
     "reanalyse": {
       "action": "Analyze entire dossier"
     },
-    "assign": {
-      "action": "Assign Owner & Members"
-    },
     "download-files": {
       "action": "Download Redacted Files"
     },
@@ -131,30 +128,6 @@
       "action": "New Dossier"
     },
     "add-new": "New Dossier",
-    "add-edit-dialog": {
-      "header-new": "Create Dossier",
-      "header-edit": "Edit Dossier",
-      "form": {
-        "name": {
-          "label": "Dossier Name",
-          "placeholder": "Enter Name"
-        },
-        "description": {
-          "label": "Description",
-          "placeholder": "Enter Description"
-        },
-        "due-date": "Due Date",
-        "template": "Dossier Template"
-      },
-      "errors": {
-        "project-already-exists": "Dossier with this name already exists!",
-        "generic": "Failed to save dossier"
-      },
-      "actions": {
-        "save": "Save",
-        "save-and-add-members": "Save and Edit Team"
-      }
-    },
     "header": "Dossiers",
     "edit": {
       "action": "Edit Dossier"
@@ -167,6 +140,67 @@
       "title": "No dossiers match your current filters."
     }
   },
+  "add-project-dialog": {
+    "header-new": "Create Dossier",
+    "form": {
+      "name": {
+        "label": "Dossier Name",
+        "placeholder": "Enter Name"
+      },
+      "description": {
+        "label": "Description",
+        "placeholder": "Enter Description"
+      },
+      "due-date": "Due Date",
+      "template": "Dossier Template"
+    },
+    "errors": {
+      "project-already-exists": "Dossier with this name already exists!",
+      "generic": "Failed to save dossier"
+    },
+    "actions": {
+      "save": "Save",
+      "save-and-add-members": "Save and Edit Team"
+    }
+  },
+  "edit-project-dialog": {
+    "header": "Edit {{projectName}}",
+    "nav-items": {
+      "dossier-info": "Dossier Info",
+      "general-info": "General Information",
+      "download-package": "Download Package",
+      "choose-download": "Choose what is included at download:",
+      "dictionary": "Dictionary",
+      "dossier-dictionary": "Dossier Dictionary",
+      "members": "Members",
+      "team-members": "Team Members",
+      "project-attributes": "Dossier Attributes",
+      "report-attributes": "Report Attributes"
+    },
+    "actions": {
+      "save": "Save Changes",
+      "revert": "Revert"
+    },
+    "general-info": {
+      "form": {
+        "name": {
+          "label": "Dossier Name",
+          "placeholder": "Enter Name"
+        },
+        "description": {
+          "label": "Description",
+          "placeholder": "Enter Description"
+        },
+        "due-date": "Due Date",
+        "template": "Dossier Template"
+      }
+    },
+    "dictionary": {
+      "entries": "{{length}} entries"
+    },
+    "unsaved-changes": "You have unsaved changes. Save or revert before changing the tab.",
+    "change-successful": "Project was updated."
+  },
   "project-details": {
     "title": "Dossier Details",
     "dialog": {
@@ -368,29 +402,7 @@
           "success": "Redaction added!",
           "error": "Failed to save redaction: {{error}}"
         },
-        "decline": {
-          "success": "Redaction suggestion declined!",
-          "error": "Failed to decline redaction: {{error}}"
-        },
-        "approve": {
-          "success": "Redaction suggestion approved!",
-          "error": "Failed to approved redaction: {{error}}"
-        },
-        "request-remove": {
-          "success": "Requested to remove redaction!",
-          "error": "Failed to request removal of redaction: {{error}}"
-        },
-        "assign-reviewer": "Assign Reviewer",
-        "assign-approver": "Assign Approver",
-        "assign-me": "Assign To Me",
-        "table-header": {
-          "title": "{{length}} documents",
-          "bulk-select": "Toggle Selection"
-        },
-        "remove": {
-          "success": "Redaction removed!",
-          "error": "Failed to remove redaction: {{error}}"
-        }
+        "search": "Document name..."
       },
       "dictionary": {
         "undo": {
diff --git a/apps/red-ui/src/assets/styles/red-menu.scss b/apps/red-ui/src/assets/styles/red-menu.scss
index d515f69b3..41e5d63ec 100644
--- a/apps/red-ui/src/assets/styles/red-menu.scss
+++ b/apps/red-ui/src/assets/styles/red-menu.scss
@@ -12,7 +12,11 @@
         padding-bottom: 24px;
     }
 
-    &.no-padding-bottom .mat-menu-content:not(:empty) {
+    &.padding-bottom-0 .mat-menu-content:not(:empty) {
+        padding-bottom: 0;
+    }
+
+    &.padding-bottom-8 .mat-menu-content:not(:empty) {
         padding-bottom: 8px;
     }
 
diff --git a/apps/red-ui/src/assets/styles/red-page-layout.scss b/apps/red-ui/src/assets/styles/red-page-layout.scss
index 677776986..e4a3344f3 100644
--- a/apps/red-ui/src/assets/styles/red-page-layout.scss
+++ b/apps/red-ui/src/assets/styles/red-page-layout.scss
@@ -20,7 +20,7 @@ section.settings {
         width: calc(100vw - 200px);
     }
 
-    redaction-side-nav {
+    redaction-admin-side-nav {
         height: calc(100vh - 61px);
     }
 }
@@ -330,11 +330,14 @@ section.settings {
     margin-right: 8px !important;
 }
 
+.mr-16 {
+    margin-right: 16px;
+}
+
 .fit-content {
     width: fit-content;
 }
 
-.space-between {
+.d-flex {
     display: flex;
-    justify-content: space-between;
 }
diff --git a/apps/red-ui/src/assets/styles/red-text-styles.scss b/apps/red-ui/src/assets/styles/red-text-styles.scss
index 638892fbb..9e72c84fd 100644
--- a/apps/red-ui/src/assets/styles/red-text-styles.scss
+++ b/apps/red-ui/src/assets/styles/red-text-styles.scss
@@ -76,6 +76,7 @@ pre {
     opacity: 0.7;
     font-size: 11px;
     line-height: 14px;
+    font-weight: initial;
 }
 
 .link-action {
diff --git a/apps/red-ui/src/assets/styles/red-tooltips.scss b/apps/red-ui/src/assets/styles/red-tooltips.scss
index 81eaa42ef..b7d8e6f77 100644
--- a/apps/red-ui/src/assets/styles/red-tooltips.scss
+++ b/apps/red-ui/src/assets/styles/red-tooltips.scss
@@ -31,11 +31,11 @@
 
     &.warn {
         background-color: $yellow-2;
-        color: $accent;
+        color: $accent !important;
 
-        &:after {
-            border-top: solid 6px $yellow-2;
-        }
+        //&:after {
+        //    border-top: solid 6px $yellow-2;
+        //}
     }
 }