diff --git a/projects/editor/src/app/unit-view/page-view/canvas/canvas.component.ts b/projects/editor/src/app/unit-view/page-view/canvas/canvas.component.ts
index da070a160e03fa79ddf296b8fc1821bc28c40616..95d1b6f4b3bab2ed237749c91d2e18307d037784 100644
--- a/projects/editor/src/app/unit-view/page-view/canvas/canvas.component.ts
+++ b/projects/editor/src/app/unit-view/page-view/canvas/canvas.component.ts
@@ -108,8 +108,8 @@ export class CanvasComponent implements OnInit, OnDestroy {
     return this.page.sections.reduce(reduceFct, 0);
   }
 
-  addSection(index: number | null = null): void {
-    this.unitService.addSection(this.page, index);
+  addSection(): void {
+    this.unitService.addSection(this.page);
     this.selectionService.selectedPageSectionIndex = this.page.sections.length - 1;
   }
 
diff --git a/projects/editor/src/app/unit-view/page-view/canvas/section-dynamic.component.ts b/projects/editor/src/app/unit-view/page-view/canvas/section-dynamic.component.ts
index ee42bead3d82cd87a360bb9b149b8f2198dcb8c0..09e1af999bf11205c737653e1216a982e965ed38 100644
--- a/projects/editor/src/app/unit-view/page-view/canvas/section-dynamic.component.ts
+++ b/projects/editor/src/app/unit-view/page-view/canvas/section-dynamic.component.ts
@@ -5,6 +5,7 @@ import { CdkDragDrop } from '@angular/cdk/drag-drop/drag-events';
 import { DragItemData, DropListData } from './canvas.component';
 import { UnitService } from '../../../unit.service';
 import { Section } from '../../../../../../common/models/section';
+import { UIElementType } from '../../../../../../common/models/uI-element';
 
 @Component({
   selector: 'app-section-dynamic',
@@ -129,7 +130,7 @@ export class SectionDynamicComponent {
   newElementDropped(event: DragEvent, gridX: number, gridY: number): void {
     event.preventDefault();
     this.unitService.addElementToSection(
-      event.dataTransfer?.getData('elementType') as string,
+      event.dataTransfer?.getData('elementType') as UIElementType,
       this.section,
       { x: gridX, y: gridY }
     );
diff --git a/projects/editor/src/app/unit-view/page-view/canvas/section-static.component.ts b/projects/editor/src/app/unit-view/page-view/canvas/section-static.component.ts
index 83776be2db99905d68a50fb12be666d07ffd5a36..ef49ec58f3c202b09452efcc0e7d8f56178450f6 100644
--- a/projects/editor/src/app/unit-view/page-view/canvas/section-static.component.ts
+++ b/projects/editor/src/app/unit-view/page-view/canvas/section-static.component.ts
@@ -3,6 +3,7 @@ import {
 } from '@angular/core';
 import { UnitService } from '../../../unit.service';
 import { Section } from '../../../../../../common/models/section';
+import { UIElementType } from '../../../../../../common/models/uI-element';
 
 @Component({
   selector: 'app-section-static',
@@ -33,7 +34,7 @@ export class SectionStaticComponent {
     event.preventDefault();
     const sectionRect = this.sectionElement.nativeElement.getBoundingClientRect();
     this.unitService.addElementToSection(
-      event.dataTransfer?.getData('elementType') as string,
+      event.dataTransfer?.getData('elementType') as UIElementType,
       this.section,
       { x: event.clientX - Math.round(sectionRect.left), y: event.clientY - Math.round(sectionRect.top) }
     );
diff --git a/projects/editor/src/app/unit-view/page-view/new-ui-element-panel/ui-element-toolbox.component.ts b/projects/editor/src/app/unit-view/page-view/new-ui-element-panel/ui-element-toolbox.component.ts
index ee8749421170f6a429e80eb6a828f302b38c4b28..ce6cf970514c2e5adeb788d98999139cd80e26d0 100644
--- a/projects/editor/src/app/unit-view/page-view/new-ui-element-panel/ui-element-toolbox.component.ts
+++ b/projects/editor/src/app/unit-view/page-view/new-ui-element-panel/ui-element-toolbox.component.ts
@@ -1,6 +1,7 @@
 import { Component } from '@angular/core';
 import { UnitService } from '../../../unit.service';
 import { SelectionService } from '../../../selection.service';
+import { UIElementType } from '../../../../../../common/models/uI-element';
 
 @Component({
   selector: 'app-ui-element-toolbox',
@@ -16,7 +17,7 @@ import { SelectionService } from '../../../selection.service';
 export class UiElementToolboxComponent {
   constructor(private selectionService: SelectionService, public unitService: UnitService) { }
 
-  async addUIElement(elementType: string): Promise<void> {
+  async addUIElement(elementType: UIElementType): Promise<void> {
     this.unitService.addElementToSectionByIndex(elementType,
       this.selectionService.selectedPageIndex,
       this.selectionService.selectedPageSectionIndex);