diff --git a/dmp-frontend/src/app/ui/admin/description-types/editor/description-template-type-editor.component.html b/dmp-frontend/src/app/ui/admin/description-types/editor/description-template-type-editor.component.html
index 0ff65f03e..c72094294 100644
--- a/dmp-frontend/src/app/ui/admin/description-types/editor/description-template-type-editor.component.html
+++ b/dmp-frontend/src/app/ui/admin/description-types/editor/description-template-type-editor.component.html
@@ -37,19 +37,29 @@
 				<mat-card-content>
 					<form (ngSubmit)="formSubmit()" [formGroup]="formGroup" *ngIf="formGroup">
 						<div class="row">
-							<div class="col-12 pt-1 pb-1">
-								<span>
-									{{'DESCRIPTION-TEMPLATE-TYPE-EDITOR.FIELDS.NAME' | translate}}
-								</span>
+							<div class="col-12">
+								<div class="container-fluid">
+									<div class="row">
+										<div class="col-12 pt-1 pb-1">
+											<span>
+												{{'DESCRIPTION-TEMPLATE-TYPE-EDITOR.FIELDS.NAME' | translate}}
+											</span>
+										</div>
+									</div>
+								</div>
 							</div>
 							<div class="col-12 mt-1">
-								<mat-form-field class="w-100">
-									<input matInput placeholder="{{'DESCRIPTION-TEMPLATE-TYPE-EDITOR.FIELDS.NAME' | translate}}" type="text" name="name" [formControl]="formGroup.get('name')" required>
-									<mat-error *ngIf="formGroup.get('name').hasError('backendError')">
-										{{formGroup.get('name').getError('backendError').message}}</mat-error>
-									<mat-error *ngIf="formGroup.get('name').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">
+												<input matInput placeholder="{{'DESCRIPTION-TEMPLATE-TYPE-EDITOR.FIELDS.NAME' | translate}}" type="text" name="name" [formControl]="formGroup.get('name')" required>
+												<mat-error *ngIf="formGroup.get('name').hasError('backendError')">{{formGroup.get('name').getError('backendError').message}}</mat-error>
+												<mat-error *ngIf="formGroup.get('name').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+											</mat-form-field>
+										</div>
+									</div>
+								</div>
 							</div>
 						</div>
 					</form>
diff --git a/dmp-frontend/src/app/ui/admin/reference-type/editor/reference-type-editor.component.html b/dmp-frontend/src/app/ui/admin/reference-type/editor/reference-type-editor.component.html
index dd0055b0a..2b6bffbd9 100644
--- a/dmp-frontend/src/app/ui/admin/reference-type/editor/reference-type-editor.component.html
+++ b/dmp-frontend/src/app/ui/admin/reference-type/editor/reference-type-editor.component.html
@@ -30,117 +30,138 @@
 				</mat-card-header>
 				<mat-card-content>
 					<form (ngSubmit)="formSubmit()" [formGroup]="formGroup" *ngIf="formGroup">
+						<div class="row mt-3">
+							<div class="col-12">
+								<div class="container-fluid">
+									<div class="row">									
+										<div class="col-6">
+											<mat-form-field class="w-100">
+												<mat-label>{{'REFERENCE-TYPE-EDITOR.FIELDS.NAME' | translate}}</mat-label>
+												<input matInput type="text" name="name" [formControl]="formGroup.get('name')" required>
+												<mat-error *ngIf="formGroup.get('name').hasError('backendError')">{{formGroup.get('name').getError('backendError').message}}</mat-error>
+												<mat-error *ngIf="formGroup.get('name').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+											</mat-form-field>
+										</div>
+										<div class="col-6">
+											<mat-form-field class="w-100">
+												<mat-label>{{'REFERENCE-TYPE-EDITOR.FIELDS.CODE' | translate}}</mat-label>
+												<input matInput type="text" name="name" [formControl]="formGroup.get('code')" required>
+												<mat-error *ngIf="formGroup.get('code').hasError('backendError')">{{formGroup.get('code').getError('backendError').message}}</mat-error>
+												<mat-error *ngIf="formGroup.get('code').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+											</mat-form-field>
+										</div>
+									</div>
+								</div>
+							</div>
+						</div>
 						<div class="row">
-							<div class="col-6">
-								<mat-form-field class="w-100">
-									<mat-label>{{'REFERENCE-TYPE-EDITOR.FIELDS.NAME' | translate}}</mat-label>
-									<input matInput type="text" name="name" [formControl]="formGroup.get('name')" required>
-									<mat-error *ngIf="formGroup.get('name').hasError('backendError')">{{formGroup.get('name').getError('backendError').message}}</mat-error>
-									<mat-error *ngIf="formGroup.get('name').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-								</mat-form-field>
-							</div>
-							<div class="col-6">
-								<mat-form-field class="w-100">
-									<mat-label>{{'REFERENCE-TYPE-EDITOR.FIELDS.CODE' | translate}}</mat-label>
-									<input matInput type="text" name="name" [formControl]="formGroup.get('code')" required>
-									<mat-error *ngIf="formGroup.get('code').hasError('backendError')">{{formGroup.get('code').getError('backendError').message}}</mat-error>
-									<mat-error *ngIf="formGroup.get('code').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-								</mat-form-field>
-							</div>
-
-							<div class="col-12 mt-3 mb-3">
-								<div class="row d-flex align-items-center">
-									<div class="col-auto">
-										<h3 class="m-0">{{'REFERENCE-TYPE-EDITOR.FIELDS.FIELDS' | translate}}</h3>
-									</div>
-									<div class="col-auto">
-										<button mat-button class="action-btn" type="button" (click)="addField()" [disabled]="formGroup.disabled">{{'REFERENCE-TYPE-EDITOR.ACTIONS.ADD-FIELD' | translate}}</button>
+							<div class="col-12">
+								<div class="container-fluid">
+									<div class="row">		
+										<div class="col-12 mt-3 mb-3">
+											<div class="row d-flex align-items-center">
+												<div class="col-auto">
+													<h3 class="m-0">{{'REFERENCE-TYPE-EDITOR.FIELDS.FIELDS' | translate}}</h3>
+												</div>
+												<div class="col-auto">
+													<button mat-button class="action-btn" type="button" (click)="addField()" [disabled]="formGroup.disabled">{{'REFERENCE-TYPE-EDITOR.ACTIONS.ADD-FIELD' | translate}}</button>
+												</div>
+											</div>
+										</div>
 									</div>
 								</div>
 							</div>
+						</div>
 							<!-- FIELDS  -->
+						<div class="row">
 							<div class="col-12">
-								<div *ngFor="let field of formGroup.get('definition').get('fields').controls; let fieldIndex=index;" class="row mb-3">
-									<div class="col-12">
-										<div class="row d-flex align-items-center">
-											<div class="col-auto pb-3 d-flex">
-												<span>{{fieldIndex + 1}}</span>
+								<div class="container-fluid">
+									<div class="row">		
+										<div class="col-12">
+											<div *ngFor="let field of formGroup.get('definition').get('fields').controls; let fieldIndex=index;" class="row mb-3">
+												<div class="col-12">
+													<div class="row d-flex align-items-center">
+														<div class="col-auto pb-3 d-flex">
+															<span>{{fieldIndex + 1}}</span>
+														</div>
+														<div class="col">
+															<mat-form-field class="w-100">
+																<mat-label>{{'REFERENCE-TYPE-EDITOR.FIELDS.LABEL' | translate}}</mat-label>
+																<input matInput type="text" name="label" [formControl]="field.get('label')" required>
+																<mat-error *ngIf="field.get('label').hasError('backendError')">{{field.get('label').getError('backendError').message}}</mat-error>
+																<mat-error *ngIf="field.get('label').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+															</mat-form-field>
+														</div>
+														<div class="col">
+															<mat-form-field class="w-100">
+																<mat-label>{{'REFERENCE-TYPE-EDITOR.FIELDS.DESCRIPTION' | translate}}</mat-label>
+																<input matInput type="text" name="description" [formControl]="field.get('description')">
+																<mat-error *ngIf="field.get('description').hasError('backendError')">{{field.get('description').getError('backendError').message}}</mat-error>
+																<mat-error *ngIf="field.get('description').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+															</mat-form-field>
+														</div>
+														<div class="col">
+															<mat-form-field class="w-100">
+																<mat-label>{{'REFERENCE-TYPE-EDITOR.FIELDS.CODE' | translate}}</mat-label>
+																<input matInput type="text" name="code" [formControl]="field.get('code')" required>
+																<mat-error *ngIf="field.get('code').hasError('backendError')">{{field.get('code').getError('backendError').message}}</mat-error>
+																<mat-error *ngIf="field.get('code').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+															</mat-form-field>
+														</div>
+														<div class="col">
+															<mat-form-field class="w-100">
+																<mat-label>{{'REFERENCE-TYPE-EDITOR.FIELDS.DATA-TYPE' | translate}}</mat-label>
+																<mat-select name="dataType" [formControl]="field.get('dataType')">
+																	<mat-option *ngFor="let fieldDataType of referenceFieldDataTypeEnum" [value]="fieldDataType">
+																		{{enumUtils.toReferenceFieldDataTypeString(fieldDataType)}}
+																	</mat-option>
+																</mat-select>
+																<mat-error *ngIf="field.get('dataType').hasError('backendError')">{{field.get('dataType').getError('backendError').message}}</mat-error>
+																<mat-error *ngIf="field.get('dataType').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+															</mat-form-field>
+														</div>
+														<div class="col-auto pb-3 d-flex">
+															<button mat-icon-button class="action-list-icon" matTooltip="{{'REFERENCE-TYPE-EDITOR.ACTIONS.REMOVE-FIELD' | translate}}" (click)="removeField(fieldIndex)" [disabled]="formGroup.disabled">
+																<mat-icon>delete</mat-icon>
+															</button>
+														</div>
+													</div>
+												</div>
 											</div>
-											<div class="col">
-												<mat-form-field class="w-100">
-													<mat-label>{{'REFERENCE-TYPE-EDITOR.FIELDS.LABEL' | translate}}</mat-label>
-													<input matInput type="text" name="label" [formControl]="field.get('label')" required>
-													<mat-error *ngIf="field.get('label').hasError('backendError')">{{field.get('label').getError('backendError').message}}</mat-error>
-													<mat-error *ngIf="field.get('label').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-												</mat-form-field>
+											<button mat-button class="action-btn" *ngIf="formGroup.get('definition').get('fields').value != ''" type="button" (click)="submitFields()" [disabled]="!formGroup.get('definition').get('fields').valid">{{'REFERENCE-TYPE-EDITOR.ACTIONS.SUBMIT-FIELDS' | translate}}</button>
+										</div>
+										<div class="col-12 mt-3 mb-3">
+											<div class="row d-flex align-items-center">
+												<div class="col-auto">
+													<h3 class="m-0">{{'REFERENCE-TYPE-EDITOR.FIELDS.SOURCES' | translate}}</h3>
+												</div>
+												<div class="col-auto">
+													<button mat-button class="action-btn" type="button" (click)="addSource()" [disabled]="formGroup.disabled">{{'REFERENCE-TYPE-EDITOR.ACTIONS.ADD-SOURCE' | translate}}</button>
+												</div>
 											</div>
-											<div class="col">
-												<mat-form-field class="w-100">
-													<mat-label>{{'REFERENCE-TYPE-EDITOR.FIELDS.DESCRIPTION' | translate}}</mat-label>
-													<input matInput type="text" name="description" [formControl]="field.get('description')">
-													<mat-error *ngIf="field.get('description').hasError('backendError')">{{field.get('description').getError('backendError').message}}</mat-error>
-													<mat-error *ngIf="field.get('description').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-												</mat-form-field>
-											</div>
-											<div class="col">
-												<mat-form-field class="w-100">
-													<mat-label>{{'REFERENCE-TYPE-EDITOR.FIELDS.CODE' | translate}}</mat-label>
-													<input matInput type="text" name="code" [formControl]="field.get('code')" required>
-													<mat-error *ngIf="field.get('code').hasError('backendError')">{{field.get('code').getError('backendError').message}}</mat-error>
-													<mat-error *ngIf="field.get('code').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-												</mat-form-field>
-											</div>
-											<div class="col">
-												<mat-form-field class="w-100">
-													<mat-label>{{'REFERENCE-TYPE-EDITOR.FIELDS.DATA-TYPE' | translate}}</mat-label>
-													<mat-select name="dataType" [formControl]="field.get('dataType')">
-														<mat-option *ngFor="let fieldDataType of referenceFieldDataTypeEnum" [value]="fieldDataType">
-															{{enumUtils.toReferenceFieldDataTypeString(fieldDataType)}}
-														</mat-option>
-													</mat-select>
-													<mat-error *ngIf="field.get('dataType').hasError('backendError')">{{field.get('dataType').getError('backendError').message}}</mat-error>
-													<mat-error *ngIf="field.get('dataType').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-												</mat-form-field>
-											</div>
-											<div class="col-auto pb-3 d-flex">
-												<button mat-icon-button class="action-list-icon" matTooltip="{{'REFERENCE-TYPE-EDITOR.ACTIONS.REMOVE-FIELD' | translate}}" (click)="removeField(fieldIndex)" [disabled]="formGroup.disabled">
-													<mat-icon>delete</mat-icon>
-												</button>
+										</div>
+										<div class="col-12">
+											<div *ngFor="let source of formGroup.get('definition').get('sources').controls; let sourceIndex=index;" class="row">
+												<div class="col-12">
+													<div class="row mb-3 d-flex align-items-center">
+														<div class="col-auto d-flex">
+															<mat-card-title>{{'REFERENCE-TYPE-EDITOR.FIELDS.SOURCE-CONFIGURATION' | translate}} {{sourceIndex + 1}}</mat-card-title>
+														</div>
+														<div class="col-auto d-flex">
+															<button mat-icon-button class="action-list-icon" matTooltip="{{'REFERENCE-TYPE-EDITOR.ACTIONS.REMOVE-SOURCE' | translate}}" (click)="removeSource(sourceIndex)" [disabled]="formGroup.disabled">
+																<mat-icon>delete</mat-icon>
+															</button>
+														</div>
+													</div>
+													<app-external-fetcher-source-component [formGroup]="source" [fieldsForm]="formGroup.get('definition').get('fields')" [validationErrorModel]="editorModel.validationErrorModel" [validationRootPath]="'definition.sources[' + sourceIndex + '].'" [referenceTypeSourceIndex]="sourceIndex" [referenceTypes]="referenceTypes" [sourceKeysMap]="sourceKeysMap">
+													</app-external-fetcher-source-component>
+												</div>
 											</div>
+											<mat-error *ngIf="formGroup.get('definition').get('sources').dirty && formGroup.get('definition').get('sources').hasError('required')">{{'REFERENCE-TYPE-EDITOR.SOURCES-REQUIRED' | translate}}</mat-error>
+											<mat-error *ngIf="formGroup.get('definition').get('sources').hasError('backendError')">{{formGroup.get('definition').get('sources').getError('backendError').message}}</mat-error>
 										</div>
 									</div>
 								</div>
-								<button mat-button class="action-btn" *ngIf="formGroup.get('definition').get('fields').value != ''" type="button" (click)="submitFields()" [disabled]="!formGroup.get('definition').get('fields').valid">{{'REFERENCE-TYPE-EDITOR.ACTIONS.SUBMIT-FIELDS' | translate}}</button>
-							</div>
-							<div class="col-12 mt-3 mb-3">
-								<div class="row d-flex align-items-center">
-									<div class="col-auto">
-										<h3 class="m-0">{{'REFERENCE-TYPE-EDITOR.FIELDS.SOURCES' | translate}}</h3>
-									</div>
-									<div class="col-auto">
-										<button mat-button class="action-btn" type="button" (click)="addSource()" [disabled]="formGroup.disabled">{{'REFERENCE-TYPE-EDITOR.ACTIONS.ADD-SOURCE' | translate}}</button>
-									</div>
-								</div>
-							</div>
-							<div class="col-12">
-								<div *ngFor="let source of formGroup.get('definition').get('sources').controls; let sourceIndex=index;" class="row">
-									<div class="col-12">
-										<div class="row mb-3 d-flex align-items-center">
-											<div class="col-auto d-flex">
-												<mat-card-title>{{'REFERENCE-TYPE-EDITOR.FIELDS.SOURCE-CONFIGURATION' | translate}} {{sourceIndex + 1}}</mat-card-title>
-											</div>
-											<div class="col-auto d-flex">
-												<button mat-icon-button class="action-list-icon" matTooltip="{{'REFERENCE-TYPE-EDITOR.ACTIONS.REMOVE-SOURCE' | translate}}" (click)="removeSource(sourceIndex)" [disabled]="formGroup.disabled">
-													<mat-icon>delete</mat-icon>
-												</button>
-											</div>
-										</div>
-										<app-external-fetcher-source-component [formGroup]="source" [fieldsForm]="formGroup.get('definition').get('fields')" [validationErrorModel]="editorModel.validationErrorModel" [validationRootPath]="'definition.sources[' + sourceIndex + '].'" [referenceTypeSourceIndex]="sourceIndex" [referenceTypes]="referenceTypes" [sourceKeysMap]="sourceKeysMap">
-										</app-external-fetcher-source-component>
-									</div>
-								</div>
-								<mat-error *ngIf="formGroup.get('definition').get('sources').dirty && formGroup.get('definition').get('sources').hasError('required')">{{'REFERENCE-TYPE-EDITOR.SOURCES-REQUIRED' | translate}}</mat-error>
-								<mat-error *ngIf="formGroup.get('definition').get('sources').hasError('backendError')">{{formGroup.get('definition').get('sources').getError('backendError').message}}</mat-error>
 							</div>
 						</div>
 					</form>
diff --git a/dmp-frontend/src/app/ui/external-fetcher/external-fetcher-source.component.html b/dmp-frontend/src/app/ui/external-fetcher/external-fetcher-source.component.html
index abd4117ef..cac29980f 100644
--- a/dmp-frontend/src/app/ui/external-fetcher/external-fetcher-source.component.html
+++ b/dmp-frontend/src/app/ui/external-fetcher/external-fetcher-source.component.html
@@ -1,3 +1,4 @@
+
 <div class="row">
 	<div class="col-3">
 		<mat-form-field class="w-100">
@@ -45,272 +46,299 @@
 			<mat-error *ngIf="formGroup.get('type').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 		</mat-form-field>
 	</div>
-
-	<div class="col-12" *ngIf="formGroup.get('type').value == externalFetcherSourceType.API">
-		<div class="row">
-			<div class="col-6">
-				<mat-form-field class="w-100">
-					<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.URL' | translate}}</mat-label>
-					<input matInput type="text" name="ordinal" [formControl]="formGroup.get('url')">
-					<mat-error *ngIf="formGroup.get('url').hasError('backendError')">{{formGroup.get('url').getError('backendError').message}}</mat-error>
-					<mat-error *ngIf="formGroup.get('url').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-				</mat-form-field>
-			</div>
-			<div class="col-6">
-				<mat-form-field class="w-100">
-					<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.PAGINATION-PATH' | translate}}</mat-label>
-					<input matInput type="text" name="paginationPath" [formControl]="formGroup.get('paginationPath')">
-					<mat-error *ngIf="formGroup.get('paginationPath').hasError('backendError')">{{formGroup.get('paginationPath').getError('backendError').message}}</mat-error>
-					<mat-error *ngIf="formGroup.get('paginationPath').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-				</mat-form-field>
-			</div>
-			<div class="col-3">
-				<mat-form-field class="w-100">
-					<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.CONTENT-TYPE' | translate}}</mat-label>
-					<input matInput type="text" name="contentType" [formControl]="formGroup.get('contentType')">
-					<mat-error *ngIf="formGroup.get('contentType').hasError('backendError')">{{formGroup.get('contentType').getError('backendError').message}}</mat-error>
-					<mat-error *ngIf="formGroup.get('contentType').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-				</mat-form-field>
-			</div>
-			<div class="col-3">
-				<mat-form-field class="w-100">
-					<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.FIRST-PAGE' | translate}}</mat-label>
-					<input matInput type="text" name="firstPage" [formControl]="formGroup.get('firstPage')">
-					<mat-error *ngIf="formGroup.get('firstPage').hasError('backendError')">{{formGroup.get('firstPage').getError('backendError').message}}</mat-error>
-					<mat-error *ngIf="formGroup.get('firstPage').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-				</mat-form-field>
-			</div>
-			<div class="col-3">
-				<mat-form-field class="w-100">
-					<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.HTTP-METHOD' | translate}}</mat-label>
-					<mat-select name="httpMethod" [formControl]="formGroup.get('httpMethod')">
-						<mat-option *ngFor="let httpMethod of externalFetcherApiHTTPMethodTypeEnum" [value]="httpMethod">
-							{{enumUtils.toExternalFetcherApiHTTPMethodTypeString(httpMethod)}}
-						</mat-option>
-					</mat-select>
-					<mat-error *ngIf="formGroup.get('httpMethod').hasError('backendError')">{{formGroup.get('httpMethod').getError('backendError').message}}</mat-error>
-					<mat-error *ngIf="formGroup.get('httpMethod').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-				</mat-form-field>
-			</div>
-			<div class="col-3" *ngIf="formGroup.get('httpMethod').value == externalFetcherApiHTTPMethodType.POST">
-				<mat-form-field class="w-100">
-					<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.REQUEST-BODY' | translate}}</mat-label>
-					<input matInput type="text" name="requestBody" [formControl]="formGroup.get('requestBody')">
-					<mat-error *ngIf="formGroup.get('requestBody').hasError('backendError')">{{formGroup.get('requestBody').getError('backendError').message}}</mat-error>
-					<mat-error *ngIf="formGroup.get('requestBody').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-				</mat-form-field>
-			</div>
-			<div class="col-3">
-				<mat-form-field class="w-100">
-					<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.FILTER-TYPE' | translate}}</mat-label>
-					<input matInput type="text" name="filterType" [formControl]="formGroup.get('filterType')">
-					<mat-error *ngIf="formGroup.get('filterType').hasError('backendError')">{{formGroup.get('filterType').getError('backendError').message}}</mat-error>
-					<mat-error *ngIf="formGroup.get('filterType').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-				</mat-form-field>
-			</div>
-			<!-- Results info -->
-			<h3 class="col-12">{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.RESULTS' | translate}}</h3>
-			<div class="col-12">
-				<mat-form-field class="w-100">
-					<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.RESULTS-PATH' | translate}}</mat-label>
-					<input matInput type="text" name="resultsArrayPath" [formControl]="formGroup.get('results').get('resultsArrayPath')">
-					<mat-error *ngIf="formGroup.get('results').get('resultsArrayPath').hasError('backendError')">{{formGroup.get('results').get('resultsArrayPath').getError('backendError').message}}</mat-error>
-					<mat-error *ngIf="formGroup.get('results').get('resultsArrayPath').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-				</mat-form-field>
-			</div>
-			<!-- fields mapping -->
-			<h3 class="col-12">{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.FIELD-MAPPINGS' | translate}}</h3>
-			<div class="col-12">
-				<div *ngFor="let field of formGroup.get('results').get('fieldsMapping').controls; let fieldMappingIndex=index;" class="row mb-3">
-					<div class="col-12">
-						<div class="row d-flex align-items-center">
-							<div class="col-auto pb-3 d-flex">
-								<span>{{fieldMappingIndex + 1}}</span>
-							</div>
-							<div class="col">
-								<mat-form-field class="w-100">
-									<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.CODE' | translate}}</mat-label>
-									<input matInput type="text" [readonly]="field.get('code').disabled" name="code" [formControl]="field.get('code')" [readOnly]="true">
-									<mat-error *ngIf="field.get('code').hasError('backendError')">{{field.get('code').getError('backendError').message}}</mat-error>
-									<mat-error *ngIf="field.get('code').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-								</mat-form-field>
-							</div>
-							<div class="col">
-								<mat-form-field class="w-100">
-									<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.RESPONSE-PATH' | translate}}</mat-label>
-									<input matInput type="text" name="responsePath" [formControl]="field.get('responsePath')">
-									<mat-error *ngIf="field.get('responsePath').hasError('backendError')">{{field.get('responsePath').getError('backendError').message}}</mat-error>
-									<mat-error *ngIf="field.get('responsePath').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-								</mat-form-field>
-							</div>
-						</div>
-					</div>
+	<ng-container *ngIf="formGroup.get('type').value == externalFetcherSourceType.API">
+		<div class="col-12">
+			<div class="row">
+				<div class="col-6">
+					<mat-form-field class="w-100">
+						<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.URL' | translate}}</mat-label>
+						<input matInput type="text" name="ordinal" [formControl]="formGroup.get('url')">
+						<mat-error *ngIf="formGroup.get('url').hasError('backendError')">{{formGroup.get('url').getError('backendError').message}}</mat-error>
+						<mat-error *ngIf="formGroup.get('url').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+					</mat-form-field>
+				</div>
+				<div class="col-6">
+					<mat-form-field class="w-100">
+						<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.PAGINATION-PATH' | translate}}</mat-label>
+						<input matInput type="text" name="paginationPath" [formControl]="formGroup.get('paginationPath')">
+						<mat-error *ngIf="formGroup.get('paginationPath').hasError('backendError')">{{formGroup.get('paginationPath').getError('backendError').message}}</mat-error>
+						<mat-error *ngIf="formGroup.get('paginationPath').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+					</mat-form-field>
+				</div>
+				<div class="col-3">
+					<mat-form-field class="w-100">
+						<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.CONTENT-TYPE' | translate}}</mat-label>
+						<input matInput type="text" name="contentType" [formControl]="formGroup.get('contentType')">
+						<mat-error *ngIf="formGroup.get('contentType').hasError('backendError')">{{formGroup.get('contentType').getError('backendError').message}}</mat-error>
+						<mat-error *ngIf="formGroup.get('contentType').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+					</mat-form-field>
+				</div>
+				<div class="col-3">
+					<mat-form-field class="w-100">
+						<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.FIRST-PAGE' | translate}}</mat-label>
+						<input matInput type="text" name="firstPage" [formControl]="formGroup.get('firstPage')">
+						<mat-error *ngIf="formGroup.get('firstPage').hasError('backendError')">{{formGroup.get('firstPage').getError('backendError').message}}</mat-error>
+						<mat-error *ngIf="formGroup.get('firstPage').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+					</mat-form-field>
+				</div>
+				<div class="col-3">
+					<mat-form-field class="w-100">
+						<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.HTTP-METHOD' | translate}}</mat-label>
+						<mat-select name="httpMethod" [formControl]="formGroup.get('httpMethod')">
+							<mat-option *ngFor="let httpMethod of externalFetcherApiHTTPMethodTypeEnum" [value]="httpMethod">
+								{{enumUtils.toExternalFetcherApiHTTPMethodTypeString(httpMethod)}}
+							</mat-option>
+						</mat-select>
+						<mat-error *ngIf="formGroup.get('httpMethod').hasError('backendError')">{{formGroup.get('httpMethod').getError('backendError').message}}</mat-error>
+						<mat-error *ngIf="formGroup.get('httpMethod').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+					</mat-form-field>
+				</div>
+				<div class="col-3" *ngIf="formGroup.get('httpMethod').value == externalFetcherApiHTTPMethodType.POST">
+					<mat-form-field class="w-100">
+						<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.REQUEST-BODY' | translate}}</mat-label>
+						<input matInput type="text" name="requestBody" [formControl]="formGroup.get('requestBody')">
+						<mat-error *ngIf="formGroup.get('requestBody').hasError('backendError')">{{formGroup.get('requestBody').getError('backendError').message}}</mat-error>
+						<mat-error *ngIf="formGroup.get('requestBody').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+					</mat-form-field>
+				</div>
+				<div class="col-3">
+					<mat-form-field class="w-100">
+						<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.FILTER-TYPE' | translate}}</mat-label>
+						<input matInput type="text" name="filterType" [formControl]="formGroup.get('filterType')">
+						<mat-error *ngIf="formGroup.get('filterType').hasError('backendError')">{{formGroup.get('filterType').getError('backendError').message}}</mat-error>
+						<mat-error *ngIf="formGroup.get('filterType').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+					</mat-form-field>
 				</div>
 			</div>
-			<!-- Auth info -->
-			<h3 class="col-12">{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.AUTHENTICATION' | translate}}
-				<mat-checkbox [formControl]="formGroup.get('auth').get('enabled')"></mat-checkbox>
-			</h3>
-			<div class="col-12" *ngIf="formGroup.get('auth').get('enabled').value == true">
-				<div class="row">
-					<div class="col-12">
-						<mat-form-field class="w-100">
-							<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.URL' | translate}}</mat-label>
-							<input matInput type="text" name="authUrl" [formControl]="formGroup.get('auth').get('authUrl')">
-							<mat-error *ngIf="formGroup.get('auth').get('authUrl').hasError('backendError')">{{formGroup.get('auth').get('authUrl').getError('backendError').message}}</mat-error>
-							<mat-error *ngIf="formGroup.get('auth').get('authUrl').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-						</mat-form-field>
-					</div>
-					<div class="col-4">
-						<mat-form-field class="w-100">
-							<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.HTTP-METHOD' | translate}}</mat-label>
-							<mat-select name="httpMethod" [formControl]="formGroup.get('auth').get('authMethod')">
-								<mat-option *ngFor="let httpMethod of externalFetcherApiHTTPMethodTypeEnum" [value]="httpMethod">
-									{{enumUtils.toExternalFetcherApiHTTPMethodTypeString(httpMethod)}}
-								</mat-option>
-							</mat-select>
-							<mat-error *ngIf="formGroup.get('auth').get('authMethod').hasError('backendError')">{{formGroup.get('auth').get('authMethod').getError('backendError').message}}</mat-error>
-							<mat-error *ngIf="formGroup.get('auth').get('authMethod').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-						</mat-form-field>
-					</div>
-					<div class="col-4">
-						<mat-form-field class="w-100">
-							<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.TOKEN-PATH' | translate}}</mat-label>
-							<input matInput type="text" name="authTokenPath" [formControl]="formGroup.get('auth').get('authTokenPath')">
-							<mat-error *ngIf="formGroup.get('auth').get('authTokenPath').hasError('backendError')">{{formGroup.get('auth').get('authTokenPath').getError('backendError').message}}</mat-error>
-							<mat-error *ngIf="formGroup.get('auth').get('authTokenPath').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-						</mat-form-field>
-					</div>
-					<div class="col-4">
-						<mat-form-field class="w-100">
-							<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.TYPE' | translate}}</mat-label>
-							<input matInput type="text" name="type" [formControl]="formGroup.get('auth').get('type')">
-							<mat-error *ngIf="formGroup.get('auth').get('type').hasError('backendError')">{{formGroup.get('auth').get('type').getError('backendError').message}}</mat-error>
-							<mat-error *ngIf="formGroup.get('auth').get('type').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-						</mat-form-field>
-					</div>
-					<div class="col-12">
-						<mat-form-field class="w-100">
-							<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.REQUEST-BODY' | translate}}</mat-label>
-							<input matInput type="text" name="authRequestBody" [formControl]="formGroup.get('auth').get('authRequestBody')">
-							<mat-error *ngIf="formGroup.get('auth').get('authRequestBody').hasError('backendError')">{{formGroup.get('auth').get('authRequestBody').getError('backendError').message}}</mat-error>
-							<mat-error *ngIf="formGroup.get('auth').get('authRequestBody').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-						</mat-form-field>
-					</div>
+		</div>
+		<!-- Results info -->
+		<div class="col-12">
+			<div class="row">
+				<h3 class="col-12">{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.RESULTS' | translate}}</h3>
+				<div class="col-12">
+					<mat-form-field class="w-100">
+						<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.RESULTS-PATH' | translate}}</mat-label>
+						<input matInput type="text" name="resultsArrayPath" [formControl]="formGroup.get('results').get('resultsArrayPath')">
+						<mat-error *ngIf="formGroup.get('results').get('resultsArrayPath').hasError('backendError')">{{formGroup.get('results').get('resultsArrayPath').getError('backendError').message}}</mat-error>
+						<mat-error *ngIf="formGroup.get('results').get('resultsArrayPath').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+					</mat-form-field>
 				</div>
 			</div>
-			<!-- Queries info -->
-			<h3 class="col-12">{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.QUERIES' | translate}}
-				<button mat-button type="button" class="action-btn" (click)="addQuery()" [disabled]="formGroup.disabled">{{'EXTERNAL-FETCHER-SOURCE-EDITOR.ACTIONS.ADD-QUERY' | translate}}</button>
-			</h3>
-			<div class="col-12">
-				<div *ngFor="let query of formGroup.get('queries').controls; let queryIndex=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">
-								<h4 class="col-12">{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.QUERY' | translate}} {{queryIndex + 1}}</h4>
-							</div>
-							<div class="col-auto d-flex">
-								<button mat-icon-button class="action-list-icon" matTooltip="{{'EXTERNAL-FETCHER-SOURCE-EDITOR.ACTIONS.REMOVE-QUERY' | translate}}" (click)="removeQuery(queryIndex)" [disabled]="formGroup.disabled">
-									<mat-icon>delete</mat-icon>
-								</button>
-							</div>
-						</div>
-						<div class="row">
-							<div class="col-6">
-								<mat-form-field class="w-100">
-									<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.NAME' | translate}}</mat-label>
-									<input matInput type="text" name="name" [formControl]="query.get('name')" required>
-									<mat-error *ngIf="query.get('name').hasError('backendError')">{{query.get('name').getError('backendError').message}}</mat-error>
-									<mat-error *ngIf="query.get('name').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-								</mat-form-field>
-							</div>
-							<div class="col-6">
-								<mat-form-field class="w-100">
-									<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.DEFAULT-VALUE' | translate}}</mat-label>
-									<input matInput type="text" name="defaultValue" [formControl]="query.get('defaultValue')">
-									<mat-error *ngIf="query.get('defaultValue').hasError('backendError')">{{query.get('defaultValue').getError('backendError').message}}</mat-error>
-									<mat-error *ngIf="query.get('defaultValue').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-								</mat-form-field>
-							</div>
-						</div>
-
-						<!-- Query Cases -->
-						<h3 class="col-12">{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.CASES' | translate}}
-							<button mat-button class="action-btn" type="button" (click)="addCase(queryIndex)" [disabled]="formGroup.disabled">{{'EXTERNAL-FETCHER-SOURCE-EDITOR.ACTIONS.ADD-CASE' | translate}}</button>
-						</h3>
-						<div *ngFor="let case of query.get('cases').controls; let caseIndex=index;" class="row">
-							<div class="col-12">
-								<div class="row mb d-flex align-items-center">
-									<div class="col-auto d-flex">
-										<span>{{caseIndex + 1}}</span>
-									</div>
-									<div class="col">
-										<div class="row">
-											<div class="col-4">
-												<mat-form-field class="w-100">
-													<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.LIKE-PATTERN' | translate}}</mat-label>
-													<input matInput type="text" name="likePattern" [formControl]="case.get('likePattern')">
-													<mat-error *ngIf="case.get('likePattern').hasError('backendError')">{{case.get('likePattern').getError('backendError').message}}</mat-error>
-													<mat-error *ngIf="case.get('likePattern').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-												</mat-form-field>
-											</div>
-											<div class="col-4">
-												<mat-form-field class="w-100">
-													<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.SEPARATOR' | translate}}</mat-label>
-													<input matInput type="text" name="separator" [formControl]="case.get('separator')">
-													<mat-error *ngIf="case.get('separator').hasError('backendError')">{{case.get('separator').getError('backendError').message}}</mat-error>
-													<mat-error *ngIf="case.get('separator').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-												</mat-form-field>
-											</div>
-											<div class="col-4">
-												<mat-form-field class="w-100">
-													<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.VALUE' | translate}}</mat-label>
-													<input matInput type="text" name="value" [formControl]="case.get('value')">
-													<mat-error *ngIf="case.get('value').hasError('backendError')">{{case.get('value').getError('backendError').message}}</mat-error>
-													<mat-error *ngIf="case.get('value').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-												</mat-form-field>
-											</div>
-											<div class="col-6" *ngIf="formGroup.get('referenceTypeDependencyIds').value">
-												<mat-form-field class="w-100">
-													<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.DEPENDENCY' | translate}}</mat-label>
-													<mat-select name="referenceTypeId" [formControl]="case.get('referenceTypeId')">
-														<mat-option *ngFor="let referenceType of referenceTypeDependenciesMap.get(referenceTypeSourceIndex)" [value]="referenceType.id">
-															{{referenceType.code}}
-														</mat-option>
-													</mat-select>
-													<mat-error *ngIf="case.get('referenceTypeId').hasError('backendError')">{{case.get('referenceTypeId').getError('backendError').message}}</mat-error>
-													<mat-error *ngIf="case.get('referenceTypeId').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-												</mat-form-field>
-											</div>
-											<div class="col-6" *ngIf="case.get('referenceTypeId').value">
-												<mat-form-field class="w-100">
-													<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.SOURCE-KEY' | translate}}</mat-label>
-													<mat-select name='referenceTypeSourceKey' [formControl]="case.get('referenceTypeSourceKey')">
-														<mat-option *ngFor="let sourceKey of sourceKeysMap.get(case.get('referenceTypeId').value)" [value]="sourceKey">
-															{{sourceKey}}
-														</mat-option>
-													</mat-select>
-													<mat-error *ngIf="case.get('referenceTypeSourceKey').hasError('backendError')">{{case.get('referenceTypeSourceKey').getError('backendError').message}}</mat-error>
-													<mat-error *ngIf="case.get('referenceTypeSourceKey').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-												</mat-form-field>
-											</div>
-										</div>
-									</div>
-									<div class="col-auto d-flex">
-										<button mat-icon-button class="action-list-icon" matTooltip="{{'EXTERNAL-FETCHER-SOURCE-EDITOR.ACTIONS.REMOVE-CASE' | translate}}" (click)="removeCase(queryIndex, caseIndex)" [disabled]="formGroup.disabled">
-											<mat-icon>delete</mat-icon>
-										</button>
-									</div>
+		</div>
+		<!-- fields mapping -->
+		<div class="col-12">
+			<div class="row">
+				<div class="col-12">
+					<h3>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.FIELD-MAPPINGS' | translate}}</h3>
+				</div>
+				<div class="col-12">
+					<div *ngFor="let field of formGroup.get('results').get('fieldsMapping').controls; let fieldMappingIndex=index;" class="row mb-3">
+						<div class="col-12">
+							<div class="row d-flex align-items-center">
+								<div class="col-auto pb-3 d-flex">
+									<span>{{fieldMappingIndex + 1}}</span>
+								</div>
+								<div class="col">
+									<mat-form-field class="w-100">
+										<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.CODE' | translate}}</mat-label>
+										<input matInput type="text" [readonly]="field.get('code').disabled" name="code" [formControl]="field.get('code')" [readOnly]="true">
+										<mat-error *ngIf="field.get('code').hasError('backendError')">{{field.get('code').getError('backendError').message}}</mat-error>
+										<mat-error *ngIf="field.get('code').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+									</mat-form-field>
+								</div>
+								<div class="col">
+									<mat-form-field class="w-100">
+										<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.RESPONSE-PATH' | translate}}</mat-label>
+										<input matInput type="text" name="responsePath" [formControl]="field.get('responsePath')">
+										<mat-error *ngIf="field.get('responsePath').hasError('backendError')">{{field.get('responsePath').getError('backendError').message}}</mat-error>
+										<mat-error *ngIf="field.get('responsePath').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+									</mat-form-field>
 								</div>
 							</div>
 						</div>
 					</div>
-
 				</div>
 			</div>
 		</div>
-	</div>
+		<!-- Auth info -->
+		<div class="col-12">
+			<div class="row">
+				<h3 class="col-12">{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.AUTHENTICATION' | translate}}
+					<mat-checkbox [formControl]="formGroup.get('auth').get('enabled')"></mat-checkbox>
+				</h3>
+				<div class="col-12" *ngIf="formGroup.get('auth').get('enabled').value == true">
+					<div class="row">
+						<div class="col-12">
+							<mat-form-field class="w-100">
+								<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.URL' | translate}}</mat-label>
+								<input matInput type="text" name="authUrl" [formControl]="formGroup.get('auth').get('authUrl')">
+								<mat-error *ngIf="formGroup.get('auth').get('authUrl').hasError('backendError')">{{formGroup.get('auth').get('authUrl').getError('backendError').message}}</mat-error>
+								<mat-error *ngIf="formGroup.get('auth').get('authUrl').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+							</mat-form-field>
+						</div>
+						<div class="col-4">
+							<mat-form-field class="w-100">
+								<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.HTTP-METHOD' | translate}}</mat-label>
+								<mat-select name="httpMethod" [formControl]="formGroup.get('auth').get('authMethod')">
+									<mat-option *ngFor="let httpMethod of externalFetcherApiHTTPMethodTypeEnum" [value]="httpMethod">
+										{{enumUtils.toExternalFetcherApiHTTPMethodTypeString(httpMethod)}}
+									</mat-option>
+								</mat-select>
+								<mat-error *ngIf="formGroup.get('auth').get('authMethod').hasError('backendError')">{{formGroup.get('auth').get('authMethod').getError('backendError').message}}</mat-error>
+								<mat-error *ngIf="formGroup.get('auth').get('authMethod').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+							</mat-form-field>
+						</div>
+						<div class="col-4">
+							<mat-form-field class="w-100">
+								<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.TOKEN-PATH' | translate}}</mat-label>
+								<input matInput type="text" name="authTokenPath" [formControl]="formGroup.get('auth').get('authTokenPath')">
+								<mat-error *ngIf="formGroup.get('auth').get('authTokenPath').hasError('backendError')">{{formGroup.get('auth').get('authTokenPath').getError('backendError').message}}</mat-error>
+								<mat-error *ngIf="formGroup.get('auth').get('authTokenPath').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+							</mat-form-field>
+						</div>
+						<div class="col-4">
+							<mat-form-field class="w-100">
+								<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.TYPE' | translate}}</mat-label>
+								<input matInput type="text" name="type" [formControl]="formGroup.get('auth').get('type')">
+								<mat-error *ngIf="formGroup.get('auth').get('type').hasError('backendError')">{{formGroup.get('auth').get('type').getError('backendError').message}}</mat-error>
+								<mat-error *ngIf="formGroup.get('auth').get('type').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+							</mat-form-field>
+						</div>
+						<div class="col-12">
+							<mat-form-field class="w-100">
+								<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.REQUEST-BODY' | translate}}</mat-label>
+								<input matInput type="text" name="authRequestBody" [formControl]="formGroup.get('auth').get('authRequestBody')">
+								<mat-error *ngIf="formGroup.get('auth').get('authRequestBody').hasError('backendError')">{{formGroup.get('auth').get('authRequestBody').getError('backendError').message}}</mat-error>
+								<mat-error *ngIf="formGroup.get('auth').get('authRequestBody').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+							</mat-form-field>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+		<!-- Queries info -->
+		<div class="col-12">
+			<div class="row align-items-center">
+				<div class="col-auto pr-0">
+					<h3 class="m-0">{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.QUERIES' | translate}}</h3>
+				</div>
+				<div class="col-auto">
+					<button mat-button type="button" class="action-btn" (click)="addQuery()" [disabled]="formGroup.disabled">{{'EXTERNAL-FETCHER-SOURCE-EDITOR.ACTIONS.ADD-QUERY' | translate}}</button>
+				</div>
+			</div>
+		</div>
+		<div class="col-12">
+			<div *ngFor="let query of formGroup.get('queries').controls; let queryIndex=index;" class="row">
+				<div class="col-12">
+					<div class="row d-flex align-items-center">
+						<div class="col-auto d-flex">
+							<h4>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.QUERY' | translate}} {{queryIndex + 1}}</h4>
+						</div>
+						<div class="col-auto d-flex">
+							<button mat-icon-button class="action-list-icon" matTooltip="{{'EXTERNAL-FETCHER-SOURCE-EDITOR.ACTIONS.REMOVE-QUERY' | translate}}" (click)="removeQuery(queryIndex)" [disabled]="formGroup.disabled">
+								<mat-icon>delete</mat-icon>
+							</button>
+						</div>
+					</div>
+					<div class="row">
+						<div class="col-6">
+							<mat-form-field class="w-100">
+								<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.NAME' | translate}}</mat-label>
+								<input matInput type="text" name="name" [formControl]="query.get('name')" required>
+								<mat-error *ngIf="query.get('name').hasError('backendError')">{{query.get('name').getError('backendError').message}}</mat-error>
+								<mat-error *ngIf="query.get('name').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+							</mat-form-field>
+						</div>
+						<div class="col-6">
+							<mat-form-field class="w-100">
+								<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.DEFAULT-VALUE' | translate}}</mat-label>
+								<input matInput type="text" name="defaultValue" [formControl]="query.get('defaultValue')">
+								<mat-error *ngIf="query.get('defaultValue').hasError('backendError')">{{query.get('defaultValue').getError('backendError').message}}</mat-error>
+								<mat-error *ngIf="query.get('defaultValue').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+							</mat-form-field>
+						</div>
+					</div>
+
+					<!-- Query Cases -->
+					<div class="row mb-2">
+						<div class="col-auto pr-0">
+							<h3 class="m-0">{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.CASES' | translate}}</h3>
+						</div>
+						<div class="col-auto">
+							<button mat-button class="action-btn" type="button" (click)="addCase(queryIndex)" [disabled]="formGroup.disabled">{{'EXTERNAL-FETCHER-SOURCE-EDITOR.ACTIONS.ADD-CASE' | translate}}</button>
+						</div>
+					</div>
+					<div *ngFor="let case of query.get('cases').controls; let caseIndex=index;" class="row">
+						<div class="col-12">
+							<div class="row mb d-flex align-items-center">
+								<div class="col-auto mb-4">
+									<span>{{caseIndex + 1}}</span>
+								</div>
+								<div class="col">
+									<div class="row">
+										<div class="col-4">
+											<mat-form-field class="w-100">
+												<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.LIKE-PATTERN' | translate}}</mat-label>
+												<input matInput type="text" name="likePattern" [formControl]="case.get('likePattern')">
+												<mat-error *ngIf="case.get('likePattern').hasError('backendError')">{{case.get('likePattern').getError('backendError').message}}</mat-error>
+												<mat-error *ngIf="case.get('likePattern').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+											</mat-form-field>
+										</div>
+										<div class="col-4">
+											<mat-form-field class="w-100">
+												<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.SEPARATOR' | translate}}</mat-label>
+												<input matInput type="text" name="separator" [formControl]="case.get('separator')">
+												<mat-error *ngIf="case.get('separator').hasError('backendError')">{{case.get('separator').getError('backendError').message}}</mat-error>
+												<mat-error *ngIf="case.get('separator').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+											</mat-form-field>
+										</div>
+										<div class="col-4">
+											<mat-form-field class="w-100">
+												<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.VALUE' | translate}}</mat-label>
+												<input matInput type="text" name="value" [formControl]="case.get('value')">
+												<mat-error *ngIf="case.get('value').hasError('backendError')">{{case.get('value').getError('backendError').message}}</mat-error>
+												<mat-error *ngIf="case.get('value').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+											</mat-form-field>
+										</div>
+										<div class="col-6" *ngIf="formGroup.get('referenceTypeDependencyIds').value">
+											<mat-form-field class="w-100">
+												<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.DEPENDENCY' | translate}}</mat-label>
+												<mat-select name="referenceTypeId" [formControl]="case.get('referenceTypeId')">
+													<mat-option *ngFor="let referenceType of referenceTypeDependenciesMap.get(referenceTypeSourceIndex)" [value]="referenceType.id">
+														{{referenceType.code}}
+													</mat-option>
+												</mat-select>
+												<mat-error *ngIf="case.get('referenceTypeId').hasError('backendError')">{{case.get('referenceTypeId').getError('backendError').message}}</mat-error>
+												<mat-error *ngIf="case.get('referenceTypeId').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+											</mat-form-field>
+										</div>
+										<div class="col-6" *ngIf="case.get('referenceTypeId').value">
+											<mat-form-field class="w-100">
+												<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.SOURCE-KEY' | translate}}</mat-label>
+												<mat-select name='referenceTypeSourceKey' [formControl]="case.get('referenceTypeSourceKey')">
+													<mat-option *ngFor="let sourceKey of sourceKeysMap.get(case.get('referenceTypeId').value)" [value]="sourceKey">
+														{{sourceKey}}
+													</mat-option>
+												</mat-select>
+												<mat-error *ngIf="case.get('referenceTypeSourceKey').hasError('backendError')">{{case.get('referenceTypeSourceKey').getError('backendError').message}}</mat-error>
+												<mat-error *ngIf="case.get('referenceTypeSourceKey').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+											</mat-form-field>
+										</div>
+									</div>
+								</div>
+								<div class="col-auto mb-4">
+									<button mat-icon-button class="action-list-icon" matTooltip="{{'EXTERNAL-FETCHER-SOURCE-EDITOR.ACTIONS.REMOVE-CASE' | translate}}" (click)="removeCase(queryIndex, caseIndex)" [disabled]="formGroup.disabled">
+										<mat-icon>delete</mat-icon>
+									</button>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</ng-container>
+
 
 	<!-- Static Items -->
 	<div class="col-12" *ngIf="formGroup.get('type').value == externalFetcherSourceType.STATIC">
diff --git a/dmp-frontend/src/notification-service/ui/admin/notification-template/editor/notification-template-editor.component.html b/dmp-frontend/src/notification-service/ui/admin/notification-template/editor/notification-template-editor.component.html
index 9cac4ff1d..ea7a495c9 100644
--- a/dmp-frontend/src/notification-service/ui/admin/notification-template/editor/notification-template-editor.component.html
+++ b/dmp-frontend/src/notification-service/ui/admin/notification-template/editor/notification-template-editor.component.html
@@ -29,80 +29,100 @@
 						<mat-card-title *ngIf="isNew">{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.NEW' | translate}}</mat-card-title>
 					</mat-card-header>
 					<mat-card-content>
-						<div class="d-flex flex-wrap mt-4">
-							<div class="col-md-12">
-								<mat-form-field class="w-100">
-									<mat-label>{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.NOTIFICATION-TYPE' | translate}}</mat-label>
-									<mat-select [formControl]="formGroup.get('notificationType')" name="notificationType" required>
-										<mat-option *ngFor="let type of notificationTypeEnum" [value]="type">
-											{{enumUtils.toNotificationTypeString(type)}}
-										</mat-option>
-									</mat-select>
-									<mat-error *ngIf="formGroup.get('notificationType').hasError('backendError')">{{formGroup.get('notificationType').getError('backendError').message}}</mat-error>
-									<mat-error *ngIf="formGroup.get('notificationType').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-								</mat-form-field>
-							</div>
-							<div class="col-12 col-lg-4">
-								<mat-form-field class="w-100">
-									<mat-label>{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.LANGUAGE' | translate}}</mat-label>
-									<mat-select [formControl]="formGroup.get('languageCode')" name="language" required>
-										<mat-option *ngFor="let language of languages" [value]="language.code">
-											{{language.code}}
-										</mat-option>
-									</mat-select>
-									<mat-error *ngIf="formGroup.get('languageCode').hasError('backendError')">{{formGroup.get('languageCode').getError('backendError').message}}</mat-error>
-									<mat-error *ngIf="formGroup.get('languageCode').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-								</mat-form-field>
-							</div>
-							<div class="col-12 col-lg-4">
-								<mat-form-field class="w-100">
-									<mat-label>{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.KIND' | translate}}</mat-label>
-									<mat-select name="kind" [formControl]="formGroup.get('kind')" required>
-										<mat-option *ngFor="let kind of notificationTemplateKindEnum" [value]="kind">
-											{{enumUtils.toNotificationTemplateKindString(kind)}}
-										</mat-option>
-									</mat-select>
-									<mat-error *ngIf="formGroup.get('kind').hasError('backendError')">{{formGroup.get('kind').getError('backendError').message}}</mat-error>
-									<mat-error *ngIf="formGroup.get('kind').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-								</mat-form-field>
-							</div>
-							<div class="col-12 col-lg-4">
-								<mat-form-field class="w-100">
-									<mat-label>{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.CHANNEL' | translate}}</mat-label>
-									<mat-select name="channel" [formControl]="formGroup.get('channel')" required>
-										<mat-option *ngFor="let channel of notificationTemplateChannelEnum" [value]="channel">
-											{{enumUtils.toNotificationTemplateChannelString(channel)}}
-										</mat-option>
-									</mat-select>
-									<mat-error *ngIf="formGroup.get('channel').hasError('backendError')">{{formGroup.get('channel').getError('backendError').message}}</mat-error>
-									<mat-error *ngIf="formGroup.get('channel').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-								</mat-form-field>
+						<div class="row mt-4">
+							<div class="col-12">
+								<div class="container-fluid">
+									<div class="row flex-wrap">
+										<div class="col-md-12">
+											<mat-form-field class="w-100">
+												<mat-label>{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.NOTIFICATION-TYPE' | translate}}</mat-label>
+												<mat-select [formControl]="formGroup.get('notificationType')" name="notificationType" required>
+													<mat-option *ngFor="let type of notificationTypeEnum" [value]="type">
+														{{enumUtils.toNotificationTypeString(type)}}
+													</mat-option>
+												</mat-select>
+												<mat-error *ngIf="formGroup.get('notificationType').hasError('backendError')">{{formGroup.get('notificationType').getError('backendError').message}}</mat-error>
+												<mat-error *ngIf="formGroup.get('notificationType').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+											</mat-form-field>
+										</div>
+										<div class="col-12 col-lg-4">
+											<mat-form-field class="w-100">
+												<mat-label>{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.LANGUAGE' | translate}}</mat-label>
+												<mat-select [formControl]="formGroup.get('languageCode')" name="language" required>
+													<mat-option *ngFor="let language of languages" [value]="language.code">
+														{{language.code}}
+													</mat-option>
+												</mat-select>
+												<mat-error *ngIf="formGroup.get('languageCode').hasError('backendError')">{{formGroup.get('languageCode').getError('backendError').message}}</mat-error>
+												<mat-error *ngIf="formGroup.get('languageCode').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+											</mat-form-field>
+										</div>
+										<div class="col-12 col-lg-4">
+											<mat-form-field class="w-100">
+												<mat-label>{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.KIND' | translate}}</mat-label>
+												<mat-select name="kind" [formControl]="formGroup.get('kind')" required>
+													<mat-option *ngFor="let kind of notificationTemplateKindEnum" [value]="kind">
+														{{enumUtils.toNotificationTemplateKindString(kind)}}
+													</mat-option>
+												</mat-select>
+												<mat-error *ngIf="formGroup.get('kind').hasError('backendError')">{{formGroup.get('kind').getError('backendError').message}}</mat-error>
+												<mat-error *ngIf="formGroup.get('kind').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+											</mat-form-field>
+										</div>
+										<div class="col-12 col-lg-4">
+											<mat-form-field class="w-100">
+												<mat-label>{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.CHANNEL' | translate}}</mat-label>
+												<mat-select name="channel" [formControl]="formGroup.get('channel')" required>
+													<mat-option *ngFor="let channel of notificationTemplateChannelEnum" [value]="channel">
+														{{enumUtils.toNotificationTemplateChannelString(channel)}}
+													</mat-option>
+												</mat-select>
+												<mat-error *ngIf="formGroup.get('channel').hasError('backendError')">{{formGroup.get('channel').getError('backendError').message}}</mat-error>
+												<mat-error *ngIf="formGroup.get('channel').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+											</mat-form-field>
+										</div>
+									</div>
+								</div>
 							</div>
 						</div>
 
 						<!-- Subject -->
-						<div class="d-flex flex-wrap">
-							<h3 class="col-md-12">{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.SUBJECT-SECTION' | translate}}</h3>
-							<div class="col-md-6">
-								<mat-form-field class="w-100">
-									<mat-label>{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.SUBJECT-TEXT' | translate}}</mat-label>
-									<input matInput [formControl]="formGroup.get('value').get('subjectText')">
-									<mat-error *ngIf="formGroup.get('value').get('subjectText').hasError('backendError')">{{formGroup.get('value').get('subjectText').getError('backendError').message}}</mat-error>
-									<mat-error *ngIf="formGroup.get('value').get('subjectText').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-								</mat-form-field>
-							</div>
-							<div class="col-md-6">
-								<mat-form-field class="w-100">
-									<mat-label>{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.SUBJECT-KEY' | translate}}</mat-label>
-									<input matInput [formControl]="formGroup.get('value').get('subjectKey')">
-									<mat-error *ngIf="formGroup.get('value').get('subjectKey').hasError('backendError')">{{formGroup.get('value').get('subjectKey').getError('backendError').message}}</mat-error>
-									<mat-error *ngIf="formGroup.get('value').get('subjectKey').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-								</mat-form-field>
+						<div class="row">
+							<div class="col-12">
+								<div class="container-fluid">
+									<div class="row flex-wrap">									
+										<h3 class="col-md-12">{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.SUBJECT-SECTION' | translate}}</h3>
+										<div class="col-md-6">
+											<mat-form-field class="w-100">
+												<mat-label>{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.SUBJECT-TEXT' | translate}}</mat-label>
+												<input matInput [formControl]="formGroup.get('value').get('subjectText')">
+												<mat-error *ngIf="formGroup.get('value').get('subjectText').hasError('backendError')">{{formGroup.get('value').get('subjectText').getError('backendError').message}}</mat-error>
+												<mat-error *ngIf="formGroup.get('value').get('subjectText').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+											</mat-form-field>
+										</div>
+										<div class="col-md-6">
+											<mat-form-field class="w-100">
+												<mat-label>{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.SUBJECT-KEY' | translate}}</mat-label>
+												<input matInput [formControl]="formGroup.get('value').get('subjectKey')">
+												<mat-error *ngIf="formGroup.get('value').get('subjectKey').hasError('backendError')">{{formGroup.get('value').get('subjectKey').getError('backendError').message}}</mat-error>
+												<mat-error *ngIf="formGroup.get('value').get('subjectKey').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+											</mat-form-field>
+										</div>
+									</div>
+								</div>
+							</div>
+						</div>
+						<div class="row">
+							<div class="col-12">
+								<div class="container-fluid">
+									<div class="row">
+										<h4 class="col-md-12">{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.SUBJECT-FIELD-OPTIONS' | translate}}
+											<mat-checkbox [checked]="subjectFieldOptionsEnabled" (change)="subjectFieldOptionsSelectionChanged($event)"></mat-checkbox>
+										</h4>
+									</div>
+								</div>
 							</div>
 						</div>
-						<h4 class="col-md-12">{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.SUBJECT-FIELD-OPTIONS' | translate}}
-							<mat-checkbox [checked]="subjectFieldOptionsEnabled" (change)="subjectFieldOptionsSelectionChanged($event)"></mat-checkbox>
-						</h4>
 						<ng-container *ngIf="subjectFieldOptionsEnabled == true">
 							<app-notification-template-field-options-component
 								[form]="formGroup.get('value').get('subjectFieldOptions')"
@@ -114,44 +134,58 @@
 						</ng-container>
 
 						<!-- Body -->
-						<div>
-							<h3 class="col-md-12">{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.BODY-SECTION' | translate}}</h3>
-							<div class="col-md-6">
-								<mat-form-field class="w-100">
-									<mat-label>{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.BODY-KEY' | translate}}</mat-label>
-									<input matInput [formControl]="formGroup.get('value').get('bodyKey')">
-									<mat-error *ngIf="formGroup.get('value').get('bodyKey').hasError('backendError')">{{formGroup.get('value').get('bodyKey').getError('backendError').message}}</mat-error>
-									<mat-error *ngIf="formGroup.get('value').get('bodyKey').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-								</mat-form-field>
-							</div>
+						<div class="row">
 							<div class="col-12">
-								<mat-label>{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.BODY-TEXT' | translate}}</mat-label>
-								<editor class="w-100 mt-2" [init]="{
-								base_url: '/tinymce',
-								suffix: '.min',
-								height: 800,
-								menubar: true,
-								plugins: [
-								'advlist', 'autolink', 'lists', 'link', 'image', 'charmap', 'print', 'preview', 'anchor',
-								'searchreplace', 'visualblocks', 'fullpage',
-								'insertdatetime', 'media', 'table' ,'paste', 'code', 'help', 'wordcount','importcss',
-								],
-								extended_valid_elements: '*[*]',
-								forced_root_block: '',
-								valid_children: '+body[script],ol[li|div|p|a|ol|table],h2[span],h3[span]',
-								save_enablewhendirty: false,
-								toolbar:
-								'undo redo | formatselect | bold italic backcolor | \
-								alignleft aligncenter alignright alignjustify | \
-								bullist numlist outdent indent | code | searchreplace | preview | removeformat | help | link | image'
-							}" [formControl]="formGroup.get('value').get('bodyText')"></editor>
-							<mat-error *ngIf="formGroup.get('value').get('bodyText').hasError('backendError')">{{formGroup.get('value').get('bodyText').getError('backendError').message}}</mat-error>
-							<mat-error *ngIf="formGroup.get('value').get('bodyText').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+								<div class="container-fluid">
+									<div class="row">		
+										<h3 class="col-md-12">{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.BODY-SECTION' | translate}}</h3>
+										<div class="col-md-6">
+											<mat-form-field class="w-100">
+												<mat-label>{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.BODY-KEY' | translate}}</mat-label>
+												<input matInput [formControl]="formGroup.get('value').get('bodyKey')">
+												<mat-error *ngIf="formGroup.get('value').get('bodyKey').hasError('backendError')">{{formGroup.get('value').get('bodyKey').getError('backendError').message}}</mat-error>
+												<mat-error *ngIf="formGroup.get('value').get('bodyKey').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+											</mat-form-field>
+										</div>
+										<div class="col-12">
+											<mat-label>{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.BODY-TEXT' | translate}}</mat-label>
+											<editor class="w-100 mt-2" [init]="{
+											base_url: '/tinymce',
+											suffix: '.min',
+											height: 800,
+											menubar: true,
+											plugins: [
+											'advlist', 'autolink', 'lists', 'link', 'image', 'charmap', 'print', 'preview', 'anchor',
+											'searchreplace', 'visualblocks', 'fullpage',
+											'insertdatetime', 'media', 'table' ,'paste', 'code', 'help', 'wordcount','importcss',
+											],
+											extended_valid_elements: '*[*]',
+											forced_root_block: '',
+											valid_children: '+body[script],ol[li|div|p|a|ol|table],h2[span],h3[span]',
+											save_enablewhendirty: false,
+											toolbar:
+											'undo redo | formatselect | bold italic backcolor | \
+											alignleft aligncenter alignright alignjustify | \
+											bullist numlist outdent indent | code | searchreplace | preview | removeformat | help | link | image'
+										}" [formControl]="formGroup.get('value').get('bodyText')"></editor>
+										<mat-error *ngIf="formGroup.get('value').get('bodyText').hasError('backendError')">{{formGroup.get('value').get('bodyText').getError('backendError').message}}</mat-error>
+										<mat-error *ngIf="formGroup.get('value').get('bodyText').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+										</div>
+									</div>
+								</div>
+							</div>
+						</div>
+						<div class="row">
+							<div class="col-12">
+								<div class="container-fluid">
+									<div class="row">
+										<h4 class="col-md-12">{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.BODY-FIELD-OPTIONS' | translate}}
+											<mat-checkbox [checked]="bodyFieldOptionsEnabled" (change)="bodyFieldOptionsSelectionChanged($event)"></mat-checkbox>
+										</h4>
+									</div>
+								</div>
 							</div>
 						</div>
-						<h4 class="col-md-12">{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.BODY-FIELD-OPTIONS' | translate}}
-							<mat-checkbox [checked]="bodyFieldOptionsEnabled" (change)="bodyFieldOptionsSelectionChanged($event)"></mat-checkbox>
-						</h4>
 						<ng-container *ngIf="bodyFieldOptionsEnabled == true">
 							<app-notification-template-field-options-component
 								[form]="formGroup.get('value').get('bodyFieldOptions')"
@@ -163,110 +197,124 @@
 						</ng-container>
 						<!--Extra Options -->
 						<div class="row">
-							<h3 class="col-md-12">{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.EXTRA-OPTIONS' | translate}}</h3>
-							<div>
-								<h4 class="col-md-12">{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.ALLOW-ATTACHMENTS' | translate}}
-									<mat-checkbox [formControl]="formGroup.get('value').get('allowAttachments')"></mat-checkbox>
-									<mat-error *ngIf="formGroup.get('value').get('allowAttachments').hasError('backendError')">{{formGroup.get('value').get('allowAttachments').getError('backendError').message}}</mat-error>
-								</h4>
+							<div class="col-12">
+								<div class="container-fluid">
+									<div class="row">
+										<h3 class="col-md-12">{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.EXTRA-OPTIONS' | translate}}</h3>
+										<div>
+											<h4 class="col-md-12">{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.ALLOW-ATTACHMENTS' | translate}}
+												<mat-checkbox [formControl]="formGroup.get('value').get('allowAttachments')"></mat-checkbox>
+												<mat-error *ngIf="formGroup.get('value').get('allowAttachments').hasError('backendError')">{{formGroup.get('value').get('allowAttachments').getError('backendError').message}}</mat-error>
+											</h4>
+										</div>
+									</div>
+								</div>
 							</div>
-							<div class="col-4">
-								<mat-form-field class="col-md-12">
-									<mat-label>{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.PRIORITY-KEY' | translate}}</mat-label>
-									<input matInput [formControl]="formGroup.get('value').get('priorityKey')">
-									<mat-error *ngIf="formGroup.get('value').get('priorityKey').hasError('backendError')">{{formGroup.get('value').get('priorityKey').getError('backendError').message}}</mat-error>
-									<mat-error *ngIf="formGroup.get('value').get('priorityKey').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-								</mat-form-field>
-							</div>
-							<div class="col-4" >
-								<mat-form-field class="chip-list">
-									<mat-label>{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.CC' | translate}}</mat-label>
-									<mat-chip-grid #cc [formControl]="formGroup.get('value').get('cc')">
-									<mat-chip-row *ngFor="let field of ccValues"
-													(removed)="removeChipListValues('cc', field)"
-													[editable]="true"
-													(edited)="editChipListValues('cc', $event, field)">
-										{{field}}
-										<button matChipRemove>
-										<mat-icon>cancel</mat-icon>
-										</button>
-									</mat-chip-row>
-									<input placeholder="{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.MANDATORY-PLACEHOLDER' | translate}}"
-											[matChipInputFor]="cc"
-											[matChipInputSeparatorKeyCodes]="separatorKeysCodes"
-											[matChipInputAddOnBlur]="true"
-											(matChipInputTokenEnd)="addChipListValues('cc',$event)"/>
-									</mat-chip-grid>
-									<mat-error *ngIf="formGroup.get('value').get('cc').hasError('backendError')">{{formGroup.get('value').get('cc').getError('backendError').message}}</mat-error>
-								</mat-form-field>
-							</div>
-							<div class="col-4">
-								<mat-form-field class="col-auto">
-									<mat-label>{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.CC-MODE' | translate}}</mat-label>
-									<mat-select name="ccMode" [formControl]="formGroup.get('value').get('ccMode')">
-										<mat-option *ngFor="let emailOverrideMode of emailOverrideModeEnum" [value]="emailOverrideMode">
-											{{enumUtils.toEmailOverrideModeString(emailOverrideMode)}}
-										</mat-option>
-									</mat-select>
-									<mat-error *ngIf="formGroup.get('value').get('ccMode').hasError('backendError')">{{formGroup.get('value').get('ccMode').getError('backendError').message}}</mat-error>
-									<mat-error *ngIf="formGroup.get('value').get('ccMode').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-								</mat-form-field>
-							</div>
-							<div class="col-4" >
-								<mat-form-field class="chip-list">
-									<mat-label>{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.BCC' | translate}}</mat-label>
-									<mat-chip-grid #bcc [formControl]="formGroup.get('value').get('bcc')">
-									<mat-chip-row *ngFor="let field of bccValues"
-													(removed)="removeChipListValues('bcc', field)"
-													[editable]="true"
-													(edited)="editChipListValues('bcc', $event, field)">
-										{{field}}
-										<button matChipRemove>
-										<mat-icon>cancel</mat-icon>
-										</button>
-									</mat-chip-row>
-									<input placeholder="{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.MANDATORY-PLACEHOLDER' | translate}}"
-											[matChipInputFor]="bcc"
-											[matChipInputSeparatorKeyCodes]="separatorKeysCodes"
-											[matChipInputAddOnBlur]="true"
-											(matChipInputTokenEnd)="addChipListValues('bcc',$event)"/>
-									</mat-chip-grid>
-									<mat-error *ngIf="formGroup.get('value').get('bcc').hasError('backendError')">{{formGroup.get('value').get('bcc').getError('backendError').message}}</mat-error>
-								</mat-form-field>
-							</div>
-							<div class="col-4">
-								<mat-form-field class="col-auto">
-									<mat-label>{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.BCC-MODE' | translate}}</mat-label>
-									<mat-select name="bccMode" [formControl]="formGroup.get('value').get('bccMode')">
-										<mat-option *ngFor="let emailOverrideMode of emailOverrideModeEnum" [value]="emailOverrideMode">
-											{{enumUtils.toEmailOverrideModeString(emailOverrideMode)}}
-										</mat-option>
-									</mat-select>
-									<mat-error *ngIf="formGroup.get('value').get('bccMode').hasError('backendError')">{{formGroup.get('value').get('bccMode').getError('backendError').message}}</mat-error>
-									<mat-error *ngIf="formGroup.get('value').get('bccMode').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-								</mat-form-field>
-							</div>
-							<div class="col-4" >
-								<mat-form-field class="chip-list">
-									<mat-label>{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.EXTRA-DATA-KEYS' | translate}}</mat-label>
-									<mat-chip-grid #extraDataKeys [formControl]="formGroup.get('value').get('extraDataKeys')">
-									<mat-chip-row *ngFor="let field of extraDataKeys"
-													(removed)="removeChipListValues('extraDataKeys', field)"
-													[editable]="true"
-													(edited)="editChipListValues('extraDataKeys', $event, field)">
-										{{field}}
-										<button matChipRemove>
-										<mat-icon>cancel</mat-icon>
-										</button>
-									</mat-chip-row>
-									<input placeholder="{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.MANDATORY-PLACEHOLDER' | translate}}"
-											[matChipInputFor]="extraDataKeys"
-											[matChipInputSeparatorKeyCodes]="separatorKeysCodes"
-											[matChipInputAddOnBlur]="true"
-											(matChipInputTokenEnd)="addChipListValues('extraDataKeys',$event)"/>
-									</mat-chip-grid>
-									<mat-error *ngIf="formGroup.get('value').get('extraDataKeys').hasError('backendError')">{{formGroup.get('value').get('extraDataKeys').getError('backendError').message}}</mat-error>
-								</mat-form-field>
+						</div>
+						<div class="row">
+							<div class="col-12">
+								<div class="container">
+									<div class="row">
+										<div class="col-12 col-lg-4">
+											<mat-form-field class="w-100">
+												<mat-label>{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.PRIORITY-KEY' | translate}}</mat-label>
+												<input matInput [formControl]="formGroup.get('value').get('priorityKey')">
+												<mat-error *ngIf="formGroup.get('value').get('priorityKey').hasError('backendError')">{{formGroup.get('value').get('priorityKey').getError('backendError').message}}</mat-error>
+												<mat-error *ngIf="formGroup.get('value').get('priorityKey').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+											</mat-form-field>
+										</div>
+										<div class="col-12 col-lg-4">
+											<mat-form-field class="w-100 chip-list">
+												<mat-label>{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.CC' | translate}}</mat-label>
+												<mat-chip-grid #cc [formControl]="formGroup.get('value').get('cc')">
+												<mat-chip-row *ngFor="let field of ccValues"
+																(removed)="removeChipListValues('cc', field)"
+																[editable]="true"
+																(edited)="editChipListValues('cc', $event, field)">
+													{{field}}
+													<button matChipRemove>
+													<mat-icon>cancel</mat-icon>
+													</button>
+												</mat-chip-row>
+												<input placeholder="{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.MANDATORY-PLACEHOLDER' | translate}}"
+														[matChipInputFor]="cc"
+														[matChipInputSeparatorKeyCodes]="separatorKeysCodes"
+														[matChipInputAddOnBlur]="true"
+														(matChipInputTokenEnd)="addChipListValues('cc',$event)"/>
+												</mat-chip-grid>
+												<mat-error *ngIf="formGroup.get('value').get('cc').hasError('backendError')">{{formGroup.get('value').get('cc').getError('backendError').message}}</mat-error>
+											</mat-form-field>
+										</div>
+										<div class="col-12 col-lg-4">
+											<mat-form-field class="w-100">
+												<mat-label>{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.CC-MODE' | translate}}</mat-label>
+												<mat-select name="ccMode" [formControl]="formGroup.get('value').get('ccMode')">
+													<mat-option *ngFor="let emailOverrideMode of emailOverrideModeEnum" [value]="emailOverrideMode">
+														{{enumUtils.toEmailOverrideModeString(emailOverrideMode)}}
+													</mat-option>
+												</mat-select>
+												<mat-error *ngIf="formGroup.get('value').get('ccMode').hasError('backendError')">{{formGroup.get('value').get('ccMode').getError('backendError').message}}</mat-error>
+												<mat-error *ngIf="formGroup.get('value').get('ccMode').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+											</mat-form-field>
+										</div>
+										<div class="col-12 col-lg-4">
+											<mat-form-field class="w-100 chip-list">
+												<mat-label>{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.BCC' | translate}}</mat-label>
+												<mat-chip-grid #bcc [formControl]="formGroup.get('value').get('bcc')">
+												<mat-chip-row *ngFor="let field of bccValues"
+																(removed)="removeChipListValues('bcc', field)"
+																[editable]="true"
+																(edited)="editChipListValues('bcc', $event, field)">
+													{{field}}
+													<button matChipRemove>
+													<mat-icon>cancel</mat-icon>
+													</button>
+												</mat-chip-row>
+												<input placeholder="{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.MANDATORY-PLACEHOLDER' | translate}}"
+														[matChipInputFor]="bcc"
+														[matChipInputSeparatorKeyCodes]="separatorKeysCodes"
+														[matChipInputAddOnBlur]="true"
+														(matChipInputTokenEnd)="addChipListValues('bcc',$event)"/>
+												</mat-chip-grid>
+												<mat-error *ngIf="formGroup.get('value').get('bcc').hasError('backendError')">{{formGroup.get('value').get('bcc').getError('backendError').message}}</mat-error>
+											</mat-form-field>
+										</div>
+										<div class="col-12 col-lg-4">
+											<mat-form-field class="w-100">
+												<mat-label>{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.BCC-MODE' | translate}}</mat-label>
+												<mat-select name="bccMode" [formControl]="formGroup.get('value').get('bccMode')">
+													<mat-option *ngFor="let emailOverrideMode of emailOverrideModeEnum" [value]="emailOverrideMode">
+														{{enumUtils.toEmailOverrideModeString(emailOverrideMode)}}
+													</mat-option>
+												</mat-select>
+												<mat-error *ngIf="formGroup.get('value').get('bccMode').hasError('backendError')">{{formGroup.get('value').get('bccMode').getError('backendError').message}}</mat-error>
+												<mat-error *ngIf="formGroup.get('value').get('bccMode').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+											</mat-form-field>
+										</div>
+										<div class="col-12 col-lg-4">
+											<mat-form-field class="w-100 chip-list">
+												<mat-label>{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.EXTRA-DATA-KEYS' | translate}}</mat-label>
+												<mat-chip-grid #extraDataKeys [formControl]="formGroup.get('value').get('extraDataKeys')">
+												<mat-chip-row *ngFor="let field of extraDataKeys"
+																(removed)="removeChipListValues('extraDataKeys', field)"
+																[editable]="true"
+																(edited)="editChipListValues('extraDataKeys', $event, field)">
+													{{field}}
+													<button matChipRemove>
+													<mat-icon>cancel</mat-icon>
+													</button>
+												</mat-chip-row>
+												<input placeholder="{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.MANDATORY-PLACEHOLDER' | translate}}"
+														[matChipInputFor]="extraDataKeys"
+														[matChipInputSeparatorKeyCodes]="separatorKeysCodes"
+														[matChipInputAddOnBlur]="true"
+														(matChipInputTokenEnd)="addChipListValues('extraDataKeys',$event)"/>
+												</mat-chip-grid>
+												<mat-error *ngIf="formGroup.get('value').get('extraDataKeys').hasError('backendError')">{{formGroup.get('value').get('extraDataKeys').getError('backendError').message}}</mat-error>
+											</mat-form-field>
+										</div>
+									</div>
+								</div>
 							</div>
 						</div>
 					</mat-card-content>