diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-editor/dataset-editor.component.html b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-editor/dataset-editor.component.html
index fcbe904f1..30d3ff105 100644
--- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-editor/dataset-editor.component.html
+++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-editor/dataset-editor.component.html
@@ -1,6 +1,7 @@
 <form class="dataset-editor" *ngIf="formGroup" [formGroup]="formGroup">
 	<div class="col-12 intro">
-		{{'DATASET-EDITOR.TITLE.INTRO' | translate}}
+		<p>{{'DATASET-EDITOR.TITLE.INTRO' | translate}}</p>
+		<span>{{'DATASET-EDITOR.TITLE.INTRO-TIP' | translate}}</span>
 	</div>
 	<div class="col-12 card">
 		<!-- Title Field -->
@@ -23,9 +24,10 @@
 		<div class="row">
 			<div class="col-12">
 				<div class="heading">1.2 {{'DATASET-EDITOR.FIELDS.DESCRIPTION' | translate}}</div>
-				<span class="hint">{{'DATASET-EDITOR.HINT.TITLE' | translate}}</span>
+				<span class="hint">{{'DATASET-EDITOR.HINT.DESCRIPTION' | translate}}</span>
+				<!-- <span class="hint">{{'DATASET-EDITOR.HINT.TITLE' | translate}}</span>
 				<a class="dmp-link dmp-tour-{{ formGroup.get('id').value + 2 }}" (click)="restartTour(formGroup.get('id').value + 2)">{{'DATASET-EDITOR.FIELDS.DMP' | translate}}</a>
-				<span class="hint">{{'DATASET-EDITOR.HINT.TITLE-REST' | translate}}</span>
+				<span class="hint">{{'DATASET-EDITOR.HINT.TITLE-REST' | translate}}</span> -->
 				<div class="description-form">
 					<mat-form-field>
 						<textarea rows="3" matInput class="description-area" placeholder="{{'DMP-EDITOR.PLACEHOLDER.DESCRIPTION' | translate}}" formControlName="description"></textarea>
diff --git a/dmp-frontend/src/app/ui/dmp/editor/dataset-editor-details/dataset-editor-details.component.html b/dmp-frontend/src/app/ui/dmp/editor/dataset-editor-details/dataset-editor-details.component.html
index 1bf6d1a48..b6348e29c 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/dataset-editor-details/dataset-editor-details.component.html
+++ b/dmp-frontend/src/app/ui/dmp/editor/dataset-editor-details/dataset-editor-details.component.html
@@ -23,9 +23,10 @@
 		<div class="row">
 			<div class="col-12">
 				<div class="heading">1.2 {{'DATASET-EDITOR.FIELDS.DESCRIPTION' | translate}}</div>
-				<span class="hint">{{'DATASET-EDITOR.HINT.TITLE' | translate}}</span>
+				<span class="hint">{{'DATASET-EDITOR.HINT.DESCRIPTION' | translate}}</span>
+				<!-- <span class="hint">{{'DATASET-EDITOR.HINT.TITLE' | translate}}</span>
 				<a class="dmp-link dmp-tour-{{ formGroup.get('id').value + 2 }}" (click)="restartTour(formGroup.get('id').value + 2)">{{'DATASET-EDITOR.FIELDS.DMP' | translate}}</a>
-				<span class="hint">{{'DATASET-EDITOR.HINT.TITLE-REST' | translate}}</span>
+				<span class="hint">{{'DATASET-EDITOR.HINT.TITLE-REST' | translate}}</span> -->
 				<div class="description-form">
 					<mat-form-field>
 						<textarea rows="3" matInput class="description-area" placeholder="{{'DMP-EDITOR.PLACEHOLDER.DESCRIPTION' | translate}}" formControlName="description"></textarea>
diff --git a/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.html b/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.html
index 06b9d9be5..7012128db 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.html
+++ b/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.html
@@ -1,6 +1,6 @@
 <div class="main-info" [formGroup]="formGroup">
 	<div class="col-12 intro">
-		<p>{{'DMP-EDITOR.DATASET-INFO.INTRO' | translate}}</p>
+		<!-- <p>{{'DMP-EDITOR.DATASET-INFO.INTRO' | translate}}</p> -->
 		<p>{{'DMP-EDITOR.DATASET-INFO.SECOND-INTRO' | translate}}</p>
 	</div>
 	<div class="col-12 card">
diff --git a/dmp-frontend/src/app/ui/dmp/editor/funding-info/funding-info.component.html b/dmp-frontend/src/app/ui/dmp/editor/funding-info/funding-info.component.html
index 61104beb1..2218f483a 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/funding-info/funding-info.component.html
+++ b/dmp-frontend/src/app/ui/dmp/editor/funding-info/funding-info.component.html
@@ -16,7 +16,7 @@
 					<div class="funder-form">
 						<div *ngIf="!isCreateNewFunder">
 							<mat-form-field appearance="outline">
-								<app-single-auto-complete required='true' [formControl]="funderFormGroup.get('existFunder')" placeholder="{{'DMP-EDITOR.FIELDS.FUNDER' | translate}}" [configuration]="funderAutoCompleteConfiguration">
+								<app-single-auto-complete required='true' [formControl]="funderFormGroup.get('existFunder')" placeholder="{{'DMP-EDITOR.FIELDS.FUNDER' | translate}}" [configuration]="funderAutoCompleteConfiguration" (optionSelected)="funderSelectionChanged()">
 								</app-single-auto-complete>
 							</mat-form-field>
 						</div>
diff --git a/dmp-frontend/src/app/ui/dmp/editor/funding-info/funding-info.component.ts b/dmp-frontend/src/app/ui/dmp/editor/funding-info/funding-info.component.ts
index 43b6123c4..c77062efc 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/funding-info/funding-info.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/editor/funding-info/funding-info.component.ts
@@ -81,9 +81,35 @@ export class FundingInfoComponent extends BaseComponent implements OnInit {
 			.subscribe(x => {
 				this.configureAutoCompletes();
 			});
+
+		// this.funderFormGroup.statusChanges
+		// 	.pipe(takeUntil(this._destroyed))
+		// 	.subscribe(x => {
+		// 		console.log("FUNDER CHANGE: INIT");
+		// 		this.grantformGroup.reset();
+		// 		if (x == 'INVALID') {
+		// 			this.grantformGroup.get('existGrant').reset();
+		// 			this.grantformGroup.get('label').reset();
+		// 			this.grantformGroup.get('description').reset();
+		// 			this.grantformGroup.get('existGrant').disable();
+		// 			this.grantformGroup.get('label').disable();
+		// 			this.grantformGroup.get('description').disable();
+		// 		} else if (x == 'VALID') {
+		// 			if (!this.isNew) {
+		// 				this.grantformGroup.get('label').reset();
+		// 				this.grantformGroup.get('description').reset();
+		// 				this.grantformGroup.get('label').disable();
+		// 				this.grantformGroup.get('description').disable();
+		// 				this.grantformGroup.get('existGrant').enable();
+
+		// 			}
+		// 		}
+		// 		this.configureAutoCompletes();
+		// 	})
 	}
 
 	configureAutoCompletes(): void {
+		console.log("before Search")
 		this.funderAutoCompleteConfiguration = {
 			filterFn: this.searchFunder.bind(this),
 			initialItems: () => this.searchFunder(''),
@@ -110,11 +136,13 @@ export class FundingInfoComponent extends BaseComponent implements OnInit {
 	}
 
 	searchGrant(query: any) {
+		// console.log("Search GRANTS");
 		const grantRequestItem: RequestItem<GrantCriteria> = new RequestItem();
 		grantRequestItem.criteria = new GrantCriteria();
 		grantRequestItem.criteria.like = query;
 		if (this.funderFormGroup.get('existFunder').value) {
 			grantRequestItem.criteria.funderReference = this.funderFormGroup.controls['existFunder'].value.reference;
+			// console.log(grantRequestItem);
 		}
 		return this.grantService.getWithExternal(grantRequestItem);
 	}
@@ -168,6 +196,7 @@ export class FundingInfoComponent extends BaseComponent implements OnInit {
 			this.grantformGroup.get('label').disable();
 			this.grantformGroup.get('description').disable();
 		} else {
+			// console.log("SET VALIDATORS")
 			this.grantformGroup.get('existGrant').enable();
 			this.grantformGroup.get('label').disable();
 			this.grantformGroup.get('label').reset();
@@ -231,8 +260,12 @@ export class FundingInfoComponent extends BaseComponent implements OnInit {
 	}
 
 	funderValueChanged(funder: any) {
+		// console.log("Funder ", funder);
+		// console.log(this.funderFormGroup.get('existFunder').value);
+
 		if ((funder.label !== "" && funder.label != null && funder.label !== undefined)
 			|| (funder.existFunder !== null && funder.existFunder !== undefined && funder.existFunder.id !== undefined)) {
+			// console.log('Funder Value Changed')
 			this.grantformGroup.reset();
 			this.grantformGroup.enable();
 			this.setGrantValidators();
@@ -243,6 +276,19 @@ export class FundingInfoComponent extends BaseComponent implements OnInit {
 		}
 	}
 
+	funderSelectionChanged() {
+		// console.log("onFunderSelectionChanged")
+		// console.log(this.funderFormGroup.get('existFunder').value);
+		// this.grantAutoCompleteConfiguration = null;
+		// this.grantAutoCompleteConfiguration = {
+		// 	filterFn: this.searchGrant.bind(this),
+		// 	initialItems: () => this.searchGrant(''),
+		// 	displayFn: (item) => item['label'] + this.getGrantIdText(item),
+		// 	titleFn: (item) => item['label'] + this.getGrantIdText(item),
+		// 	subtitleFn: (item) => item['source'] ? this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.SOURCE:') + item['source'] : (item['key'] ? this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.SOURCE:') + item['key'] : this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.NO-SOURCE'))
+		// };
+	}
+
 	isGrantDisabled() {
 		return this.grantformGroup.disabled;
 	}
diff --git a/dmp-frontend/src/assets/i18n/de.json b/dmp-frontend/src/assets/i18n/de.json
index ce0e61148..9d3f5cf62 100644
--- a/dmp-frontend/src/assets/i18n/de.json
+++ b/dmp-frontend/src/assets/i18n/de.json
@@ -890,7 +890,7 @@
 			"TYPING": "Type more letters of the name so its more possible to find the correct one."
 		},
 		"FUNDING-INFO": {
-			"INTRO": "A Data Management Plan (DMP) consist of your Data Management Plans closer to where they are generated, analysed and stored. argos is an open, extensible, collaborative tool supporting Open and FAIR Data Management Plans.",
+			"INTRO": "You are using the DMP editor. Add here information about the scope, funding, actors of your DMP and decide on access and re-use issues for the DMP output that you are creating.",
 			"FIND": "Couldn't find the correct one?"
 		},
 		"DATASET-INFO": {
@@ -1001,7 +1001,8 @@
 		"TITLE": {
 			"NEW": "Neuer Datenmanagementplan",
 			"EDIT": "Bearbeiten",
-			"INTRO": "A Data Management Plan (DMP) consist of your Data Management Plans closer to where they are generated, analysed and stored. argos is an open, extensible, collaborative tool supporting Open and FAIR Data Management Plans."
+			"INTRO": "You are using the Dataset editor. Answer here questions that describe your data management activities.",
+			"INTRO-TIP": "Tip: Add new datasets to describe different types of data or disciplinary data to avoid mixing information."
 		},
 		"FIELDS": {
 			"NAME": "Name der Datensatzbeschreibung",
@@ -1034,6 +1035,7 @@
 			"EXTERNAL-LINK": "Provide an external URL link"
 		},
 		"HINT": {
+			"DESCRIPTION": "Briefly describe the context and purpose of the Dataset",
 			"TITLE": "A brief description of what the ",
 			"TITLE-REST": " is about it’s scope and objectives."
 		},
diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json
index 2aeec65ad..cee54cbce 100644
--- a/dmp-frontend/src/assets/i18n/en.json
+++ b/dmp-frontend/src/assets/i18n/en.json
@@ -890,7 +890,7 @@
 			"TYPING": "Type more letters of the name so its more possible to find the correct one."
 		},
 		"FUNDING-INFO": {
-			"INTRO": "A Data Management Plan (DMP) consist of your Data Management Plans closer to where they are generated, analysed and stored. argos is an open, extensible, collaborative tool supporting Open and FAIR Data Management Plans.",
+			"INTRO": "You are using the DMP editor. Add here information about the scope, funding, actors of your DMP and decide on access and re-use issues for the DMP output that you are creating.",
 			"FIND": "Couldn't find the correct one?"
 		},
 		"DATASET-INFO": {
@@ -1001,7 +1001,8 @@
 		"TITLE": {
 			"NEW": "New Data Management Plan",
 			"EDIT": "Edit",
-			"INTRO": "A Data Management Plan (DMP) consist of your Data Management Plans closer to where they are generated, analysed and stored. argos is an open, extensible, collaborative tool supporting Open and FAIR Data Management Plans."
+			"INTRO": "You are using the Dataset editor. Answer here questions that describe your data management activities.",
+			"INTRO-TIP": "Tip: Add new datasets to describe different types of data or disciplinary data to avoid mixing information."
 		},
 		"FIELDS": {
 			"NAME": "Name of the Dataset",
@@ -1034,6 +1035,7 @@
 			"EXTERNAL-LINK": "Provide an external URL link"
 		},
 		"HINT": {
+			"DESCRIPTION": "Briefly describe the context and purpose of the Dataset",
 			"TITLE": "A brief description of what the ",
 			"TITLE-REST": " is about it’s scope and objectives."
 		},
diff --git a/dmp-frontend/src/assets/i18n/es.json b/dmp-frontend/src/assets/i18n/es.json
index 067313e83..5cde47db8 100644
--- a/dmp-frontend/src/assets/i18n/es.json
+++ b/dmp-frontend/src/assets/i18n/es.json
@@ -890,7 +890,7 @@
 			"TYPING": "Escriba más letras del nombre para que sea más probable encontrar el correcto"
 		},
 		"FUNDING-INFO": {
-			"INTRO": "Un plan de gestión de datos (PGD) consiste en sus planes de gestión de datos acercándolos a dónde son generados, analizados y almacenados. Argos es una herramienta abierta, extensive y colaborativa pensada para crear planes de gestión de datos abiertos y que cumplan los principios FAIR.",
+			"INTRO": "You are using the DMP editor. Add here information about the scope, funding, actors of your DMP and decide on access and re-use issues for the DMP output that you are creating.",
 			"FIND": "¿No se encontró el correcto?"
 		},
 		"DATASET-INFO": {
@@ -1001,7 +1001,8 @@
 		"TITLE": {
 			"NEW": "Nuevo Plan de Gestión de Datos",
 			"EDIT": "Editar",
-			"INTRO": "A Data Management Plan (DMP) consist of your Data Management Plans closer to where they are generated, analysed and stored. argos is an open, extensible, collaborative tool supporting Open and FAIR Data Management Plans."
+			"INTRO": "You are using the Dataset editor. Answer here questions that describe your data management activities.",
+			"INTRO-TIP": "Tip: Add new datasets to describe different types of data or disciplinary data to avoid mixing information."
 		},
 		"FIELDS": {
 			"NAME": "Nombre de la descripción del dataset",
@@ -1034,6 +1035,7 @@
 			"EXTERNAL-LINK": "Provide an external URL link"
 		},
 		"HINT": {
+			"DESCRIPTION": "Briefly describe the context and purpose of the Dataset",
 			"TITLE": "A brief description of what the ",
 			"TITLE-REST": " is about it’s scope and objectives."
 		},
diff --git a/dmp-frontend/src/assets/i18n/gr.json b/dmp-frontend/src/assets/i18n/gr.json
index 9c5f00256..1de593b4f 100644
--- a/dmp-frontend/src/assets/i18n/gr.json
+++ b/dmp-frontend/src/assets/i18n/gr.json
@@ -890,7 +890,7 @@
 			"TYPING": "Προσθέστε περισσότερα γράμματα στο όνομα ώστε να είναι πιο πιθανό να βρείτε το σωστό."
 		},
 		"FUNDING-INFO": {
-			"INTRO": "Ένα Σχέδιο Διαχείρισης Δεδομένων αποτελείται από τα Σχέδια Διαχείρισης Δεδομένων σας πιο κοντά στο που έχουν παραχθεί, αναλυθεί και αποθηκευτεί. Το Argos είναι ένα ανοικτό, επεκτάσιμο και συνεργατικό εργαλείο που υποστηρίζει τα Ανοικτά και FAIR Σχέδια Διαχείρισης Δεδομένων.",
+			"INTRO": "You are using the DMP editor. Add here information about the scope, funding, actors of your DMP and decide on access and re-use issues for the DMP output that you are creating.",
 			"FIND": "Δεν μπορέσατε να βρείτε το σωστό;"
 		},
 		"DATASET-INFO": {
@@ -1001,7 +1001,8 @@
 		"TITLE": {
 			"NEW": "Νέο Σχέδιο Διαχείρισης Δεδομένων",
 			"EDIT": "Επεξεργασία",
-			"INTRO": "Ένα Σχέδιο Διαχείρισης Δεδομένων αποτελείται από τα Σχέδια Διαχείρισης Δεδομένων σας πιο κοντά στο που έχουν παραχθεί, αναλυθεί και αποθηκευτεί. Το Argos είναι ένα ανοικτό, επεκτάσιμο και συνεργατικό εργαλείο που υποστηρίζει Ανοικτά και FAIR Σχέδια Διαχείρισης Δεδομένων."
+			"INTRO": "You are using the Dataset editor. Answer here questions that describe your data management activities.",
+			"INTRO-TIP": "Tip: Add new datasets to describe different types of data or disciplinary data to avoid mixing information."
 		},
 		"FIELDS": {
 			"NAME": "Τίτλος Περιγραφής Συνόλου Δεδομένων",
@@ -1034,6 +1035,7 @@
 			"EXTERNAL-LINK": "Προσθέστε έναν εξωτερικό σύνδεσμο URL"
 		},
 		"HINT": {
+			"DESCRIPTION": "Briefly describe the context and purpose of the Dataset",
 			"TITLE": "Μία σύντομη περιγραφή του τι",
 			"TITLE-REST": "αφορά, το πεδίο εφαρμογής του και τους στόχους του."
 		},
diff --git a/dmp-frontend/src/assets/i18n/sk.json b/dmp-frontend/src/assets/i18n/sk.json
index 5b4305a9f..2b563ad6a 100644
--- a/dmp-frontend/src/assets/i18n/sk.json
+++ b/dmp-frontend/src/assets/i18n/sk.json
@@ -890,7 +890,7 @@
 			"TYPING": "Napíšte viac písmen názvu, aby bolo možné nájsť správny DMP."
 		},
 		"FUNDING-INFO": {
-			"INTRO": "Data Management plán (DMP) alebo plán manažmentu dát tvoria vaše Data Management plány, bližšie miestu, kde sú vygenerované, analyzované a uložené. Argos je otvorený šíriteľný nástroj, vhodný na spoluprácu, ktorý podporuje otvorené a FAIR plány manažmentu dát (Open and FAIR Data Management Plans).",
+			"INTRO": "You are using the DMP editor. Add here information about the scope, funding, actors of your DMP and decide on access and re-use issues for the DMP output that you are creating.",
 			"FIND": "Nenašli ste správny súbor?"
 		},
 		"DATASET-INFO": {
@@ -1001,7 +1001,8 @@
 		"TITLE": {
 			"NEW": "Nový Data Management plán",
 			"EDIT": "Upraviť",
-			"INTRO": "Data Management plán (DMP) tvoria vaše Data Management plány, bližšie miestu, kde sú vygenerované, analyzované a uložené. Argos je otvorený šíriteľný nástroj, vhodný na spoluprácu, ktorý podporuje otvorené a FAIR plány manažmentu dát (Open and FAIR Data Management Plans)."
+			"INTRO": "You are using the Dataset editor. Answer here questions that describe your data management activities.",
+			"INTRO-TIP": "Tip: Add new datasets to describe different types of data or disciplinary data to avoid mixing information."
 		},
 		"FIELDS": {
 			"NAME": "Názov súboru údajov",
@@ -1034,6 +1035,7 @@
 			"EXTERNAL-LINK": "Poskytnúť externý URL link"
 		},
 		"HINT": {
+			"DESCRIPTION": "Briefly describe the context and purpose of the Dataset",
 			"TITLE": "Stručný opis toho, o čom je ",
 			"TITLE-REST": " , opis rozsahu a cieľov."
 		},
diff --git a/dmp-frontend/src/assets/i18n/tr.json b/dmp-frontend/src/assets/i18n/tr.json
index a252b163c..359d3ac48 100644
--- a/dmp-frontend/src/assets/i18n/tr.json
+++ b/dmp-frontend/src/assets/i18n/tr.json
@@ -890,7 +890,7 @@
 			"TYPING": "Doğru olanı bulabilmek için daha fazla harf yazın."
 		},
 		"FUNDING-INFO": {
-			"INTRO": "Bir Veri Yönetim Planı (VYP), Veri Yönetim Planlarınızı oluşturan verilerin nasıl analiz edildiği ve depolandığı bilgisinden oluşur. Argos, açık ve FAIR veri ilkelerini destekleyen, genişletilebilir, işbirliğine dayalı bir araçtır.",
+			"INTRO": "You are using the DMP editor. Add here information about the scope, funding, actors of your DMP and decide on access and re-use issues for the DMP output that you are creating.",
 			"FIND": "Doğru bir tane bulamadınız mı?"
 		},
 		"DATASET-INFO": {
@@ -1001,7 +1001,8 @@
 		"TITLE": {
 			"NEW": "Yeni Veri Yönetim Planı",
 			"EDIT": "Düzenle",
-			"INTRO": "A Data Management Plan (DMP) consist of your Data Management Plans closer to where they are generated, analysed and stored. argos is an open, extensible, collaborative tool supporting Open and FAIR Data Management Plans."
+			"INTRO": "You are using the Dataset editor. Answer here questions that describe your data management activities.",
+			"INTRO-TIP": "Tip: Add new datasets to describe different types of data or disciplinary data to avoid mixing information."
 		},
 		"FIELDS": {
 			"NAME": "Veri Seti Tanımının Adı",
@@ -1034,6 +1035,7 @@
 			"EXTERNAL-LINK": "Provide an external URL link"
 		},
 		"HINT": {
+			"DESCRIPTION": "Briefly describe the context and purpose of the Dataset",
 			"TITLE": "A brief description of what the ",
 			"TITLE-REST": " is about it’s scope and objectives."
 		},