diff --git a/frontend/src/app/ui/description/editor/description-editor.component.scss b/frontend/src/app/ui/description/editor/description-editor.component.scss
index 6c5c5df1c..8e2ad4110 100644
--- a/frontend/src/app/ui/description/editor/description-editor.component.scss
+++ b/frontend/src/app/ui/description/editor/description-editor.component.scss
@@ -206,7 +206,8 @@
   }
 
   .stepper-options {
-	height: calc(100vh - 650px);
+    flex: 1;
+    max-height: calc(100vh - 32rem);
     overflow-y: auto;
     .main-info {
       color: #21212194;
@@ -235,7 +236,7 @@
     letter-spacing: 0px;
     color: #212121;
     opacity: 0.6;
-    margin: 2.875rem 0rem 2.25rem 0rem;
+    margin: 2rem 0rem 1rem 0rem;
     padding-left: 1rem;
   }
 
diff --git a/frontend/src/app/ui/description/editor/description-editor.component.ts b/frontend/src/app/ui/description/editor/description-editor.component.ts
index e7ceefefb..b00a3232d 100644
--- a/frontend/src/app/ui/description/editor/description-editor.component.ts
+++ b/frontend/src/app/ui/description/editor/description-editor.component.ts
@@ -308,7 +308,10 @@ export class DescriptionEditorComponent extends BaseEditor<DescriptionEditorMode
 				complete => {
 					onSuccess ? onSuccess(complete) : this.onCallbackSuccess(complete);
 					this.descriptionIsOnceSaved = true;
-					if (this.formGroup.get('status').value == DescriptionStatusEnum.Finalized) this.isFinalized = true;
+					if (this.formGroup.get('status').value == DescriptionStatusEnum.Finalized){
+                        this.isFinalized = true;
+                        this.formGroup.disable();
+                    }
 				},
 				error => {
 					if (this.formGroup.get('status').value == DescriptionStatusEnum.Finalized) {
diff --git a/frontend/src/app/ui/description/editor/table-of-contents/table-of-contents-internal/table-of-contents-internal.ts b/frontend/src/app/ui/description/editor/table-of-contents/table-of-contents-internal/table-of-contents-internal.ts
index 6954ebab7..38b6fd135 100644
--- a/frontend/src/app/ui/description/editor/table-of-contents/table-of-contents-internal/table-of-contents-internal.ts
+++ b/frontend/src/app/ui/description/editor/table-of-contents/table-of-contents-internal/table-of-contents-internal.ts
@@ -88,13 +88,16 @@ export class TableOfContentsInternal extends BaseComponent implements OnInit, On
 	isTocEntryValid(entry: ToCEntry): boolean {
 		if (entry == null) return true;
 
-		if (entry.validityAbstractControl && !entry.validityAbstractControl.touched) return true;
-
+		if (entry.validityAbstractControl && (!entry.validityAbstractControl.touched || entry.validityAbstractControl.disabled)){
+            return true;
+        }
 		let currentValidity = entry.validityAbstractControl?.valid ?? true;
 		if (!currentValidity) return currentValidity;
 		entry.subEntries?.forEach(subEntry => {
 			currentValidity = currentValidity && this.isTocEntryValid(subEntry);
-			if (!currentValidity) return currentValidity;
+			if (!currentValidity){
+                return currentValidity;
+            }
 		});
 
 		return currentValidity;
diff --git a/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.html b/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.html
index 27656d30e..a54b40af6 100644
--- a/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.html
+++ b/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.html
@@ -135,7 +135,7 @@
 						<div class="row stepper-options">
 							<div class="col-auto">
 								<ol class="stepper-list" start="1">
-									<div *ngIf="selectedBlueprint?.definition && this.step !== 0">
+                                    @if(selectedBlueprint?.definition && this.step !== 0){
 										<ng-container *ngFor="let section of selectedBlueprint?.definition?.sections; let i=index">
 											<li (click)="changeStep(i + 1)" [ngClass]="{'active': this.step === (i + 1), 'text-danger': hasErrors(section.id) }"><span class="d-flex align-items-center">{{section.label}}
 													<mat-icon *ngIf="section.description" class="ml-1 w-auto h-auto" style="font-size: 1rem; font-weight: 700;" [matTooltip]="section.description">info</mat-icon>
@@ -163,7 +163,7 @@
 												</li>
 											</ul>
 										</ng-container>
-									</div>
+                                    }
 								</ol>
 							</div>
 						</div>