diff --git a/dmp-frontend/src/app/homepage/homepage.component.css b/dmp-frontend/src/app/homepage/homepage.component.css
index 63b3980b7..4aff42e90 100644
--- a/dmp-frontend/src/app/homepage/homepage.component.css
+++ b/dmp-frontend/src/app/homepage/homepage.component.css
@@ -1,72 +1,74 @@
-  .card{
-    padding: 25px 20px 20px 20px;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-  }
-  
-  .card h6, p {
-    color: #999;
-  }
-  
-  .icon{
-    margin-top: 20px;
-    width: 130px;
-    height: 130px;
-    border: 1px solid #e5e5e5;
-    border-radius: 50%;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-  }
-  
-  .icon i{
-    font-size: 55px;
-    color: #e91e63;
-  }
-  
-  .card-title{
-    margin-top: 30px;
-    margin-bottom: 3px;
-  }
-  
-  .card-description{
-    margin-bottom: 20px;
+  .card {
+      padding: 25px 20px 20px 20px;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
   }
 
-  .card-dataset{
-    display: flex;
-    flex-direction: column;
-    padding: 20px;
-    position: relative;
-    margin-top: 40px;
+  .card h6,
+  p {
+      color: #999;
   }
 
-  .card{
-    box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.14);
-    border-radius: 6px;
-    color: rgba(0,0,0, 0.87);
-    background: #fff;
-  }
-  
-  .card-raised{
-    box-shadow: 0 10px 30px -12px rgba(0, 0, 0, 0.42), 0 4px 25px 0px rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(0, 0, 0, 0.2);
+  .icon {
+      margin-top: 20px;
+      width: 130px;
+      height: 130px;
+      border: 1px solid #e5e5e5;
+      border-radius: 50%;
+      display: flex;
+      justify-content: center;
+      align-items: center;
   }
 
-  @media screen and (max-width: 990px){
-    #sidebar, #nav-right, #nav-left-button{
-      display: none;
-    }
-    #menu{
-      display: inline;
-    }
-    #main-panel{
-      padding-left: 0;
-      -webkit-transition: all 400ms;
-      -moz-transition: all 400ms;
-      -ms-transition: all 400ms;
-      -o-transition: all 400ms;
-      transition: all 400ms;
-    }
+  .icon i {
+      font-size: 55px;
+      color: #e91e63;
   }
-  
\ No newline at end of file
+
+  .card-title {
+      margin-top: 30px;
+      margin-bottom: 3px;
+  }
+
+  .card-description {
+      margin-bottom: 20px;
+  }
+
+  .card-dataset {
+      display: flex;
+      flex-direction: column;
+      padding: 20px;
+      position: relative;
+      margin-top: 40px;
+  }
+
+  .card {
+      box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.14);
+      border-radius: 6px;
+      color: rgba(0, 0, 0, 0.87);
+      background: #fff;
+  }
+
+  .card-raised {
+      box-shadow: 0 10px 30px -12px rgba(0, 0, 0, 0.42), 0 4px 25px 0px rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(0, 0, 0, 0.2);
+  }
+
+  @media screen and (max-width: 990px) {
+      #sidebar,
+      #nav-right,
+      #nav-left-button {
+          display: none;
+      }
+      #menu {
+          display: inline;
+      }
+      #main-panel {
+          padding-left: 0;
+          -webkit-transition: all 400ms;
+          -moz-transition: all 400ms;
+          -ms-transition: all 400ms;
+          -o-transition: all 400ms;
+          transition: all 400ms;
+      }
+  }
\ No newline at end of file
diff --git a/dmp-frontend/src/app/homepage/homepage.component.html b/dmp-frontend/src/app/homepage/homepage.component.html
index fd567315c..64a3d15fc 100644
--- a/dmp-frontend/src/app/homepage/homepage.component.html
+++ b/dmp-frontend/src/app/homepage/homepage.component.html
@@ -1,17 +1,47 @@
-<!-- <div class="jumbotron">
-    <h2>Hello {{ userInfo?.name!=null ? userInfo?.name : userInfo?.email }}</h2>
-    <p>Welcome {{ userInfo?.created != userInfo?.lastloggedin ? "back" : "" }} to the <a href="https://en.wikipedia.org/wiki/Data_management_plan">Data Management Plans</a> composer application. </p>
-    <!--
-    <p><a class="btn btn-primary btn-lg" href="#" role="button">Learn more</a></p>
-    -->
-<!--</div> -->
-
 <div class="main-panel" id="main-panel">
+   
+        <div class="container">
+                <div class="row" style="margin-top: 30px">
+                  <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12 col-md-offset-1">
+                    <app-figurecard
+                      title={{dashboardStatisticsData.totalProjectCount}}
+                      headerIcon="list"
+                      category="Projects"
+                      footContent="open projects"
+                      routelLink= '/projects'
+                      footerIcon="open_in_new"
+                      linearColor="linear-gradient(60deg, #ffa726, #fb8c00)"
+                      boxShadow="0 4px 20px 0 rgba(0, 0, 0, 0.14), 0 7px 10px -5px rgba(255, 152, 0, 0.4)">
+                    </app-figurecard>
+                  </div>
+                  <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
+                    <app-figurecard
+                      title={{dashboardStatisticsData.totalDataManagementPlanCount}}
+                      headerIcon="mode_edit"
+                      category="DMPs"
+                      footContent="open DMPs"
+                      routelLink=  '/dmps'
+                      footerIcon="open_in_new"
+                      linearColor="linear-gradient(60deg, #ef5350, #e53935)"
+                      boxShadow="0 4px 20px 0px rgba(0, 0, 0, 0.14), 0 7px 10px -5px rgba(244, 67, 54, 0.4)">
+                    </app-figurecard>
+                  </div>
+                  <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
+                    <app-figurecard
+                      title={{dashboardStatisticsData.totalDataSetCount}}
+                      headerIcon="subject"
+                      category="Datasets"
+                      footContent="open datasets"
+                      routelLink= '/datasets'
+                      footerIcon="open_in_new"
+                      linearColor="linear-gradient(60deg, #26c6da, #00acc1)"
+                      boxShadow="0 4px 20px 0px rgba(0, 0, 0, 0.14), 0 7px 10px -5px rgba(0, 188, 212, 0.4)">
+                    </app-figurecard>
+                  </div>
+                </div>
+            </div>
 
-
-
-    <div class="container">
-        
+    <!-- <div class="container">
         <div class="row page-title">
             <div class="col-md-8 col-md-offset-2">
                 <div class="row">
@@ -57,50 +87,10 @@
                 </div>
             </div>
         </div>
-    </div>
+    </div> -->
 
-    <div class="container">
-        <!-- <app-navbar title="Dashboard"></app-navbar> -->
-        <div class="row" style="margin-top: 30px">
-          <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12 col-md-offset-1">
-            <app-figurecard
-              title={{dashboardStatisticsData.totalProjectCount}}
-              headerIcon="list"
-              category="Projects"
-              footContent="open projects"
-              routelLink= '/projects'
-              footerIcon="open_in_new"
-              linearColor="linear-gradient(60deg, #ffa726, #fb8c00)"
-              boxShadow="0 4px 20px 0 rgba(0, 0, 0, 0.14), 0 7px 10px -5px rgba(255, 152, 0, 0.4)">
-            </app-figurecard>
-          </div>
-          <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
-            <app-figurecard
-              title={{dashboardStatisticsData.totalDataManagementPlanCount}}
-              headerIcon="mode_edit"
-              category="DMPs"
-              footContent="open DMPs"
-              routelLink=  '/dmps'
-              footerIcon="open_in_new"
-              linearColor="linear-gradient(60deg, #ef5350, #e53935)"
-              boxShadow="0 4px 20px 0px rgba(0, 0, 0, 0.14), 0 7px 10px -5px rgba(244, 67, 54, 0.4)">
-            </app-figurecard>
-          </div>
-          <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
-            <app-figurecard
-              title={{dashboardStatisticsData.totalDataSetCount}}
-              headerIcon="subject"
-              category="Datasets"
-              footContent="open datasets"
-              routelLink= '/datasets'
-              footerIcon="open_in_new"
-              linearColor="linear-gradient(60deg, #26c6da, #00acc1)"
-              boxShadow="0 4px 20px 0px rgba(0, 0, 0, 0.14), 0 7px 10px -5px rgba(0, 188, 212, 0.4)">
-            </app-figurecard>
-          </div>
-        </div>
-    </div>
+   
     
 
-    <app-dataset-listing-component></app-dataset-listing-component>
+    <!-- <app-dataset-listing-component></app-dataset-listing-component> -->
 </div>
\ No newline at end of file
diff --git a/dmp-frontend/src/app/shared/components/figurecard/figurecard.component.css b/dmp-frontend/src/app/shared/components/figurecard/figurecard.component.css
index c2099ed33..3f58a46b3 100644
--- a/dmp-frontend/src/app/shared/components/figurecard/figurecard.component.css
+++ b/dmp-frontend/src/app/shared/components/figurecard/figurecard.component.css
@@ -1,16 +1,16 @@
-.figure-card{
+.figure-card {
     display: inline-block;
     position: relative;
     width: 100%;
     margin: 25px 0;
-  }
-  
-  .card-content{
+}
+
+.card-content {
     text-align: right;
     padding: 15px 20px 13px 20px;
-  }
-  
-  .card-header {
+}
+
+.card-header {
     float: left;
     text-align: center;
     /*background: linear-gradient(60deg, #ffa726, #fb8c00);*/
@@ -19,33 +19,46 @@
     border-radius: 3px;
     padding: 15px;
     position: relative;
-  }
-  
-  .card-header i {
+}
+
+.card-header i {
     font-size: 36px;
     line-height: 56px;
     width: 56px;
     height: 56px;
     color: #fff;
-  }
-  
-  .category{
+}
+
+.category {
     color: #999;
-  }
-  
-  .card-footer{
+}
+
+.card-footer {
     margin: 0 20px 10px;
     padding-top: 10px;
     border-top: 1px solid #eee;
     color: #999;
     font-size: 12px;
     position: relative;
-  }
-  
-  .card-footer i {
+}
+
+.card-footer i {
     font-size: 16px;
     position: relative;
     top: 4px;
     color: #999;
-  }
-  
\ No newline at end of file
+}
+
+.card {
+    padding: 25px 20px 20px 20px;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+}
+
+.card {
+    box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.14);
+    border-radius: 6px;
+    color: rgba(0, 0, 0, 0.87);
+    background: #fff;
+}
\ No newline at end of file
diff --git a/dmp-frontend/src/app/shared/components/navigation/navigation.component.html b/dmp-frontend/src/app/shared/components/navigation/navigation.component.html
index 980ee8d3d..ddfe5a96b 100644
--- a/dmp-frontend/src/app/shared/components/navigation/navigation.component.html
+++ b/dmp-frontend/src/app/shared/components/navigation/navigation.component.html
@@ -3,7 +3,7 @@
 		<div *ngIf="isAuthenticated()">
 			<button mat-button class="navbar-button" routerLink="/projects">{{'NAV-BAR.PROJECTS' | translate}}</button>
 			<button mat-button class="navbar-button" routerLink="/dmps">{{'NAV-BAR.DMPS' | translate}}</button>
-			<button mat-button class="navbar-button" routerLink="/datadets">{{'NAV-BAR.DATASETS' | translate}}</button>
+			<button mat-button class="navbar-button" routerLink="/datasets">{{'NAV-BAR.DATASETS' | translate}}</button>
 		</div>
 		<span class="navbar-spacer"></span>
 		<div *ngIf="isAuthenticated()">