diff --git a/dmp-frontend/src/app/datasets/dataset.component.ts b/dmp-frontend/src/app/datasets/dataset.component.ts
index 01d6e1f5b..e5334bf43 100644
--- a/dmp-frontend/src/app/datasets/dataset.component.ts
+++ b/dmp-frontend/src/app/datasets/dataset.component.ts
@@ -1,8 +1,9 @@
-import { Component, OnInit, Input, ViewChild  } from '@angular/core';
+import { Component, OnInit, Input, ViewChild, NgZone  } from '@angular/core';
 import {GoogleSignInSuccess} from 'angular-google-signin';
 import { Router, ActivatedRoute } from '@angular/router';
 import { ServerService } from '../../app/services/server.service';
 import { Project } from '../entities/model/project';
+import { Dataset } from '../entities/model/dataset';
 import { Dmp } from '../entities/model/Dmp';
 import { DataTable, DataTableTranslations, DataTableResource } from 'angular-4-data-table-bootstrap-4';
 
@@ -27,56 +28,56 @@ import { DataTable, DataTableTranslations, DataTableResource } from 'angular-4-d
 })
 
 export class DatasetsComponent implements OnInit{
-  
+
   returnUrl: string;
-  @Input() projects: Project[];
-  projectResource :DataTableResource<Project>;
-  @Input() projectCount = 0;
+  @Input() datasets: Dataset[];
+  datasetResource :DataTableResource<Dataset>;
+  @Input() datasetCount = 0;
 
   @ViewChild(DataTable) projectsTable;
 
   constructor( 
     private serverService: ServerService,
     private route: ActivatedRoute,
-    private router: Router){
+    private router: Router,
+    private ngZone: NgZone){
 
   }
 
   ngOnInit() {
     //this.projects = this.serverService.getDummyProjects();
-    this.projects = [];
-    this.serverService.getProjects().subscribe( 
+    this.datasets = [];
+    this.serverService.getAllDatasets().subscribe( 
       response => {
 
         console.log("response");
         console.log(response);
         response.forEach(resp => {
-          let pr = new Project();
-          pr.id = resp.id;
-          pr.name = resp.label;
-          pr.abbreviation = resp.abbreviation;
-          pr.definition = resp.definition;
-          pr.uri = resp.uri;
-          pr.dmp = new Dmp();
-        //  pr.dmp.id = resp.dmp; 
-          pr.dmp.id = resp.dmp =! null || resp.dmp ==! undefined ? resp.dmp.id : null;
-        //  pr.dmp.dataset = resp.dmp.dataset != null ? resp.dmp.dataset.id: null;
-          this.projects.push(pr);
+
+          let dt = new Dataset();
+          dt.id = resp.id;
+          dt.name = resp.label;
+          dt.uriDataset = resp.uri;
+          this.datasets.push(dt);
           var params = {limit:8,offset:0, sortAsc:false}
           this.afterLoad();   
-          this.projectResource.query(params).then(projects => this.projects = projects);      
+          this.datasetResource.query(params).then(datasets => this.datasets = datasets);           
         });
       }      
     );    
   }
 
-  reloadProjects(params) {
-    this.projectResource.query(params).then(projects => this.projects = projects);
+  reloadDatasets(params) {
+    this.datasetResource.query(params).then(projects => this.datasets = projects);
 }
 
 afterLoad(){
-  this.projectResource = new DataTableResource(this.projects);
-  this.projectResource.count().then(count => this.projectCount = count);
+  this.datasetResource = new DataTableResource(this.datasets);
+  this.datasetResource.count().then(count => this.datasetCount = count);
+}
+
+rowClick(rowEvent){
+  this.ngZone.run(() => this.router.navigateByUrl('dynamic-form', rowEvent.row.item.id));
 }
 
   // special params:
diff --git a/dmp-frontend/src/app/datasets/dataset.html b/dmp-frontend/src/app/datasets/dataset.html
index 039e985f6..bfe1847eb 100644
--- a/dmp-frontend/src/app/datasets/dataset.html
+++ b/dmp-frontend/src/app/datasets/dataset.html
@@ -1,46 +1,27 @@
 <div style="margin: auto; max-width: 1000px; margin-top:50px">
-        <data-table id="films-grid" headerTitle="My Projects" [items]="projects" [itemCount]="projectCount" (reload)="reloadProjects($event)"
-            [limit]="8" [sortBy]="'rating'" [sortAsc]="false" [selectColumn]="true" [multiSelect]="false" [substituteRows]="false"
-            [expandableRows]="true" [translations]="translations" [indexColumnHeader]="'#'" [selectOnRowClick]="true">
+        <data-table id="films-grid" headerTitle="Datasets" [items]="datasets" [itemCount]="datasetCount" (reload)="reloadDatasets($event)"
+            [limit]="8" [sortBy]="'rating'" [sortAsc]="false" [substituteRows]="false"
+            [expandableRows]="true" [translations]="translations" [selectOnRowClick]="true" (rowClick)="rowClick($event)">
             <template #dataTableExpand let-item="item">
                 <div>
-                    <!-- <a [routerLink]="['/dynamic-form', item.id]"> {{ item.dmp.id }}</a> -->
-                    <table class="table">
-                        <thead class="thead-inverse">
-                            <tr>
-                                
-                                <th>Dmp</th>
-                                <th>Id</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            <tr>
-                                
-                               <!-- <td> <a [routerLink]="['/dynamic-form', item.id]"> {{ item.dmp.id }}</a></td>-->
-                                <td> <a [routerLink]="['/dataset']"> {{ item.dmp.id }}</a></td>
-                                <td>{{item.dmp.id}}</td>
-                            </tr>
-                            
-                        </tbody>
-                    </table>
-    
+                     <a [routerLink]="['/dynamic-form', item.id]"> dataset</a>    
                 </div>
     
             </template>
-            <data-table-column [property]="'name'" [header]="'Label'" [sortable]="true">
-            </data-table-column>
-            <data-table-column [property]="'abbreviation'" [header]="'Abbreviation'" [sortable]="true">
+            <data-table-column [property]="'name'" [header]="'Label'" [sortable]="true">                  
             </data-table-column>
+            <!-- <data-table-column [property]="'abbreviation'" [header]="'Abbreviation'" [sortable]="true">
+            </data-table-column> -->
             <data-table-column [property]="'id'" [header]="'Id'" [sortable]="true">
             </data-table-column>
-            <data-table-column [property]="'uri'" [header]="'Uri'" [sortable]="true">
-            </data-table-column>
-            <data-table-column [property]="'definition'" [header]="'Definition'" [sortable]="true">
+            <data-table-column [property]="'uriDataset'" [header]="'Uri'" [sortable]="true">
             </data-table-column>
+            <!-- <data-table-column [property]="'definition'" [header]="'Definition'" [sortable]="true">
+            </data-table-column> -->
         </data-table>
         <div style="margin-top: 10px">
             <b>Selected:</b>
             <span *ngIf="projectsTable.selectedRow == null"><i>No item selected</i></span>
             <span [textContent]="projectsTable.selectedRow && projectsTable.selectedRow.item.name"></span>
-        </div>
+        </div>       
     </div>
\ No newline at end of file
diff --git a/dmp-frontend/src/app/entities/model/dataset.ts b/dmp-frontend/src/app/entities/model/dataset.ts
index 45239a369..b3cd57fbf 100644
--- a/dmp-frontend/src/app/entities/model/dataset.ts
+++ b/dmp-frontend/src/app/entities/model/dataset.ts
@@ -3,4 +3,5 @@ import { Injectable } from '@angular/core';
 export class Dataset {
   id:string;
   name: string;
+  uriDataset: string;
 }
\ No newline at end of file
diff --git a/dmp-frontend/src/app/projects/project.html b/dmp-frontend/src/app/projects/project.html
index 4c3166f6c..37629be74 100644
--- a/dmp-frontend/src/app/projects/project.html
+++ b/dmp-frontend/src/app/projects/project.html
@@ -1,3 +1,4 @@
+<div> <a [routerLink]="['/dynamic-form',123]"> dataset</a></div>
 <div style="margin: auto; max-width: 1000px; margin-top:50px">
     <data-table id="films-grid" headerTitle="My Projects" [items]="projects" [itemCount]="projectCount" (reload)="reloadProjects($event)"
         [limit]="8" [sortBy]="'rating'" [sortAsc]="false" [selectColumn]="true" [multiSelect]="false" [substituteRows]="false"
diff --git a/dmp-frontend/src/app/projects/projects.component.ts b/dmp-frontend/src/app/projects/projects.component.ts
index 46d829a04..6781bc5c1 100644
--- a/dmp-frontend/src/app/projects/projects.component.ts
+++ b/dmp-frontend/src/app/projects/projects.component.ts
@@ -45,7 +45,7 @@ export class ProjectsComponent implements OnInit{
   ngOnInit() {
     //this.projects = this.serverService.getDummyProjects();
     this.projects = [];
-    this.serverService.getProjects().subscribe( 
+    this.serverService.getAllProjects().subscribe(  //getProjects()
       response => {
 
         console.log("response");
diff --git a/dmp-frontend/src/app/services/rest-base.ts b/dmp-frontend/src/app/services/rest-base.ts
index 12efb01f4..eb33a9f16 100644
--- a/dmp-frontend/src/app/services/rest-base.ts
+++ b/dmp-frontend/src/app/services/rest-base.ts
@@ -16,8 +16,8 @@ export class RestBase {
     }
     
     protocol: string = "http";
-    hostname: string = "localhost";//"dl010.madgik.di.uoa.gr";//
-    port: number = 7070;//8080;//
+    hostname: string ="dl010.madgik.di.uoa.gr" ;//"localhost";//"dl010.madgik.di.uoa.gr";//
+    port: number = 8080;//8080;//
     webappname: string = "dmp-backend";//"dmp-backend-new";//
 
 
@@ -48,7 +48,7 @@ export class RestBase {
     }
 
 
-    private createOptions(){
+    private createOptions(){debugger;
         var token = this.tokenService.getToken();
         var provider: TokenProvider = this.tokenService.getProvider();
         //var csrfToken : string = this.tokenService.getCSRFToken();
diff --git a/dmp-frontend/src/app/services/server.service.ts b/dmp-frontend/src/app/services/server.service.ts
index d3532781c..2725aea5f 100644
--- a/dmp-frontend/src/app/services/server.service.ts
+++ b/dmp-frontend/src/app/services/server.service.ts
@@ -40,49 +40,49 @@ export class ServerService {
 
 
 
-  listDatasetIDs(){
+  public listDatasetIDs(){
     return this.restBase.get("dataset");
   }
 
-  getAllDatasets(){
-    return this.restBase.get("getAllDatasets");
+  public getAllDatasets(){
+    return this.restBase.get("getAllDatasets");    
   }
 
-  getAllDatasetIDs(datasetId: string){
+  public getAllDatasetIDs(datasetId: string){
     return this.restBase.get("dataset/"+datasetId);
   }
 
 
-  getAllDmps(){
+  public getAllDmps(){
     return this.restBase.get("dmp/getAll");
   }
 
-  listDmpsLabelID(){
+  public listDmpsLabelID(){
     return this.restBase.get("dmp/listDMPLabelID");
   }
 
-  getDmp(dmpid : string){
+  public getDmp(dmpid : string){
     return this.restBase.get("dmps/"+dmpid);
   }
 
-  listDmpIDs(){
+  public listDmpIDs(){
     return this.restBase.get("dmps");
   }
 
 
-  listProjectIDs(){
+  public listProjectIDs(){
     return this.restBase.get("projects");
   }
 
-  getAllProjects(){
+  public getAllProjects(){
     return this.restBase.get("project/getAll");
   }
 
-  getProject(projectID : string){
+  public getProject(projectID : string){
     return this.restBase.get("projects/"+projectID);
   }
 
-  listProjectsLabelID(){
+  public listProjectsLabelID(){
     return this.restBase.get("project/listAllLabelIDs");
   }
   
@@ -92,12 +92,13 @@ export class ServerService {
   getData() {
     
       //let headers = new HttpHeaders();
-    let headers = new HttpHeaders().set("google-token", this.tokenService.getToken());
 
-    console.log("google-token: "+ this.tokenService.getToken());
+    // let headers = new HttpHeaders().set("google-token", this.tokenService.getToken());
 
-    return this.httpClient.get<any>(this.fetchURL);
+    // console.log("google-token: "+ this.tokenService.getToken());
 
+    // return this.httpClient.get<any>(this.fetchURL);
+    return this.restBase.get("dmps/9a4a4a57-4d01-465e-9887-254534f31600");
     
 /*
     return this.http.get(this.fetchURL)
diff --git a/dmp-frontend/src/index.html b/dmp-frontend/src/index.html
index 7b008a2fe..a1f9747d3 100644
--- a/dmp-frontend/src/index.html
+++ b/dmp-frontend/src/index.html
@@ -31,7 +31,7 @@
 
 	<div class="panel panel-default" style="margin-top: 30px; margin-bottom: 30px; margin-right: 30px; margin-left: 30px;">
 	  <div class="panel-heading">
-	    <h3 class="panel-title" style="text-align: center;">Digital Management Plans Editor</h3>
+	    <h3 class="panel-title" style="text-align: center;">Digital Management Plan</h3>
 	  </div>
 	  <div class="panel-body">