diff --git a/dmp-frontend/src/app/datasets/dataset-referenced-models-helper/datarepository/datarepository-referenced-model-helper.component.html b/dmp-frontend/src/app/datasets/dataset-referenced-models-helper/datarepository/datarepository-referenced-model-helper.component.html
index a1c322489..a2163361a 100644
--- a/dmp-frontend/src/app/datasets/dataset-referenced-models-helper/datarepository/datarepository-referenced-model-helper.component.html
+++ b/dmp-frontend/src/app/datasets/dataset-referenced-models-helper/datarepository/datarepository-referenced-model-helper.component.html
@@ -1,23 +1,22 @@
 <form *ngIf="formGroup" [formGroup]="formGroup">
-  <h1 mat-dialog-title>{{'DATASET-REFERENCED-MODELS.DATA-REPOSITORY.TITLE' | translate}}</h1>
-  <div mat-dialog-content>
-    <mat-form-field class="full-width">
-      <input matInput formControlName="label" placeholder="{{'DATASET-REFERENCED-MODELS.DATA-REPOSITORY.LABEL' | translate}}" required>
-      <mat-error *ngIf="formGroup.get('label').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-    </mat-form-field>
-    <mat-form-field class="full-width">
-      <input matInput formControlName="abbreviation" placeholder="{{'DATASET-REFERENCED-MODELS.DATA-REPOSITORY.ABBREVIATION' | translate}}" required>
-      <mat-error *ngIf="formGroup.get('abbreviation').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-    </mat-form-field>
-    <mat-form-field class="full-width">
-      <input matInput formControlName="uri" placeholder="{{'DATASET-REFERENCED-MODELS.DATA-REPOSITORY.URI' | translate}}" required>
-      <mat-error *ngIf="formGroup.get('uri').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-    </mat-form-field>
-  </div>
-  <div mat-dialog-actions>
-    <div layout="row" class="full-width text-right" align="end">
-      <button mat-raised-button color="primary" (click)="send()" type="button">Save</button>
-      <button mat-button mat-dialog-close mat-raised-button color="primary">Cancel</button>
-    </div>
-  </div>
+	<h1 mat-dialog-title>{{'DATASET-REFERENCED-MODELS.DATA-REPOSITORY.TITLE' | translate}}</h1>
+	<div mat-dialog-content class="row">
+		<mat-form-field class="col-4">
+			<input matInput formControlName="label" placeholder="{{'DATASET-REFERENCED-MODELS.DATA-REPOSITORY.LABEL' | translate}}" required>
+			<mat-error *ngIf="formGroup.get('label').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+		</mat-form-field>
+		<mat-form-field class="col-4">
+			<input matInput formControlName="abbreviation" placeholder="{{'DATASET-REFERENCED-MODELS.DATA-REPOSITORY.ABBREVIATION' | translate}}" required>
+			<mat-error *ngIf="formGroup.get('abbreviation').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+		</mat-form-field>
+		<mat-form-field class="col-4">
+			<input matInput formControlName="uri" placeholder="{{'DATASET-REFERENCED-MODELS.DATA-REPOSITORY.URI' | translate}}" required>
+			<mat-error *ngIf="formGroup.get('uri').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+		</mat-form-field>
+	</div>
+	<div mat-dialog-actions class="row">
+		<div class="col-auto"><button mat-button mat-dialog-close mat-raised-button color="primary">Cancel</button></div>
+		<div class="col"></div>
+		<div class="col-auto"><button mat-raised-button color="primary" (click)="send()" type="button">Save</button></div>
+	</div>
 </form>
diff --git a/dmp-frontend/src/app/datasets/dataset-referenced-models-helper/externalDataset/externaldataset-referenced-model-helper.component.html b/dmp-frontend/src/app/datasets/dataset-referenced-models-helper/externalDataset/externaldataset-referenced-model-helper.component.html
index 390e5a783..c134a53e2 100644
--- a/dmp-frontend/src/app/datasets/dataset-referenced-models-helper/externalDataset/externaldataset-referenced-model-helper.component.html
+++ b/dmp-frontend/src/app/datasets/dataset-referenced-models-helper/externalDataset/externaldataset-referenced-model-helper.component.html
@@ -1,20 +1,18 @@
 <form *ngIf="formGroup" [formGroup]="formGroup">
-  <h1 mat-dialog-title>{{'DATASET-REFERENCED-MODELS.EXTERNAL-DATASET.TITLE' | translate}}</h1>
-  <div mat-dialog-content>
-    <mat-form-field class="full-width">
-      <input matInput formControlName="label" placeholder="{{'DATASET-REFERENCED-MODELS.EXTERNAL-DATASET.LABEL' | translate}}" required>
-      <mat-error *ngIf="formGroup.get('label').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-    </mat-form-field>
-    <mat-form-field class="full-width">
-      <input matInput formControlName="abbreviation" placeholder="{{'DATASET-REFERENCED-MODELS.EXTERNAL-DATASET.ABBREVIATION' | translate}}" required>
-      <mat-error *ngIf="formGroup.get('abbreviation').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-    </mat-form-field>
-
-  </div>
-  <div mat-dialog-actions>
-    <div layout="row" class="full-width text-right" align="end">
-      <button mat-raised-button color="primary" (click)="send()" type="button">Save</button>
-      <button mat-button mat-dialog-close mat-raised-button color="primary">Cancel</button>
-    </div>
-  </div>
+	<h1 mat-dialog-title>{{'DATASET-REFERENCED-MODELS.EXTERNAL-DATASET.TITLE' | translate}}</h1>
+	<div mat-dialog-content class="row">
+		<mat-form-field class="col-md-6">
+			<input matInput formControlName="label" placeholder="{{'DATASET-REFERENCED-MODELS.EXTERNAL-DATASET.LABEL' | translate}}" required>
+			<mat-error *ngIf="formGroup.get('label').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+		</mat-form-field>
+		<mat-form-field class="col-md-6">
+			<input matInput formControlName="abbreviation" placeholder="{{'DATASET-REFERENCED-MODELS.EXTERNAL-DATASET.ABBREVIATION' | translate}}" required>
+			<mat-error *ngIf="formGroup.get('abbreviation').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+		</mat-form-field>
+	</div>
+	<div mat-dialog-actions class="row">
+		<div class="col-auto"><button mat-button mat-dialog-close mat-raised-button color="primary">Cancel</button></div>
+		<div class="col"></div>
+		<div class="col-auto"><button mat-raised-button color="primary" (click)="send()" type="button">Save</button></div>
+	</div>
 </form>
diff --git a/dmp-frontend/src/app/datasets/dataset-referenced-models-helper/registry/registry-referenced-model-helper.component.html b/dmp-frontend/src/app/datasets/dataset-referenced-models-helper/registry/registry-referenced-model-helper.component.html
index d5ffae7cc..f9a916427 100644
--- a/dmp-frontend/src/app/datasets/dataset-referenced-models-helper/registry/registry-referenced-model-helper.component.html
+++ b/dmp-frontend/src/app/datasets/dataset-referenced-models-helper/registry/registry-referenced-model-helper.component.html
@@ -1,23 +1,22 @@
 <form *ngIf="formGroup" [formGroup]="formGroup">
-  <h1 mat-dialog-title>{{'DATASET-REFERENCED-MODELS.REGISTRY.TITLE' | translate}}</h1>
-  <div mat-dialog-content>
-    <mat-form-field class="full-width">
-      <input matInput formControlName="label" placeholder="{{'DATASET-REFERENCED-MODELS.REGISTRY.LABEL' | translate}}" required>
-      <mat-error *ngIf="formGroup.get('label').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-    </mat-form-field>
-    <mat-form-field class="full-width">
-      <input matInput formControlName="abbreviation" placeholder="{{'DATASET-REFERENCED-MODELS.REGISTRY.ABBREVIATION' | translate}}" required>
-      <mat-error *ngIf="formGroup.get('abbreviation').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-    </mat-form-field>
-    <mat-form-field class="full-width">
-      <input matInput formControlName="uri" placeholder="{{'DATASET-REFERENCED-MODELS.REGISTRY.URI' | translate}}" required>
-      <mat-error *ngIf="formGroup.get('uri').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-    </mat-form-field>
-  </div>
-  <div mat-dialog-actions>
-    <div layout="row" class="full-width text-right" align="end">
-      <button mat-raised-button color="primary" (click)="send()" type="button">Save</button>
-      <button mat-button mat-dialog-close mat-raised-button color="primary">Cancel</button>
-    </div>
-  </div>
+	<h1 mat-dialog-title>{{'DATASET-REFERENCED-MODELS.REGISTRY.TITLE' | translate}}</h1>
+	<div mat-dialog-content class="row">
+		<mat-form-field class="col-md-4">
+			<input matInput formControlName="label" placeholder="{{'DATASET-REFERENCED-MODELS.REGISTRY.LABEL' | translate}}" required>
+			<mat-error *ngIf="formGroup.get('label').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+		</mat-form-field>
+		<mat-form-field class="col-md-4">
+			<input matInput formControlName="abbreviation" placeholder="{{'DATASET-REFERENCED-MODELS.REGISTRY.ABBREVIATION' | translate}}" required>
+			<mat-error *ngIf="formGroup.get('abbreviation').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+		</mat-form-field>
+		<mat-form-field class="col-md-4">
+			<input matInput formControlName="uri" placeholder="{{'DATASET-REFERENCED-MODELS.REGISTRY.URI' | translate}}" required>
+			<mat-error *ngIf="formGroup.get('uri').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+		</mat-form-field>
+	</div>
+	<div mat-dialog-actions class="row">
+		<div class="col-auto"><button mat-button mat-dialog-close mat-raised-button color="primary">Cancel</button></div>
+		<div class="col"></div>
+		<div class="col-auto"><button mat-raised-button color="primary" (click)="send()" type="button">Save</button></div>
+	</div>
 </form>
diff --git a/dmp-frontend/src/app/datasets/dataset-referenced-models-helper/services/services-referenced-model-helper.component.html b/dmp-frontend/src/app/datasets/dataset-referenced-models-helper/services/services-referenced-model-helper.component.html
index 4043fb8d7..f9aaa27c4 100644
--- a/dmp-frontend/src/app/datasets/dataset-referenced-models-helper/services/services-referenced-model-helper.component.html
+++ b/dmp-frontend/src/app/datasets/dataset-referenced-models-helper/services/services-referenced-model-helper.component.html
@@ -1,24 +1,22 @@
 <form *ngIf="formGroup" [formGroup]="formGroup">
-  <h1 mat-dialog-title>{{'DATASET-REFERENCED-MODELS.SERVICES.TITLE' | translate}}</h1>
-  <div mat-dialog-content>
-    <mat-form-field class="full-width">
-      <input matInput formControlName="label" placeholder="{{'DATASET-REFERENCED-MODELS.SERVICES.LABEL' | translate}}" required>
-      <mat-error *ngIf="formGroup.get('label').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-    </mat-form-field>
-    <mat-form-field class="full-width">
-      <input matInput formControlName="abbreviation" placeholder="{{'DATASET-REFERENCED-MODELS.SERVICES.ABBREVIATION' | translate}}" required>
-      <mat-error *ngIf="formGroup.get('abbreviation').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-    </mat-form-field>
-    <mat-form-field class="full-width">
-      <input matInput formControlName="uri" placeholder="{{'DATASET-REFERENCED-MODELS.SERVICES.URI' | translate}}" required>
-      <mat-error *ngIf="formGroup.get('uri').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-    </mat-form-field>
-
-  </div>
-  <div mat-dialog-actions>
-    <div layout="row" class="full-width text-right" align="end">
-      <button mat-raised-button color="primary" (click)="send()" type="button">Save</button>
-      <button mat-button mat-dialog-close mat-raised-button color="primary">Cancel</button>
-    </div>
-  </div>
+	<h1 mat-dialog-title>{{'DATASET-REFERENCED-MODELS.SERVICES.TITLE' | translate}}</h1>
+	<div mat-dialog-content class="row">
+		<mat-form-field class="col-md-4">
+			<input matInput formControlName="label" placeholder="{{'DATASET-REFERENCED-MODELS.SERVICES.LABEL' | translate}}" required>
+			<mat-error *ngIf="formGroup.get('label').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+		</mat-form-field>
+		<mat-form-field class="col-md-4">
+			<input matInput formControlName="abbreviation" placeholder="{{'DATASET-REFERENCED-MODELS.SERVICES.ABBREVIATION' | translate}}" required>
+			<mat-error *ngIf="formGroup.get('abbreviation').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+		</mat-form-field>
+		<mat-form-field class="col-md-4">
+			<input matInput formControlName="uri" placeholder="{{'DATASET-REFERENCED-MODELS.SERVICES.URI' | translate}}" required>
+			<mat-error *ngIf="formGroup.get('uri').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+		</mat-form-field>
+	</div>
+	<div mat-dialog-actions class="row">
+		<div class="col-auto"><button mat-button mat-dialog-close mat-raised-button color="primary">Cancel</button></div>
+		<div class="col"></div>
+		<div class="col-auto"><button mat-raised-button color="primary" (click)="send()" type="button">Save</button></div>
+	</div>
 </form>
diff --git a/dmp-frontend/src/app/datasets/dataset-wizard/dataset-wizard.component.ts b/dmp-frontend/src/app/datasets/dataset-wizard/dataset-wizard.component.ts
index e5b39519e..adbe0e6f5 100644
--- a/dmp-frontend/src/app/datasets/dataset-wizard/dataset-wizard.component.ts
+++ b/dmp-frontend/src/app/datasets/dataset-wizard/dataset-wizard.component.ts
@@ -1,5 +1,5 @@
 import { AfterViewInit, Component, OnInit, ViewChild } from '@angular/core';
-import { FormArray, FormBuilder, FormGroup } from '@angular/forms';
+import { FormArray, FormGroup } from '@angular/forms';
 import { MatDialog, MatSnackBar, MatStepper } from '@angular/material';
 import { ActivatedRoute, Params, Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
@@ -29,7 +29,6 @@ import { ServiceModel } from '../../models/services/ServiceModel';
 import { TagModel } from '../../models/tags/TagModel';
 import { DataManagementPlanService } from '../../services/data-management-plan/data-management-plan.service';
 import { DatasetWizardService } from '../../services/dataset-wizard/dataset-wizard.service';
-import { DatasetService } from '../../services/dataset/dataset.service';
 import { ExternalSourcesConfigurationService } from '../../services/external-sources/external-sources-configuration.service';
 import { ExternalSourcesService } from '../../services/external-sources/external-sources.service';
 import { AutoCompleteConfiguration } from '../../shared/components/auto-complete/AutoCompleteConfiguration';
@@ -90,8 +89,6 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, Aft
 
 	constructor(
 		private datasetWizardService: DatasetWizardService,
-		private formBuilder: FormBuilder,
-		private datasetService: DatasetService,
 		private route: ActivatedRoute,
 		public snackBar: MatSnackBar,
 		public router: Router,
@@ -433,8 +430,6 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, Aft
 
 	addDataRepository() {
 		const dialogRef = this.dialog.open(DataRepositoryReferencedModelHelperComponent, {
-			height: '255px',
-			width: '700px',
 			data: {
 
 			}
@@ -450,8 +445,6 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, Aft
 
 	addRegistry() {
 		const dialogRef = this.dialog.open(RegistryReferencedModelHelperComponent, {
-			height: '255px',
-			width: '700px',
 			data: {
 
 			}
@@ -467,8 +460,6 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, Aft
 
 	addExternalDataset() {
 		const dialogRef = this.dialog.open(ExternalDatasetReferencedModelHelperComponent, {
-			height: '255px',
-			width: '700px',
 			data: {
 
 			}
@@ -484,8 +475,6 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, Aft
 
 	addService() {
 		const dialogRef = this.dialog.open(ServicesReferencedModelHelperComponent, {
-			height: '255px',
-			width: '700px',
 			data: {
 
 			}
diff --git a/dmp-frontend/src/app/dmps/editor/dmp-editor.component.ts b/dmp-frontend/src/app/dmps/editor/dmp-editor.component.ts
index f1a559a61..cc8bca3af 100644
--- a/dmp-frontend/src/app/dmps/editor/dmp-editor.component.ts
+++ b/dmp-frontend/src/app/dmps/editor/dmp-editor.component.ts
@@ -264,8 +264,6 @@ export class DataManagementPlanEditorComponent extends BaseComponent implements
 
 	addResearcher(rowId: any, rowName: any) {
 		const dialogRef = this.dialog.open(AddResearchersComponent, {
-			height: '255px',
-			width: '700px',
 			data: {
 				dmpId: rowId,
 				dmpName: rowName
@@ -276,8 +274,8 @@ export class DataManagementPlanEditorComponent extends BaseComponent implements
 
 	availableProfiles() {
 		const dialogRef = this.dialog.open(AvailableProfilesComponent, {
-			height: '355px',
-			width: '700px',
+			// height: '355px',
+			// width: '700px',
 			data: {
 				profiles: this.formGroup.get('profiles')
 			}
diff --git a/dmp-frontend/src/app/shared/components/add-researchers/add-researchers.component.html b/dmp-frontend/src/app/shared/components/add-researchers/add-researchers.component.html
index 3e0b5ea56..e7490f31e 100644
--- a/dmp-frontend/src/app/shared/components/add-researchers/add-researchers.component.html
+++ b/dmp-frontend/src/app/shared/components/add-researchers/add-researchers.component.html
@@ -1,19 +1,20 @@
 <form *ngIf="formGroup" [formGroup]="formGroup">
-    <h1 mat-dialog-title>{{'ADDRESEARCHERS-EDITOR.TITLE' | translate}}</h1>
-    <div mat-dialog-content>
-        <mat-form-field class="full-width">
-            <input matInput formControlName="firstName" placeholder="{{'ADDRESEARCHERS-EDITOR.FIRST_NAME' | translate}}" required>
-            <mat-error *ngIf="formGroup.get('firstName').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-        </mat-form-field>
-        <mat-form-field class="full-width">
-                <input matInput formControlName="lastName" placeholder="{{'ADDRESEARCHERS-EDITOR.LAST_NAME' | translate}}" required>
-                <mat-error *ngIf="formGroup.get('lastName').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-            </mat-form-field>
-    </div>
-    <div mat-dialog-actions>
-        <div layout="row" class="full-width text-right" align="end">
-            <button mat-raised-button color="primary" (click)="send()" type="button">Save</button>
-            <button mat-button mat-dialog-close mat-raised-button color="primary">Cancel</button>
-        </div>
-    </div>
+	<h1 mat-dialog-title>{{'ADDRESEARCHERS-EDITOR.TITLE' | translate}}</h1>
+	<div mat-dialog-content class="row">
+		<mat-form-field class="col-6">
+			<input matInput formControlName="firstName" placeholder="{{'ADDRESEARCHERS-EDITOR.FIRST_NAME' | translate}}" required>
+			<mat-error *ngIf="formGroup.get('firstName').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+		</mat-form-field>
+		<mat-form-field class="col-6">
+			<input matInput formControlName="lastName" placeholder="{{'ADDRESEARCHERS-EDITOR.LAST_NAME' | translate}}" required>
+			<mat-error *ngIf="formGroup.get('lastName').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+		</mat-form-field>
+		<div class="col-12">
+			<div class="row">
+				<div class="col-auto"><button mat-button mat-dialog-close mat-raised-button color="primary">Cancel</button></div>
+				<div class="col"></div>
+				<div class="col-auto"><button mat-raised-button color="primary" (click)="send()" type="button">Save</button></div>
+			</div>
+		</div>
+	</div>
 </form>
diff --git a/dmp-frontend/src/app/shared/components/available-profiles/available-profiles.component.html b/dmp-frontend/src/app/shared/components/available-profiles/available-profiles.component.html
index a1ce7b4e4..6fbe63d45 100644
--- a/dmp-frontend/src/app/shared/components/available-profiles/available-profiles.component.html
+++ b/dmp-frontend/src/app/shared/components/available-profiles/available-profiles.component.html
@@ -1,10 +1,12 @@
-<mat-selection-list #datasetsprofiles [ngModel]="selectedOptions">
-    <mat-list-option *ngFor="let profile of profiles" [value]="profile" [selected]='isOptionSelected(profile)'>
-      {{profile.label}}
-    </mat-list-option>
-  </mat-selection-list>
-  
-  <p>
-    Dataset Profiles selected: {{datasetsprofiles.selectedOptions.selected.length}}
-  </p>
-  <button mat-raised-button color="primary" (click)="addProfiles(datasetsprofiles)">OK</button>
\ No newline at end of file
+<h4 mat-dialog-title>Available Dataset profiles</h4>
+<div mat-dialog-content>
+	<mat-selection-list #datasetsprofiles [ngModel]="selectedOptions">
+		<mat-list-option *ngFor="let profile of profiles" [value]="profile" [selected]='isOptionSelected(profile)'>
+			{{profile.label}}
+		</mat-list-option>
+	</mat-selection-list>
+	<p>
+		Dataset Profiles selected: {{datasetsprofiles.selectedOptions.selected.length}}
+	</p>
+	<button mat-raised-button color="primary" (click)="addProfiles(datasetsprofiles)">OK</button>
+</div>