diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
index ba44a40f2f..ce76ef20db 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
@@ -37,7 +37,7 @@
             </select>
         </div>
 
-        <div *ngIf="hasRelationLookup" class="col-auto text-center">
+        <div *ngIf="hasRelationLookup && context?.index < 1" class="col-auto text-center">
             <button class="btn btn-secondary"
                     type="submit"
                     ngbTooltip="{{'form.lookup-help' | translate}}"
@@ -59,19 +59,5 @@
         </ds-existing-metadata-list-element>
     </ng-container>
     <ng-content></ng-content>
-
-
-    <!--    <div *ngIf="hasRelationLookup" class="mt-3">-->
-    <!--        <ul class="list-unstyled" cdkDropList (cdkDropListDropped)="moveSelection($event)">-->
-    <!--            <ds-existing-metadata-list-element cdkDrag-->
-    <!--                                               *ngFor="let reorderable of reorderables; trackBy: trackReorderable"-->
-    <!--                                               [reoRel]="reorderable"-->
-    <!--                                               [submissionItem]="item"-->
-    <!--                                               [listId]="listId"-->
-    <!--                                               [metadataFields]="model.metadataFields"-->
-    <!--                                               [relationshipOptions]="model.relationship">-->
-    <!--            </ds-existing-metadata-list-element>-->
-    <!--        </ul>-->
-    <!--    </div>-->
 </div>
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
index d98624f0c5..455b82be5f 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
@@ -227,6 +227,7 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
   }
 
   ngOnInit(): void {
+    console.log(this.model);
     this.hasRelationLookup = hasValue(this.model.relationship);
     if (this.hasRelationLookup) {
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.html
index 960dd78767..20bfd34689 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.html
@@ -1,7 +1,4 @@
 <li *ngIf="metadataRepresentation">
-    <button type="button" class="close float-left" aria-label="Move button" cdkDragHandle>
-        <i aria-hidden="true" class="fas fa-arrows-alt fa-xs"></i>
-    </button>
     <button type="button" class="close float-left" aria-label="Close button" (click)="removeSelection()">
         <span aria-hidden="true">&times;</span>
     </button>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
index 247bf20a8c..3c24371957 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
@@ -1,30 +1,42 @@
 <ng-container [formGroup]="group">
     <div [dynamicId]="bindId && model.id"
          [formArrayName]="model.id"
-         [ngClass]="getClass('element', 'control')" cdkDropList (cdkDropListDropped)="moveSelection($event)">
-
-        <div *ngFor="let groupModel of model.groups; let idx = index" role="group"
-             [formGroupName]="idx" [ngClass]="[getClass('element', 'group'), getClass('grid', 'group')]" cdkDrag>
-            <ng-container *ngTemplateOutlet="startTemplate?.templateRef; context: groupModel"></ng-container>
-
-            <ds-dynamic-form-control-container  *ngFor="let _model of groupModel.group"
-                                               [bindId]="false"
-                                               [context]="groupModel"
-                                               [group]="control.at(idx)"
-                                               [hidden]="_model.hidden"
-                                               [layout]="layout"
-                                               [model]="_model"
-                                               [templates]="templates"
-                                               [ngClass]="[getClass('element', 'host', _model), getClass('grid', 'host', _model)]"
-                                               (dfBlur)="onBlur($event)"
-                                               (dfChange)="onChange($event)"
-                                               (dfFocus)="onFocus($event)"
-                                               (ngbEvent)="onCustomEvent($event, null, true)"></ds-dynamic-form-control-container>
-
-            <ng-container *ngTemplateOutlet="endTemplate?.templateRef; context: groupModel"></ng-container>
-
+         [ngClass]="getClass('element', 'control')">
+        <div role="group"
+             formGroupName="0" [ngClass]="[getClass('element', 'group'), getClass('grid', 'group')]">
+            <ng-container *ngTemplateOutlet="startTemplate?.templateRef; context: model.groups[0]"></ng-container>
+            <ng-container *ngTemplateOutlet="controlContainer; context: {$implicit: 0}"></ng-container>
+            <ng-container *ngTemplateOutlet="endTemplate?.templateRef; context: model.groups[0]"></ng-container>
+        </div>
+        <div cdkDropList cdkDropListLockAxis="y" (cdkDropListDropped)="moveSelection($event)">
+            <div *ngFor="let groupModel of model.groups; let idx = index" role="group"
+                 [formGroupName]="idx" [ngClass]="[getClass('element', 'group'), getClass('grid', 'group')]" cdkDrag>
+                <ng-container *ngIf="idx > 0">
+                    <button type="button" class="close float-left" aria-label="Move button" cdkDragHandle>
+                        <i aria-hidden="true" class="fas fa-arrows-alt fa-xs"></i>
+                    </button>
+                    <ng-container *ngTemplateOutlet="startTemplate?.templateRef; context: groupModel"></ng-container>
+                    <ng-container *ngTemplateOutlet="controlContainer; context: {$implicit: idx}"></ng-container>
+                    <ng-container *ngTemplateOutlet="endTemplate?.templateRef; context: groupModel"></ng-container>
+                </ng-container>
+            </div>
         </div>
-
     </div>
-
 </ng-container>
+
+
+<ng-template #controlContainer let-idx>
+    <ds-dynamic-form-control-container *ngFor="let _model of model.groups[idx].group"
+                                       [bindId]="false"
+                                       [context]="model.groups[idx]"
+                                       [group]="control.at(idx)"
+                                       [hidden]="_model.hidden"
+                                       [layout]="layout"
+                                       [model]="_model"
+                                       [templates]="templates"
+                                       [ngClass]="[getClass('element', 'host', _model), getClass('grid', 'host', _model)]"
+                                       (dfBlur)="onBlur($event)"
+                                       (dfChange)="onChange($event)"
+                                       (dfFocus)="onFocus($event)"
+                                       (ngbEvent)="onCustomEvent($event, null, true)"></ds-dynamic-form-control-container>
+</ng-template>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts
index 1843beb448..20a4a6c275 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts
@@ -69,6 +69,7 @@ export class DsDynamicFormArrayComponent extends DynamicFormArrayComponent imple
   }
 
   ngOnInit(): void {
+    console.log(this.model);
     this.submissionObjectService
       .findById(this.model.submissionId).pipe(
       getSucceededRemoteData(),
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-array-model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-array-model.ts
index 432446c56c..1a20453248 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-array-model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-array-model.ts
@@ -4,12 +4,14 @@ export interface DynamicRowArrayModelConfig extends DynamicFormArrayModelConfig
   notRepeatable: boolean;
   required: boolean;
   submissionId: string;
+  hasRelationship: boolean;
 }
 
 export class DynamicRowArrayModel extends DynamicFormArrayModel {
   @serializable() notRepeatable = false;
   @serializable() required = false;
   @serializable() submissionId: string;
+  @serializable() hasRelationship: boolean;
   isRowArray = true;
 
   constructor(config: DynamicRowArrayModelConfig, layout?: DynamicFormControlLayout) {
@@ -17,5 +19,6 @@ export class DynamicRowArrayModel extends DynamicFormArrayModel {
     this.notRepeatable = config.notRepeatable;
     this.required = config.required;
     this.submissionId = config.submissionId;
+    this.hasRelationship = config.hasRelationship;
   }
 }
diff --git a/src/app/shared/form/builder/parsers/field-parser.ts b/src/app/shared/form/builder/parsers/field-parser.ts
index 7b83d20e1d..5cacbe962c 100644
--- a/src/app/shared/form/builder/parsers/field-parser.ts
+++ b/src/app/shared/form/builder/parsers/field-parser.ts
@@ -48,7 +48,8 @@ export abstract class FieldParser {
         id: uniqueId() + '_array',
         label: this.configData.label,
         initialCount: this.getInitArrayIndex() + 1,
-        notRepeatable: !this.configData.repeatable || hasValue(this.configData.selectableRelationship),
+        notRepeatable: !this.configData.repeatable,
+        hasRelationship: isNotEmpty(this.configData.selectableRelationship),
         required: isNotEmpty(this.configData.mandatory),
         submissionId: this.submissionId,
         groupFactory: () => {
@@ -79,7 +80,7 @@ export abstract class FieldParser {
             }
           }
           setLayout(model, 'element', 'host', 'col');
-          if (model.hasLanguages) {
+          if (model.hasLanguages|| isNotEmpty(model.relationship)) {
             setLayout(model, 'grid', 'control', 'col');
           }
           return [model];
@@ -193,7 +194,7 @@ export abstract class FieldParser {
     }
   }
 
-  protected initModel(id?: string, label = true, setErrors = true) {
+  protected initModel(id?: string, label = true, setErrors = true, hint = true) {
 
     const controlModel = Object.create(null);
 
@@ -218,11 +219,11 @@ export abstract class FieldParser {
 
     // Set label
     this.setLabel(controlModel, label);
-
+    if (hint) {
+      controlModel.hint = this.configData.hints;
+    }
     controlModel.placeholder = this.configData.label;
 
-    controlModel.hint = this.configData.hints;
-
     if (this.configData.mandatory && setErrors) {
       this.markAsRequired(controlModel);
     }
diff --git a/src/app/shared/form/form.component.html b/src/app/shared/form/form.component.html
index aebf8bcf67..61649e384d 100644
--- a/src/app/shared/form/form.component.html
+++ b/src/app/shared/form/form.component.html
@@ -1,62 +1,71 @@
 <div class="container-fluid">
-  <form class="form-horizontal" [formGroup]="formGroup">
+    <form class="form-horizontal" [formGroup]="formGroup">
 
-    <ds-dynamic-form
-      [formId]="formId"
-      [formGroup]="formGroup"
-      [formModel]="formModel"
-      [formLayout]="formLayout"
-      (change)="$event.stopPropagation();"
-      (dfBlur)="onBlur($event)"
-      (dfChange)="onChange($event)"
-      (dfFocus)="onFocus($event)">
+        <ds-dynamic-form
+                [formId]="formId"
+                [formGroup]="formGroup"
+                [formModel]="formModel"
+                [formLayout]="formLayout"
+                (change)="$event.stopPropagation();"
+                (dfBlur)="onBlur($event)"
+                (dfChange)="onChange($event)"
+                (dfFocus)="onFocus($event)">
 
-      <ng-template modelType="ARRAY" let-group let-index="index" let-context="context">
+            <ng-template modelType="ARRAY" let-group let-index="index" let-context="context">
+                <ng-container *ngIf="!context.hasRelationship">
+                    <!--Array with repeatable items-->
+                    <div *ngIf="!context.notRepeatable"
+                         class="col-xs-2 d-flex flex-column justify-content-sm-start align-items-end">
+                        <div class="btn-group" role="group" aria-label="Add and remove button">
+                            <button type="button" class="btn btn-secondary"
+                                    [disabled]="isItemReadOnly(context, index)"
+                                    (click)="insertItem($event, group.context, group.index + 1)">
+                                <i class="fas fa-plus" aria-hidden="true"></i>
+                            </button>
+                            <button type="button" class="btn btn-secondary"
+                                    (click)="removeItem($event, context, index)"
+                                    [disabled]="group.context.groups.length === 1 || isItemReadOnly(context, index)">
+                                <i class="fas fa-trash" aria-hidden="true"></i>
+                            </button>
+                        </div>
+                    </div>
 
-        <!--Array with repeatable items-->
-        <div *ngIf="!context.notRepeatable"
-             class="col-xs-2 d-flex flex-column justify-content-sm-start align-items-end">
-          <div class="btn-group" role="group" aria-label="Add and remove button">
-            <button type="button" class="btn btn-secondary"
-                    [disabled]="isItemReadOnly(context, index)"
-                    (click)="insertItem($event, group.context, group.index + 1)">
-              <i class="fas fa-plus" aria-hidden="true"></i>
-            </button>
-            <button type="button" class="btn btn-secondary"
-                    (click)="removeItem($event, context, index)"
-                    [disabled]="group.context.groups.length === 1 || isItemReadOnly(context, index)">
-              <i class="fas fa-trash" aria-hidden="true"></i>
-            </button>
-          </div>
+                    <!--Array with non repeatable items - Only delete button-->
+                    <div *ngIf="context.notRepeatable && group.context.groups.length > 1"
+                         class="col-xs-2 d-flex flex-column justify-content-sm-start align-items-end">
+                        <div class="btn-group" role="group" aria-label="Remove button">
+                            <button type="button" class="btn btn-secondary"
+                                    (click)="removeItem($event, context, index)"
+                                    [disabled]="group.context.groups.length === 1 || isItemReadOnly(context, index)">
+                                <i class="fas fa-trash" aria-hidden="true"></i>
+                            </button>
+                        </div>
+                    </div>
+                </ng-container>
+
+                <div *ngIf="!context.notRepeatable && context.hasRelationship && index < 1" class="col-auto text-center">
+                    <button type="button" class="btn btn-secondary"
+                            [disabled]="isItemReadOnly(context, index)"
+                            (click)="insertItem($event, group.context, group.index + 1)">
+                        {{'form.add' | translate}}
+                    </button>
+                </div>
+            </ng-template>
+
+        </ds-dynamic-form>
+
+        <div *ngIf="displaySubmit">
+            <hr>
+            <div class="form-group row">
+                <div class="col text-right">
+                    <button type="reset" class="btn btn-default" (click)="reset()">{{'form.cancel' | translate}}</button>
+                    <button type="submit" class="btn btn-primary" (click)="onSubmit()"
+                            [disabled]="!(isValid() | async)">{{'form.submit' | translate}}
+                    </button>
+                </div>
+            </div>
         </div>
 
-        <!--Array with non repeatable items - Only delete button-->
-        <div *ngIf="context.notRepeatable && group.context.groups.length > 1"
-             class="col-xs-2 d-flex flex-column justify-content-sm-start align-items-end">
-          <div class="btn-group" role="group" aria-label="Remove button">
-            <button type="button" class="btn btn-secondary"
-                    (click)="removeItem($event, context, index)"
-                    [disabled]="group.context.groups.length === 1 || isItemReadOnly(context, index)">
-              <i class="fas fa-trash" aria-hidden="true"></i>
-            </button>
-          </div>
-        </div>
-      </ng-template>
-
-    </ds-dynamic-form>
-
-    <div *ngIf="displaySubmit">
-      <hr>
-      <div class="form-group row">
-        <div class="col text-right">
-          <button type="reset" class="btn btn-default" (click)="reset()">{{'form.cancel' | translate}}</button>
-          <button type="submit" class="btn btn-primary" (click)="onSubmit()"
-                  [disabled]="!(isValid() | async)">{{'form.submit' | translate}}
-          </button>
-        </div>
-      </div>
-    </div>
-
-  </form>
+    </form>
 
 </div>
diff --git a/src/app/shared/mocks/mock-form-models.ts b/src/app/shared/mocks/mock-form-models.ts
index 9a6ef13731..a98a950527 100644
--- a/src/app/shared/mocks/mock-form-models.ts
+++ b/src/app/shared/mocks/mock-form-models.ts
@@ -76,6 +76,7 @@ const rowArrayQualdropConfig = {
   id: 'row_QUALDROP_GROUP',
   initialCount: 1,
   notRepeatable: true,
+  hasRelationship: false,
   groupFactory: () => {
     return [MockQualdropModel];
   },