diff --git a/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.scss b/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.scss
index 8b0858e0d..1230c73a7 100644
--- a/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.scss
+++ b/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.scss
@@ -8,10 +8,10 @@
 
 
 	.align-arrow-right {
-		position: absolute;
+		// position: absolute;
 		right: 0;
 		// bottom: 0;
-		vertical-align: middle;
+		// vertical-align: middle;
 		cursor: pointer;
 		align-self: center;
 		color: rgba(0, 0, 0, 0.54);
@@ -39,3 +39,8 @@
 .two-line-mat-option {
 	line-height: 1.2em;
 }
+
+::ng-deep .mat-chip-list-wrapper {
+	max-height: 4.8em !important;
+	overflow: auto !important;
+}
diff --git a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria-dialogue/dataset-criteria-dialog.component.html b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria-dialogue/dataset-criteria-dialog.component.html
index 167a8da14..db2bddfee 100644
--- a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria-dialogue/dataset-criteria-dialog.component.html
+++ b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria-dialogue/dataset-criteria-dialog.component.html
@@ -1,2 +1,2 @@
 <a class="col-auto d-flex pointer" (click)="onClose()"><span class="ml-auto mt-3 material-icons clear-icon">clear</span></a>
-<app-dataset-criteria-component [isPublic]="data.isPublic" [status]="data.status" [criteriaFormGroup]="data.formGroup" (filtersChanged)="onFiltersChanged($event)" class="col-auto"></app-dataset-criteria-component>
+<app-dataset-criteria-component [isPublic]="data.isPublic" [status]="data.status" [criteriaFormGroup]="data.formGroup" (filtersChanged)="onFiltersChanged($event)"></app-dataset-criteria-component>
diff --git a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.html b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.html
index b50c6e0c8..6498dc3f5 100644
--- a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.html
+++ b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.html
@@ -1,7 +1,11 @@
 <div class="dmp-criteria">
 	<div class="filters">
-		<h6 class="filters-title">{{'CRITERIA.FILTERS'| translate}}</h6>
-		<div class="row" style="justify-content: center;">
+		<div class="row justify-content-center">
+			<div class="col-10">
+				<h6 class="criteria-title">{{'CRITERIA.FILTERS'| translate}}</h6>
+			</div>
+		</div>
+		<div class="row justify-content-center">
 			<!-- Search Filter-->
 			<!-- <mat-form-field class="col-11 search">
 				<input matInput placeholder="{{'CRITERIA.GRANTS.LIKE'| translate}}" name="grantCriteriaLike"
@@ -13,112 +17,133 @@
 			<!-- End of Search Filter -->
 
 			<!-- Status Filter-->
-			<div class="col-10 gray-container" *ngIf="!isPublic" >
+			<div class="col-10" *ngIf="!isPublic">
 				<h6 class="category-title">{{'CRITERIA.DATA-SETS.STATUS'| translate}}</h6>
 				<mat-radio-group aria-label="Select an option" [formControl]="formGroup.get('status')">
-					<mat-list-item><mat-radio-button value="null" [checked]="!formGroup.get('status').value">{{ 'TYPES.DATASET-STATUS.ANY' | translate }}</mat-radio-button></mat-list-item>
-					<mat-list-item><mat-radio-button value="0" >{{ 'TYPES.DATASET-STATUS.DRAFT' | translate }}</mat-radio-button></mat-list-item>
-					<mat-list-item><mat-radio-button value="1">{{ 'TYPES.DATASET-STATUS.FINALISED' | translate }}</mat-radio-button></mat-list-item>
+					<mat-list-item>
+						<mat-radio-button value="null" [checked]="!formGroup.get('status').value">{{ 'TYPES.DATASET-STATUS.ANY' | translate }}</mat-radio-button>
+					</mat-list-item>
+					<mat-list-item>
+						<mat-radio-button value="0">{{ 'TYPES.DATASET-STATUS.DRAFT' | translate }}</mat-radio-button>
+					</mat-list-item>
+					<mat-list-item>
+						<mat-radio-button value="1">{{ 'TYPES.DATASET-STATUS.FINALISED' | translate }}</mat-radio-button>
+					</mat-list-item>
 				</mat-radio-group>
+				<hr>
 			</div>
 			<!-- End of Status Filter-->
 
 			<!-- Grant Status -->
-			<div class="col-10 gray-container" *ngIf="isPublic">
+			<div class="col-10" *ngIf="isPublic">
 				<h6 class="category-title">{{ 'FACET-SEARCH.GRANT-STATUS.TITLE' | translate }}</h6>
 				<mat-radio-group [formControl]="formGroup.get('grantStatus')">
-					<mat-list-item><mat-radio-button checked value="null" [checked]="!formGroup.get('grantStatus').value">{{ 'FACET-SEARCH.GRANT-STATUS.OPTIONS.ANY' | translate }}</mat-radio-button></mat-list-item>
-					<mat-list-item><mat-radio-button value="0">{{ 'FACET-SEARCH.GRANT-STATUS.OPTIONS.ACTIVE' | translate }}</mat-radio-button></mat-list-item>
-					<mat-list-item><mat-radio-button value="1">{{ 'FACET-SEARCH.GRANT-STATUS.OPTIONS.INACTIVE' | translate }}</mat-radio-button></mat-list-item>
+					<mat-list-item>
+						<mat-radio-button checked value="null" [checked]="!formGroup.get('grantStatus').value">{{ 'FACET-SEARCH.GRANT-STATUS.OPTIONS.ANY' | translate }}</mat-radio-button>
+					</mat-list-item>
+					<mat-list-item>
+						<mat-radio-button value="0">{{ 'FACET-SEARCH.GRANT-STATUS.OPTIONS.ACTIVE' | translate }}</mat-radio-button>
+					</mat-list-item>
+					<mat-list-item>
+						<mat-radio-button value="1">{{ 'FACET-SEARCH.GRANT-STATUS.OPTIONS.INACTIVE' | translate }}</mat-radio-button>
+					</mat-list-item>
 				</mat-radio-group>
+				<hr>
 			</div>
 			<!-- End of Grant Status -->
 
 			<!-- Related Dataset Templates Filters -->
-			<div class="col-10 gray-container">
+			<div class="col-10">
 				<h6 class="category-title">{{'CRITERIA.DATA-SETS.RELATED-DATASET-TEMPLATES' | translate}}</h6>
-				<mat-form-field>
-					<app-multiple-auto-complete [formControl]="formGroup.get('datasetTemplates')"
-						placeholder="{{'CRITERIA.DATA-SETS.SELECT-DATASET-TEMPLATES' | translate }}"
-						[configuration]="datasetTemplateAutoCompleteConfiguration">
+				<mat-form-field class="mb-4">
+					<mat-label>{{'CRITERIA.DATA-SETS.SELECT-DATASET-TEMPLATES' | translate }}</mat-label>
+					<app-multiple-auto-complete [formControl]="formGroup.get('datasetTemplates')" [configuration]="datasetTemplateAutoCompleteConfiguration">
 					</app-multiple-auto-complete>
 				</mat-form-field>
+				<hr>
 			</div>
 			<!-- End of Related Dataset Templates Filters -->
 
 			<!-- Related DMP Filters -->
-			<div class="col-10 gray-container">
+			<div class="col-10">
 				<h6 class="category-title">{{'CRITERIA.DATA-SETS.RELATED-DMP' | translate}}</h6>
-				<mat-form-field>
-					<app-multiple-auto-complete [formControl]="formGroup.get('groupIds')"
-						placeholder="{{'CRITERIA.DATA-SETS.SELECT-DMP' | translate }}"
-						[configuration]="dmpAutoCompleteConfiguration">
+				<mat-form-field class="mb-4">
+					<mat-label>{{'CRITERIA.DATA-SETS.SELECT-DMP' | translate }}</mat-label>
+					<app-multiple-auto-complete [formControl]="formGroup.get('groupIds')" [configuration]="dmpAutoCompleteConfiguration">
 					</app-multiple-auto-complete>
 				</mat-form-field>
+				<hr>
 			</div>
 			<!-- End of Related DMP Filters -->
 
 			<!-- All Versions Filter-->
-			<div class="col-10 gray-container" *ngIf="!isPublic">
+			<div class="col-10" *ngIf="!isPublic">
 				<h6 class="category-title">{{'CRITERIA.DATA-SETS.ALL-VERSIONS'| translate}}</h6>
 				<mat-slide-toggle [formControl]="formGroup.get('allVersions')"></mat-slide-toggle>
+				<hr>
 			</div>
 			<!-- End of All Versions Filter-->
 
 			<!-- Related Grant Filters -->
-			<div class="col-10 gray-container">
+			<div class="col-10">
 				<h6 class="category-title">{{'CRITERIA.DATA-SETS.RELATED-GRANT' | translate}}</h6>
-				<mat-form-field>
-					<app-multiple-auto-complete [formControl]="formGroup.get('grants')"
-						placeholder="{{'CRITERIA.DATA-SETS.SELECT-GRANTS' | translate }}"
-						[configuration]="grantAutoCompleteConfiguration">
+				<mat-form-field class="mb-4">
+					<mat-label>{{'CRITERIA.DATA-SETS.SELECT-GRANTS' | translate }}</mat-label>
+					<app-multiple-auto-complete [formControl]="formGroup.get('grants')" [configuration]="grantAutoCompleteConfiguration">
 					</app-multiple-auto-complete>
 				</mat-form-field>
+				<hr>
 			</div>
 			<!-- End of Related Grants Filters -->
 
 			<!-- Related Collaborators Filters -->
-			<div class="col-10 gray-container" *ngIf="!isPublic">
+			<div class="col-10" *ngIf="!isPublic">
 				<h6 class="category-title">{{'CRITERIA.DATA-SETS.RELATED-COLLABORATORS' | translate}}</h6>
-				<mat-form-field>
-					<app-multiple-auto-complete [formControl]="formGroup.get('collaborators')"
-						placeholder="{{'CRITERIA.DATA-SETS.SELECT-COLLABORATORS' | translate }}"
-						[configuration]="collaboratorsAutoCompleteConfiguration">
+				<mat-form-field class="mb-4">
+					<mat-label>{{'CRITERIA.DATA-SETS.SELECT-COLLABORATORS' | translate }}</mat-label>
+					<app-multiple-auto-complete [formControl]="formGroup.get('collaborators')" [configuration]="collaboratorsAutoCompleteConfiguration">
 					</app-multiple-auto-complete>
 				</mat-form-field>
+				<hr>
 			</div>
 			<!-- End of Related Collaborators Filters -->
 
 			<!-- Role Filter -->
-			<div class="col-10 gray-container" *ngIf="isAuthenticated()">
+			<div class="col-10" *ngIf="isAuthenticated()">
 				<h6 class="category-title">{{'CRITERIA.DATA-SETS.ROLE' | translate }}</h6>
 				<mat-radio-group aria-label="Select an option" [formControl]="formGroup.get('role')">
-					<mat-list-item><mat-radio-button checked value="null" [checked]="!formGroup.get('role').value">{{ 'TYPES.DATASET-ROLE.ANY' | translate }}</mat-radio-button></mat-list-item>
-					<mat-list-item><mat-radio-button value="0">{{ 'TYPES.DATASET-ROLE.OWNER' | translate }}</mat-radio-button></mat-list-item>
-					<mat-list-item><mat-radio-button value="1">{{ 'TYPES.DATASET-ROLE.MEMBER' | translate }}</mat-radio-button></mat-list-item>
+					<mat-list-item>
+						<mat-radio-button checked value="null" [checked]="!formGroup.get('role').value">{{ 'TYPES.DATASET-ROLE.ANY' | translate }}</mat-radio-button>
+					</mat-list-item>
+					<mat-list-item>
+						<mat-radio-button value="0">{{ 'TYPES.DATASET-ROLE.OWNER' | translate }}</mat-radio-button>
+					</mat-list-item>
+					<mat-list-item>
+						<mat-radio-button value="1">{{ 'TYPES.DATASET-ROLE.MEMBER' | translate }}</mat-radio-button>
+					</mat-list-item>
 				</mat-radio-group>
+				<hr>
 			</div>
 			<!-- End of Role Filter -->
 
 			<!-- Related Organization Filter -->
-			<div class="col-10 gray-container">
+			<div class="col-10">
 				<h6 class="category-title">{{'CRITERIA.DATA-SETS.ORGANIZATION' | translate }}</h6>
-				<mat-form-field>
-					<app-multiple-auto-complete [formControl]="formGroup.get('organisations')"
-						placeholder="{{'CRITERIA.DATA-SETS.SELECT-ORGANIZATIONS' | translate}}"
-						[configuration]="organisationAutoCompleteConfiguration">
+				<mat-form-field class="mb-4">
+					<mat-label>{{'CRITERIA.DATA-SETS.SELECT-ORGANIZATIONS' | translate}}</mat-label>
+					<app-multiple-auto-complete [formControl]="formGroup.get('organisations')" [configuration]="organisationAutoCompleteConfiguration">
 					</app-multiple-auto-complete>
 				</mat-form-field>
+				<hr>
 			</div>
 			<!-- End of Related Organization Filter -->
 
 			<!-- Tags Filter -->
-			<div class="col-10 gray-container">
+			<div class="col-10">
 				<h6 class="category-title">{{'CRITERIA.DATA-SETS.TAGS' | translate }}</h6>
-				<mat-form-field>
-					<app-multiple-auto-complete [formControl]="formGroup.get('tags')"
-						placeholder="{{'CRITERIA.DATA-SETS.SELECT-TAGS' | translate}}"
-						[configuration]="tagsAutoCompleteConfiguration">
+				<mat-form-field class="mb-4">
+					<mat-label>{{'CRITERIA.DATA-SETS.SELECT-TAGS' | translate}}</mat-label>
+					<app-multiple-auto-complete [formControl]="formGroup.get('tags')" [configuration]="tagsAutoCompleteConfiguration">
 					</app-multiple-auto-complete>
 				</mat-form-field>
 			</div>
diff --git a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.scss b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.scss
index e94acdcec..62c992251 100644
--- a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.scss
+++ b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.scss
@@ -1,37 +1,49 @@
 .search ::ng-deep.mat-form-field-infix {
-  margin-left: 1em;
+	margin-left: 1em;
 }
 
 .category-title {
-  color: black;
-  // color: #089dbb;
-  margin-top: 8px;
-  margin-bottom: 12px;
+	color: black;
+	// color: #089dbb;
+	margin-top: 8px;
+	margin-bottom: 12px;
+	text-transform: none;
+	font-size: 1rem;
+	font-weight: 400;
 }
 
 .import {
-  margin: 10px;
-  padding: 0px;
+	margin: 10px;
+	padding: 0px;
 }
 
 .filters {
-  border: 1px solid #e4e4e4;
-  border-radius: 5px;
+	//   border: 1px solid #e4e4e4;
+	//   border-radius: 5px;
+}
+
+.criteria-title {
+	color: black;
+	font-weight: 500;
+	text-transform: none;
+	font-size: 1.25rem;
+	margin-bottom: 1.5em;
+	opacity: 0.8;
 }
 
 .filters-title {
-  width: 93px;
-  //   color: #089dbb;
-  color: #23bcba;
-  background-color: white;
-  padding: 0px 20px;
-  margin-top: -10px;
-  margin-left: 20px;
-  text-transform: uppercase;
+	width: 93px;
+	//   color: #089dbb;
+	color: #23bcba;
+	background-color: white;
+	padding: 0px 20px;
+	margin-top: -10px;
+	margin-left: 20px;
+	text-transform: uppercase;
 }
 
 .style-icon {
-  color: #adadad;
+	color: #adadad;
 }
 
 ::ng-deep .search-form .mat-form-field-wrapper {
diff --git a/dmp-frontend/src/app/ui/dmp/clone/clone-dialog/clone-dialog.component.html b/dmp-frontend/src/app/ui/dmp/clone/clone-dialog/clone-dialog.component.html
index 2f3e58286..bb17bf957 100644
--- a/dmp-frontend/src/app/ui/dmp/clone/clone-dialog/clone-dialog.component.html
+++ b/dmp-frontend/src/app/ui/dmp/clone/clone-dialog/clone-dialog.component.html
@@ -36,7 +36,8 @@
 		<div class="col-12">
 			<div class="heading">{{'DMP-EDITOR.FIELDS.TEMPLATES' | translate}}</div>
 			<mat-form-field>
-				<app-multiple-auto-complete required='true' [formControl]="this.data.formGroup.get('profiles')" placeholder="{{'DMP-EDITOR.FIELDS.SELECT-TEMPLATE' | translate}}" [configuration]="profilesAutoCompleteConfiguration" (optionActionClicked)="onPreviewTemplate($event)">
+				<mat-label>{{'DMP-EDITOR.FIELDS.SELECT-TEMPLATE' | translate}}</mat-label>
+				<app-multiple-auto-complete required='true' [formControl]="this.data.formGroup.get('profiles')" [configuration]="profilesAutoCompleteConfiguration" (optionActionClicked)="onPreviewTemplate($event)">
 				</app-multiple-auto-complete>
 				<mat-error *ngIf="data.formGroup.get('profiles').hasError('backendError')">
 					{{data.formGroup.get('profiles').getError('backendError').message}}</mat-error>
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 7012128db..79a8c1464 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
@@ -13,7 +13,8 @@
 				</div>
 				<div class="profile-form">
 					<mat-form-field>
-						<app-multiple-auto-complete required='true' [formControl]="formGroup.get('profiles')" placeholder="{{'DMP-EDITOR.FIELDS.SELECT-TEMPLATE' | translate}}" [configuration]="profilesAutoCompleteConfiguration" (optionRemoved)="onRemoveTemplate($event)" (optionActionClicked)="onPreviewTemplate($event)">
+						<mat-label>{{'DMP-EDITOR.FIELDS.SELECT-TEMPLATE' | translate}}</mat-label>
+						<app-multiple-auto-complete required='true' [formControl]="formGroup.get('profiles')" [configuration]="profilesAutoCompleteConfiguration" (optionRemoved)="onRemoveTemplate($event)" (optionActionClicked)="onPreviewTemplate($event)">
 						</app-multiple-auto-complete>
 						<mat-error *ngIf="formGroup.get('profiles').hasError('backendError')">
 							{{formGroup.get('profiles').getError('backendError').message}}</mat-error>
diff --git a/dmp-frontend/src/app/ui/dmp/editor/main-info/main-info.component.html b/dmp-frontend/src/app/ui/dmp/editor/main-info/main-info.component.html
index f83b80bf7..29c17b5a0 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/main-info/main-info.component.html
+++ b/dmp-frontend/src/app/ui/dmp/editor/main-info/main-info.component.html
@@ -81,7 +81,8 @@
 				</div>
 				<div class="researchers-form">
 					<mat-form-field>
-						<app-multiple-auto-complete [formControl]="formGroup.get('researchers')" placeholder="{{'DMP-EDITOR.PLACEHOLDER.RESEARCHERS' | translate}}" [configuration]="researchersAutoCompleteConfiguration">
+						<mat-label>{{'DMP-EDITOR.PLACEHOLDER.RESEARCHERS' | translate}}</mat-label>
+						<app-multiple-auto-complete [formControl]="formGroup.get('researchers')" [configuration]="researchersAutoCompleteConfiguration">
 						</app-multiple-auto-complete>
 						<mat-error *ngIf="formGroup.get('researchers').hasError('backendError')">
 							{{formGroup.get('researchers').getError('backendError').message}}</mat-error>
@@ -108,7 +109,8 @@
 				</div>
 				<div class="organizations-form">
 					<mat-form-field>
-						<app-multiple-auto-complete [formControl]="formGroup.get('organisations')" placeholder="{{'DMP-EDITOR.PLACEHOLDER.ORGANIZATION' | translate}}" [configuration]="organisationsAutoCompleteConfiguration">
+						<mat-label>{{'DMP-EDITOR.PLACEHOLDER.ORGANIZATION' | translate}}</mat-label>
+						<app-multiple-auto-complete [formControl]="formGroup.get('organisations')" [configuration]="organisationsAutoCompleteConfiguration">
 						</app-multiple-auto-complete>
 						<mat-error *ngIf="formGroup.get('organisations').hasError('backendError')">
 							{{formGroup.get('organisations').getError('backendError').message}}</mat-error>
diff --git a/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation-dialog.component.html b/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation-dialog.component.html
index fb7cc5926..1e0bd007e 100644
--- a/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation-dialog.component.html
+++ b/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation-dialog.component.html
@@ -8,6 +8,7 @@
 		</div>
 		<div mat-dialog-content class="row content">
 			<mat-form-field class="col pt-0 pb-2 mb-4 search">
+				<!-- <mat-label>{{'INVITATION-EDITOR.AUTOCOMPLETE-USER-EMAIL' | translate}}</mat-label> -->
 				<app-multiple-auto-complete [formControl]="formGroup.get('users')" placeholder="{{'INVITATION-EDITOR.AUTOCOMPLETE-USER-EMAIL' | translate}}" [configuration]="usersAutoCompleteConfiguration">
 				</app-multiple-auto-complete>
 			</mat-form-field>
diff --git a/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria-dialog.component.html b/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria-dialog.component.html
index b38f8336c..39d6887fe 100644
--- a/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria-dialog.component.html
+++ b/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria-dialog.component.html
@@ -1,2 +1,2 @@
 <a class="col-auto d-flex pointer" (click)="onClose()"><span class="ml-auto mt-3 material-icons clear-icon">clear</span></a>
-<app-dmp-criteria-component [showGrant]="data.showGrant" [isPublic]="data.isPublic" [criteriaFormGroup]="data.formGroup" (filtersChanged)="onFiltersChanged($event)" class="col-auto"></app-dmp-criteria-component>
+<app-dmp-criteria-component [showGrant]="data.showGrant" [isPublic]="data.isPublic" [criteriaFormGroup]="data.formGroup" (filtersChanged)="onFiltersChanged($event)"></app-dmp-criteria-component>
diff --git a/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.html b/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.html
index c73aac723..0274d0c00 100644
--- a/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.html
+++ b/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.html
@@ -1,6 +1,11 @@
 <div class="dmp-criteria">
 	<div class="filters">
-		<h6 class="filters-title">{{'CRITERIA.FILTERS'| translate}}</h6>
+		<div class="row justify-content-center">
+			<div class="col-10">
+				<h6 class="criteria-title">{{'CRITERIA.FILTERS'| translate}}</h6>
+			</div>
+		</div>
+		<!-- <h6 class="filters-title">{{'CRITERIA.FILTERS'| translate}}</h6> -->
 		<div class="row" style="justify-content: center;">
 			<!-- Search Filter-->
 			<!-- <mat-form-field class="col-11 search">
@@ -13,7 +18,7 @@
 			<!-- End of Search Filter -->
 
 			<!-- Visibility Filter-->
-			<div *ngIf="!isPublic" class="col-10 gray-container">
+			<div *ngIf="!isPublic" class="col-10">
 				<h6 class="category-title">{{ 'TYPES.DMP-VISIBILITY.VISIBILITY' | translate }}</h6>
 				<mat-radio-group aria-label="Select an option" [formControl]="formGroup.get('status')">
 					<mat-list-item><mat-radio-button value="null" [checked]="!formGroup.get('status').value">{{ 'TYPES.DMP-VISIBILITY.ANY' | translate }}</mat-radio-button></mat-list-item>
@@ -21,11 +26,12 @@
 					<mat-list-item><mat-radio-button value="1">{{ 'TYPES.DMP-VISIBILITY.FINALIZED' | translate }}</mat-radio-button></mat-list-item>
 					<mat-list-item><mat-radio-button value="0">{{ 'TYPES.DMP-VISIBILITY.DRAFT' | translate }}</mat-radio-button></mat-list-item>
 				</mat-radio-group>
+				<hr>
 			</div>
 			<!-- End of Visibility Filter-->
 
 			<!-- Grant Status -->
-			<div class="col-10 gray-container" *ngIf="isPublic">
+			<div class="col-10" *ngIf="isPublic">
 				<h6 class="category-title">{{ 'FACET-SEARCH.GRANT-STATUS.TITLE' | translate }}</h6>
 				<mat-radio-group [formControl]="formGroup.get('grantStatus')">
 					<mat-list-item>
@@ -38,62 +44,67 @@
 						<mat-radio-button value="1">{{ 'FACET-SEARCH.GRANT-STATUS.OPTIONS.INACTIVE' | translate }}</mat-radio-button>
 					</mat-list-item>
 				</mat-radio-group>
+				<hr>
 			</div>
 			<!-- End of Grant Status -->
 
 			<!-- Related Dataset Templates Filter -->
-			<div *ngIf="showGrant" class="col-10 gray-container">
+			<div *ngIf="showGrant" class="col-10">
 				<h6 class="category-title">{{ 'CRITERIA.DMP.RELATED-DATASET-TEMPLATES' | translate}}</h6>
 				<mat-form-field>
+					<mat-label>{{ 'CRITERIA.DMP.SELECT-DATASET-TEMPLATES' | translate }}</mat-label>
 					<app-multiple-auto-complete [formControl]="formGroup.get('datasetTemplates')"
-						placeholder="{{ 'CRITERIA.DMP.SELECT-DATASET-TEMPLATES' | translate }}"
 						[configuration]="datasetTemplateAutoCompleteConfiguration">
 					</app-multiple-auto-complete>
 				</mat-form-field>
+				<hr>
 			</div>
 			<!-- End of Related Dataset Templates Filter -->
 
 			<!-- Related Grant Filters -->
-			<div *ngIf="showGrant" class="col-10 gray-container">
+			<div *ngIf="showGrant" class="col-10">
 				<h6 class="category-title">{{ 'DMP-RELATED-GRANT.RELATED-GRANT' | translate}}</h6>
 				<mat-form-field>
+					<mat-label>{{ 'CRITERIA.DMP.SELECT-GRANTS' | translate }}</mat-label>
 					<app-multiple-auto-complete [formControl]="formGroup.get('grants')"
-						placeholder="{{ 'CRITERIA.DMP.SELECT-GRANTS' | translate }}"
 						[configuration]="grantAutoCompleteConfiguration">
 					</app-multiple-auto-complete>
 				</mat-form-field>
+				<hr>
 			</div>
 			<!-- End of Related Grants Filters -->
 
 			<!-- Collaborators Filter -->
-			<div *ngIf="isAuthenticated()" class="col-10 gray-container">
+			<div *ngIf="isAuthenticated()" class="col-10">
 				<h6 class="category-title">{{ 'CRITERIA.DMP.RELATED-COLLABORATORS' | translate}}</h6>
 				<mat-form-field>
+					<mat-label>{{'CRITERIA.DMP.SELECT-COLLABORATORS' | translate}}</mat-label>
 					<app-multiple-auto-complete [formControl]="formGroup.get('collaborators')"
-						placeholder="{{'CRITERIA.DMP.SELECT-COLLABORATORS' | translate}}"
 						[configuration]="collaboratorsAutoCompleteConfiguration">
 					</app-multiple-auto-complete>
 				</mat-form-field>
+				<hr>
 			</div>
 			<!-- End of Collaborators Filter -->
 
 			<!-- Role Filter -->
-			<div *ngIf="isAuthenticated()" class="col-10 gray-container">
+			<div *ngIf="isAuthenticated()" class="col-10">
 				<h6 class="category-title">{{ 'DATASET-PROFILE-LISTING.COLUMNS.ROLE' | translate }}</h6>
 				<mat-radio-group aria-label="Select an option" [formControl]="formGroup.get('role')">
 					<mat-list-item><mat-radio-button value="null" [checked]="!formGroup.get('role').value">{{ 'TYPES.DATASET-ROLE.ANY' | translate }}</mat-radio-button></mat-list-item>
 					<mat-list-item><mat-radio-button value="0">{{ 'TYPES.DATASET-ROLE.OWNER' | translate }}</mat-radio-button></mat-list-item>
 					<mat-list-item><mat-radio-button value="1">{{ 'TYPES.DATASET-ROLE.MEMBER' | translate }}</mat-radio-button></mat-list-item>
 				</mat-radio-group>
+				<hr>
 			</div>
 			<!-- End of Role Filter -->
 
 			<!-- Related Organization Filter -->
-			<div *ngIf="showGrant" class="col-10 gray-container">
+			<div *ngIf="showGrant" class="col-10">
 				<h6 class="category-title">{{ 'DMP-RELATED-ORGANIZATION.RELATED-ORGANIZATION' | translate }}</h6>
 				<mat-form-field>
+					<mat-label>{{'DMP-RELATED-ORGANIZATION.SELECT-ORGANIZATIONS' | translate}}</mat-label>
 					<app-multiple-auto-complete [formControl]="formGroup.get('organisations')"
-						placeholder="{{'DMP-RELATED-ORGANIZATION.SELECT-ORGANIZATIONS' | translate}}"
 						[configuration]="organisationAutoCompleteConfiguration">
 					</app-multiple-auto-complete>
 				</mat-form-field>
diff --git a/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.scss b/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.scss
index 8198a3f04..41829afd6 100644
--- a/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.scss
+++ b/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.scss
@@ -8,6 +8,15 @@
     padding-bottom: 0px;
   }
 
+  .criteria-title {
+	color: black;
+	font-weight: 500;
+	text-transform: none;
+    font-size: 1.25rem;
+    margin-bottom: 1.5em;
+    opacity: 0.8;
+  }
+
   .hidden {
     display: none;
   }
@@ -26,11 +35,14 @@
   //   color: #089dbb;
   margin-top: 8px;
   margin-bottom: 12px;
+  text-transform: none;
+  font-size: 1rem;
+  font-weight: 400;
 }
 
 .filters {
-  border: 1px solid #e4e4e4;
-  border-radius: 5px;
+//   border: 1px solid #e4e4e4;
+//   border-radius: 5px;
 }
 
 .filters-title {
diff --git a/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.ts b/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.ts
index 54e4b4dd8..54b36fd77 100644
--- a/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.ts
@@ -106,6 +106,7 @@ export class DmpCriteriaComponent extends BaseCriteriaComponent implements OnIni
 			this.formGroup.get('grants').setValue(this.criteriaFormGroup.get('grants').value);
 			this.formGroup.get('collaborators').setValue(this.criteriaFormGroup.get('collaborators').value);
 			this.formGroup.get('organisations').setValue(this.criteriaFormGroup.get('organisations').value);
+			this.formGroup.get('status').setValue(this.criteriaFormGroup.get('status').value);
 		}
 
 		this.formGroup.get('role').valueChanges
diff --git a/dmp-frontend/src/app/ui/dmp/listing/upload-dialogue/dmp-upload-dialogue.component.html b/dmp-frontend/src/app/ui/dmp/listing/upload-dialogue/dmp-upload-dialogue.component.html
index cfcad8106..941a735a4 100644
--- a/dmp-frontend/src/app/ui/dmp/listing/upload-dialogue/dmp-upload-dialogue.component.html
+++ b/dmp-frontend/src/app/ui/dmp/listing/upload-dialogue/dmp-upload-dialogue.component.html
@@ -23,7 +23,8 @@
 		<div class="col-12 d-flex justify-content-center attach-btn">
 			<button mat-button type="button" class="col-auto attach-file" (click)="fileInput.click()">
 				<mat-icon class="mr-2">input</mat-icon>
-				{{'GENERAL.START-NEW-DMP-DIALOG.UPLOAD-FILE' | translate}}
+				<span *ngIf="!hasFile()">{{'GENERAL.START-NEW-DMP-DIALOG.UPLOAD-FILE' | translate}}</span>
+				<span *ngIf="hasFile()">{{'GENERAL.START-NEW-DMP-DIALOG.REPLACE-FILE' | translate}}</span>
 			</button>
 			<form>
 				<input class="hidden" #fileInput type="file" onClick="this.form.reset()" (change)="uploadFile($event)" accept="text/xml, application/json">
@@ -31,7 +32,9 @@
 		</div>
 		<div class="upload-form col-sm-12 col-md-12">
 			<mat-form-field>
-				<app-multiple-auto-complete required='true' [(ngModel)]="dmpProfiles" placeholder="{{'DMP-EDITOR.FIELDS.DATASET-TEMPLATES' | translate}}" [configuration]="profilesAutoCompleteConfiguration" (optionActionClicked)="onPreviewTemplate($event)">
+				<mat-label>{{'DMP-EDITOR.FIELDS.DATASET-TEMPLATES' | translate}}</mat-label>
+				<app-multiple-auto-complete [(ngModel)]="dmpProfiles" [configuration]="profilesAutoCompleteConfiguration" (optionActionClicked)="onPreviewTemplate($event)">
+				<!-- <app-multiple-auto-complete required='true' [(ngModel)]="dmpProfiles" placeholder="{{'DMP-EDITOR.FIELDS.DATASET-TEMPLATES' | translate}}" [configuration]="profilesAutoCompleteConfiguration" (optionActionClicked)="onPreviewTemplate($event)"> -->
 				</app-multiple-auto-complete>
 			</mat-form-field>
 		</div>
@@ -41,7 +44,7 @@
 			<button mat-button type="button" class="cancel-btn" (click)="cancel()">{{'DMP-UPLOAD.ACTIONS.CANCEL' | translate}}</button>
 		</div>
 		<div class="col-auto">
-			<button mat-button type="button" (click)="confirm()" [disabled]="data.fileList.length === 0" [ngClass]="{'next-btn-disabled': data.fileList.length === 0, 'next-btn': data.fileList.length !== 0}">{{'DMP-UPLOAD.ACTIONS.IMPORT' | translate}}</button>
+			<button mat-button type="button" (click)="confirm()" [disabled]="data.fileList.length === 0 || files.length === 0" class="next-btn">{{'DMP-UPLOAD.ACTIONS.IMPORT' | translate}}</button>
 		</div>
 	</div>
 </div>
diff --git a/dmp-frontend/src/app/ui/dmp/listing/upload-dialogue/dmp-upload-dialogue.component.scss b/dmp-frontend/src/app/ui/dmp/listing/upload-dialogue/dmp-upload-dialogue.component.scss
index be50ce8e5..efe9825bd 100644
--- a/dmp-frontend/src/app/ui/dmp/listing/upload-dialogue/dmp-upload-dialogue.component.scss
+++ b/dmp-frontend/src/app/ui/dmp/listing/upload-dialogue/dmp-upload-dialogue.component.scss
@@ -46,7 +46,7 @@
 	font-weight: 500;
 }
 
-.next-btn-disabled {
+.next-btn[disabled] {
 	width: 100px;
 	height: 43px;
 	background: #ffffff 0% 0% no-repeat padding-box;
@@ -55,11 +55,25 @@
 	opacity: 1;
 }
 
-.next-btn:hover {
-	background: #129d99;
+.next-btn:not([disabled]):hover {
+	background-color: #129d99;
 	color: #ffffff;
 }
 
+// .next-btn-disabled {
+// 	width: 100px;
+// 	height: 43px;
+// 	background: #ffffff 0% 0% no-repeat padding-box;
+// 	border: 1px solid #b5b5b5;
+// 	border-radius: 30px;
+// 	opacity: 1;
+// }
+
+// .next-btn:hover {
+// 	background: #129d99;
+// 	color: #ffffff;
+// }
+
 .attach-btn {
 	top: -20px;
 }
@@ -93,12 +107,26 @@
 	width: auto !important;
 	max-width: 500px !important;
 	min-height: 1rem !important;
+
+	background-color: #e0e0e0 !important;
+	background-image: none !important;
+	color: rgba(0, 0, 0, 0.87) !important;
+	font-weight: 500 !important;
+	border-radius: 24px !important;
+	line-height: 1.25 !important;
 }
 
 .file-label {
 	white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis;
+	font-size: 14px !important;
+}
+
+::ng-deep ngx-dropzone-remove-badge {
+	opacity: 1 !important;
+	margin-left: .5rem !important;
+	position: initial !important;
 }
 
 ::ng-deep .upload-form .mat-form-field-appearance-outline .mat-form-field-outline {
diff --git a/dmp-frontend/src/app/ui/dmp/listing/upload-dialogue/dmp-upload-dialogue.component.ts b/dmp-frontend/src/app/ui/dmp/listing/upload-dialogue/dmp-upload-dialogue.component.ts
index 5a147355d..614397aba 100644
--- a/dmp-frontend/src/app/ui/dmp/listing/upload-dialogue/dmp-upload-dialogue.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/listing/upload-dialogue/dmp-upload-dialogue.component.ts
@@ -119,4 +119,8 @@ export class DmpUploadDialogue extends BaseComponent {
 		request.criteria = criteria;
 		return this._service.searchDMPProfiles(request);
 	}
+
+	hasFile(): boolean {
+		return this.files && this.files.length > 0;
+	}
 }
diff --git a/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.scss b/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.scss
index 00a2b8620..1f78b313e 100644
--- a/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.scss
+++ b/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.scss
@@ -15,6 +15,7 @@ $mat-card-header-size: 40px !default;
   font-weight: 300;
   color: #212121;
   height: 1.875rem;
+  line-height: 1.875rem;
   width: 100%;
   text-align: left;
 }
diff --git a/dmp-frontend/src/app/ui/user-profile/user-profile.component.html b/dmp-frontend/src/app/ui/user-profile/user-profile.component.html
index 75b6c9743..567239f41 100644
--- a/dmp-frontend/src/app/ui/user-profile/user-profile.component.html
+++ b/dmp-frontend/src/app/ui/user-profile/user-profile.component.html
@@ -199,7 +199,7 @@
 									</div>
 								</div>
 								<div *ngIf="!hasZenodo()" class="col-md-4 link-zenodo-btn">
-									<div><button mat-raised-button type="button" (click)="loginToZenodo()" class="confirm default-btn">{{'USER-PROFILE.ZENODO.AUTHORIZE' | translate}}</button></div>
+									<div><button mat-raised-button type="button" (click)="loginToZenodo()" class="confirm accent-btn mt-3">{{'USER-PROFILE.ZENODO.AUTHORIZE' | translate}}</button></div>
 								</div>
 							</div>
 						</div>
diff --git a/dmp-frontend/src/app/ui/user-profile/user-profile.component.scss b/dmp-frontend/src/app/ui/user-profile/user-profile.component.scss
index 3b7c5fbd9..903a18d24 100644
--- a/dmp-frontend/src/app/ui/user-profile/user-profile.component.scss
+++ b/dmp-frontend/src/app/ui/user-profile/user-profile.component.scss
@@ -142,6 +142,20 @@
     font-weight: 500;
 }
 
+.accent-btn {
+    background: #ffffff 0% 0% no-repeat padding-box;
+    box-shadow: 0px 3px 6px #1e202029;
+    border: 1px solid #b5b5b5;
+    border-radius: 30px;
+    opacity: 1;
+    min-width: 162px;
+    max-width: 256px;
+    height: 40px;
+    color: #129d99;
+    font-size: 0.87rem;
+    font-weight: 500;
+}
+
 .vertical-line {
 	border-left: 2px solid #129d99;
 }
diff --git a/dmp-frontend/src/assets/i18n/de.json b/dmp-frontend/src/assets/i18n/de.json
index b33fe606e..8ba654889 100644
--- a/dmp-frontend/src/assets/i18n/de.json
+++ b/dmp-frontend/src/assets/i18n/de.json
@@ -85,7 +85,8 @@
 			"PRODUCED": "produced",
 			"RDA-SPECIFICATIONS": "according to RDA specifications",
 			"MACHINE-ACTIONABLE": "for machine-actionable DMPs",
-			"UPLOAD-FILE": "Upload File"
+			"UPLOAD-FILE": "Upload File",
+			"REPLACE-FILE": "Replace File"
 		},
 		"INVITATION-DIALOG": {
 			"HINT": "Press comma or enter between authors",
diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json
index 22a9fb101..5a5c2fc47 100644
--- a/dmp-frontend/src/assets/i18n/en.json
+++ b/dmp-frontend/src/assets/i18n/en.json
@@ -85,7 +85,8 @@
 			"PRODUCED": "produced",
 			"RDA-SPECIFICATIONS": "according to RDA specifications",
 			"MACHINE-ACTIONABLE": "for machine-actionable DMPs",
-			"UPLOAD-FILE": "Upload File"
+			"UPLOAD-FILE": "Upload File",
+			"REPLACE-FILE": "Replace File"
 		},
 		"INVITATION-DIALOG": {
 			"HINT": "Press comma or enter between authors",
diff --git a/dmp-frontend/src/assets/i18n/es.json b/dmp-frontend/src/assets/i18n/es.json
index ae69ccc06..61ae7e046 100644
--- a/dmp-frontend/src/assets/i18n/es.json
+++ b/dmp-frontend/src/assets/i18n/es.json
@@ -85,7 +85,8 @@
 			"PRODUCED": "produced",
 			"RDA-SPECIFICATIONS": "according to RDA specifications",
 			"MACHINE-ACTIONABLE": "for machine-actionable DMPs",
-			"UPLOAD-FILE": "Upload File"
+			"UPLOAD-FILE": "Upload File",
+			"REPLACE-FILE": "Replace File"
 		},
 		"INVITATION-DIALOG": {
 			"HINT": "Press comma or enter between authors",
diff --git a/dmp-frontend/src/assets/i18n/gr.json b/dmp-frontend/src/assets/i18n/gr.json
index 17ce0b8bc..f95ba004f 100644
--- a/dmp-frontend/src/assets/i18n/gr.json
+++ b/dmp-frontend/src/assets/i18n/gr.json
@@ -85,7 +85,8 @@
 			"PRODUCED": "που έχουν παραχθεί",
 			"RDA-SPECIFICATIONS": "σύμφωνα με τις προδιαγραφές του RDA",
 			"MACHINE-ACTIONABLE": "για μηχαναγνώσιμα Σχέδια Διαχείρισης Δεδομένων",
-			"UPLOAD-FILE": "Μεταφόρτωση Αρχείου"
+			"UPLOAD-FILE": "Μεταφόρτωση Αρχείου",
+			"REPLACE-FILE": "Replace File"
 		},
 		"INVITATION-DIALOG": {
 			"HINT": "Προσθέστε κόμμα ή πατήστε το κουμπί “enter” ανάμεσα στους συγγραφείς",
diff --git a/dmp-frontend/src/assets/i18n/sk.json b/dmp-frontend/src/assets/i18n/sk.json
index 5c8d10246..29b2a48dc 100644
--- a/dmp-frontend/src/assets/i18n/sk.json
+++ b/dmp-frontend/src/assets/i18n/sk.json
@@ -85,7 +85,8 @@
 			"PRODUCED": "vytvorené",
 			"RDA-SPECIFICATIONS": "podľa špecifikácií RDS",
 			"MACHINE-ACTIONABLE": "pre strojovo využiteľné DMP",
-			"UPLOAD-FILE": "Nahrať súbor"
+			"UPLOAD-FILE": "Nahrať súbor",
+			"REPLACE-FILE": "Replace File"
 		},
 		"INVITATION-DIALOG": {
 			"HINT": "Po každom vložení pozvánky nového užívateľa stlačte čiarku",
diff --git a/dmp-frontend/src/assets/i18n/tr.json b/dmp-frontend/src/assets/i18n/tr.json
index 46bcbbe1e..bc64b01a3 100644
--- a/dmp-frontend/src/assets/i18n/tr.json
+++ b/dmp-frontend/src/assets/i18n/tr.json
@@ -85,7 +85,8 @@
 			"PRODUCED": "produced",
 			"RDA-SPECIFICATIONS": "according to RDA specifications",
 			"MACHINE-ACTIONABLE": "for machine-actionable DMPs",
-			"UPLOAD-FILE": "Upload File"
+			"UPLOAD-FILE": "Upload File",
+			"REPLACE-FILE": "Replace File"
 		},
 		"INVITATION-DIALOG": {
 			"HINT": "Press comma or enter between authors",