diff --git a/dmp-frontend/src/app/ui/admin/prefilling-source/editor/prefilling-source-editor.component.html b/dmp-frontend/src/app/ui/admin/prefilling-source/editor/prefilling-source-editor.component.html
index 4adb789db..54f78bec3 100644
--- a/dmp-frontend/src/app/ui/admin/prefilling-source/editor/prefilling-source-editor.component.html
+++ b/dmp-frontend/src/app/ui/admin/prefilling-source/editor/prefilling-source-editor.component.html
@@ -30,14 +30,20 @@
 						<mat-card-title *ngIf="isNew">{{'PREFILLING-SOURCE-EDITOR.NEW' | translate}}</mat-card-title>
 					</mat-card-header>
 					<mat-card-content>
-						<div class="row">
+						<div class="row mt-3">
 							<div class="col-12">
-								<mat-form-field class="w-100">
-									<mat-label>{{'PREFILLING-SOURCE-EDITOR.FIELDS.LABEL' | translate}}</mat-label>
-									<input matInput type="text" name="label" [formControl]="formGroup.get('label')" required>
-									<mat-error *ngIf="formGroup.get('label').hasError('backendError')">{{formGroup.get('label').getError('backendError').message}}</mat-error>
-									<mat-error *ngIf="formGroup.get('label').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-								</mat-form-field>
+								<div class="container-fluid">
+									<div class="row">
+										<div class="col-12">
+											<mat-form-field class="w-100">
+												<mat-label>{{'PREFILLING-SOURCE-EDITOR.FIELDS.LABEL' | translate}}</mat-label>
+												<input matInput type="text" name="label" [formControl]="formGroup.get('label')" required>
+												<mat-error *ngIf="formGroup.get('label').hasError('backendError')">{{formGroup.get('label').getError('backendError').message}}</mat-error>
+												<mat-error *ngIf="formGroup.get('label').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+											</mat-form-field>
+										</div>
+									</div>
+								</div>
 							</div>
 						</div>
 					</mat-card-content>
@@ -50,34 +56,40 @@
 						<div class="row">
 							<!-- Fixed Value Fields -->
 							<div class="col-12">
-								<div *ngFor="let field of formGroup.get('definition').get('fixedValueFields').controls; let fieldIndex=index;" class="row mb-3">
-									<div class="col-12">
-										<div class="row mb-3 d-flex align-items-center">
-											<div class="col-auto d-flex">
-												<mat-card-title>{{'PREFILLING-SOURCE-EDITOR.FIELDS.FIELD' | translate}} {{fieldIndex + 1}}</mat-card-title>
-											</div>
-											<div class="col-auto d-flex">
-												<button mat-icon-button class="action-list-icon" matTooltip="{{'PREFILLING-SOURCE-EDITOR.ACTIONS.REMOVE-FIELD' | translate}}" (click)="removeFixedValueField(fieldIndex)" [disabled]="formGroup.disabled">
-													<mat-icon>delete</mat-icon>
-												</button>
-											</div>
-										</div>
-										<div class="row">
-											<div class="col-9">
-												<app-prefilling-source-field-component [form]="field"></app-prefilling-source-field-component>
-											</div>
-											<div class="col-3">
-												<mat-form-field class="w-100">
-													<mat-label>{{'PREFILLING-SOURCE-EDITOR.FIELDS.FIXED-VALUE' | translate}}</mat-label>
-													<input matInput type="text" name="fixedValue" [formControl]="field.get('fixedValue')">
-													<mat-error *ngIf="field.get('fixedValue').hasError('backendError')">{{field.get('fixedValue').getError('backendError').message}}</mat-error>
-													<mat-error *ngIf="field.get('fixedValue').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-												</mat-form-field>
+								<div class="container-fluid">
+									<div class="row">
+										<div class="col-12">
+											<div *ngFor="let field of formGroup.get('definition').get('fixedValueFields').controls; let fieldIndex=index;" class="row mb-3">
+												<div class="col-12">
+													<div class="row mb-3 d-flex align-items-center">
+														<div class="col-auto d-flex">
+															<mat-card-title>{{'PREFILLING-SOURCE-EDITOR.FIELDS.FIELD' | translate}} {{fieldIndex + 1}}</mat-card-title>
+														</div>
+														<div class="col-auto d-flex">
+															<button mat-icon-button class="action-list-icon" matTooltip="{{'PREFILLING-SOURCE-EDITOR.ACTIONS.REMOVE-FIELD' | translate}}" (click)="removeFixedValueField(fieldIndex)" [disabled]="formGroup.disabled">
+																<mat-icon>delete</mat-icon>
+															</button>
+														</div>
+													</div>
+													<div class="row">
+														<div class="col-9">
+															<app-prefilling-source-field-component [form]="field"></app-prefilling-source-field-component>
+														</div>
+														<div class="col-3">
+															<mat-form-field class="w-100">
+																<mat-label>{{'PREFILLING-SOURCE-EDITOR.FIELDS.FIXED-VALUE' | translate}}</mat-label>
+																<input matInput type="text" name="fixedValue" [formControl]="field.get('fixedValue')">
+																<mat-error *ngIf="field.get('fixedValue').hasError('backendError')">{{field.get('fixedValue').getError('backendError').message}}</mat-error>
+																<mat-error *ngIf="field.get('fixedValue').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+															</mat-form-field>
+														</div>
+													</div>
+												</div>
 											</div>
+											<button mat-button class="action-btn" type="button" (click)="addFixedValiueField()" [disabled]="formGroup.disabled">{{'PREFILLING-SOURCE-EDITOR.ACTIONS.ADD-FIELD' | translate}}</button>
 										</div>
 									</div>
 								</div>
-								<button mat-button class="action-btn" type="button" (click)="addFixedValiueField()" [disabled]="formGroup.disabled">{{'PREFILLING-SOURCE-EDITOR.ACTIONS.ADD-FIELD' | translate}}</button>
 							</div>
 						</div>
 					</mat-card-content>
@@ -127,17 +139,26 @@
 						<mat-card-title>{{'PREFILLING-SOURCE-EDITOR.FIELDS.SOURCE-CONFIGURATION' | translate}}</mat-card-title>
 					</mat-card-header>
 					<mat-card-content>
-						<app-external-fetcher-source-component [formGroup]="formGroup.get('definition').get('searchConfiguration')" [validationErrorModel]="editorModel.validationErrorModel" [validationRootPath]="'definition.searchConfiguration.'"></app-external-fetcher-source-component>
-						<div>
-							<mat-checkbox [formControl]="formGroup.get('definition').get('getEnabled')" (change)="getEnabledChanged($event)">
-								{{'PREFILLING-SOURCE-EDITOR.FIELDS.GET-SOURCE-CONFIGURATION' | translate}}
-								<mat-error *ngIf="formGroup.get('definition').get('getEnabled').hasError('backendError')">{{formGroup.get('definition').get('getEnabled').getError('backendError').message}}</mat-error>
-								<mat-error *ngIf="formGroup.get('definition').get('getEnabled').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-							</mat-checkbox>
+						<div class="row mt-3">
+							<div class="col-12">
+								<div class="container">
+									<div class="row">
+										<div class="col-12">
+											<app-external-fetcher-source-component [formGroup]="formGroup.get('definition').get('searchConfiguration')" [validationErrorModel]="editorModel.validationErrorModel" [validationRootPath]="'definition.searchConfiguration.'"></app-external-fetcher-source-component>
+											<div>
+												<mat-checkbox [formControl]="formGroup.get('definition').get('getEnabled')" (change)="getEnabledChanged($event)">
+													{{'PREFILLING-SOURCE-EDITOR.FIELDS.GET-SOURCE-CONFIGURATION' | translate}}
+													<mat-error *ngIf="formGroup.get('definition').get('getEnabled').hasError('backendError')">{{formGroup.get('definition').get('getEnabled').getError('backendError').message}}</mat-error>
+													<mat-error *ngIf="formGroup.get('definition').get('getEnabled').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+												</mat-checkbox>
+											</div>
+										</div>
+									</div>
+								</div>
+							</div>
 						</div>
 					</mat-card-content>
 				</mat-card>
-
 				<mat-card appearance="outlined" *ngIf="formGroup.get('definition').get('getEnabled').value == true" class="mb-1">
 					<mat-card-header>
 						<mat-card-title>{{'PREFILLING-SOURCE-EDITOR.FIELDS.GET-SOURCE-CONFIGURATION' | translate}}</mat-card-title>