diff --git a/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.component.html b/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.component.html
index bced5e940..48da68a57 100644
--- a/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.component.html
+++ b/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.component.html
@@ -7,17 +7,13 @@
 				<mat-step class="step-container" [stepControl]="formGroup.get('dmpMeta')">
 					<ng-template matStepLabel>{{'DATASET-CREATE-WIZARD.FIRST-STEP.TITLE'| translate}}</ng-template>
 					<form [formGroup]="formGroup.get('dmpMeta')">
-						<dataset-dmp-selector-component class="col-12" [formGroup]="formGroup.get('dmpMeta')"
-							[datasetFormGroup]="formGroup.get('datasets')" [stepper]="stepper">
+						<dataset-dmp-selector-component class="col-12" [formGroup]="formGroup.get('dmpMeta')" [datasetFormGroup]="formGroup.get('datasets')" [stepper]="stepper">
 						</dataset-dmp-selector-component>
 					</form>
 					<div class="col-12">
 						<div class="row">
 							<div class="col"></div>
-							<div>
-								<button matStepperNext mat-raised-button
-									color="primary">{{'DATASET-CREATE-WIZARD.ACTIONS.NEXT'| translate}}</button>
-							</div>
+							<div><button matStepperNext mat-raised-button color="primary" [disabled]="!formGroup.get('dmpMeta').valid">{{'DATASET-CREATE-WIZARD.ACTIONS.NEXT'| translate}}</button></div>
 						</div>
 					</div>
 				</mat-step>
@@ -26,20 +22,13 @@
 						{{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.THIRD-STEP.TITLE' | translate}}
 					</ng-template>
 					<div *ngIf="formGroup.get('dmpMeta').valid && isActive('step2')">
-						<app-dataset-editor-wizard-component class="col-12" [formGroup]="formGroup"
-							[datasetProfile]="formGroup.get('dmpMeta').get('datasetProfile')"
-							[datasetLabel]="formGroup.get('dmpMeta').get('dmp').value['label']">
+						<app-dataset-editor-wizard-component class="col-12" [formGroup]="formGroup" [datasetProfile]="formGroup.get('dmpMeta').get('datasetProfile')" [datasetLabel]="formGroup.get('dmpMeta').get('dmp').value['label']">
 						</app-dataset-editor-wizard-component>
 					</div>
 					<div class="navigation-buttons-container">
-						<button matStepperPrevious mat-raised-button
-							color="primary">{{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.ACTIONS.BACK' | translate}}</button>
-						<button class="saveAndFinalizeButton" matStepperNext mat-raised-button (click)='saveFinalize()'
-							[disabled]="!isFormValid() || !hasDatasets()"
-							color="primary">{{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.ACTIONS.SAVE-AND-FINALIZE' | translate}}</button>
-						<button class="saveButton" matStepperNext mat-raised-button (click)='save()'
-							[disabled]="!hasDatasets()"
-							color="primary">{{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.ACTIONS.SAVE' | translate}}</button>
+						<button matStepperPrevious mat-raised-button color="primary">{{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.ACTIONS.BACK' | translate}}</button>
+						<button class="saveAndFinalizeButton" matStepperNext mat-raised-button (click)='saveFinalize()' [disabled]="!isFormValid() || !hasDatasets()" color="primary">{{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.ACTIONS.SAVE-AND-FINALIZE' | translate}}</button>
+						<button class="saveButton" matStepperNext mat-raised-button (click)='save()' [disabled]="!hasDatasets()" color="primary">{{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.ACTIONS.SAVE' | translate}}</button>
 					</div>
 				</mat-step>
 			</mat-horizontal-stepper>