diff --git a/projects/common/services/sanitization.service.ts b/projects/common/services/sanitization.service.ts
index baa6e9d6bb5ed3a22b0dcc5d5e58edfcccbefea8..bb7e2b5e2c7ef6ebf5e637cd80cc295ae3a906cf 100644
--- a/projects/common/services/sanitization.service.ts
+++ b/projects/common/services/sanitization.service.ts
@@ -23,7 +23,7 @@ import { Page } from 'common/models/page';
 import { Section } from 'common/models/section';
 import { RadioButtonGroupComplexElement } from 'common/models/elements/input-elements/radio-button-group-complex';
 import { RadioButtonGroupElement } from 'common/models/elements/input-elements/radio-button-group';
-import { MessageService } from 'common/services/message.service';
+import { MessageService } from 'editor/src/app/services/message.service';
 import { IDService } from 'editor/src/app/services/id.service';
 import {
   BasicStyles,
diff --git a/projects/common/shared.module.ts b/projects/common/shared.module.ts
index 5a8e449a00f790ff548bd0c6b073bed68d7dbefe..e889bbfc460e51e75e93de4b294985797728de1e 100644
--- a/projects/common/shared.module.ts
+++ b/projects/common/shared.module.ts
@@ -81,11 +81,6 @@ import { SpinnerComponent } from './components/spinner/spinner.component';
 import { GetValuePipe, MathFieldComponent } from './components/input-elements/math-field.component';
 import { MeasurePipe } from './pipes/measure.pipe';
 import { TextImagePanelComponent } from './components/text-image-panel.component';
-import { ReferenceListComponent } from './components/reference-list.component';
-import {
-  FixedReferencesSnackbarComponent,
-  ReferenceListSnackbarComponent
-} from './services/message.service';
 import { UnitDefErrorDialogComponent } from './components/unit-def-error-dialog.component';
 import { MathTableComponent } from './components/input-elements/math-table.component';
 
@@ -167,9 +162,6 @@ import { DraggableDirective } from './components/input-elements/drop-list/dragga
     DynamicRowsDirective,
     MeasurePipe,
     TextImagePanelComponent,
-    ReferenceListComponent,
-    ReferenceListSnackbarComponent,
-    FixedReferencesSnackbarComponent,
     UnitDefErrorDialogComponent,
     TooltipComponent,
     TooltipEventTooltipDirective,
@@ -221,7 +213,6 @@ import { DraggableDirective } from './components/input-elements/drop-list/dragga
     MathFieldComponent,
     MeasurePipe,
     TextImagePanelComponent,
-    ReferenceListComponent,
     TextAreaMathComponent,
     MathTableComponent
   ]
diff --git a/projects/editor/src/app/app.module.ts b/projects/editor/src/app/app.module.ts
index ba704c7c957a85c1b950690dacfc065182d14d75..bc0a3a3a66243c8b897af2edbdace2de5b8af709 100644
--- a/projects/editor/src/app/app.module.ts
+++ b/projects/editor/src/app/app.module.ts
@@ -67,7 +67,9 @@ import { StaticCanvasOverlayComponent } from
 import { DynamicCanvasOverlayComponent } from
     'editor/src/app/components/unit-view/canvas/section-dynamic/dynamic-canvas-overlay.component';
 import { EditorTranslateLoader } from './editor-translate-loader';
-import { SectionMenuComponent } from 'editor/src/app/components/unit-view/canvas/section-menu.component';
+import {
+  SectionMenuComponent,
+} from 'editor/src/app/components/unit-view/canvas/section-menu.component';
 import { SectionStaticComponent } from 'editor/src/app/components/unit-view/canvas/section-static/section-static.component';
 import { SectionDynamicComponent } from 'editor/src/app/components/unit-view/canvas/section-dynamic/section-dynamic.component';
 import { RichTextEditorComponent } from './text-editor/rich-text-editor.component';
@@ -125,6 +127,8 @@ import {
 } from 'editor/src/app/components/properties-panel/model-properties-tab/input-groups/ele-specific-props.component';
 import { PageMenu } from 'editor/src/app/components/unit-view/page-menu.component';
 import { MAT_TOOLTIP_DEFAULT_OPTIONS, MatTooltipDefaultOptions } from '@angular/material/tooltip';
+import { ReferenceListComponent } from 'editor/src/app/components/reference-list.component';
+import { ElementListComponent } from 'editor/src/app/components/element-list.component';
 
 /** Custom options the configure the tooltip's default show/hide delays. */
 export const myCustomTooltipDefaults: MatTooltipDefaultOptions = {
@@ -231,7 +235,9 @@ export const myCustomTooltipDefaults: MatTooltipDefaultOptions = {
     IsInputElementPipe,
     OptionListPanelComponent,
     EleSpecificPropsComponent,
-    PageMenu
+    PageMenu,
+    ReferenceListComponent,
+    ElementListComponent
   ],
   providers: [
     { provide: APIService, useExisting: VeronaAPIService },
diff --git a/projects/editor/src/app/components/properties-panel/element-properties-panel.component.ts b/projects/editor/src/app/components/properties-panel/element-properties-panel.component.ts
index 5a39cea83739fff0b45f10831c44bbb165343b84..081ec4b22217d9061578497ade3da956c4e4e722 100644
--- a/projects/editor/src/app/components/properties-panel/element-properties-panel.component.ts
+++ b/projects/editor/src/app/components/properties-panel/element-properties-panel.component.ts
@@ -5,7 +5,7 @@ import { DomSanitizer } from '@angular/platform-browser';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 import { TranslateService } from '@ngx-translate/core';
-import { MessageService } from 'common/services/message.service';
+import { MessageService } from 'editor/src/app/services/message.service';
 import { UIElement } from 'common/models/elements/element';
 import { LikertRowElement } from 'common/models/elements/compound-elements/likert/likert-row';
 import { UnitService } from '../../services/unit-services/unit.service';
diff --git a/projects/editor/src/app/components/properties-panel/model-properties-tab/input-groups/ele-specific/drop-list-properties.component.ts b/projects/editor/src/app/components/properties-panel/model-properties-tab/input-groups/ele-specific/drop-list-properties.component.ts
index 48b73eaec40a77766bb644706be83e0a4787dd03..cdd1069c7af8b77ca5b699d1752e3c9ef52e62be 100644
--- a/projects/editor/src/app/components/properties-panel/model-properties-tab/input-groups/ele-specific/drop-list-properties.component.ts
+++ b/projects/editor/src/app/components/properties-panel/model-properties-tab/input-groups/ele-specific/drop-list-properties.component.ts
@@ -6,7 +6,7 @@ import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import { moveItemInArray } from '@angular/cdk/drag-drop';
 import { MatSelect, MatSelectModule } from '@angular/material/select';
 import { MatOption } from '@angular/material/core';
-import { MessageService } from 'common/services/message.service';
+import { MessageService } from 'editor/src/app/services/message.service';
 import { CombinedProperties } from 'editor/src/app/components/properties-panel/element-properties-panel.component';
 import { IDService } from 'editor/src/app/services/id.service';
 import { DragNDropValueObject, TextImageLabel } from 'common/models/elements/label-interfaces';
diff --git a/projects/common/components/reference-list.component.ts b/projects/editor/src/app/components/reference-list.component.ts
similarity index 100%
rename from projects/common/components/reference-list.component.ts
rename to projects/editor/src/app/components/reference-list.component.ts
diff --git a/projects/editor/src/app/components/unit-view/canvas/section-menu.component.ts b/projects/editor/src/app/components/unit-view/canvas/section-menu.component.ts
index a4cc1636e52dbf1e538930adce5f7fa6332f5d1c..ba2cafed8f5496959f998d8b18e8219a474f9074 100644
--- a/projects/editor/src/app/components/unit-view/canvas/section-menu.component.ts
+++ b/projects/editor/src/app/components/unit-view/canvas/section-menu.component.ts
@@ -4,8 +4,8 @@ import {
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 import { Clipboard } from '@angular/cdk/clipboard';
-import { MessageService } from 'common/services/message.service';
-import { CompoundElement, UIElement } from 'common/models/elements/element';
+import { MessageService } from 'editor/src/app/services/message.service';
+import { CompoundElement, Measurement, UIElement } from 'common/models/elements/element';
 import { Section } from 'common/models/section';
 import { DropListElement } from 'common/models/elements/input-elements/drop-list';
 import { IDService } from 'editor/src/app/services/id.service';
diff --git a/projects/editor/src/app/components/unit-view/page-menu.component.ts b/projects/editor/src/app/components/unit-view/page-menu.component.ts
index 8b4809dba71bbffb0f754c04c51ef4251be305c7..478aefafa628cb624d025e689d5c73e731e1fda8 100644
--- a/projects/editor/src/app/components/unit-view/page-menu.component.ts
+++ b/projects/editor/src/app/components/unit-view/page-menu.component.ts
@@ -13,7 +13,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { Page } from 'common/models/page';
 import { SelectionService } from 'editor/src/app/services/selection.service';
 import { UnitService } from 'editor/src/app/services/unit-services/unit.service';
-import { MessageService } from 'common/services/message.service';
+import { MessageService } from 'editor/src/app/services/message.service';
 import { Subject } from 'rxjs';
 import { MatTooltipModule } from '@angular/material/tooltip';
 import { PageService } from 'editor/src/app/services/unit-services/page.service';
diff --git a/projects/editor/src/app/services/id.service.ts b/projects/editor/src/app/services/id.service.ts
index e5ae9701e8ab74865f62d0cc3b109bcfab0d0396..5e910c5888b2e2f6fe00c857f59975e3a8e69394 100644
--- a/projects/editor/src/app/services/id.service.ts
+++ b/projects/editor/src/app/services/id.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 import { Unit } from 'common/models/unit';
 import { UIElement } from 'common/models/elements/element';
 import { DropListElement } from 'common/models/elements/input-elements/drop-list';
-import { MessageService } from 'common/services/message.service';
+import { MessageService } from 'editor/src/app/services/message.service';
 import { TranslateService } from '@ngx-translate/core';
 
 @Injectable({
diff --git a/projects/common/services/message.service.ts b/projects/editor/src/app/services/message.service.ts
similarity index 100%
rename from projects/common/services/message.service.ts
rename to projects/editor/src/app/services/message.service.ts
diff --git a/projects/editor/src/app/services/unit-services/element.service.ts b/projects/editor/src/app/services/unit-services/element.service.ts
index ddcb063b16ed404c39f5eb6af9f685112cd9205d..c5e93903f91a2264f339f2f56e33120778204d22 100644
--- a/projects/editor/src/app/services/unit-services/element.service.ts
+++ b/projects/editor/src/app/services/unit-services/element.service.ts
@@ -25,7 +25,7 @@ import {
 import { ElementFactory } from 'common/util/element.factory';
 import { ReferenceManager } from 'editor/src/app/services/reference-manager';
 import { DialogService } from 'editor/src/app/services/dialog.service';
-import { MessageService } from 'common/services/message.service';
+import { MessageService } from 'editor/src/app/services/message.service';
 import { TextElement } from 'common/models/elements/text/text';
 import { ClozeDocument, ClozeElement } from 'common/models/elements/compound-elements/cloze/cloze';
 import { DomSanitizer } from '@angular/platform-browser';
diff --git a/projects/editor/src/app/services/unit-services/page.service.ts b/projects/editor/src/app/services/unit-services/page.service.ts
index 4fcaec7cf3088f1b8d047cc460ea7da2095e3498..5cdea1226386bb86b3bc52382bc7d1028c38b209 100644
--- a/projects/editor/src/app/services/unit-services/page.service.ts
+++ b/projects/editor/src/app/services/unit-services/page.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { Page } from 'common/models/page';
 import { UnitService } from 'editor/src/app/services/unit-services/unit.service';
-import { MessageService } from 'common/services/message.service';
+import { MessageService } from 'editor/src/app/services/message.service';
 import { SelectionService } from 'editor/src/app/services/selection.service';
 import { ArrayUtils } from 'common/util/array';
 
diff --git a/projects/editor/src/app/services/unit-services/unit.service.ts b/projects/editor/src/app/services/unit-services/unit.service.ts
index 697d8a7c31652e4b99ad618abbf7373db19873fb..86de02da03c888254aca271a9490d1e793b184d8 100644
--- a/projects/editor/src/app/services/unit-services/unit.service.ts
+++ b/projects/editor/src/app/services/unit-services/unit.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import {  Subject } from 'rxjs';
 import { FileService } from 'common/services/file.service';
-import { MessageService } from 'common/services/message.service';
+import { MessageService } from 'editor/src/app/services/message.service';
 import { Unit, UnitProperties } from 'common/models/unit';
 import { DragNDropValueObject } from 'common/models/elements/label-interfaces';
 import {