diff --git a/dmp-frontend/src/app/models/facet-search/FacetSearchCriteriaModel.ts b/dmp-frontend/src/app/models/facet-search/FacetSearchCriteriaModel.ts
index b2c009e90..0a566ec2d 100644
--- a/dmp-frontend/src/app/models/facet-search/FacetSearchCriteriaModel.ts
+++ b/dmp-frontend/src/app/models/facet-search/FacetSearchCriteriaModel.ts
@@ -1,4 +1,4 @@
-import { ProjectStateType } from "../projects/ProjectStateType";
+import { ProjectStateType } from '../projects/ProjectStateType';
 
 export class FacetSearchCriteriaModel {
   public projectStatus: ProjectStateType;
diff --git a/dmp-frontend/src/app/shared/components/facets/facet-search-component/facet-search-section.component.html b/dmp-frontend/src/app/shared/components/facets/facet-search-component/facet-search-section.component.html
index b0b3865db..90e27f291 100644
--- a/dmp-frontend/src/app/shared/components/facets/facet-search-component/facet-search-section.component.html
+++ b/dmp-frontend/src/app/shared/components/facets/facet-search-component/facet-search-section.component.html
@@ -3,13 +3,13 @@
 		<input type="text" placeholder="{{ 'FACET-SEARCH.FILTER' | translate }}" matInput [formControl]="optionSearchControl">
 	</mat-form-field>
 </div>
-<mat-chip-list>
-	<mat-chip [removable]="removable" (removed)="removeOption(option)" *ngFor="let option of selectedOptions">{{ option }}
-		<mat-icon matChipRemove *ngIf="removable">cancel</mat-icon>
+<mat-chip-list *ngIf="searchEnabled">
+	<mat-chip [removable]="true" (removed)="removeOption(option)" *ngFor="let option of selectedOptions">{{ displayLabel(option) }}
+		<mat-icon matChipRemove>cancel</mat-icon>
 	</mat-chip>
 </mat-chip-list>
 <mat-selection-list #optionsList (selectionChange)="selectionChanged($event)">
-	<mat-list-option *ngFor="let option of (options | async) | slice:0:10" [value]="displayValue(option)" [selected]="isOptionSelected(option)">
+	<mat-list-option *ngFor="let option of (options | async) | slice:0:10" [value]="option" [selected]="isOptionSelected(option)">
 		<p>{{ displayLabel(option) }}</p>
 	</mat-list-option>
 </mat-selection-list>
diff --git a/dmp-frontend/src/app/shared/components/facets/facet-search-component/facet-search-section.component.ts b/dmp-frontend/src/app/shared/components/facets/facet-search-component/facet-search-section.component.ts
index 87bb31711..ad64fc4c6 100644
--- a/dmp-frontend/src/app/shared/components/facets/facet-search-component/facet-search-section.component.ts
+++ b/dmp-frontend/src/app/shared/components/facets/facet-search-component/facet-search-section.component.ts
@@ -1,7 +1,8 @@
 import { Component, ViewEncapsulation, OnInit, Input, Output, ViewChild, EventEmitter } from '@angular/core';
 import { Observable } from 'rxjs/Observable';
 import { FormControl } from '@angular/forms';
-import { MatSelectionList } from '@angular/material';
+import { MatSelectionList, MatListOption } from '@angular/material';
+import { SelectionModel } from '@angular/cdk/collections';
 
 @Component({
 	selector: 'app-facet-section-component',
@@ -14,6 +15,9 @@ export class FacetSearchSectionComponent implements OnInit {
 	@Input()
 	searchEnabled = false;
 
+	@Input()
+	multipleSelect = true;
+
 	@Input()
 	filterOptions: (value) => Observable<any[]>;
 
@@ -40,10 +44,17 @@ export class FacetSearchSectionComponent implements OnInit {
 
 
 	ngOnInit(): void {
+		if (!this.multipleSelect) { this.selectionList.selectedOptions = new SelectionModel<MatListOption>(this.multipleSelect); }
 		this.optionSearchControl.valueChanges.subscribe(x => { if (this.filterOptions) { this.options = this.filterOptions(x); } });
 	}
 
 	public selectionChanged(event: any) {
+		const eventValue = event.option.value;
+		if (event.option.selected) { this.selectedOptions.push(eventValue); }
+		if (!event.option.selected) {
+			const index = this.selectedOptions.map(x => this.displayValue(x)).indexOf(this.displayValue(eventValue));
+			this.selectedOptions.splice(index, 1);
+		}
 		this.selectedChanged.emit(event);
 	}
 
@@ -54,11 +65,12 @@ export class FacetSearchSectionComponent implements OnInit {
 			this.selectionList.selectedOptions.selected[indexOfProject].selected = false;
 			this.selectionList.selectedOptions.selected.splice(indexOfProject, 1);
 		}
+		this.selectedOptions.splice(this.selectedOptions.map(x => this.displayValue(x)).indexOf(this.displayValue(project)), 1);
 		this.optionRemoved.emit(project);
 	}
 
 	public isOptionSelected(value) {
-		return this.selectedOptions.indexOf(value) !== -1;
+		return this.selectedOptions.map(x => this.displayValue(x)).indexOf(this.displayValue(value)) !== -1;
 	}
 
 	displayLabel(value) {
@@ -68,4 +80,5 @@ export class FacetSearchSectionComponent implements OnInit {
 	displayValue(value) {
 		return this.displayValueFunc ? this.displayValueFunc(value) : value;
 	}
+
 }
diff --git a/dmp-frontend/src/app/shared/components/facets/facet-search.component.html b/dmp-frontend/src/app/shared/components/facets/facet-search.component.html
index ec244ab85..e95bed097 100644
--- a/dmp-frontend/src/app/shared/components/facets/facet-search.component.html
+++ b/dmp-frontend/src/app/shared/components/facets/facet-search.component.html
@@ -1,70 +1,48 @@
 <mat-accordion>
-  <mat-expansion-panel>
-    <mat-expansion-panel-header>
-      <mat-panel-title>
-        {{ 'FACET-SEARCH.PROJECT-STATUS.TITLE' | translate }}
-      </mat-panel-title>
-    </mat-expansion-panel-header>
-    <mat-selection-list #projectState role="listbox" (selectionChange)="projectStatusChanged($event)">
-      <mat-list-option [value]="ProjectStateType.Finished">
-        <p>{{ 'FACET-SEARCH.PROJECT-STATUS.OPTIONS.INACTIVE' | translate }}</p>
-      </mat-list-option>
-      <mat-list-option [value]="ProjectStateType.OnGoing">
-        <p>{{ 'FACET-SEARCH.PROJECT-STATUS.OPTIONS.ACTIVE' | translate }}</p>
-      </mat-list-option>
-    </mat-selection-list>
-  </mat-expansion-panel>
-  <mat-expansion-panel *ngIf="this.facetCriteria.projectStatus == ProjectStateType.OnGoing || this.facetCriteria.projectStatus == ProjectStateType.Finished">
-    <mat-expansion-panel-header>
-      <mat-panel-title>
-        {{ 'FACET-SEARCH.PROJECT.TITLE' | translate }}
-      </mat-panel-title>
-    </mat-expansion-panel-header>
-    <div>
-      <mat-form-field>
-        <input type="text" placeholder="{{ 'FACET-SEARCH.PROJECT.FILTER' | translate }}" matInput [formControl]="projectSearchControl">
-      </mat-form-field>
-    </div>
-    <mat-chip-list>
-      <mat-chip [removable]="removable" (removed)="removeProject(project)" *ngFor="let project of facetCriteria.projects">{{
-        project }}
-        <mat-icon matChipRemove *ngIf="removable">cancel</mat-icon>
-      </mat-chip>
-    </mat-chip-list>
-    <mat-selection-list #project (selectionChange)="projectChanged($event)">
-      <mat-list-option *ngFor="let project of (projects | async) | slice:0:10" [value]="project.id" [selected]="projectIsSelected(project.id)">
-        <p>{{ project.label }}</p>
-      </mat-list-option>
-    </mat-selection-list>
-  </mat-expansion-panel>
-  <mat-expansion-panel>
-    <mat-expansion-panel-header>
-      <mat-panel-title>
-        {{ 'FACET-SEARCH.PROFILES.TITLE' | translate }}
-      </mat-panel-title>
-    </mat-expansion-panel-header>
-    <mat-selection-list (selectionChange)="profileChanged($event)">
-      <mat-list-option *ngFor="let profile of (profiles | async) | slice:0:10" [value]="profile.id">
-        <p>{{ profile.label }}</p>
-      </mat-list-option>
-    </mat-selection-list>
-  </mat-expansion-panel>
-  <mat-expansion-panel>
-    <mat-expansion-panel-header>
-      <mat-panel-title>
-        {{ 'FACET-SEARCH.DMP-ORGANISATIONS.TITLE' | translate }}
-      </mat-panel-title>
-    </mat-expansion-panel-header>
-    <div>
-      <mat-form-field>
-        <input type="text" placeholder="{{ 'FACET-SEARCH.DMP-ORGANISATIONS.FILTER' | translate }}" matInput
-          [formControl]="organisationSearchControl">
-      </mat-form-field>
-    </div>
-    <mat-selection-list (selectionChange)="dmpOrganisationChanged($event)">
-      <mat-list-option *ngFor="let dmpOrganisation of (dmpOrganisations | async) | slice:0:10" [value]="dmpOrganisation.id">
-        <p>{{ dmpOrganisation.name }}</p>
-      </mat-list-option>
-    </mat-selection-list>
-  </mat-expansion-panel>
+	<mat-expansion-panel>
+		<mat-expansion-panel-header>
+			<mat-panel-title>
+				{{ 'FACET-SEARCH.PROJECT-STATUS.TITLE' | translate }}
+			</mat-panel-title>
+		</mat-expansion-panel-header>
+		<app-facet-section-component [multipleSelect]="false" [options]="this.projectStateOptions" (selectedChanged)="projectStatusChanged($event)"
+		 [displayTitleFunc]="displayProjectStateLabel" [displayValueFunc]="displayProjectStateValue">
+
+		</app-facet-section-component>
+	</mat-expansion-panel>
+	<mat-expansion-panel *ngIf="this.facetCriteria.projectStatus == ProjectStateType.OnGoing || this.facetCriteria.projectStatus == ProjectStateType.Finished">
+		<mat-expansion-panel-header>
+			<mat-panel-title>
+				{{ 'FACET-SEARCH.PROJECT.TITLE' | translate }}
+			</mat-panel-title>
+		</mat-expansion-panel-header>
+
+		<app-facet-section-component [options]="this.projects" (selectedChanged)="projectChanged($event)" [filterOptions]="projectSearch.bind(this)"
+		 [searchEnabled]="true" (optionRemoved)="removeProject($event)" [displayTitleFunc]="displayProjectLabel"
+		 [displayValueFunc]="displayProjectValue">
+		</app-facet-section-component>
+	</mat-expansion-panel>
+	<mat-expansion-panel>
+		<mat-expansion-panel-header>
+			<mat-panel-title>
+				{{ 'FACET-SEARCH.PROFILES.TITLE' | translate }}
+			</mat-panel-title>
+		</mat-expansion-panel-header>
+		<app-facet-section-component [options]="this.profiles" (selectedChanged)="profileChanged($event)" [filterOptions]="profileSearch.bind(this)"
+		 [searchEnabled]="true" (optionRemoved)="removeProfile($event)" [displayTitleFunc]="displayProfileLabel"
+		 [displayValueFunc]="displayProfileValue">
+		</app-facet-section-component>
+	</mat-expansion-panel>
+	<mat-expansion-panel>
+		<mat-expansion-panel-header>
+			<mat-panel-title>
+				{{ 'FACET-SEARCH.DMP-ORGANISATIONS.TITLE' | translate }}
+			</mat-panel-title>
+		</mat-expansion-panel-header>
+
+		<app-facet-section-component [options]="this.dmpOrganisations" (selectedChanged)="dmpOrganisationChanged($event)"
+		 [filterOptions]="dmpOrganisationSearch.bind(this)" (optionRemoved)="removeOrganisation($event)" [searchEnabled]="true"
+		 [displayTitleFunc]="displayDmpOrganisationsLabel" [displayValueFunc]="displayDmpOrganisationsValue">
+		</app-facet-section-component>
+	</mat-expansion-panel>
 </mat-accordion>
diff --git a/dmp-frontend/src/app/shared/components/facets/facet-search.component.ts b/dmp-frontend/src/app/shared/components/facets/facet-search.component.ts
index 742f917cf..7344c0d38 100644
--- a/dmp-frontend/src/app/shared/components/facets/facet-search.component.ts
+++ b/dmp-frontend/src/app/shared/components/facets/facet-search.component.ts
@@ -36,32 +36,25 @@ export class FacetSearchComponent implements OnInit {
 	@Output()
 	facetCriteriaChange = new EventEmitter();
 
-
-
-
-	removable = true;
 	ProjectStateType = ProjectStateType;
 	projects: Observable<ProjectModel[]>;
 	profiles: Observable<DatasetProfileModel[]>;
 	dmpOrganisations: Observable<ExternalSourcesItemModel[]>;
-	projectSearchControl = new FormControl('');
-	organisationSearchControl = new FormControl('');
-
-	projectStateOptions = Observable.of(
-		[
-			{ label: this.languageService.instant('FACET-SEARCH.PROJECT-STATUS.OPTIONS.INACTIVE'), value: ProjectStateType.Finished },
-			{ label: this.languageService.instant('FACET-SEARCH.PROJECT-STATUS.OPTIONS.ACTIVE'), value: ProjectStateType.OnGoing },
-		]);
 	projectOptions: Observable<ProjectModel[]>;
 
-	@ViewChild('project') projectSelectionList: MatSelectionList;
-
+	projectStateOptions: Observable<any[]>;
 	displayProjectStateValue = (option) => option['value'];
 	displayProjectStateLabel = (option) => option['label'];
 
 	displayProjectValue = (option) => option['id'];
 	displayProjectLabel = (option) => option['label'];
 
+	displayProfileValue = (option) => option['id'];
+	displayProfileLabel = (option) => option['label'];
+
+	displayDmpOrganisationsValue = (option) => option['id'];
+	displayDmpOrganisationsLabel = (option) => option['name'];
+
 	constructor(
 		public activatedRoute: ActivatedRoute,
 		public projectService: ProjectService,
@@ -72,14 +65,19 @@ export class FacetSearchComponent implements OnInit {
 	}
 
 	ngOnInit() {
+		setTimeout(x => {
+			this.projectStateOptions = Observable.of(
+				[
+					{ label: this.languageService.instant('FACET-SEARCH.PROJECT-STATUS.OPTIONS.INACTIVE'), value: ProjectStateType.Finished },
+					{ label: this.languageService.instant('FACET-SEARCH.PROJECT-STATUS.OPTIONS.ACTIVE'), value: ProjectStateType.OnGoing },
+				]);
+		});
 		this.profiles = this.datasetProfileService.getDatasetProfiles();
 		this.dmpOrganisations = this.externalSourcesService.searchDMPOrganizations('');
-		this.projectSearchControl.valueChanges.subscribe(x => this.projectSearch(x));
-		this.organisationSearchControl.valueChanges.subscribe(x => this.dmpOrganisationSearch(x));
 	}
 
 	public projectStatusChanged(event) {
-		this.facetCriteria.projectStatus = event.option.value;
+		this.facetCriteria.projectStatus = event.option.value.value;
 		if (!event.option.selected) {
 			this.facetCriteria.projectStatus = null;
 			this.projects = Observable.of([]);
@@ -97,7 +95,7 @@ export class FacetSearchComponent implements OnInit {
 	}
 
 	public projectChanged(event: any) {
-		const eventValue = event.option.value;
+		const eventValue = event.option.value.id;
 		if (event.option.selected) { this.facetCriteria.projects.push(eventValue); }
 		if (!event.option.selected) {
 			const index = this.facetCriteria.projects.indexOf(eventValue);
@@ -107,18 +105,12 @@ export class FacetSearchComponent implements OnInit {
 	}
 
 	removeProject(project) {
-		const list = this.projectSelectionList.selectedOptions.selected.map(x => x.value);
-		const indexOfProject = list.indexOf(project);
-		if (this.projectSelectionList.selectedOptions.selected[indexOfProject]) {
-			this.projectSelectionList.selectedOptions.selected[indexOfProject].selected = false;
-			this.projectSelectionList.selectedOptions.selected.splice(indexOfProject, 1);
-		}
 		this.facetCriteria.projects.splice(this.facetCriteria.projects.indexOf(project), 1);
 		this.facetCriteriaChange.emit(this.facetCriteria);
 	}
 
 	public profileChanged(event: any) {
-		const eventValue = event.option.value;
+		const eventValue = event.option.value.id;
 		if (event.option.selected) {
 			this.facetCriteria.datasetProfile.push(eventValue);
 		}
@@ -129,8 +121,13 @@ export class FacetSearchComponent implements OnInit {
 		this.facetCriteriaChange.emit(this.facetCriteria);
 	}
 
+	removeProfile(profile) {
+		this.facetCriteria.datasetProfile.splice(this.facetCriteria.datasetProfile.indexOf(profile), 1);
+		this.facetCriteriaChange.emit(this.facetCriteria);
+	}
+
 	public dmpOrganisationChanged(event: any) {
-		const eventValue = event.option.value;
+		const eventValue = event.option.value.id;
 		if (event.option.selected) { this.facetCriteria.dmpOrganisations.push(eventValue); }
 		if (!event.option.selected) {
 			const index = this.facetCriteria.dmpOrganisations.indexOf(eventValue);
@@ -139,10 +136,6 @@ export class FacetSearchComponent implements OnInit {
 		this.facetCriteriaChange.emit(this.facetCriteria);
 	}
 
-	public projectIsSelected(value: string) {
-		return this.facetCriteria.projects.indexOf(value) !== -1;
-	}
-
 	public projectSearch(value: string): Observable<ProjectModel[]> {
 		const projectCriteria = new ProjectCriteria();
 		projectCriteria.projectStateType = this.facetCriteria.projectStatus;
@@ -152,7 +145,16 @@ export class FacetSearchComponent implements OnInit {
 		return this.projectService.get(dataTableRequest);
 	}
 
-	public dmpOrganisationSearch(value: string) {
-		this.dmpOrganisations = this.externalSourcesService.searchDMPOrganizations(value);
+	public dmpOrganisationSearch(value: string): Observable<ExternalSourcesItemModel[]> {
+		return this.externalSourcesService.searchDMPOrganizations(value);
+	}
+
+	removeOrganisation(organisation) {
+		this.facetCriteria.dmpOrganisations.splice(this.facetCriteria.dmpOrganisations.indexOf(organisation), 1);
+		this.facetCriteriaChange.emit(this.facetCriteria);
+	}
+
+	public profileSearch(value: string) {
+		return this.datasetProfileService.getDatasetProfiles();
 	}
 }
diff --git a/dmp-frontend/src/assets/lang/en.json b/dmp-frontend/src/assets/lang/en.json
index cc1550a08..bf0be7ffd 100644
--- a/dmp-frontend/src/assets/lang/en.json
+++ b/dmp-frontend/src/assets/lang/en.json
@@ -1,402 +1,403 @@
 {
-  "GENERAL": {
-    "VALIDATION": {
-      "REQUIRED": "Required"
-    },
-    "DELETE-CONFIRMATION": {
-      "TITLE": "Warning",
-      "MESSAGE": "Are you sure you want to delete this item?",
-      "POSITIVE": "Yes",
-      "NEGATIVE": "Cancel"
-    },
-    "SNACK-BAR": {
-      "SUCCESSFUL-CREATION": "Created Successfully",
-      "SUCCESSFUL-UPDATE": "Updated Successfully",
-      "SUCCESSFUL-LOGIN": "Successful Login",
-      "SUCCESSFUL-LOGOUT": "Successful Logout",
-      "UNSUCCESSFUL-LOGOUT": "Unsuccessful Logout",
-      "UNSUCCESSFUL-LOGIN": "Unsuccessful Login"
-    },
-    "ERRORS": {
-      "HTTP-REQUEST-ERROR": "An Unexpected Error Has Occured"
-    },
-    "NAMES": {
-      "DATASET": "Dataset"
-    },
-    "STATUSES": {
-      "EDIT": "Edited",
-      "FINALISED": "Finalized"
-    }
-  },
-  "NAV-BAR": {
-    "TITLE": "OpenDMP",
-    "PROJECTS": "Projects",
-    "DMPS": "DMPs",
-    "DATASETS": "Datasets",
-    "PUBLIC-DATASETS": "Explore OpenDMP",
-    "USERS": "Users",
-    "DATASETS-ADMIN": "Dataset Profiles",
-    "DMP-PROFILES": "DMP Profiles",
-    "ABOUT": "About"
-  },
-  "PROJECT-LISTING": {
-    "TITLE": "Projects",
-    "COLUMNS": {
-      "AVATAR": "Image",
-      "NAME": "Name",
-      "ABBREVIATION": "Abbreviation",
-      "START": "Start",
-      "END": "End",
-      "ACTIONS": "Actions",
-      "DMPS": "DMPs"
-    }
-  },
-  "DMP-LISTING": {
-    "TITLE": "Data Management Plans",
-    "COLUMNS": {
-      "NAME": "Name",
-      "PROJECT": "Project",
-      "PROFILE": "Profile",
-      "CREATION-TIME": "Creation Time",
-      "ORGANISATIONS": "Organisations",
-      "LATEST_VERSION": "Latest Version",
-      "ACTIONS": "Actions",
-      "DATASETS": "Datasets"
-    },
-    "ACTIONS": {
-      "EDIT": "Edit",
-      "INVITE": "Invite Contributors",
-      "ADD-DATASET": "Add Dataset To DMP",
-      "DATASETS": "List All DMP Datasets",
-      "NEW-VERSION": "New Version",
-      "VIEW-VERSION": "All DMP Versions",
-      "CLONE": "Clone"
-    }
-  },
-  "DATASET-WIZARD": {
-    "EDITOR": {
-      "FIELDS": {
-        "EXTERNAL-DATASET-TYPE": "Type"
-      }
-    },
-    "FIRST-STEP": {
-      "TITLE": "Dataset Information",
-      "DMP": "Data Management Plan",
-      "PROFILE": "Dataset Profile"
-    },
-    "SECOND-STEP": {
-      "TITLE": "External References"
-    },
-    "THIRD-STEP": {
-      "TITLE": "Description"
-    },
-    "ACTIONS": {
-      "NEXT": "Next",
-      "BACK": "Back",
-      "GO-TO-PROJECT": "Go to Dataset Project",
-      "GO-TO-DMP": "Go to Dataset DMP"
-    }
-  },
-  "DATASET-LISTING": {
-    "TITLE": "Datasets",
-    "COLUMNS": {
-      "NAME": "Name",
-      "REFERNCE": "Reference",
-      "URI": "Uri",
-      "STATUS": "Status",
-      "DESCRIPTION": "Description",
-      "CREATED": "Created",
-      "ACTIONS": "Actions",
-      "DMP": "Dmp",
-      "PROFILE": "Profile",
-      "DATAREPOSITORIES": "Data Repositories",
-      "REGISTRIES": "Registries",
-      "SERVICES": "Services"
-    },
-    "ACTIONS": {
-      "EDIT": "Edit",
-      "MAKE-IT-PUBLIC": "Make it public",
-      "VIEW": "View"
-    }
-  },
-  "DATASET-PUBLIC-LISTING": {
-    "TITLE": "Published dataset descriptions"
-  },
-  "DMP-PROFILE-EDITOR": {
-    "TITLE": {
-      "NEW": "New DMP Profile",
-      "EDIT": "Edit"
-    },
-    "FIELDS": {
-      "LABEL": "Name",
-      "TYPE": "Type",
-      "DATATYPE": "Data Type",
-      "REQUIRED": "Required"
-    },
-    "ACTIONS": {
-      "SAVE": "Save",
-      "CANCEL": "Cancel",
-      "DELETE": "Delete"
-    }
-  },
-  "PROJECT-EDITOR": {
-    "TITLE": {
-      "NEW": "New Project",
-      "EDIT": "Edit"
-    },
-    "FIELDS": {
-      "LABEL": "Title",
-      "ABBREVIATION": "Abbreviation",
-      "URI": "URL",
-      "START": "Start",
-      "END": "End",
-      "DESCRIPTION": "Description",
-      "LOGO": "Project Logo"
-    },
-    "ACTIONS": {
-      "SAVE": "Save",
-      "CANCEL": "Cancel",
-      "DELETE": "Delete",
-      "GO-TO-DMPS": "Go To DMPs"
-    }
-  },
-  "DMP-EDITOR": {
-    "TITLE": {
-      "NEW": "New Data Management Plan",
-      "EDIT": "Edit"
-    },
-    "FIELDS": {
-      "NAME": "Name",
-      "PROJECT": "Project",
-      "DESCRIPTION": "Description",
-      "ORGANISATIONS": "Organisations",
-      "RESEARCHERS": "Researchers",
-      "PROFILES": "Available Dataset Profiles",
-      "PROFILE": "DMP Profile",
-      "GRANT": "Grant",
-      "FUNDER": "Funder"
-    },
-    "ACTIONS": {
-      "GO-TO-PROJECT": "Go To DMP Project",
-      "GO-TO-DATASETS": "Go To Datasets",
-      "SAVE": "Save",
-      "CANCEL": "Cancel",
-      "DELETE": "Remove"
-    }
-  },
-  "CRITERIA": {
-    "FILTERS": "Filters",
-    "PROJECTS": {
-      "LIKE": "Search",
-      "PERIOD-FROM": "Project Start",
-      "PERIOD-TO": "Project End",
-      "PROJECT-STATE-TYPE": "Project Status",
-      "TYPES": {
-        "ON-GOING": "On Going",
-        "FINISHED": "Finished"
-      }
-    },
-    "DATA-SETS": {
-      "LIKE": "Search",
-      "PERIOD-FROM": "Start",
-      "PERIOD-TO": "End",
-      "STATUS": "Status",
-      "TAGS": "Tags"
-    },
-    "DMP": {
-      "LIKE": "Search",
-      "PROJECTS": "Projects"
-    },
-    "USERS": {
-      "LABEL": "Label",
-      "ROLE": "Role"
-    }
-  },
-  "DATASET-EDITOR": {
-    "TITLE": {
-      "NEW": "New Data Management Plan",
-      "EDIT": "Edit"
-    },
-    "FIELDS": {
-      "NAME": "Name of the Dataset",
-      "DESCRIPTION": "Description",
-      "PROFILE": "Profile",
-      "URI": "Uri",
-      "DMP": "DMP",
-      "DATAREPOSITORIES": "Data Repositories",
-      "REGISTRIES": "Registries",
-      "SERVICES": "Services",
-      "EXTERNAL-DATASETS": "External Datasets",
-      "EXTERNAL-DATASET-TYPE": "External Datasets Type",
-      "EXTERNAL-DATASET-INFO": "External Datasets Info",
-      "DATAREPOSITORIES-INFO": "Data Repositories Info",
-      "TAGS": "Tags",
-      "CREATE": "Create New"
-    },
-    "ACTIONS": {
-      "SAVE": "Save",
-      "CANCEL": "Cancel",
-      "DELETE": "Delete"
-    }
-  },
-  "INVITATION-EDITOR": {
-    "TITLE": "Send Invitations for ",
-    "AUTOCOMPLETE-TITLE": "User/Email",
-    "ACTIONS": {
-      "SEND-INVITATION": "Send Invitations",
-      "CANCEL": "Cancel"
-    }
-  },
-  "USERS": {
-    "LISTING": {
-      "TITLE": "Users",
-      "EMAIL": "Email",
-      "LAST-LOGGED-IN": "Last Logged In",
-      "LABEL": "Label",
-      "ROLES": "Roles"
-    }
-  },
-  "TYPES": {
-    "APP-ROLE": {
-      "ADMIN": "Admin",
-      "USER": "User",
-      "MANAGER": "Manager"
-    },
-    "DMP-PROFILE-FIELD": {
-      "DATA-TYPE": {
-        "DATE": "Date",
-        "NUMBER": "Number",
-        "TEXT": "Text"
-      },
-      "TYPE": {
-        "INPUT": "Input"
-      }
-    },
-    "DATASET-STATUS": {
-      "DRAFT": "Draft",
-      "FINALISED": "Finalised"
-    },
-    "EXTERNAL-DATASET-TYPE": {
-      "SOURCE": "Source",
-      "OUTPUT": "Output"
-    }
-  },
-  "ADDRESEARCHERS-EDITOR": {
-    "TITLE": "Add a Researcher",
-    "FIRST_NAME": "First Name",
-    "LAST_NAME": "Last Name",
-    "ACTIONS": {
-      "SAVE": "Save",
-      "CANCEL": "Cancel"
-    }
-  },
-  "DMP-WIZARD": {
-    "FIRST-STEP": {
-      "DMP": "DMP Editor",
-      "DATASETS": "Datasets"
-    },
-    "ACTIONS": {
-      "NEXT": "Next",
-      "BACK": "Back",
-      "SAVE": "Save"
-    }
-  },
-  "RECENT-ACTIVITY": {
-    "MY-TITLE-PROJECT": "My Recent Project Activity",
-    "MY-TITLE-DMP": "My Recent DMP Activity",
-    "MY-TITLE-DATASET": "My Recent Dataset Activity"
-  },
-  "FILE-UPLOADER": {
-    "DEFAULT": "Choose a file",
-    "PROJECT": "",
-    "UPLOAD": "Upload"
-  },
-  "URL-LISTING-COMPONENT": {
-    "SHOW-MORE": "Show more"
-  },
-  "HOMEPAGE": {
-    "OPEN-DMPS": {
-      "STATS": "OpenDMP DashBoard"
-    },
-    "MY-DMPS": {
-      "STATS": "My DashBoard"
-    }
-  },
-  "ABOUT": {
-    "TITLE": "-Our Mission-",
-    "MAIN-CONTENT": "Our goal is to make your research data FAIR, that is findable, accessible,interoperable and re-usable. These principles precede implementation choices and do not necessarily suggest any specific technology, standard, or implementationsolution.",
-    "CONTRIBUTORS": "Contributors"
-  },
-  "DASHBOARD": {
-    "MY-PROJECTS": "My Projects",
-    "PROJECTS": "Projects",
-    "MY-DMPS": "My DMPs",
-    "DMPS": "DMPs",
-    "MY-DATASETS": "My Datasets",
-    "DATASETS": "Datasets",
-    "SEARCH": "Search"
-  },
-  "USER-DIALOG": {
-    "USER-PROFILE": "My Profile",
-    "EXIT": "Exit "
-  },
-  "USER-PROFILE": {
-    "SETTINGS": {
-      "TITLE": "Settings",
-      "TIMEZONE": "Time Zone",
-      "CULTURE": "Culture",
-      "LANGUAGE": "Language"
-    },
-    "ASSOCIATED-DMPS": "Associated DMPs",
-    "DMPS": {
-      "SHOW-ALL": "Show All",
-      "CREATOR": "Creator",
-      "MEMBER": "Member"
-    }
-  },
-  "DATASET-REFERENCED-MODELS": {
-    "SERVICES": {
-      "TITLE": "Add New Service",
-      "LABEL": "Label",
-      "ABBREVIATION": "Abbreviation",
-      "URI": "Uri"
-    },
-    "DATA-REPOSITORY": {
-      "TITLE": "Add New Service",
-      "LABEL": "Label",
-      "ABBREVIATION": "Abbreviation",
-      "URI": "Uri"
-    },
-    "EXTERNAL-DATASET": {
-      "TITLE": "Add New Service",
-      "LABEL": "Label",
-      "ABBREVIATION": "Abbreviation"
-    },
-    "REGISTRY": {
-      "TITLE": "Add New Service",
-      "LABEL": "Label",
-      "ABBREVIATION": "Abbreviation",
-      "URI": "Uri"
-    }
-  },
-  "FACET-SEARCH": {
-    "PROJECT-STATUS": {
-      "TITLE": "Project Status",
-      "OPTIONS": {
-        "ACTIVE": "Active",
-        "INACTIVE": "Inactive"
-      }
-    },
-    "PROJECT": {
-      "TITLE": "Project",
-      "FILTER": "Filter Projects"
-    },
-    "PROFILES": {
-      "TITLE": "Dataset specification"
-    },
-    "DMP-ORGANISATIONS": {
-      "TITLE": "DMP Organisations",
-      "FILTER": "Filter Organisations"
-    }
-  }
+	"GENERAL": {
+		"VALIDATION": {
+			"REQUIRED": "Required"
+		},
+		"DELETE-CONFIRMATION": {
+			"TITLE": "Warning",
+			"MESSAGE": "Are you sure you want to delete this item?",
+			"POSITIVE": "Yes",
+			"NEGATIVE": "Cancel"
+		},
+		"SNACK-BAR": {
+			"SUCCESSFUL-CREATION": "Created Successfully",
+			"SUCCESSFUL-UPDATE": "Updated Successfully",
+			"SUCCESSFUL-LOGIN": "Successful Login",
+			"SUCCESSFUL-LOGOUT": "Successful Logout",
+			"UNSUCCESSFUL-LOGOUT": "Unsuccessful Logout",
+			"UNSUCCESSFUL-LOGIN": "Unsuccessful Login"
+		},
+		"ERRORS": {
+			"HTTP-REQUEST-ERROR": "An Unexpected Error Has Occured"
+		},
+		"NAMES": {
+			"DATASET": "Dataset"
+		},
+		"STATUSES": {
+			"EDIT": "Edited",
+			"FINALISED": "Finalized"
+		}
+	},
+	"NAV-BAR": {
+		"TITLE": "OpenDMP",
+		"PROJECTS": "Projects",
+		"DMPS": "DMPs",
+		"DATASETS": "Datasets",
+		"PUBLIC-DATASETS": "Explore OpenDMP",
+		"USERS": "Users",
+		"DATASETS-ADMIN": "Dataset Profiles",
+		"DMP-PROFILES": "DMP Profiles",
+		"ABOUT": "About"
+	},
+	"PROJECT-LISTING": {
+		"TITLE": "Projects",
+		"COLUMNS": {
+			"AVATAR": "Image",
+			"NAME": "Name",
+			"ABBREVIATION": "Abbreviation",
+			"START": "Start",
+			"END": "End",
+			"ACTIONS": "Actions",
+			"DMPS": "DMPs"
+		}
+	},
+	"DMP-LISTING": {
+		"TITLE": "Data Management Plans",
+		"COLUMNS": {
+			"NAME": "Name",
+			"PROJECT": "Project",
+			"PROFILE": "Profile",
+			"CREATION-TIME": "Creation Time",
+			"ORGANISATIONS": "Organisations",
+			"LATEST_VERSION": "Latest Version",
+			"ACTIONS": "Actions",
+			"DATASETS": "Datasets"
+		},
+		"ACTIONS": {
+			"EDIT": "Edit",
+			"INVITE": "Invite Contributors",
+			"ADD-DATASET": "Add Dataset To DMP",
+			"DATASETS": "List All DMP Datasets",
+			"NEW-VERSION": "New Version",
+			"VIEW-VERSION": "All DMP Versions",
+			"CLONE": "Clone"
+		}
+	},
+	"DATASET-WIZARD": {
+		"EDITOR": {
+			"FIELDS": {
+				"EXTERNAL-DATASET-TYPE": "Type"
+			}
+		},
+		"FIRST-STEP": {
+			"TITLE": "Dataset Information",
+			"DMP": "Data Management Plan",
+			"PROFILE": "Dataset Profile"
+		},
+		"SECOND-STEP": {
+			"TITLE": "External References"
+		},
+		"THIRD-STEP": {
+			"TITLE": "Description"
+		},
+		"ACTIONS": {
+			"NEXT": "Next",
+			"BACK": "Back",
+			"GO-TO-PROJECT": "Go to Dataset Project",
+			"GO-TO-DMP": "Go to Dataset DMP"
+		}
+	},
+	"DATASET-LISTING": {
+		"TITLE": "Datasets",
+		"COLUMNS": {
+			"NAME": "Name",
+			"REFERNCE": "Reference",
+			"URI": "Uri",
+			"STATUS": "Status",
+			"DESCRIPTION": "Description",
+			"CREATED": "Created",
+			"ACTIONS": "Actions",
+			"DMP": "Dmp",
+			"PROFILE": "Profile",
+			"DATAREPOSITORIES": "Data Repositories",
+			"REGISTRIES": "Registries",
+			"SERVICES": "Services"
+		},
+		"ACTIONS": {
+			"EDIT": "Edit",
+			"MAKE-IT-PUBLIC": "Make it public",
+			"VIEW": "View"
+		}
+	},
+	"DATASET-PUBLIC-LISTING": {
+		"TITLE": "Published dataset descriptions"
+	},
+	"DMP-PROFILE-EDITOR": {
+		"TITLE": {
+			"NEW": "New DMP Profile",
+			"EDIT": "Edit"
+		},
+		"FIELDS": {
+			"LABEL": "Name",
+			"TYPE": "Type",
+			"DATATYPE": "Data Type",
+			"REQUIRED": "Required"
+		},
+		"ACTIONS": {
+			"SAVE": "Save",
+			"CANCEL": "Cancel",
+			"DELETE": "Delete"
+		}
+	},
+	"PROJECT-EDITOR": {
+		"TITLE": {
+			"NEW": "New Project",
+			"EDIT": "Edit"
+		},
+		"FIELDS": {
+			"LABEL": "Title",
+			"ABBREVIATION": "Abbreviation",
+			"URI": "URL",
+			"START": "Start",
+			"END": "End",
+			"DESCRIPTION": "Description",
+			"LOGO": "Project Logo"
+		},
+		"ACTIONS": {
+			"SAVE": "Save",
+			"CANCEL": "Cancel",
+			"DELETE": "Delete",
+			"GO-TO-DMPS": "Go To DMPs"
+		}
+	},
+	"DMP-EDITOR": {
+		"TITLE": {
+			"NEW": "New Data Management Plan",
+			"EDIT": "Edit"
+		},
+		"FIELDS": {
+			"NAME": "Name",
+			"PROJECT": "Project",
+			"DESCRIPTION": "Description",
+			"ORGANISATIONS": "Organisations",
+			"RESEARCHERS": "Researchers",
+			"PROFILES": "Available Dataset Profiles",
+			"PROFILE": "DMP Profile",
+			"GRANT": "Grant",
+			"FUNDER": "Funder"
+		},
+		"ACTIONS": {
+			"GO-TO-PROJECT": "Go To DMP Project",
+			"GO-TO-DATASETS": "Go To Datasets",
+			"SAVE": "Save",
+			"CANCEL": "Cancel",
+			"DELETE": "Remove"
+		}
+	},
+	"CRITERIA": {
+		"FILTERS": "Filters",
+		"PROJECTS": {
+			"LIKE": "Search",
+			"PERIOD-FROM": "Project Start",
+			"PERIOD-TO": "Project End",
+			"PROJECT-STATE-TYPE": "Project Status",
+			"TYPES": {
+				"ON-GOING": "On Going",
+				"FINISHED": "Finished"
+			}
+		},
+		"DATA-SETS": {
+			"LIKE": "Search",
+			"PERIOD-FROM": "Start",
+			"PERIOD-TO": "End",
+			"STATUS": "Status",
+			"TAGS": "Tags"
+		},
+		"DMP": {
+			"LIKE": "Search",
+			"PROJECTS": "Projects"
+		},
+		"USERS": {
+			"LABEL": "Label",
+			"ROLE": "Role"
+		}
+	},
+	"DATASET-EDITOR": {
+		"TITLE": {
+			"NEW": "New Data Management Plan",
+			"EDIT": "Edit"
+		},
+		"FIELDS": {
+			"NAME": "Name of the Dataset",
+			"DESCRIPTION": "Description",
+			"PROFILE": "Profile",
+			"URI": "Uri",
+			"DMP": "DMP",
+			"DATAREPOSITORIES": "Data Repositories",
+			"REGISTRIES": "Registries",
+			"SERVICES": "Services",
+			"EXTERNAL-DATASETS": "External Datasets",
+			"EXTERNAL-DATASET-TYPE": "External Datasets Type",
+			"EXTERNAL-DATASET-INFO": "External Datasets Info",
+			"DATAREPOSITORIES-INFO": "Data Repositories Info",
+			"TAGS": "Tags",
+			"CREATE": "Create New"
+		},
+		"ACTIONS": {
+			"SAVE": "Save",
+			"CANCEL": "Cancel",
+			"DELETE": "Delete"
+		}
+	},
+	"INVITATION-EDITOR": {
+		"TITLE": "Send Invitations for ",
+		"AUTOCOMPLETE-TITLE": "User/Email",
+		"ACTIONS": {
+			"SEND-INVITATION": "Send Invitations",
+			"CANCEL": "Cancel"
+		}
+	},
+	"USERS": {
+		"LISTING": {
+			"TITLE": "Users",
+			"EMAIL": "Email",
+			"LAST-LOGGED-IN": "Last Logged In",
+			"LABEL": "Label",
+			"ROLES": "Roles"
+		}
+	},
+	"TYPES": {
+		"APP-ROLE": {
+			"ADMIN": "Admin",
+			"USER": "User",
+			"MANAGER": "Manager"
+		},
+		"DMP-PROFILE-FIELD": {
+			"DATA-TYPE": {
+				"DATE": "Date",
+				"NUMBER": "Number",
+				"TEXT": "Text"
+			},
+			"TYPE": {
+				"INPUT": "Input"
+			}
+		},
+		"DATASET-STATUS": {
+			"DRAFT": "Draft",
+			"FINALISED": "Finalised"
+		},
+		"EXTERNAL-DATASET-TYPE": {
+			"SOURCE": "Source",
+			"OUTPUT": "Output"
+		}
+	},
+	"ADDRESEARCHERS-EDITOR": {
+		"TITLE": "Add a Researcher",
+		"FIRST_NAME": "First Name",
+		"LAST_NAME": "Last Name",
+		"ACTIONS": {
+			"SAVE": "Save",
+			"CANCEL": "Cancel"
+		}
+	},
+	"DMP-WIZARD": {
+		"FIRST-STEP": {
+			"DMP": "DMP Editor",
+			"DATASETS": "Datasets"
+		},
+		"ACTIONS": {
+			"NEXT": "Next",
+			"BACK": "Back",
+			"SAVE": "Save"
+		}
+	},
+	"RECENT-ACTIVITY": {
+		"MY-TITLE-PROJECT": "My Recent Project Activity",
+		"MY-TITLE-DMP": "My Recent DMP Activity",
+		"MY-TITLE-DATASET": "My Recent Dataset Activity"
+	},
+	"FILE-UPLOADER": {
+		"DEFAULT": "Choose a file",
+		"PROJECT": "",
+		"UPLOAD": "Upload"
+	},
+	"URL-LISTING-COMPONENT": {
+		"SHOW-MORE": "Show more"
+	},
+	"HOMEPAGE": {
+		"OPEN-DMPS": {
+			"STATS": "OpenDMP DashBoard"
+		},
+		"MY-DMPS": {
+			"STATS": "My DashBoard"
+		}
+	},
+	"ABOUT": {
+		"TITLE": "-Our Mission-",
+		"MAIN-CONTENT": "Our goal is to make your research data FAIR, that is findable, accessible,interoperable and re-usable. These principles precede implementation choices and do not necessarily suggest any specific technology, standard, or implementationsolution.",
+		"CONTRIBUTORS": "Contributors"
+	},
+	"DASHBOARD": {
+		"MY-PROJECTS": "My Projects",
+		"PROJECTS": "Projects",
+		"MY-DMPS": "My DMPs",
+		"DMPS": "DMPs",
+		"MY-DATASETS": "My Datasets",
+		"DATASETS": "Datasets",
+		"SEARCH": "Search"
+	},
+	"USER-DIALOG": {
+		"USER-PROFILE": "My Profile",
+		"EXIT": "Exit "
+	},
+	"USER-PROFILE": {
+		"SETTINGS": {
+			"TITLE": "Settings",
+			"TIMEZONE": "Time Zone",
+			"CULTURE": "Culture",
+			"LANGUAGE": "Language"
+		},
+		"ASSOCIATED-DMPS": "Associated DMPs",
+		"DMPS": {
+			"SHOW-ALL": "Show All",
+			"CREATOR": "Creator",
+			"MEMBER": "Member"
+		}
+	},
+	"DATASET-REFERENCED-MODELS": {
+		"SERVICES": {
+			"TITLE": "Add New Service",
+			"LABEL": "Label",
+			"ABBREVIATION": "Abbreviation",
+			"URI": "Uri"
+		},
+		"DATA-REPOSITORY": {
+			"TITLE": "Add New Service",
+			"LABEL": "Label",
+			"ABBREVIATION": "Abbreviation",
+			"URI": "Uri"
+		},
+		"EXTERNAL-DATASET": {
+			"TITLE": "Add New Service",
+			"LABEL": "Label",
+			"ABBREVIATION": "Abbreviation"
+		},
+		"REGISTRY": {
+			"TITLE": "Add New Service",
+			"LABEL": "Label",
+			"ABBREVIATION": "Abbreviation",
+			"URI": "Uri"
+		}
+	},
+	"FACET-SEARCH": {
+		"FILTER": "Filter",
+		"PROJECT-STATUS": {
+			"TITLE": "Project Status",
+			"OPTIONS": {
+				"ACTIVE": "Active",
+				"INACTIVE": "Inactive"
+			}
+		},
+		"PROJECT": {
+			"TITLE": "Project",
+			"FILTER": "Filter Projects"
+		},
+		"PROFILES": {
+			"TITLE": "Dataset specification"
+		},
+		"DMP-ORGANISATIONS": {
+			"TITLE": "DMP Organisations",
+			"FILTER": "Filter Organisations"
+		}
+	}
 }