diff --git a/dmp-frontend/karma.conf.js b/dmp-frontend/karma.conf.js
index af139fada..0840f6ca5 100644
--- a/dmp-frontend/karma.conf.js
+++ b/dmp-frontend/karma.conf.js
@@ -4,24 +4,22 @@
 module.exports = function (config) {
   config.set({
     basePath: '',
-    frameworks: ['jasmine', '@angular/cli'],
+    frameworks: ['jasmine', '@angular-devkit/build-angular'],
     plugins: [
       require('karma-jasmine'),
       require('karma-chrome-launcher'),
       require('karma-jasmine-html-reporter'),
       require('karma-coverage-istanbul-reporter'),
-      require('@angular/cli/plugins/karma')
+      require('@angular-devkit/build-angular/plugins/karma')
     ],
     client:{
       clearContext: false // leave Jasmine Spec Runner output visible in browser
     },
     coverageIstanbulReporter: {
-      reports: [ 'html', 'lcovonly' ],
+      dir: require('path').join(__dirname, 'coverage'), reports: [ 'html', 'lcovonly' ],
       fixWebpackSourcePaths: true
     },
-    angularCli: {
-      environment: 'dev'
-    },
+    
     reporters: ['progress', 'kjhtml'],
     port: 9876,
     colors: true,
diff --git a/dmp-frontend/src/app/app-routing.module.ts b/dmp-frontend/src/app/app-routing.module.ts
index ac9c630c0..7fd32336b 100644
--- a/dmp-frontend/src/app/app-routing.module.ts
+++ b/dmp-frontend/src/app/app-routing.module.ts
@@ -68,7 +68,7 @@ const appRoutes: Routes = [
     path: '',
     redirectTo: '/welcome',
     data: {
-      breadcrumbs: true
+      breadcrumbs: false
     },
     pathMatch: 'full'
   },
@@ -94,7 +94,7 @@ const appRoutes: Routes = [
     path: "welcome",
     component: WelcomepageComponent,
     data: {
-      breadcrumb: true
+      breadcrumb: false
     },
   },
   {
diff --git a/dmp-frontend/src/app/app.component.html b/dmp-frontend/src/app/app.component.html
index cbb177565..cf99e1dfe 100644
--- a/dmp-frontend/src/app/app.component.html
+++ b/dmp-frontend/src/app/app.component.html
@@ -9,7 +9,9 @@
       <help-content position="left"></help-content>
     </div>
     <div class="col-md-8">
-      <app-breadcrumb *ngIf="this.isAuthenticated() && (hasBreadCrumb | async)"></app-breadcrumb>
+      <h4>
+        <app-breadcrumb *ngIf="this.isAuthenticated() && (hasBreadCrumb | async)"></app-breadcrumb>
+      </h4>
       <router-outlet (activate)='onActivate($event)' (deactivate)='onDeactivate($event)'></router-outlet>
     </div>
     <div class="col-md-2">
diff --git a/dmp-frontend/src/app/datasets/dataset-wizard/dataset-wizard.component.html b/dmp-frontend/src/app/datasets/dataset-wizard/dataset-wizard.component.html
index eb5708df5..15e5a871a 100644
--- a/dmp-frontend/src/app/datasets/dataset-wizard/dataset-wizard.component.html
+++ b/dmp-frontend/src/app/datasets/dataset-wizard/dataset-wizard.component.html
@@ -1,6 +1,6 @@
 <div class="dataset-wizard">
-  <h3 *ngIf="isNew">New {{datasetWizardModel?.dmp?.project?.label}} Dataset</h3>
-  <h3 *ngIf="!isNew">{{datasetWizardModel?.dmp?.project?.label}} Dataset</h3>
+  <h3 *ngIf="isNew">New Dataset</h3>
+  <h3 *ngIf="!isNew">{{datasetWizardModel.label}} Dataset</h3>
   <div class="flex-container">
 
     <button mat-raised-button color="primary" *ngIf="datasetWizardModel&&datasetWizardModel?.status != 1" style="margin-top: 15px;margin-bottom: 15px;margin-right: 15px;"
diff --git a/dmp-frontend/src/app/datasets/dataset-wizard/dataset-wizard.component.scss b/dmp-frontend/src/app/datasets/dataset-wizard/dataset-wizard.component.scss
index 16cf867e6..4d2f97b73 100644
--- a/dmp-frontend/src/app/datasets/dataset-wizard/dataset-wizard.component.scss
+++ b/dmp-frontend/src/app/datasets/dataset-wizard/dataset-wizard.component.scss
@@ -48,3 +48,7 @@
 mat-card-title.thick {
   font-weight: bold;
 }
+
+h3{
+  margin-top: 0px;
+}
diff --git a/dmp-frontend/src/app/datasets/dataset-wizard/dataset-wizard.component.ts b/dmp-frontend/src/app/datasets/dataset-wizard/dataset-wizard.component.ts
index e84792d6f..56161dea6 100644
--- a/dmp-frontend/src/app/datasets/dataset-wizard/dataset-wizard.component.ts
+++ b/dmp-frontend/src/app/datasets/dataset-wizard/dataset-wizard.component.ts
@@ -153,13 +153,7 @@ export class DatasetWizardComponent implements OnInit, IBreadCrumbComponent {
                     url: "/dmps/edit/" + this.datasetWizardModel.dmp.id,
                   },
                 ]
-              },
-              {
-                parentComponentName: null,
-                label: this.datasetWizardModel.label,
-                url: "/datasets/" + this.datasetWizardModel.id
-              }
-            ])
+              }])
             this.formGroup = this.datasetWizardModel.buildForm();
             this.loadDatasetProfiles();
           });
@@ -189,11 +183,6 @@ export class DatasetWizardComponent implements OnInit, IBreadCrumbComponent {
                       label: this.datasetWizardModel.dmp.label,
                       url: "/dmps/edit/" + this.datasetWizardModel.dmp.id,
                     }]
-                },
-                {
-                  parentComponentName: null,
-                  label: "New Dataset",
-                  url: "/datasets/new"
                 }])
             });
           });
diff --git a/dmp-frontend/src/app/datasets/listing/dataset-listing.component.html b/dmp-frontend/src/app/datasets/listing/dataset-listing.component.html
index c7c67040c..263c7ea3d 100644
--- a/dmp-frontend/src/app/datasets/listing/dataset-listing.component.html
+++ b/dmp-frontend/src/app/datasets/listing/dataset-listing.component.html
@@ -1,4 +1,4 @@
-<div class="container-fluid">
+<div>
   <h3>{{'DATASET-LISTING.TITLE' | translate}} {{titlePrefix}}</h3>
 
 
diff --git a/dmp-frontend/src/app/datasets/listing/dataset-listing.component.scss b/dmp-frontend/src/app/datasets/listing/dataset-listing.component.scss
index 2688cb118..a460060c1 100644
--- a/dmp-frontend/src/app/datasets/listing/dataset-listing.component.scss
+++ b/dmp-frontend/src/app/datasets/listing/dataset-listing.component.scss
@@ -22,7 +22,7 @@
     cursor: pointer;
 }
 
-mat-row:hover { 
+mat-row:hover {
     background-color: lightgray;
 }
 
@@ -32,4 +32,8 @@ mat-row:hover {
 
 mat-row:nth-child(odd){
     background-color:#eef0fb;
-    }
\ No newline at end of file
+    }
+
+h3{
+  margin-top: 0px;
+}
diff --git a/dmp-frontend/src/app/datasets/listing/dataset-listing.component.ts b/dmp-frontend/src/app/datasets/listing/dataset-listing.component.ts
index e8b119a3a..89e9fa90e 100644
--- a/dmp-frontend/src/app/datasets/listing/dataset-listing.component.ts
+++ b/dmp-frontend/src/app/datasets/listing/dataset-listing.component.ts
@@ -63,11 +63,11 @@ export class DatasetListingComponent implements OnInit, IBreadCrumbComponent {
       this.criteria.setRefreshCallback(() => this.refresh());
       if (this.dmpId != null) {
         let dmp = await this.dataManagementPlanService.getSingle(this.dmpId).toPromise()
-        this.breadCrumbs = Observable.of([{ parentComponentName: "DataManagementPlanEditorComponent", label: dmp.label, url: "dmps/edit/" + this.dmpId }, { parentComponentName: null, label: 'Datasets', url: "dmps" }])
+        this.breadCrumbs = Observable.of([{ parentComponentName: "DataManagementPlanEditorComponent", label: dmp.label, url: "dmps/edit/" + this.dmpId }])
         if (params['dmpLabel'] != undefined)
           this.titlePrefix = "for " + params['dmpLabel'];
       } else {
-        this.breadCrumbs = Observable.of([{ parentComponentName: null, label: 'Datasets', url: "datasets" }])
+        this.breadCrumbs = Observable.of([])
       }
     });
   }
diff --git a/dmp-frontend/src/app/dmps/editor/dmp-editor.component.scss b/dmp-frontend/src/app/dmps/editor/dmp-editor.component.scss
index 24c35d806..b90ca0dab 100644
--- a/dmp-frontend/src/app/dmps/editor/dmp-editor.component.scss
+++ b/dmp-frontend/src/app/dmps/editor/dmp-editor.component.scss
@@ -32,4 +32,8 @@
 	.description-area {
 		height: 100px;
 	}
-}
\ No newline at end of file
+}
+
+h3{
+  margin-top: 0px;
+}
diff --git a/dmp-frontend/src/app/dmps/editor/dmp-editor.component.ts b/dmp-frontend/src/app/dmps/editor/dmp-editor.component.ts
index 38e2341d1..e38bdba4e 100644
--- a/dmp-frontend/src/app/dmps/editor/dmp-editor.component.ts
+++ b/dmp-frontend/src/app/dmps/editor/dmp-editor.component.ts
@@ -106,12 +106,8 @@ export class DataManagementPlanEditorComponent implements AfterViewInit, IBreadC
                 label: 'DMPs',
                 url: "dmps",
                 notFoundResolver: [await this.projectService.getSingle(this.dataManagementPlan.project.id).map(x => ({ label: x.label, url: '/projects/edit/' + x.id }) as BreadcrumbItem).toPromise()]
-              },
-              {
-                parentComponentName: null,
-                label: this.dataManagementPlan.label,
-                url: "/dmps/edit/" + this.dataManagementPlan.id
-              }]
+              }
+            ]
             )
             this.associatedUsers = data.associatedUsers;
           });
@@ -127,12 +123,8 @@ export class DataManagementPlanEditorComponent implements AfterViewInit, IBreadC
               parentComponentName: "DataManagementPlanListingComponent",
               label: 'DMPs',
               url: "dmps",
-            },
-            {
-              parentComponentName: null,
-              label: "New DMP",
-              url: "/dmps/new"
-            }])
+            }
+          ])
         });
       }
 
diff --git a/dmp-frontend/src/app/dmps/listing/dmp-listing.component.html b/dmp-frontend/src/app/dmps/listing/dmp-listing.component.html
index cf95a25c5..fa7f62d80 100644
--- a/dmp-frontend/src/app/dmps/listing/dmp-listing.component.html
+++ b/dmp-frontend/src/app/dmps/listing/dmp-listing.component.html
@@ -1,4 +1,4 @@
-<div class="container-fluid">
+<div>
   <h3>{{'DMP-LISTING.TITLE' | translate}} {{titlePrefix}}</h3>
 
   <app-dmp-criteria-component [showProject]="showProject"></app-dmp-criteria-component>
diff --git a/dmp-frontend/src/app/dmps/listing/dmp-listing.component.scss b/dmp-frontend/src/app/dmps/listing/dmp-listing.component.scss
index 40e52cbb2..f28168d87 100644
--- a/dmp-frontend/src/app/dmps/listing/dmp-listing.component.scss
+++ b/dmp-frontend/src/app/dmps/listing/dmp-listing.component.scss
@@ -22,10 +22,14 @@
     cursor: pointer;
 }
 
-mat-row:hover { 
+mat-row:hover {
     background-color: lightgray;
 }
 
 mat-row:nth-child(odd){
     background-color:#eef0fb;
-    }
\ No newline at end of file
+    }
+
+h3{
+  margin-top: 0px;
+}
diff --git a/dmp-frontend/src/app/dmps/listing/dmp-listing.component.ts b/dmp-frontend/src/app/dmps/listing/dmp-listing.component.ts
index 22d0a47c0..dc6b1c3c3 100644
--- a/dmp-frontend/src/app/dmps/listing/dmp-listing.component.ts
+++ b/dmp-frontend/src/app/dmps/listing/dmp-listing.component.ts
@@ -62,7 +62,7 @@ export class DataManagementPlanListingComponent implements OnInit, IBreadCrumbCo
         this.criteria.setCriteria({ like: null, projects: [project], groupIds: null, allVersions: false })
         this.refresh();
         projectLabel = this.route.snapshot.queryParams.projectLabel
-        this.breadCrumbs = Observable.of([{ parentComponentName: "ProjectEditorComponent", label: projectLabel, url: "/projects/edit/" + this.projectId }, { parentComponentName: null, label: 'DMPs', url: "/dmps/project/" + this.projectId, params: { projectLabel: projectLabel } }])
+        this.breadCrumbs = Observable.of([{ parentComponentName: "ProjectEditorComponent", label: projectLabel, url: "/projects/edit/" + this.projectId }])
         this.criteria.setRefreshCallback(() => this.refresh());
       } else {
         this.itemId = params['groupId'];
@@ -71,9 +71,11 @@ export class DataManagementPlanListingComponent implements OnInit, IBreadCrumbCo
 
         if (this.itemId) {
           let dmplabel = this.route.snapshot.queryParams.groupLabel
-          breadCrumbs.push({ parentComponentName: null, label: 'DMPs', url: "/dmps" }, { parentComponentName: null, label: 'DMPs Versions Of ' + dmplabel, url: "/dmps/viewversions/" + this.itemId })
+          breadCrumbs.push(
+            { parentComponentName: null, label: 'DMPs', url: "/dmps" },
+          )
         }
-        else breadCrumbs.push({ parentComponentName: null, label: 'DMPs', url: "/dmps" })
+        //else breadCrumbs.push({ parentComponentName: null, label: 'DMPs', url: "/dmps" })
         this.breadCrumbs = Observable.of(breadCrumbs)
 
         this.criteria.setCriteria(this.getDefaultCriteria());
diff --git a/dmp-frontend/src/app/projects/editor/project-editor.component.scss b/dmp-frontend/src/app/projects/editor/project-editor.component.scss
index 9a5306381..79409aeb1 100644
--- a/dmp-frontend/src/app/projects/editor/project-editor.component.scss
+++ b/dmp-frontend/src/app/projects/editor/project-editor.component.scss
@@ -41,4 +41,8 @@
 	.description-area {
 		height: 100px;
 	}
-}
\ No newline at end of file
+}
+
+h3{
+  margin-top: 0px;
+}
diff --git a/dmp-frontend/src/app/projects/editor/project-editor.component.ts b/dmp-frontend/src/app/projects/editor/project-editor.component.ts
index 751060307..922005b98 100644
--- a/dmp-frontend/src/app/projects/editor/project-editor.component.ts
+++ b/dmp-frontend/src/app/projects/editor/project-editor.component.ts
@@ -59,11 +59,14 @@ export class ProjectEditorComponent implements OnInit, IBreadCrumbComponent {
           .subscribe(data => {
             this.project = JsonSerializer.fromJSONObject(data, ProjectModel);
             this.formGroup = this.project.buildForm(null, this.project.type == ProjectType.External || !this.editMode);
-            this.breadCrumbs = Observable.of([{ parentComponentName: "ProjectListingComponent", label: 'Projects', url: "/projects" }, { parentComponentName: null, label: this.project.label, url: "/projects/edit/" + this.project.id }])
-
+            this.breadCrumbs = Observable.of([
+              { parentComponentName: "ProjectListingComponent", label: 'Projects', url: "/projects" },
+            ])
           });
       } else {
-        this.breadCrumbs = Observable.of([{ parentComponentName: "ProjectListingComponent", label: 'Projects', url: "/projects" }, { parentComponentName: null, label: "Project New", url: "/projects/new" }])
+        this.breadCrumbs = Observable.of([
+          { parentComponentName: "ProjectListingComponent", label: 'Projects', url: "/projects" },
+        ])
         this.project = new ProjectModel();
         setTimeout(() => {
           this.formGroup = this.project.buildForm();
diff --git a/dmp-frontend/src/app/projects/listing/project-listing.component.html b/dmp-frontend/src/app/projects/listing/project-listing.component.html
index f249b494b..3eb9989b1 100644
--- a/dmp-frontend/src/app/projects/listing/project-listing.component.html
+++ b/dmp-frontend/src/app/projects/listing/project-listing.component.html
@@ -1,4 +1,4 @@
-<div class="container-fluid">
+<div>
   <h3>{{languageResolverService.getBy('listingTitle') | translate}}</h3>
 
   <app-projects-criteria-component></app-projects-criteria-component>
diff --git a/dmp-frontend/src/app/projects/listing/project-listing.component.scss b/dmp-frontend/src/app/projects/listing/project-listing.component.scss
index b2f6556a1..c50f11ec1 100644
--- a/dmp-frontend/src/app/projects/listing/project-listing.component.scss
+++ b/dmp-frontend/src/app/projects/listing/project-listing.component.scss
@@ -2,7 +2,9 @@
     margin: 24px;
 }
 
-
+h3{
+  margin-top: 0px;
+}
 .mat-fab-bottom-right {
     top: auto !important;
     right: 20px !important;
@@ -23,10 +25,10 @@
     cursor: pointer;
 }
 
-mat-row:hover { 
+mat-row:hover {
     background-color: lightgray;
 }
 
 mat-row:nth-child(odd){
     background-color:#eef0fb;
-    }
\ No newline at end of file
+    }
diff --git a/dmp-frontend/src/app/projects/listing/project-listing.component.ts b/dmp-frontend/src/app/projects/listing/project-listing.component.ts
index 68f5e2058..7f4c575ca 100644
--- a/dmp-frontend/src/app/projects/listing/project-listing.component.ts
+++ b/dmp-frontend/src/app/projects/listing/project-listing.component.ts
@@ -44,7 +44,7 @@ export class ProjectListingComponent implements OnInit, IBreadCrumbComponent {
   }
 
   ngOnInit() {
-    this.breadCrumbs = Observable.of([{ parentComponentName: null, label: 'Projects', url: "/projects" }])
+    this.breadCrumbs = Observable.of([])
 
     this.criteria.setCriteria(this.getDefaultCriteria());
     this.refresh();
diff --git a/dmp-frontend/src/app/shared/components/breadcrumb/breadcrumb.component.html b/dmp-frontend/src/app/shared/components/breadcrumb/breadcrumb.component.html
index b5370168f..6aa4bf1f0 100644
--- a/dmp-frontend/src/app/shared/components/breadcrumb/breadcrumb.component.html
+++ b/dmp-frontend/src/app/shared/components/breadcrumb/breadcrumb.component.html
@@ -1,16 +1,13 @@
-<mat-card>
-  <mat-card-content aria-label="breadcrumb">
-    <ol class="no-style" fxLayout="row">
-      <div fxFlex="nogrow" *ngFor="let breadcrumb of buildBreadCrumb(this.activatedRoute) | async ; let i = index; let length = count ">
-        <div fxLayout="row">
-          <li fxFlex="nogrow">
-            <a [routerLink]="[breadcrumb.url]" [queryParams]="breadcrumb.params">
-              {{ breadcrumb.label }}
-            </a>
-          </li>
-          <mat-icon fxFlex="nogrow" *ngIf="length > 1 && i != ( length - 1 )">chevron_right</mat-icon>
-        </div>
-      </div>
-    </ol>
-  </mat-card-content>
-</mat-card>
+<ol class="no-style" fxLayout="row" fxLayoutAlign="start center">
+  <div fxFlex="nogrow" *ngFor="let breadcrumb of buildBreadCrumb(this.activatedRoute) | async ; let i = index; let length = count ">
+    <div fxLayout="row">
+      <li fxFlex="nogrow">
+        <a [routerLink]="[breadcrumb.url]" [queryParams]="breadcrumb.params">
+          {{ breadcrumb.label }}
+        </a>
+      </li>
+      <mat-icon fxFlex="nogrow">chevron_right</mat-icon>
+
+    </div>
+  </div>
+</ol>
diff --git a/dmp-frontend/src/app/shared/components/breadcrumb/breadcrumb.component.scss b/dmp-frontend/src/app/shared/components/breadcrumb/breadcrumb.component.scss
index dfee11f93..537e871db 100644
--- a/dmp-frontend/src/app/shared/components/breadcrumb/breadcrumb.component.scss
+++ b/dmp-frontend/src/app/shared/components/breadcrumb/breadcrumb.component.scss
@@ -2,4 +2,6 @@ ol.no-style {
   li {
     list-style-type: none;
   }
+
+  padding-left: 0px
 }
diff --git a/dmp-frontend/src/app/shared/components/breadcrumb/breadcrumb.component.ts b/dmp-frontend/src/app/shared/components/breadcrumb/breadcrumb.component.ts
index ce01d27de..d62ac5839 100644
--- a/dmp-frontend/src/app/shared/components/breadcrumb/breadcrumb.component.ts
+++ b/dmp-frontend/src/app/shared/components/breadcrumb/breadcrumb.component.ts
@@ -30,7 +30,6 @@ export class BreadcrumbComponent implements OnInit {
   }
 
   buildBreadCrumb(route: ActivatedRoute): Observable<BreadcrumbItem[]> {
-
     return this.breadCrumbService.resolve(route).map(x => { x.unshift({ label: "Home", url: "/welcome" }); return x; });
   }
 
diff --git a/dmp-frontend/src/app/shared/components/figurecard/figurecard.component.html b/dmp-frontend/src/app/shared/components/figurecard/figurecard.component.html
index 336dea1af..284a40e44 100644
--- a/dmp-frontend/src/app/shared/components/figurecard/figurecard.component.html
+++ b/dmp-frontend/src/app/shared/components/figurecard/figurecard.component.html
@@ -1,13 +1,11 @@
-<div class="figure-card card">
-    <div class="card-header" [ngStyle]="{ 'background': linearColor, 'box-shadow': boxShadow }">
-      <i class="material-icons">{{ headerIcon }}</i>
-    </div>
-    <div class="card-content">
-      <p class="category">{{ category }}</p>
-      <h3 class="title">{{ title }}</h3>
-    </div>
-    <div *ngIf="hasFootContent" class="card-footer">
-        <a style="cursor:pointer;" (click)= "navigateToUrl()"><i class="material-icons text-danger">{{ footerIcon }}</i> {{ footContent }}</a>
-    </div>
+<div class="figure-card card" (click)="navigateToUrl()">
+  <div class="card-header" [ngStyle]="{ 'background': linearColor, 'box-shadow': boxShadow }">
+    <i class="material-icons">{{ headerIcon }}</i>
   </div>
-  
\ No newline at end of file
+  <div class="card-content">
+    <p class="category">{{ category }}</p>
+    <h3 class="title">{{ title }}</h3>
+  </div>
+  <div *ngIf="hasFootContent" class="card-footer">
+  </div>
+</div>