diff --git a/package.json b/package.json
index cd9024c..f6b8273 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
   ],
   "scripts": {
     "ng": "ng",
-    "start": "PORT=5000 ng serve --disable-host-check --host 0.0.0.0",
+    "start": " ng serve --disable-host-check --host 0.0.0.0",
     "start:dynamic": "PORT=5000 npm run build:dynamic && npm run serve:dynamic",
     "start:static": "npm run build:static && npm run serve:static",
     "build": "ng build",
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
new file mode 100644
index 0000000..d918833
--- /dev/null
+++ b/src/app/app-routing.module.ts
@@ -0,0 +1,52 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+
+import {EnvironmentSpecificResolver, EnvironmentSpecificService} from 'ng-openaire-library';
+import {NavigationBarModule, FeedbackModule, BottomModule, CookieLawModule, ErrorModule} from 'ng-openaire-library';
+
+import { OpenaireErrorPageComponent } from './error/errorPage.component';
+
+const routes: Routes = [
+  { path: '', loadChildren: './communities/communities.module#CommunitiesModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+{ path: 'community', loadChildren: './community/community.module#CommunityModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+      { path: 'communities', loadChildren: './communities/communities.module#CommunitiesModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+      { path: 'my-communities', loadChildren: './my-communities/communities.module#CommunitiesModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+
+  { path: 'search/publication', loadChildren: './landingPages/publication/libPublication.module#LibPublicationModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'search/dataset', loadChildren: './landingPages/dataset/libDataset.module#LibDatasetModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'search/software', loadChildren: './landingPages/software/libSoftware.module#LibSoftwareModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'search/project', loadChildren: './landingPages/project/libProject.module#LibProjectModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'search/dataprovider', loadChildren: '././landingPages/dataProvider/libDataProvider.module#LibDataProviderModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'search/organization', loadChildren: './landingPages/organization/libOrganization.module#LibOrganizationModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'participate/deposit-datasets', loadChildren: './deposit/datasets/depositDatasets.module#LibDepositDatasetsModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'participate/deposit-datasets-result', loadChildren: './deposit/datasets/depositDatasetsResults.module#LibDepositDatasetsResultsModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'participate/deposit-subject-result', loadChildren: './deposit/datasets/depositBySubjectResults.module#LibDepositBySubjectResultsModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'participate/deposit-publications', loadChildren: './deposit/publications/depositPublications.module#LibDepositPublicationsModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'participate/deposit-publications-result', loadChildren: './deposit/publications/depositPublicationsResults.module#LibDepositPublicationsResultsModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'search/find', loadChildren: './searchPages/find/libSearch.module#LibMainSearchModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'search/find/publications', loadChildren: './searchPages/simple/searchPublications.module#LibSearchPublicationsModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'search/find/datasets', loadChildren: './searchPages/simple/searchDatasets.module#LibSearchDatasetsModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'search/find/software', loadChildren: './searchPages/simple/searchSoftware.module#LibSearchSoftwareModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'search/find/projects', loadChildren: './searchPages/simple/searchProjects.module#LibSearchProjectsModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'search/find/dataproviders', loadChildren: './searchPages/simple/searchDataProviders.module#LibSearchDataProvidersModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'search/find/organizations', loadChildren: './searchPages/simple/searchOrganizations.module#LibSearchOrganizationsModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'search/advanced/publications', loadChildren: './searchPages/advanced/advancedSearchPublications.module#LibAdvancedSearchPublicationsModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'search/advanced/datasets', loadChildren: './searchPages/advanced/advancedSearchDatasets.module#LibAdvancedSearchDatasetsModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'search/advanced/software', loadChildren: './searchPages/advanced/advancedSearchSoftware.module#LibAdvancedSearchSoftwareModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'project-report', loadChildren: './landingPages/htmlProjectReport/libHtmlProjectReport.module#LibHtmlProjectReportModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'myclaims', loadChildren: './claims/myClaims/myClaims.module#LibMyClaimsModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'participate/claim', loadChildren: './claims/linking/linkingGeneric.module#LibLinkingGenericModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'participate/direct-claim', loadChildren: './claims/directLinking/directLinking.module#LibDirectLinkingModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'reload', loadChildren: './reload/libReload.module#LibReloadModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'user-info', loadChildren: './login/libUser.module#LibUserModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'error', component: OpenaireErrorPageComponent, resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: '**',pathMatch: 'full',component: OpenaireErrorPageComponent, resolve: { envSpecific: EnvironmentSpecificResolver  }}
+];
+
+@NgModule({
+  imports: [RouterModule.forRoot(routes)],
+  exports: [RouterModule],
+  providers: [EnvironmentSpecificResolver, EnvironmentSpecificService]
+})
+export class AppRoutingModule { }
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 5ae50da..a9ac663 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -1,6 +1,10 @@
 import { Component, Directive, ElementRef, Renderer, ChangeDetectionStrategy, ViewEncapsulation } from '@angular/core';
 import {Observable}       from 'rxjs/Observable';
-import { Properties} from './utils/properties';
+import {ActivatedRoute} from '@angular/router';
+
+import {MenuItem, RootMenuItem, EnvironmentSpecificService, EnvProperties} from 'ng-openaire-library';
+
+
 @Component({
   //changeDetection: ChangeDetectionStrategy.Default,
   //encapsulation: ViewEncapsulation.Emulated,
@@ -9,7 +13,8 @@ import { Properties} from './utils/properties';
   `],
   template: `
 
-        <navbar portal="connect" onlyTop=false [userMenuItems]=userMenuItems [menuItems]=menuItems logoPath="assets/logo/" [logInUrl]=logInUrl [logOutUrl]=logOutUrl></navbar>
+        <navbar *ngIf= "properties" portal="connect" onlyTop=false [(communityId)]="properties.adminToolsCommunity"  [userMenuItems]=userMenuItems [menuItems]=menuItems
+        [(APIUrl)]="properties.adminToolsAPIURL" [(logInUrl)]="properties.loginUrl" [(logOutUrl)]="properties.logoutUrl"  [(cookieDomain)]="properties.cookieDomain" [(community)]=community></navbar>
                    <div class="custom-main-content"   >
                       <main>
                        <router-outlet></router-outlet>
@@ -30,22 +35,80 @@ import { Properties} from './utils/properties';
 })
 export class AppComponent {
    isClient:boolean = false;
-   feedbackmail:string = Properties.getFeedbackMail();
 
-   userMenuItems =  [
-   ];
 
-   menuItems = [ 
-];
-   loginUrl = Properties.getLoginURL();
-   logOutUrl = Properties.getLogoutURL();
+   userMenuItems:MenuItem[] =[];
+
+
+  menuItems:RootMenuItem []=[];
+
+  feedbackmail:string
+   properties:EnvProperties;
+   community: {id:string, name:string, logoUrl:string};
+   constructor(  private  route: ActivatedRoute, private propertiesService:EnvironmentSpecificService) {
+   }
+
    ngOnInit() {
+     this.route.queryParams.subscribe(data => {
 
+       if(data['community'] && data['community']!=""){
+         this.community = {id: data['community'], name: "Egi Federation", logoUrl:"https:\/\/egi.eu/wp-content/uploads/2016/05/cropped-logo_site-1-300x300.png"};
+
+            this.userMenuItems = [ new MenuItem("","My profile","","",false,[],[],{}),
+           new MenuItem("","My claims","","/myclaims",false,[],["/myclaims"],{}),
+           new MenuItem("","Manage all claims","","/claims",true,[],["/claims"],{}),]
+
+           this.menuItems= [{
+           rootItem: new MenuItem("dashboard","Dashboard","","/community",false,[],[],{community:"egi||EGI Federation"}),
+           items: []
+           },
+             {rootItem: new MenuItem("search","Search","","",false,[],[],{}),
+               items: [new MenuItem("","Publications","","/search/find/publications",false,["publication"],["/search/find/publications"],{community: "%22egi%7C%7CEGI%20Federation%22"}),
+               new MenuItem("","Research Data","","/search/find/datasets",false,["dataset"],["/search/find/datasets"],{community: "%22egi%7C%7CEGI%20Federation%22"}),
+               new MenuItem("","Software","","/search/find/software",false,["software"],["/search/find/software"],{community: "%22egi%7C%7CEGI%20Federation%22"}),
+               new MenuItem("","Projects","","/search/find/projects/",false,["project"],["/search/find/projects"],{community: "%22egi%7C%7CEGI%20Federation%22"}),
+               new MenuItem("","Content Providers","","/search/find/dataproviders",false,["datasource"],["/search/find/dataproviders"],{community: "%22egi%7C%7CEGI%20Federation%22"}),
+               new MenuItem("","Organizations","","/search/find/organizations/",false,["organization"],["/search/find/organizations"],{community: "%22egi%7C%7CEGI%20Federation%22"}),
+             ]},
+             {
+             rootItem: new MenuItem("share","Share","","",false,[],["/participate/deposit-publications","/participate/deposit-datasets"],{community:"egi||EGI Federation"}),
+             items: [new MenuItem("","Publications","","/participate/deposit-publications",false,["publication"],["/participate/deposit-publications"],{community:"egi||EGI Federation"}),
+             new MenuItem("","Research Data","","/participate/deposit-datasets",false,["dataset"],["/participate/deposit-datasets"],{community:"egi||EGI Federation"})]
+             },
+             {
+             rootItem: new MenuItem("link","Link","","/participate/claim",false,[],["/participate/claim"],{community:"egi||EGI Federation"}),
+             items: []
+             }
+         ];
+       }else{
+         this.community = null;
+         this.userMenuItems = [ new MenuItem("","My profile","","",false,[],[],{}),
+        new MenuItem("","My claims","","/myclaims",false,[],["/myclaims"],{}),
+        new MenuItem("","Manage all claims","","/claims",true,[],["/claims"],{}),];
+         this.menuItems= [
+           {
+           rootItem: new MenuItem("communities","Communities","","/",false,[],[],{}),
+           items: []
+           }
+       ];
+       }
+
+   });
      if (typeof document !== 'undefined') {
        try{
          this.isClient = true;
        }catch (e) {
        }
      }
+     this.propertiesService.loadEnvironment()
+             .then(es => {
+                 this.propertiesService.setEnvProperties(es);
+                 this.properties = this.propertiesService.envSpecific;
+                 this.feedbackmail = this.properties.feedbackmail;
+             }, error => {
+               console.log("App couldn't fetch properties");
+                 console.log(error);
+
+             });
    }
 }
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index dd883be..26b5f2c 100755
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -8,9 +8,10 @@ import { HttpModule } from '@angular/http';
 import { RouterModule } from '@angular/router';
 import { AppComponent } from './app.component';
 
-import {NavigationBarModule, FeedbackModule, BottomModule, CookieLawModule, ErrorModule} from 'ng-openaire-library';
+import {NavigationBarModule, FeedbackModule, BottomModule, CookieLawModule, ErrorModule, EnvironmentSpecificResolver} from 'ng-openaire-library';
 
 import { OpenaireErrorPageComponent } from './error/errorPage.component';
+import { AppRoutingModule } from './app-routing.module';
 
 import { CommunityService } from './community/community.service';
 
@@ -25,57 +26,12 @@ ErrorModule,
 NavigationBarModule, FeedbackModule, BottomModule,
     CookieLawModule,
     BrowserModule.withServerTransition({appId: 'my-app'}),
-    RouterModule.forRoot([
-      // { path: '', loadChildren: './community/community.module#CommunityModule'},
-      { path: '', loadChildren: './home/home.module#HomeModule'},
-      { path: 'home', loadChildren: './home/home.module#HomeModule'},
-      { path: 'community', loadChildren: './community/community.module#CommunityModule'},
-      { path: 'communities', loadChildren: './communities/communities.module#CommunitiesModule'},
-      { path: 'search/publication', loadChildren: './landingPages/publication/libPublication.module#LibPublicationModule' },
-      { path: 'search/dataset', loadChildren: './landingPages/dataset/libDataset.module#LibDatasetModule' },
-      { path: 'search/software', loadChildren: './landingPages/software/libSoftware.module#LibSoftwareModule' },
-      { path: 'search/project', loadChildren: './landingPages/project/libProject.module#LibProjectModule' },
-      { path: 'search/dataprovider', loadChildren: '././landingPages/dataProvider/libDataProvider.module#LibDataProviderModule' },
-      { path: 'search/organization', loadChildren: './landingPages/organization/libOrganization.module#LibOrganizationModule' },
-      { path: 'participate/deposit-datasets', loadChildren: './deposit/datasets/depositDatasets.module#LibDepositDatasetsModule' },
-      { path: 'participate/deposit-datasets-result', loadChildren: './deposit/datasets/depositDatasetsResults.module#LibDepositDatasetsResultsModule' },
-      { path: 'participate/deposit-subject-result', loadChildren: './deposit/datasets/depositBySubjectResults.module#LibDepositBySubjectResultsModule' },
-      { path: 'participate/deposit-publications', loadChildren: './deposit/publications/depositPublications.module#LibDepositPublicationsModule' },
-      { path: 'participate/deposit-publications-result', loadChildren: './deposit/publications/depositPublicationsResults.module#LibDepositPublicationsResultsModule' },
-      { path: 'search/find', loadChildren: './searchPages/find/libSearch.module#LibMainSearchModule' },
-      { path: 'search/find/publications', loadChildren: './searchPages/simple/searchPublications.module#LibSearchPublicationsModule' },
-      { path: 'search/find/datasets', loadChildren: './searchPages/simple/searchDatasets.module#LibSearchDatasetsModule' },
-      { path: 'search/find/software', loadChildren: './searchPages/simple/searchSoftware.module#LibSearchSoftwareModule' },
-      { path: 'search/find/projects', loadChildren: './searchPages/simple/searchProjects.module#LibSearchProjectsModule' },
-      { path: 'search/find/dataproviders', loadChildren: './searchPages/simple/searchDataProviders.module#LibSearchDataProvidersModule' },
-      { path: 'search/find/organizations', loadChildren: './searchPages/simple/searchOrganizations.module#LibSearchOrganizationsModule' },
-      { path: 'search/content-providers', loadChildren: './searchPages/dataProviders/compatibleDataProviders.module#LibCompatibleDataProvidersModule' },
-      { path: 'search/content-providers-table', loadChildren: './searchPages/dataProviders/compatibleDataProvidersTable.module#CompatibleDataProvidersTableModule' },
-      { path: 'search/entity-registries', loadChildren: './searchPages/dataProviders/entityRegistries.module#LibEntityRegistriesModule' },
-      { path: 'search/entity-registries-table', loadChildren: './searchPages/dataProviders/entityRegistriesTable.module#EntityRegistriesTableModule' },
-      { path: 'search/journals', loadChildren: './searchPages/dataProviders/journals.module#LibJournalsModule' },
-      { path: 'search/journals-table', loadChildren: './searchPages/dataProviders/journalsTable.module#JournalsTableModule' },
-      { path: 'search/advanced/publications', loadChildren: './searchPages/advanced/advancedSearchPublications.module#LibAdvancedSearchPublicationsModule' },
-      { path: 'search/advanced/datasets', loadChildren: './searchPages/advanced/advancedSearchDatasets.module#LibAdvancedSearchDatasetsModule' },
-      { path: 'search/advanced/software', loadChildren: './searchPages/advanced/advancedSearchSoftware.module#LibAdvancedSearchSoftwareModule' },
-      { path: 'search/advanced/organizations', loadChildren: './searchPages/advanced/advancedSearchOrganizations.module#LibAdvancedSearchOrganizationsModule' },
-      { path: 'search/advanced/dataproviders', loadChildren: './searchPages/advanced/advancedSearchDataProviders.module#LibAdvancedSearchDataProvidersModule' },
-      { path: 'search/advanced/projects', loadChildren: './searchPages/advanced/advancedSearchProjects.module#LibAdvancedSearchProjectsModule' },
-      { path: 'project-report', loadChildren: './landingPages/htmlProjectReport/libHtmlProjectReport.module#LibHtmlProjectReportModule' },
-      { path: 'myclaims', loadChildren: './claims/myClaims/myClaims.module#LibMyClaimsModule' },
-      { path: 'claims', loadChildren: './claims/claimsAdmin/claimsAdmin.module#LibClaimsAdminModule' },
-      { path: 'participate/claim', loadChildren: './claims/linking/linkingGeneric.module#LibLinkingGenericModule' },
-      { path: 'participate/direct-claim', loadChildren: './claims/directLinking/directLinking.module#LibDirectLinkingModule' },
-      { path: 'claims-project-manager', loadChildren: './claims/claimsByToken/claimsByToken.module#LibClaimsByTokenModule' },
-      { path: 'reload', loadChildren: './reload/libReload.module#LibReloadModule' },
-      { path: 'user-info', loadChildren: './login/libUser.module#LibUserModule' },
-      { path: 'error', component: OpenaireErrorPageComponent },
-      { path: '**',pathMatch: 'full',component: OpenaireErrorPageComponent }
-    ]),
+     AppRoutingModule
+
   ],
   declarations: [ AppComponent, OpenaireErrorPageComponent],
   exports: [ AppComponent ],
- providers:[ CommunityService ],
+ providers:[EnvironmentSpecificResolver , CommunityService ],
  bootstrap: [AppComponent]
 })
 //
diff --git a/src/app/claims/claimsAdmin/claimsAdmin-routing.module.ts b/src/app/claims/claimsAdmin/claimsAdmin-routing.module.ts
index cd92c4e..ed7b539 100644
--- a/src/app/claims/claimsAdmin/claimsAdmin-routing.module.ts
+++ b/src/app/claims/claimsAdmin/claimsAdmin-routing.module.ts
@@ -2,13 +2,13 @@ import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import { OpenaireClaimsAdminComponent } from './claimsAdmin.component';
 import{ PreviousRouteRecorder, IsRouteEnabled ,AdminLoginGuard} from 'ng-openaire-library';
-
+import {Properties} from '../../utils/properties';
 
 @NgModule({
   imports: [
     RouterModule.forChild([
       { path: '', component: OpenaireClaimsAdminComponent, canActivate: [IsRouteEnabled, AdminLoginGuard],
-      data: {redirect: '/error'}, canDeactivate: [PreviousRouteRecorder]}])
+      data: {redirect: '/error', api: Properties.adminToolsAPIURL, community :Properties.adminToolsCommunity}, canDeactivate: [PreviousRouteRecorder]}])
   ]
 })
 export class ClaimsAdminRoutingModule { }
diff --git a/src/app/claims/claimsByToken/claimsByToken-routing.module.ts b/src/app/claims/claimsByToken/claimsByToken-routing.module.ts
index 91c2961..2a0698a 100644
--- a/src/app/claims/claimsByToken/claimsByToken-routing.module.ts
+++ b/src/app/claims/claimsByToken/claimsByToken-routing.module.ts
@@ -2,12 +2,12 @@ import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import { OpenaireClaimsByTokenComponent } from './claimsByToken.component';
 import{ PreviousRouteRecorder, IsRouteEnabled ,LoginGuard} from 'ng-openaire-library';
-
+import {Properties} from '../../utils/properties';
 @NgModule({
   imports: [
     RouterModule.forChild([
       { path: '', component: OpenaireClaimsByTokenComponent, canActivate: [IsRouteEnabled, LoginGuard],
-      data: {redirect: '/error'}, canDeactivate: [PreviousRouteRecorder]}])
+      data: {redirect: '/error', api: Properties.adminToolsAPIURL, community :Properties.adminToolsCommunity}, canDeactivate: [PreviousRouteRecorder]}])
   ]
 })
 export class ClaimsByTokenRoutingModule { }
diff --git a/src/app/claims/directLinking/directLinking-routing.module.ts b/src/app/claims/directLinking/directLinking-routing.module.ts
index f73f859..1aec2fe 100644
--- a/src/app/claims/directLinking/directLinking-routing.module.ts
+++ b/src/app/claims/directLinking/directLinking-routing.module.ts
@@ -3,12 +3,12 @@ import { RouterModule } from '@angular/router';
 
 import { OpenaireDirectLinkingComponent } from './directLinking.component';
 import{ PreviousRouteRecorder, IsRouteEnabled, LoginGuard} from 'ng-openaire-library';
-
+import {Properties} from '../../utils/properties';
 @NgModule({
   imports: [
     RouterModule.forChild([
       { path: '', component: OpenaireDirectLinkingComponent, canActivate: [IsRouteEnabled, LoginGuard], data: {
-          redirect: '/error'
+          redirect: '/error', api: Properties.adminToolsAPIURL, community :Properties.adminToolsCommunity
         }, canDeactivate: [PreviousRouteRecorder]},
 
     ])
diff --git a/src/app/claims/linking/linking-routing.module.ts b/src/app/claims/linking/linking-routing.module.ts
index 4a48405..70cfe73 100644
--- a/src/app/claims/linking/linking-routing.module.ts
+++ b/src/app/claims/linking/linking-routing.module.ts
@@ -3,12 +3,12 @@ import { RouterModule } from '@angular/router';
 import { OpenaireLinkingComponent } from './linkingGeneric.component';
 
 import{ PreviousRouteRecorder, IsRouteEnabled, LoginGuard} from 'ng-openaire-library';
-
+import {Properties} from '../../utils/properties';
 @NgModule({
   imports: [
     RouterModule.forChild([
       { path: '', component: OpenaireLinkingComponent, canActivate: [IsRouteEnabled, LoginGuard], data: {
-          redirect: '/error'
+          redirect: '/error', api: Properties.adminToolsAPIURL, community :Properties.adminToolsCommunity
         }, canDeactivate: [PreviousRouteRecorder]},
 
     ])
diff --git a/src/app/claims/myClaims/myClaims-routing.module.ts b/src/app/claims/myClaims/myClaims-routing.module.ts
index 665e3b1..9a2c678 100644
--- a/src/app/claims/myClaims/myClaims-routing.module.ts
+++ b/src/app/claims/myClaims/myClaims-routing.module.ts
@@ -3,12 +3,12 @@ import { RouterModule } from '@angular/router';
 
 import {OpenaireMyClaimsComponent } from './myClaims.component';
 import{ PreviousRouteRecorder, IsRouteEnabled, LoginGuard} from 'ng-openaire-library';
-
+import {Properties} from '../../utils/properties';
 @NgModule({
   imports: [
     RouterModule.forChild([
       { path: '', component: OpenaireMyClaimsComponent, canActivate: [IsRouteEnabled, LoginGuard],
-      data: {redirect: '/error'}, canDeactivate: [PreviousRouteRecorder]}])
+      data: {redirect: '/error', api: Properties.adminToolsAPIURL, community :Properties.adminToolsCommunity}, canDeactivate: [PreviousRouteRecorder]}])
   ]
 })
 export class MyClaimsRoutingModule { }
diff --git a/src/app/communities/communities.component.html b/src/app/communities/communities.component.html
index 7a5d9ef..a233010 100644
--- a/src/app/communities/communities.component.html
+++ b/src/app/communities/communities.component.html
@@ -1,5 +1,72 @@
-<div class=" uk-section  uk-margin-small-top tm-middle uk-container" id="tm-main">
 
-  <div >Communities goes here..</div>
+  <div class="image-front-topbar uk-section-default uk-light" tm-header-transparent="light" tm-header-transparent-placeholder="">
+  <div
+   class="mainPageSearchForm uk-background-norepeat uk-background-cover uk-background-top-center uk-section uk-padding-remove-bottom uk-flex uk-flex-middle" uk-height-viewport="offset-top: true;offset-bottom: 20">
+   <div class="uk-width-1-1">
+      <div class="uk-position-relative">
+         <div class="uk-container uk-margin-medium">
+            <div class="tm-header-placeholder uk-margin-medium" style="height: 84px;"></div>
+            <div class="search_box_bg uk-grid-large uk-flex-middle uk-grid uk-grid-stack" uk-grid="">
+               <div class="uk-width-1-1@m uk-first-column">
+                  <div data-id="page#4">
+                  <p class="uk-text-large uk-text-center">Welcome to Research Community Dashboard! </p>
+                  <p class="uk-text-large uk-text-center">Use a trusted partner to share, link, disseminate and monitor your research. </p>
+                  </div>
+               </div>
+            </div>
+         </div>
 
-</div>
+      </div>
+   </div>
+  </div>
+  </div>
+  <div class="uk-container uk-margin-top uk-margin-bottom">
+    <div class="uk-child-width-1-3@m uk-text-center " uk-grid>
+
+            <div>
+                <div class="uk-card uk-card-default">
+                    <div class="uk-card-media-top">
+                        <img src="" alt="A logo goes here">
+                    </div>
+                    <div class="uk-card-body">
+                        <h3 class="uk-card-title"><a   [queryParams]="{community: 'egi||EGI Federation'}" routerLinkActive="router-link-active" routerLink="/community">
+                          EGI Federation</a></h3>
+                        <p> EGI is a federated e-Infrastructure set up to provide advanced computing services for research and innovation.
+
+The EGI e-infrastructure is publicly-funded and comprises hundreds of data centres and cloud providers spread across Europe and worldwide.</p>
+                        <a class="uk-button uk-button-primary"> Subscribe</a>
+                    </div>
+                </div>
+            </div>
+
+
+            <div>
+                <div class="uk-card uk-card-default">
+                    <div class="uk-card-media-top">
+                        <img src="logo.png" alt="A logo goes here">
+                    </div>
+                    <div class="uk-card-body">
+                        <h3 class="uk-card-title"><a>Environment and Economy Research Community</a></h3>
+                        <p>the national/EU node of the United Nations Sustainable Development Solutions Network sets out to build an infrastructure to gather all publications, data (in repositories and in Public Sector Information portals), and link them to EU and national funding </p>
+                        <a class="uk-button uk-button-primary"> Subscribe</a>
+                    </div>
+                </div>
+            </div>
+
+            <div>
+                <div class="uk-card uk-card-default">
+                    <div class="uk-card-media-top">
+                        <img src="logo.png" alt="A logo goes here">
+                    </div>
+                    <div class="uk-card-body">
+                        <h3 class="uk-card-title"><a>Marine environmental science</a></h3>
+                        <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+                          Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
+                          </p>
+                        <a class="uk-button uk-button-primary"> Subscribe</a>
+                    </div>
+                </div>
+            </div>
+
+    </div>
+  </div>
diff --git a/src/app/communities/communities.component.ts b/src/app/communities/communities.component.ts
index 480147f..2659669 100644
--- a/src/app/communities/communities.component.ts
+++ b/src/app/communities/communities.component.ts
@@ -3,7 +3,7 @@ import {Observable}       from 'rxjs/Observable';
 import {ActivatedRoute, Router} from '@angular/router';
 import {Location} from '@angular/common';
 import "rxjs/add/observable/zip";
-import { Meta, MetaDefinition, ConfigurationService} from 'ng-openaire-library';
+import { Meta, MetaDefinition, ConfigurationService, EnvProperties} from 'ng-openaire-library';
 
 import { ErrorCodes, RouterHelper, PiwikService} from 'ng-openaire-library';
 import {Properties} from '../utils/properties';
@@ -18,7 +18,7 @@ export class CommunitiesComponent {
   public subfunders: any;
 
   public pageTitle = "OpenAIRE"
-
+properties:EnvProperties;
 
 
   constructor (
@@ -28,25 +28,30 @@ export class CommunitiesComponent {
       private config: ConfigurationService
     ) {
 
-          var description = "open access, research, scientific publication, European Commission, EC, FP7, ERC, Horizon 2020, H2020, search, projects ";
+                var description = "open access, research, scientific publication, European Commission, EC, FP7, ERC, Horizon 2020, H2020, search, projects ";
 
-          var title = "OpenAIRE";
+                var title = "OpenAIRE";
 
-          var url = Properties.getBaseLink()+this._router.url;
-          this._meta.setTitle(title);
-          this._meta.updateMeta("description", description);
-          this._meta.updateProperty("og:description", description);
-          this._meta.updateProperty("og:title", title);
-          this._meta.updateProperty("og:url", url);
+                this._meta.setTitle(title);
+                this._meta.updateMeta("description", description);
+                this._meta.updateProperty("og:description", description);
+                this._meta.updateProperty("og:title", title);
 
 
-          if(Properties.isPiwikTrackEnabled() && (typeof document !== 'undefined')){
-            this.piwiksub = this._piwikService.trackView("OpenAIRE").subscribe();
-          }
 
-  }
+        }
 
-  public ngOnInit() {
+        public ngOnInit() {
+          this.route.data
+              .subscribe((data: { envSpecific: EnvProperties }) => {
+                 this.properties = data.envSpecific;
+                 var url = data.envSpecific.baseLink+this._router.url
+                 this._meta.updateProperty("og:url", url);
+                 if(this.properties.enablePiwikTrack && (typeof document !== 'undefined')){
+                   this.piwiksub = this._piwikService.trackView("OpenAIRE").subscribe();
+                 }
+
+              });
   }
   public ngOnDestroy() {
     if(this.piwiksub){
diff --git a/src/app/community/community.component.html b/src/app/community/community.component.html
index 7bcf684..d344165 100644
--- a/src/app/community/community.component.html
+++ b/src/app/community/community.component.html
@@ -5,26 +5,27 @@
   <article class="uk-article ">
     <a class="uk-button uk-button-primary uk-align-right"> Subscribe</a>
       <blockquote>
-        <p>the ATLAS community relies on thematic data archives (Pangaea) whose datasets are packages of datasets and related literature, aiming to link to different scientific domains</p>
+        <p>EGI is a federated e-Infrastructure set up to provide advanced computing services for research and innovation. The EGI e-infrastructure is publicly-funded and comprises hundreds of data centres and cloud providers spread across Europe and worldwide.</p>
       </blockquote>
       <p><span class="uk-label">Nature</span>&nbsp;<span class=" uk-label uk-label-danger">Life science</span>&nbsp;<span class="uk-label uk-label-success">Environment</span></p>
       <p> <span>Curated by: Tom</span> <span class="uk-margin-left"> Created: 26-01-2018</span> </p>
       <div class="uk-child-width-1-6@l uk-child-width-1-6@m uk-child-width-1-3@s uk-text-center uk-grid" uk-grid="">
         <div class="uk-first-column">
             <div class="uk-card uk-card-default uk-card-small uk-card-body">
-                <a><h3 class="uk-card-title">{{publications.total}}</h3>
+                <a [queryParams]=params routerLinkActive="router-link-active" routerLink="/search/find/publications" ><h3 class="uk-card-title">{{publications.total}}</h3>
                 <p>publications</p></a>
+
             </div>
         </div>
         <div>
           <div class="uk-card uk-card-default uk-card-small uk-card-body">
-              <a><h3 class="uk-card-title">{{reasearchData.total}}</h3>
+              <a [queryParams]=params routerLinkActive="router-link-active" routerLink="/search/find/datasets"><h3 class="uk-card-title">{{reasearchData.total}}</h3>
               <p>research data</p></a>
           </div>
         </div>
         <div>
           <div class="uk-card uk-card-default uk-card-small uk-card-body">
-              <a><h3 class="uk-card-title">{{software.total}}</h3>
+              <a [queryParams]=params routerLinkActive="router-link-active" routerLink="/search/find/software"><h3 class="uk-card-title">{{software.total}}</h3>
               <p>software</p></a>
           </div>
         </div>
@@ -60,151 +61,118 @@
                <div class="uk-first-column">
                   <div class="el-item uk-panel">
                     <h6 class="el-title uk-margin uk-h6 uk-text-primary uk-margin-remove-adjacent uk-margin-remove-bottom">
-                      {{item.result["metadata"]["oaf:entity"]["oaf:result"]["title"]["content"]}}
+
+                      <a [queryParams]="{articleId: item.id, community: 'egi||EGI Federation'}" routerLinkActive="router-link-active" routerLink="/search/publication" >
+                      {{item.title}}</a>
                     </h6>
-                      <div class="el-content uk-margin"><span class=" uk-label uk-label-danger">{{item.result["metadata"]["oaf:entity"]["oaf:result"]["bestaccessright"]["classid"]}}</span><br></div>
+                      <div class="el-content  "><span class=" uk-label label-{{item.bestaccessright}}">{{item.bestaccessright}}</span><br></div>
                       <!--authors-->
-                      <div *ngFor='let item1 of item.result["metadata"]["oaf:entity"]["oaf:result"]["creator"]; let i = index'>
-                        <div class="el-meta uk-margin uk-text-meta">{{item1["content"]}}</div>
-                      </div>
-                      <div class="el-meta uk-margin uk-text-meta"> {{item.result["metadata"]["oaf:entity"]["oaf:result"]["dateofacceptance"]}} </div>
-                      <div class="text-justify descriptionText"> {{item.result["metadata"]["oaf:entity"]["oaf:result"]["description"]}} </div>
+                      <span *ngFor='let item1 of item.authors; let i = index'>
+                        <span  class="el-meta uk-margin uk-text-meta">{{item1["content"]}}</span><span  *ngIf='i< item.authors.length -1'  class="el-meta uk-margin uk-text-meta">, </span>
+                      </span>
+
+
+
+                      <div class="el-meta uk-margin uk-text-meta"> {{item.dateofacceptance}} </div>
+                      <!--div class="text-justify descriptionText"> {{item.description}} </div-->
                   </div>
                </div>
               </li>
             </div>
             <!--end of test-->
-            <div class="uk-margin-remove-vertical uk-grid-match uk-child-width-1-1 uk-child-width-1-1@m uk-child-width-1-1@l uk-child-width-1-1@xl uk-grid-small uk-grid-divider uk-grid uk-grid-stack" uk-grid="">
-               <div class="uk-first-column">
-                  <div class="el-item uk-panel">
-                     <h6 class="el-title uk-margin uk-h6 uk-text-primary uk-margin-remove-adjacent uk-margin-remove-bottom">
-                        Aaltodoc Publication Archive
-                     </h6>
-                     <div class="el-meta uk-margin uk-text-meta">Aalto University</div>
-                     <div class="el-content uk-margin"><span class="uk-label">IR</span>&nbsp;<span class=" uk-label uk-label-danger">Data</span>&nbsp;<span class="uk-label uk-label-success">OpenAIRE 3.0</span><br>
-                        12469 datasets
-                     </div>
-                  </div>
-               </div>
-               <div class="uk-grid-margin uk-first-column">
-                  <div class="el-item uk-panel">
-                     <h6 class="el-title uk-margin uk-h6 uk-text-primary uk-margin-remove-adjacent uk-margin-remove-bottom">
-                        Cambridge Server
-                     </h6>
-                     <div class="el-meta uk-margin uk-text-meta">Cambridge Uviversity</div>
-                     <div class="el-content uk-margin"><span class="uk-label">IR</span>&nbsp;<span class=" uk-label uk-label-warning">Literature</span>&nbsp;<span class="uk-label uk-label-success" style="background-color:orange!important">OpenAIRE 2.0</span><br>
-                        4567 publications
-                     </div>
-                  </div>
-               </div>
-            </div>
+
             <hr>
             <div class="uk-margin">
-               <a class="el-content uk-button uk-button-text" routerlink="/search/find/dataproviders" routerlinkactive="uk-link" href="http://scoobydoo.di.uoa.gr/search/find/dataproviders">
+               <a class="el-content uk-button uk-button-text"  [queryParams]=params routerLinkActive="router-link-active" routerLink="/search/find/publications" >
                View all
-               </a>
+             </a>
             </div>
          </div>
          <div class="uk-width-expand@m">
             <h2 class="uk-h3 uk-heading-line uk-text-primary">
                <span>Most recent research data</span>
             </h2>
-
-            <!-- <div class="uk-margin-remove-vertical uk-grid-match uk-child-width-1-1 uk-child-width-1-1@m uk-child-width-1-1@l uk-child-width-1-1@xl uk-grid-small uk-grid-divider uk-grid uk-grid-stack" uk-grid="">
-              <li *ngFor="let item2 of researchDataInfo; let i = index">
+            <div class="uk-margin-remove-vertical uk-grid-match uk-child-width-1-1 uk-child-width-1-1@m uk-child-width-1-1@l uk-child-width-1-1@xl uk-grid-small uk-grid-divider uk-grid uk-grid-stack" uk-grid="">
+              <li *ngFor="let item of researchDataInfo; let i = index">
                <div class="uk-first-column">
                   <div class="el-item uk-panel">
                     <h6 class="el-title uk-margin uk-h6 uk-text-primary uk-margin-remove-adjacent uk-margin-remove-bottom">
-                      {{item2.result["metadata"]["oaf:entity"]["oaf:result"]["title"]["content"]}}
+                      <a [queryParams]="{articleId: item.id, community: 'egi||EGI Federation'}" routerLinkActive="router-link-active" routerLink="/search/publication" >
+                      {{item.title}}</a>
                     </h6>
-                      <div class="el-content uk-margin"><span class=" uk-label uk-label-danger">{{item2.result["metadata"]["oaf:entity"]["oaf:result"]["bestaccessright"]["classid"]}}</span><br></div>
+                      <div class="el-content  "><span class=" uk-label label-{{item.bestaccessright}}">{{item.bestaccessright}}</span><br></div>
                       <!--authors-->
-                      <!-- <div *ngFor='let item3 of item2.result["metadata"]["oaf:entity"]["oaf:result"]["creator"]; let i = index'>
-                        <div class="el-meta uk-margin uk-text-meta">{{item3["content"]}}</div>
-                      </div>
-                      <div class="el-meta uk-margin uk-text-meta"> {{item2.result["metadata"]["oaf:entity"]["oaf:result"]["dateofacceptance"]}} </div>
-                      <div class="text-justify descriptionText"> {{item2.result["metadata"]["oaf:entity"]["oaf:result"]["description"]}} </div>
+                      <span *ngFor='let item1 of item.authors; let i = index'>
+                        <span  class="el-meta uk-margin uk-text-meta">{{item1["content"]}}</span><span  *ngIf='i< item.authors.length -1'  class="el-meta uk-margin uk-text-meta">, </span>
+                      </span>
+
+
+
+                      <div class="el-meta uk-margin uk-text-meta"> {{item.dateofacceptance}} </div>
+                      <!--div class="text-justify descriptionText"> {{item.description}} </div-->
                   </div>
                </div>
               </li>
-            </div> -->
-
-            <div class="uk-margin-remove-vertical uk-grid-match uk-child-width-1-1 uk-child-width-1-1@m uk-child-width-1-1@l uk-child-width-1-1@xl uk-grid-small uk-grid-divider uk-grid uk-grid-stack" uk-grid="">
-               <div class="uk-first-column">
-                  <div class="el-item uk-panel">
-                     <h6 class="el-title uk-margin uk-h6 uk-text-primary uk-margin-remove-adjacent uk-margin-remove-bottom">
-                        Swiss National Science Foundation
-                     </h6>
-                     <div class="el-meta uk-margin uk-text-meta">Switzerland</div>
-                     <div class="el-content uk-margin"><span class="uk-label">OA mandate</span><br> 47.509 publications</div>
-                  </div>
-               </div>
-               <div class="uk-grid-margin uk-first-column">
-                  <div class="el-item uk-panel">
-                     <h6 class="el-title uk-margin uk-h6 uk-text-primary uk-margin-remove-adjacent uk-margin-remove-bottom">
-                        Ministry of Education, Science and Technological Development of Republic of Serbia
-                     </h6>
-                     <div class="el-meta uk-margin uk-text-meta">Serbia</div>
-                     <div class="el-content uk-margin">7.942 publicatios</div>
-                  </div>
-               </div>
             </div>
+            <div *ngIf = "researchDataInfo.length == 0 " class=" uk-alert uk-alert-primary"> No results found</div>
+
+            <hr>
+            <div *ngIf = "researchDataInfo.length > 0 " class="uk-margin">
+               <a class="el-content uk-button uk-button-text"  [queryParams]=params routerLinkActive="router-link-active" routerLink="/search/find/datasets" >
+               View all
+             </a>
+            </div>
+
+
+
          </div>
          <div class="uk-width-expand@m">
             <h2 class="uk-h3 uk-heading-line uk-text-primary">
                <span>Most recent software</span>
             </h2>
 
-            <!-- <div class="uk-margin-remove-vertical uk-grid-match uk-child-width-1-1 uk-child-width-1-1@m uk-child-width-1-1@l uk-child-width-1-1@xl uk-grid-small uk-grid-divider uk-grid uk-grid-stack" uk-grid="">
-              <li *ngFor="let item4 of publicationsInfo; let i = index">
+            <div class="uk-margin-remove-vertical uk-grid-match uk-child-width-1-1 uk-child-width-1-1@m uk-child-width-1-1@l uk-child-width-1-1@xl uk-grid-small uk-grid-divider uk-grid uk-grid-stack" uk-grid="">
+              <li *ngFor="let item of softwareInfo; let i = index">
                <div class="uk-first-column">
                   <div class="el-item uk-panel">
                     <h6 class="el-title uk-margin uk-h6 uk-text-primary uk-margin-remove-adjacent uk-margin-remove-bottom">
-                      {{item4.result["metadata"]["oaf:entity"]["oaf:result"]["title"]["content"]}}
+                      <a [queryParams]="{articleId: item.id, community: 'egi||EGI Federation'}" routerLinkActive="router-link-active" routerLink="/search/publication" >
+                      {{item.title}}</a>
                     </h6>
-                      <div class="el-content uk-margin"><span class=" uk-label uk-label-danger">{{item4.result["metadata"]["oaf:entity"]["oaf:result"]["bestaccessright"]["classid"]}}</span><br></div>
+                      <div class="el-content  "><span class=" uk-label label-{{item.bestaccessright}}">{{item.bestaccessright}}</span><br></div>
                       <!--authors-->
-                      <!-- <div *ngFor='let item4 of item5.result["metadata"]["oaf:entity"]["oaf:result"]["creator"]; let i = index'>
-                        <div class="el-meta uk-margin uk-text-meta">{{item4["content"]}}</div>
-                      </div>
-                      <div class="el-meta uk-margin uk-text-meta"> {{item4.result["metadata"]["oaf:entity"]["oaf:result"]["dateofacceptance"]}} </div>
-                      <div class="text-justify descriptionText"> {{item4.result["metadata"]["oaf:entity"]["oaf:result"]["description"]}} </div>
+                      <span *ngFor='let item1 of item.authors; let i = index'>
+                        <span  class="el-meta uk-margin uk-text-meta">{{item1["content"]}}</span><span  *ngIf='i< item.authors.length -1'  class="el-meta uk-margin uk-text-meta">, </span>
+                      </span>
+
+
+
+                      <div class="el-meta uk-margin uk-text-meta"> {{item.dateofacceptance}} </div>
+                      <!--div class="text-justify descriptionText"> {{item.description}} </div-->
                   </div>
                </div>
               </li>
-            </div> -->
-
-
-            <div class="uk-margin-remove-vertical uk-grid-match uk-child-width-1-1 uk-child-width-1-1@m uk-child-width-1-1@l uk-child-width-1-1@xl uk-grid-small uk-grid-divider uk-grid uk-grid-stack" uk-grid="">
-               <div class="uk-first-column">
-                  <div class="el-item uk-panel">
-                     <h6 class="el-title uk-margin uk-h6 uk-text-primary uk-margin-remove-adjacent uk-margin-remove-bottom">
-                        Swiss National Science Foundation
-                     </h6>
-                     <div class="el-meta uk-margin uk-text-meta">Switzerland</div>
-                     <div class="el-content uk-margin"><span class="uk-label">OA mandate</span><br> 47.509 publications</div>
-                  </div>
-               </div>
-               <div class="uk-grid-margin uk-first-column">
-                  <div class="el-item uk-panel">
-                     <h6 class="el-title uk-margin uk-h6 uk-text-primary uk-margin-remove-adjacent uk-margin-remove-bottom">
-                        Ministry of Education, Science and Technological Development of Republic of Serbia
-                     </h6>
-                     <div class="el-meta uk-margin uk-text-meta">Serbia</div>
-                     <div class="el-content uk-margin">7.942 publicatios</div>
-                  </div>
-               </div>
             </div>
+
+            <hr>
+            <div class="uk-margin">
+               <a class="el-content uk-button uk-button-text"  [queryParams]=params routerLinkActive="router-link-active" routerLink="/search/find/software" >
+               View all
+             </a>
+            </div>
+
+
+
          </div>
       </div>
       <div class="uk-grid">
         <div class="uk-text-center  uk-width-1-2@m uk-width-1-1@s">
           <p class="uk-text-large"> Publications through the years</p>
-          <img alt="stats" class="uk-responsive-width" src="./OpenAIRE-Connect Admin Tools_files/stats1.png">
+          <img alt="stats" class="uk-responsive-width" src="./assets/stats1.png">
         </div>
         <div class="uk-text-center  uk-width-1-2@m uk-width-1-1@s">
-          <p class="uk-text-large"> Word cloud</p>
-          <img alt="stats" class="uk-responsive-width" src="./OpenAIRE-Connect Admin Tools_files/wordcloud.svg">
+          <p class="uk-text-large"> Publications per project</p>
+          <img alt="stats" class="uk-responsive-width" src="./assets/pub-per-pr.png">
         </div>
       </div>
   </article>
diff --git a/src/app/community/community.component.ts b/src/app/community/community.component.ts
index 6afff5b..f9da344 100644
--- a/src/app/community/community.component.ts
+++ b/src/app/community/community.component.ts
@@ -5,7 +5,7 @@ import {Location} from '@angular/common';
 import "rxjs/add/observable/zip";
 import { Meta, MetaDefinition, ConfigurationService} from 'ng-openaire-library';
 
-import { ErrorCodes, RouterHelper, PiwikService} from 'ng-openaire-library';
+import { ErrorCodes, RouterHelper, PiwikService, EnvProperties} from 'ng-openaire-library';
 import {Properties} from '../utils/properties';
 import {CommunityService} from "./community.service";
 
@@ -27,6 +27,8 @@ export class CommunityComponent {
   public publicationsInfo=[];
   public researchDataInfo=[];
   public softwareInfo=[];
+  params = {community: encodeURIComponent('"egi||EGI Federation"')};
+  properties:EnvProperties;
 
   //public publicationsInfo: PublicationInfo[] = [];
 
@@ -42,21 +44,26 @@ export class CommunityComponent {
 
           var title = "OpenAIRE";
 
-          var url = Properties.getBaseLink()+this._router.url;
           this._meta.setTitle(title);
           this._meta.updateMeta("description", description);
           this._meta.updateProperty("og:description", description);
           this._meta.updateProperty("og:title", title);
-          this._meta.updateProperty("og:url", url);
 
 
-          if(Properties.isPiwikTrackEnabled() && (typeof document !== 'undefined')){
-            this.piwiksub = this._piwikService.trackView("OpenAIRE").subscribe();
-          }
 
   }
 
   public ngOnInit() {
+    this.route.data
+        .subscribe((data: { envSpecific: EnvProperties }) => {
+           this.properties = data.envSpecific;
+           var url = data.envSpecific.baseLink+this._router.url
+           this._meta.updateProperty("og:url", url);
+           if(this.properties.enablePiwikTrack && (typeof document !== 'undefined')){
+             this.piwiksub = this._piwikService.trackView("OpenAIRE").subscribe();
+           }
+
+        });
     this._communityService.getNumberOfPublications().subscribe(
       publications => {
                 this.publications = publications;
diff --git a/src/app/community/community.service.ts b/src/app/community/community.service.ts
index 775de59..4e069ec 100644
--- a/src/app/community/community.service.ts
+++ b/src/app/community/community.service.ts
@@ -17,8 +17,13 @@ export class CommunityService {
 
     // Most recent publications
     getPublicationsInfo(){
-        return this.http.get('http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/publications?fq=communityid exact "egi"&sortBy=resultdateofacceptance,descending&format=json')
-                        .map(res => <any> res.json()).map(res => res.results).do(res => {console.log(res)});
+        return this.http.get('http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/publications?fq=communityid exact "egi"&sortBy=resultdateofacceptance,descending&format=json&size=5')
+                        .map(res => <any> res.json()).map(res => this.parse(res)).do(res => {console.log(res)});
+
+    }
+    getDatasetsInfo(){
+        return this.http.get('http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/datasets?fq=communityid exact "egi"&sortBy=resultdateofacceptance,descending&format=json&size=5')
+                        .map(res => <any> res.json()).map(res => this.parse(res)).do(res => {console.log(res)});
 
     }
 
@@ -28,7 +33,7 @@ export class CommunityService {
     }
 
     getResearchDataInfo() {
-        return this.http.get('http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/datasets?fq=communityid exact "egi"&sortBy=resultdateofacceptance,descending&format=json')
+        return this.http.get('http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/datasets?fq=communityid exact "egi"&sortBy=resultdateofacceptance,descending&format=json&size=5')
                         .map(res => <any> res.json()).map(res => res.results).do(res => {console.log(res)});
     }
 
@@ -39,9 +44,31 @@ export class CommunityService {
 
     getSoftwareInfo() {
         return this.http.get('http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/software?fq=communityid exact "egi"&sortBy=resultdateofacceptance,descending&format=json')
-                        .map(res => <any> res.json()).map(res => res.results).do(res => {console.log(res)});
+                        .map(res => <any> res.json()).map(res => this.parse(res)).do(res => {console.log(res)});
     }
+    parse(res){
+      var results =[];
+      for(let item of res.results){
+        var result= {};
 
+        result["id"] = item.result["header"]["dri:objIdentifier"];
+        result["title"] = item.result["metadata"]["oaf:entity"]["oaf:result"]["title"]["content"];
+        result["bestaccessright"] = item.result["metadata"]["oaf:entity"]["oaf:result"]["bestaccessright"]["classid"];
+        result["date"]=item.result["metadata"]["oaf:entity"]["oaf:result"]["dateofacceptance"];
+        result["description"]= item.result["metadata"]["oaf:entity"]["oaf:result"]["description"];
+
+        result["authors"] = [];
+        if(Array.isArray(item.result["metadata"]["oaf:entity"]["oaf:result"]["creator"])){
+          result["authors"] = item.result["metadata"]["oaf:entity"]["oaf:result"]["creator"];
+        }else{
+          result["authors"].push(item.result["metadata"]["oaf:entity"]["oaf:result"]["creator"]);
+        }
+        result["authors"] = result["authors"].slice(0,10);
+
+        results.push(result);
+      }
+      return results;
+    }
     // getPublicationInfo(url: string) {
     //     return this.http.get(url).map(res => <any> res.json()).map(res => res.results).do(res => {console.log(res)});
     // }
diff --git a/src/app/deposit/datasets/depositBySubjectResult-routing.module.ts b/src/app/deposit/datasets/depositBySubjectResult-routing.module.ts
index c5039b7..1009d1e 100644
--- a/src/app/deposit/datasets/depositBySubjectResult-routing.module.ts
+++ b/src/app/deposit/datasets/depositBySubjectResult-routing.module.ts
@@ -3,12 +3,12 @@ import { RouterModule } from '@angular/router';
 
 import { OpenaireDepositBySubjectResultComponent } from './depositBySubjectResult.component';
 import {  FreeGuard,PreviousRouteRecorder,IsRouteEnabled} from 'ng-openaire-library';
-
+import {Properties} from '../../utils/properties';
 @NgModule({
   imports: [
     RouterModule.forChild([
      	{ path: '', component: OpenaireDepositBySubjectResultComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-          redirect: '/error'
+          redirect: '/error', api: Properties.adminToolsAPIURL, community :Properties.adminToolsCommunity
         },canDeactivate: [PreviousRouteRecorder]   }
 
     ])
diff --git a/src/app/deposit/datasets/depositDatasets-routing.module.ts b/src/app/deposit/datasets/depositDatasets-routing.module.ts
index c5e3b1d..70d0080 100644
--- a/src/app/deposit/datasets/depositDatasets-routing.module.ts
+++ b/src/app/deposit/datasets/depositDatasets-routing.module.ts
@@ -3,12 +3,12 @@ import { RouterModule } from '@angular/router';
 
 import { OpenaireDepositDatasetsComponent } from './depositDatasets.component';
 import {  FreeGuard,PreviousRouteRecorder,IsRouteEnabled} from 'ng-openaire-library';
-
+import {Properties} from '../../utils/properties';
 @NgModule({
   imports: [
     RouterModule.forChild([
      	{ path: '', component: OpenaireDepositDatasetsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-          redirect: '/error'
+          redirect: '/error', api: Properties.adminToolsAPIURL, community :Properties.adminToolsCommunity
         },canDeactivate: [PreviousRouteRecorder]  }
 
     ])
diff --git a/src/app/deposit/datasets/depositDatasetsResults-routing.module.ts b/src/app/deposit/datasets/depositDatasetsResults-routing.module.ts
index ab0eb90..b40575d 100644
--- a/src/app/deposit/datasets/depositDatasetsResults-routing.module.ts
+++ b/src/app/deposit/datasets/depositDatasetsResults-routing.module.ts
@@ -2,12 +2,12 @@ import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import { OpenaireDepositDatasetsResultComponent } from './depositDatasetsResult.component';
 import {  FreeGuard,PreviousRouteRecorder,IsRouteEnabled} from 'ng-openaire-library';
-
+import {Properties} from '../../utils/properties';
 @NgModule({
   imports: [
     RouterModule.forChild([
      	{ path: '', component: OpenaireDepositDatasetsResultComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-          redirect: '/error'
+          redirect: '/error', api: Properties.adminToolsAPIURL, community :Properties.adminToolsCommunity
         },canDeactivate: [PreviousRouteRecorder]  }
 
     ])
diff --git a/src/app/deposit/publications/depositPublications-routing.module.ts b/src/app/deposit/publications/depositPublications-routing.module.ts
index 3f27028..58607fc 100644
--- a/src/app/deposit/publications/depositPublications-routing.module.ts
+++ b/src/app/deposit/publications/depositPublications-routing.module.ts
@@ -2,12 +2,12 @@ import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import { OpenaireDepositPublicationsComponent } from './depositPublications.component';
 import {  FreeGuard,PreviousRouteRecorder,IsRouteEnabled} from 'ng-openaire-library';
-
+import {Properties} from '../../utils/properties';
 @NgModule({
   imports: [
     RouterModule.forChild([
       { path: '', component: OpenaireDepositPublicationsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-          redirect: '/error'
+          redirect: '/error', api: Properties.adminToolsAPIURL, community :Properties.adminToolsCommunity
         }, canDeactivate: [PreviousRouteRecorder]   }
 
     ])
diff --git a/src/app/deposit/publications/depositPublicationsResult-routing.module.ts b/src/app/deposit/publications/depositPublicationsResult-routing.module.ts
index 645a9df..b049907 100644
--- a/src/app/deposit/publications/depositPublicationsResult-routing.module.ts
+++ b/src/app/deposit/publications/depositPublicationsResult-routing.module.ts
@@ -2,12 +2,12 @@ import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import { OpenaireDepositPublicationsResultComponent } from './depositPublicationsResult.component';
 import {  FreeGuard,PreviousRouteRecorder,IsRouteEnabled} from 'ng-openaire-library';
- 
+import {Properties} from '../../utils/properties';
 @NgModule({
   imports: [
     RouterModule.forChild([
       { path: '', component: OpenaireDepositPublicationsResultComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-          redirect: '/error'
+          redirect: '/error', api: Properties.adminToolsAPIURL, community :Properties.adminToolsCommunity
         }, canDeactivate: [PreviousRouteRecorder] }
 
     ])
diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html
deleted file mode 100644
index ca69df5..0000000
--- a/src/app/home/home.component.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<div class="image-front-topbar uk-section-default uk-light" tm-header-transparent="light" tm-header-transparent-placeholder="">
-<div
- class="mainPageSearchForm uk-background-norepeat uk-background-cover uk-background-top-center uk-section uk-padding-remove-bottom uk-flex uk-flex-middle" uk-height-viewport="offset-top: true;offset-bottom: 20">
- <div class="uk-width-1-1">
-    <div class="uk-position-relative">
-       <div class="uk-container uk-margin-medium">
-          <div class="tm-header-placeholder uk-margin-medium" style="height: 84px;"></div>
-          <div class="search_box_bg uk-grid-large uk-flex-middle uk-grid uk-grid-stack" uk-grid="">
-             <div class="uk-width-1-1@m uk-first-column">
-                <div data-id="page#4">
-                <p class="uk-text-large uk-text-center">Welcome to Research Community Dashboard! </p>
-                <p class="uk-text-large uk-text-center">Use a trusted partner to share, link, disseminate and monitor your research. </p>
-                </div>
-             </div>
-          </div>
-       </div>
-
-    </div>
- </div>
-</div>
-</div>
-<div class="uk-container">
-  <div class="uk-child-width-1-3@m uk-text-center " uk-grid>
-          <div>
-              <div class="uk-card uk-card-default">
-                  <div class="uk-card-media-top">
-                      <img src="logo.png" alt="A logo goes here">
-                  </div>
-                  <div class="uk-card-body">
-                      <h3 class="uk-card-title"><a href="#">Neuroinformatics Research Community</a></h3>
-                      <p>the France Life Imaging national infrastructure produces data images linking them with methods (software services) producing packages for the context. </p>
-                      <a class="uk-button uk-button-primary"> Subscribe</a>
-                  </div>
-              </div>
-          </div>
-
-  </div>
-</div>
diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts
deleted file mode 100644
index f1bc8c3..0000000
--- a/src/app/home/home.component.ts
+++ /dev/null
@@ -1,174 +0,0 @@
-import {Component, Input, Output, EventEmitter, ViewChild, ChangeDetectionStrategy, ViewEncapsulation} from '@angular/core';
-import {Observable}       from 'rxjs/Observable';
-import {ActivatedRoute, Router} from '@angular/router';
-import {Location} from '@angular/common';
-import "rxjs/add/observable/zip";
-import { Meta, MetaDefinition, ConfigurationService} from 'ng-openaire-library';
-
-import {SearchPublicationsService, SearchDataprovidersService, SearchProjectsService, SearchDatasetsService, SearchOrganizationsService, SearchFields} from 'ng-openaire-library';
-import { ErrorCodes, RouterHelper, NumberUtils, RefineFieldResultsService, PiwikService} from 'ng-openaire-library';
-import {Properties} from '../utils/properties';
-
-
-@Component({
-    selector: 'home',
-    templateUrl: 'home.component.html',
-})
-export class HomeComponent {
-  public piwiksub: any;
-  public subfunders: any;
-
-  public pageTitle = "OpenAIRE"
-  public keyword:string = "";
-
-  public searchFields:SearchFields = new SearchFields();
-  public errorCodes:ErrorCodes = new ErrorCodes();
-  public routerHelper:RouterHelper = new RouterHelper();
-
-  public publicationsSize:any = null;
-  public datasetsSize:any = null;
-  public fundersSize:any = null;
-  public projectsSize:any = null;
-  public datasourcesSize:any = null;
-
-  showPublications:boolean= false;
-  showDatasets:boolean= false;
-  showProjects:boolean= false;
-  showDataProviders:boolean= false;
-
-public subPub;public subData;public subProjects;public subOrg; public subDataPr;
-
-  constructor (
-    private route: ActivatedRoute,
-      private _router: Router,
-      private _searchPublicationsService: SearchPublicationsService,
-      private _searchDataprovidersService: SearchDataprovidersService,
-      private _searchProjectsService: SearchProjectsService,
-      private _searchDatasetsService: SearchDatasetsService,
-      private _searchOrganizationsService: SearchOrganizationsService,
-      private _refineFieldResultsService:RefineFieldResultsService,
-      private location: Location, private _meta: Meta,private _piwikService:PiwikService,
-      private config: ConfigurationService
-    ) {
-
-          var description = "open access, research, scientific publication, European Commission, EC, FP7, ERC, Horizon 2020, H2020, search, projects ";
-
-          var title = "OpenAIRE";
-
-          var url = Properties.getBaseLink()+this._router.url;
-          this._meta.setTitle(title);
-          this._meta.updateMeta("description", description);
-          this._meta.updateProperty("og:description", description);
-          this._meta.updateProperty("og:title", title);
-          this._meta.updateProperty("og:url", url);
-
-          const entityOne = this.config.isEntityEnabled("publication");
-          const entityTwo = this.config.isEntityEnabled("dataset");
-          const entityThree = this.config.isEntityEnabled("project");
-          const entityFour = this.config.isEntityEnabled("datasource");
-          const example = Observable.zip(entityOne,entityTwo,entityThree,entityFour);
-
-      // wait until all observables have emitted a value then emit all as an array
-          example.subscribe(data => {
-               this.showPublications =  data[0];
-               this.showDatasets =  data[1];
-               this.showProjects =  data[2];
-               this.showDataProviders =  data[3];
-               this.getNumbers();
-          });
-          if(Properties.isPiwikTrackEnabled() && (typeof document !== 'undefined')){
-            this.piwiksub = this._piwikService.trackView("OpenAIRE").subscribe();
-          }
-
-  }
-
-  public ngOnInit() {
-  }
-  public ngOnDestroy() {
-    if(this.piwiksub){
-      this.piwiksub.unsubscribe();
-    }
-    if(this.subfunders){
-      this.subfunders.unsubscribe();
-    }
-        if(this.subPub){
-          this.subPub.unsubscribe();
-        }
-        if(this.subData){
-          this.subData.unsubscribe();
-        }
-    //     if(this.subProjects){
-    //       this.subProjects.unsubscribe();
-    //     }
-    //     if(this.subOrg){
-    //       this.subOrg.unsubscribe();
-    //     }
-        if(this.subDataPr){
-          this.subDataPr.unsubscribe();
-        }
-
-  }
-
-   private getNumbers() {
-     if(this.showPublications){
-       this.subPub = this._searchPublicationsService.numOfSearchPublications("").subscribe(
-               data => {
-                  console.log("Count results: "+data);
-                  if(data && data != null && data > 0 ){
-                      this.publicationsSize = NumberUtils.roundNumber(data);
-                      console.log("After round");
-
-                  }
-               },
-               err => {
-         		    console.log(err);
-          		 }
-        );
-      }
-      if(this.showDatasets){
-       this.subData = this._searchDatasetsService.numOfSearchDatasets("").subscribe(
-             data => {
-               if(data && data != null && data > 0 ){
-                   this.datasetsSize = NumberUtils.roundNumber(data);
-               }
-             },
-             err => {
-                 console.log(err);
-               }
-         );
-       }
-       if(this.showProjects){
-         this.subfunders = this._refineFieldResultsService.getRefineFieldsResultsByEntityName(["funder"],"project").subscribe(
-           data => {
-
-                console.info("Funders: "+data[1][0].title+ " values "+data[1][0].values.length+"]");
-                console.info("Projects: "+data[0]);
-
-                if(data[0] && data[0] > 0 ){
-                  this.projectsSize = NumberUtils.roundNumber(data[0]);
-                }
-                if(data[1].length > 0 && data[1][0].filterId == "funder" && data[1][0].values ){
-                  this.fundersSize = NumberUtils.roundNumber(data[1][0].values.length);
-                }
-
-           },
-           err => {
-               console.log(err);
-        });
-      }
-      if(this.showDataProviders){
-        this.subDataPr = this._searchDataprovidersService.numOfSearchDataproviders("").subscribe(
-           data => {
-             if(data && data != null && data > 0 ){
-                 this.datasourcesSize = NumberUtils.roundNumber(data);
-             }
-
-           },
-           err => {
-               console.log(err);
-
-           }
-       );
-     }
-   }
-}
diff --git a/src/app/home/home.module.ts b/src/app/home/home.module.ts
deleted file mode 100644
index 5e2e2d9..0000000
--- a/src/app/home/home.module.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { NgModule}            from '@angular/core';
-import { CommonModule }        from '@angular/common';
-import { FormsModule }         from '@angular/forms';
-import { RouterModule } from '@angular/router';
-
-import{HomeRoutingModule} from './home-routing.module';
-import{HomeComponent} from './home.component';
-
-
-import {DataProvidersServiceModule, DatasetsServiceModule,ProjectsServiceModule,PublicationsServiceModule,
-  OrganizationsServiceModule,SearchFormModule,PiwikServiceModule,RefineFieldResultsServiceModule,HelperModule} from 'ng-openaire-library';
-import {Meta, ConfigurationService, FreeGuard, PreviousRouteRecorder,} from 'ng-openaire-library';
-@NgModule({
-  imports: [
-    CommonModule, FormsModule, RouterModule,
-     RefineFieldResultsServiceModule,
-    DataProvidersServiceModule, DatasetsServiceModule, ProjectsServiceModule,
-     PublicationsServiceModule,
-    OrganizationsServiceModule,
-     SearchFormModule,
-      PiwikServiceModule,
-      HomeRoutingModule,
-      HelperModule
-
-  ],
-  declarations: [
-    HomeComponent
-   ],
-  providers:[
-    FreeGuard, PreviousRouteRecorder, ConfigurationService, Meta
-    ],
-  exports: [
-    HomeComponent
-     ]
-})
-export class HomeModule { }
diff --git a/src/app/landingPages/dataProvider/dataProvider-routing.module.ts b/src/app/landingPages/dataProvider/dataProvider-routing.module.ts
index fce156d..35e5c52 100644
--- a/src/app/landingPages/dataProvider/dataProvider-routing.module.ts
+++ b/src/app/landingPages/dataProvider/dataProvider-routing.module.ts
@@ -3,12 +3,12 @@ import { RouterModule } from '@angular/router';
 
 import { OpenaireDataProviderComponent } from './dataProvider.component';
 import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
-
+import {Properties} from '../../utils/properties';
 @NgModule({
  imports: [
   RouterModule.forChild([
     { path: '', component: OpenaireDataProviderComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-        redirect: '/error'
+        redirect: '/error', api: Properties.adminToolsAPIURL, community :Properties.adminToolsCommunity
       },canDeactivate: [PreviousRouteRecorder] }
   ])
 ]
diff --git a/src/app/landingPages/dataset/dataset-routing.module.ts b/src/app/landingPages/dataset/dataset-routing.module.ts
index aa94134..449665b 100644
--- a/src/app/landingPages/dataset/dataset-routing.module.ts
+++ b/src/app/landingPages/dataset/dataset-routing.module.ts
@@ -3,12 +3,12 @@ import { RouterModule } from '@angular/router';
 
 import { OpenaireDatasetComponent } from './dataset.component';
 import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
-
+import {Properties} from '../../utils/properties';
 @NgModule({
  imports: [
   RouterModule.forChild([
     { path: '', component: OpenaireDatasetComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-        redirect: '/error'
+        redirect: '/error', api: Properties.adminToolsAPIURL, community :Properties.adminToolsCommunity
       },canDeactivate: [PreviousRouteRecorder] }
   ])
 ]
diff --git a/src/app/landingPages/organization/organization-routing.module.ts b/src/app/landingPages/organization/organization-routing.module.ts
index 093a3ec..b43b4f4 100644
--- a/src/app/landingPages/organization/organization-routing.module.ts
+++ b/src/app/landingPages/organization/organization-routing.module.ts
@@ -3,13 +3,13 @@ import { RouterModule } from '@angular/router';
 
 import { OpenaireOrganizationComponent } from './organization.component';
 import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
-
+import {Properties} from '../../utils/properties';
 
 @NgModule({
  imports: [
   RouterModule.forChild([
     { path: '', component: OpenaireOrganizationComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-        redirect: '/error'
+        redirect: '/error', api: Properties.adminToolsAPIURL, community :Properties.adminToolsCommunity
       },canDeactivate: [PreviousRouteRecorder] }
   ])
 ]
diff --git a/src/app/landingPages/project/project-routing.module.ts b/src/app/landingPages/project/project-routing.module.ts
index 0a114c6..af145a2 100644
--- a/src/app/landingPages/project/project-routing.module.ts
+++ b/src/app/landingPages/project/project-routing.module.ts
@@ -3,12 +3,12 @@ import { RouterModule } from '@angular/router';
 
 import { OpenaireProjectComponent } from './project.component';
 import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
-
+import {Properties} from '../../utils/properties';
 @NgModule({
  imports: [
   RouterModule.forChild([
     { path: '', component: OpenaireProjectComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-        redirect: '/error'
+        redirect: '/error', api: Properties.adminToolsAPIURL, community :Properties.adminToolsCommunity
       },canDeactivate: [PreviousRouteRecorder]  }
   ])
  ]
diff --git a/src/app/landingPages/publication/publication-routing.module.ts b/src/app/landingPages/publication/publication-routing.module.ts
index 24057fe..421db29 100644
--- a/src/app/landingPages/publication/publication-routing.module.ts
+++ b/src/app/landingPages/publication/publication-routing.module.ts
@@ -3,12 +3,12 @@ import { RouterModule } from '@angular/router';
 
 import {OpenairePublicationComponent } from './publication.component';
 import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
-
+import {Properties} from '../../utils/properties';
 @NgModule({
  imports: [
   RouterModule.forChild([
     { path: '', component: OpenairePublicationComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-        redirect: '/error'
+        redirect: '/error', api: Properties.adminToolsAPIURL, community :Properties.adminToolsCommunity
       },canDeactivate: [PreviousRouteRecorder]  }
   ])
 ]
diff --git a/src/app/home/home-routing.module.ts b/src/app/my-communities/communities-routing.module.ts
similarity index 50%
rename from src/app/home/home-routing.module.ts
rename to src/app/my-communities/communities-routing.module.ts
index 8ee1c6a..39867b7 100644
--- a/src/app/home/home-routing.module.ts
+++ b/src/app/my-communities/communities-routing.module.ts
@@ -1,15 +1,15 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 
-import{HomeComponent} from './home.component';
+import{CommunitiesComponent} from './communities.component';
 import {FreeGuard,PreviousRouteRecorder} from 'ng-openaire-library';
 
 @NgModule({
   imports: [
     RouterModule.forChild([
-     	{ path: '', component: HomeComponent, canActivate: [FreeGuard], canDeactivate: [PreviousRouteRecorder] }
+     	{ path: '', component: CommunitiesComponent, canActivate: [FreeGuard], canDeactivate: [PreviousRouteRecorder] }
 
     ])
   ]
 })
-export class HomeRoutingModule { }
+export class CommunitiesRoutingModule { }
diff --git a/src/app/my-communities/communities.component.html b/src/app/my-communities/communities.component.html
new file mode 100644
index 0000000..ef58417
--- /dev/null
+++ b/src/app/my-communities/communities.component.html
@@ -0,0 +1,81 @@
+
+  <div class="image-front-topbar uk-section-default uk-light" tm-header-transparent="light" tm-header-transparent-placeholder="">
+  <div
+   class="mainPageSearchForm uk-background-norepeat uk-background-cover uk-background-top-center uk-section uk-padding-remove-bottom uk-flex uk-flex-middle" uk-height-viewport="offset-top: true;offset-bottom: 20">
+   <div class="uk-width-1-1">
+      <div class="uk-position-relative">
+         <div class="uk-container uk-margin-medium">
+            <div class="tm-header-placeholder uk-margin-medium" style="height: 84px;"></div>
+            <div class="search_box_bg uk-grid-large uk-flex-middle uk-grid uk-grid-stack" uk-grid="">
+               <div class="uk-width-1-1@m uk-first-column">
+                  <div data-id="page#4">
+                  <p class="uk-text-large uk-text-center">Welcome to Research Community Dashboard! </p>
+                  <p class="uk-text-large uk-text-center">Use a trusted partner to share, link, disseminate and monitor your research. </p>
+                  </div>
+               </div>
+            </div>
+         </div>
+
+      </div>
+   </div>
+  </div>
+  </div>
+  <div class="uk-container uk-margin-top uk-margin-bottom">
+    <div class="uk-h2">My communities</div>
+    <div class="uk-child-width-1-3@m uk-text-center " uk-grid>
+
+            <div>
+                <div class="uk-card uk-card-default">
+                    <div class="">
+                        <img src="https://egi.eu/wp-content/uploads/2016/05/cropped-logo_site-1-300x300.png" alt="A logo goes here">
+                    </div>
+                    <div class="uk-card-body">
+                        <h3 class="uk-card-title"><a   [queryParams]="{community: 'egi||EGI Federation'}" routerLinkActive="router-link-active" routerLink="/community">
+                          EGI Federation</a></h3>
+                        <p> EGI is a federated e-Infrastructure set up to provide advanced computing services for research and innovation.
+
+The EGI e-infrastructure is publicly-funded and comprises hundreds of data centres and cloud providers spread across Europe and worldwide.</p>
+                        <a class="uk-button uk-button-primary"> Unsubscribe</a>
+                    </div>
+                </div>
+            </div>
+
+
+
+
+    </div>
+   <div class="uk-h2">Other communities</div>
+     <div class="uk-child-width-1-3@m uk-text-center " uk-grid>
+
+           
+
+            <div>
+                <div class="uk-card uk-card-default">
+                    <div class="uk-card-media-top">
+                        <img src="logo.png" alt="A logo goes here">
+                    </div>
+                    <div class="uk-card-body">
+                        <h3 class="uk-card-title"><a>Environment and Economy Research Community</a></h3>
+                        <p>the national/EU node of the United Nations Sustainable Development Solutions Network sets out to build an infrastructure to gather all publications, data (in repositories and in Public Sector Information portals), and link them to EU and national funding </p>
+                        <a class="uk-button uk-button-primary"> Subscribe</a>
+                    </div>
+                </div>
+            </div>
+
+            <div>
+                <div class="uk-card uk-card-default">
+                    <div class="uk-card-media-top">
+                        <img src="logo.png" alt="A logo goes here">
+                    </div>
+                    <div class="uk-card-body">
+                        <h3 class="uk-card-title"><a>Marine environmental science</a></h3>
+                        <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+                          Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
+                          </p>
+                        <a class="uk-button uk-button-primary"> Subscribe</a>
+                    </div>
+                </div>
+            </div>
+
+    </div>
+  </div>
diff --git a/src/app/my-communities/communities.component.ts b/src/app/my-communities/communities.component.ts
new file mode 100644
index 0000000..853d0b0
--- /dev/null
+++ b/src/app/my-communities/communities.component.ts
@@ -0,0 +1,65 @@
+import {Component, Input, Output, EventEmitter, ViewChild, ChangeDetectionStrategy, ViewEncapsulation} from '@angular/core';
+import {Observable}       from 'rxjs/Observable';
+import {ActivatedRoute, Router} from '@angular/router';
+import {Location} from '@angular/common';
+import "rxjs/add/observable/zip";
+import { Meta, MetaDefinition, ConfigurationService} from 'ng-openaire-library';
+
+import { ErrorCodes, RouterHelper, PiwikService, EnvProperties} from 'ng-openaire-library';
+import {Properties} from '../utils/properties';
+
+
+@Component({
+    selector: 'communities',
+    templateUrl: 'communities.component.html',
+})
+export class CommunitiesComponent {
+  public piwiksub: any;
+  public subfunders: any;
+
+  public pageTitle = "OpenAIRE"
+properties:EnvProperties;
+
+
+  constructor (
+    private route: ActivatedRoute,
+      private _router: Router,
+      private location: Location, private _meta: Meta,private _piwikService:PiwikService,
+      private config: ConfigurationService
+    ) {
+
+
+                var description = "open access, research, scientific publication, European Commission, EC, FP7, ERC, Horizon 2020, H2020, search, projects ";
+
+                var title = "OpenAIRE";
+
+                this._meta.setTitle(title);
+                this._meta.updateMeta("description", description);
+                this._meta.updateProperty("og:description", description);
+                this._meta.updateProperty("og:title", title);
+
+
+
+        }
+
+        public ngOnInit() {
+          this.route.data
+              .subscribe((data: { envSpecific: EnvProperties }) => {
+                 this.properties = data.envSpecific;
+                 var url = data.envSpecific.baseLink+this._router.url
+                 this._meta.updateProperty("og:url", url);
+                 if(this.properties.enablePiwikTrack && (typeof document !== 'undefined')){
+                   this.piwiksub = this._piwikService.trackView("OpenAIRE").subscribe();
+                 }
+
+              });
+  }
+  public ngOnDestroy() {
+    if(this.piwiksub){
+      this.piwiksub.unsubscribe();
+    }
+
+
+  }
+
+}
diff --git a/src/app/my-communities/communities.module.ts b/src/app/my-communities/communities.module.ts
new file mode 100644
index 0000000..fe45693
--- /dev/null
+++ b/src/app/my-communities/communities.module.ts
@@ -0,0 +1,28 @@
+import { NgModule}            from '@angular/core';
+import { CommonModule }        from '@angular/common';
+import { FormsModule }         from '@angular/forms';
+import { RouterModule } from '@angular/router';
+
+import{CommunitiesRoutingModule} from './communities-routing.module';
+import{CommunitiesComponent} from './communities.component';
+import {PiwikService} from 'ng-openaire-library';
+
+
+
+import {Meta, ConfigurationService, FreeGuard, PreviousRouteRecorder,} from 'ng-openaire-library';
+@NgModule({
+  imports: [
+    CommonModule, FormsModule, RouterModule,
+      CommunitiesRoutingModule
+  ],
+  declarations: [
+    CommunitiesComponent
+   ],
+  providers:[
+    FreeGuard, PreviousRouteRecorder, ConfigurationService, Meta, PiwikService
+    ],
+  exports: [
+    CommunitiesComponent
+     ]
+})
+export class CommunitiesModule { }
diff --git a/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts b/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts
deleted file mode 100644
index 22919a1..0000000
--- a/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-import{OpenaireAdvancedSearchDataProvidersComponent} from './advancedSearchDataProviders.component';
-import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
-
-
-@NgModule({
-  imports: [
-    RouterModule.forChild([
-     	{ path: '', component: OpenaireAdvancedSearchDataProvidersComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-          redirect: '/error'
-        }, canDeactivate: [PreviousRouteRecorder] }
-
-    ])
-  ]
-})
-export class AdvancedSearchDataProvidersRoutingModule { }
diff --git a/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts b/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts
deleted file mode 100644
index f5cc238..0000000
--- a/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import {Component, Input, ViewChild} from '@angular/core';
-
-
-@Component({
-    selector: 'openaire-advanced-search-dataprovider',
-    template: `
-    <advanced-search-dataprovider>
-    </advanced-search-dataprovider>
-
-    `
- })
-
-export class OpenaireAdvancedSearchDataProvidersComponent { 
-}
diff --git a/src/app/searchPages/advanced/advancedSearchDataProviders.module.ts b/src/app/searchPages/advanced/advancedSearchDataProviders.module.ts
deleted file mode 100644
index 3f7613e..0000000
--- a/src/app/searchPages/advanced/advancedSearchDataProviders.module.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { NgModule}            from '@angular/core';
-import { CommonModule }        from '@angular/common';
-import { FormsModule }         from '@angular/forms';
-
-import{ AdvancedSearchDataProvidersRoutingModule} from './advancedSearchDataProviders-routing.module';
-import{OpenaireAdvancedSearchDataProvidersComponent} from './advancedSearchDataProviders.component';
-import {AdvancedSearchDataProvidersModule,FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
-
-@NgModule({
-  imports: [
-    CommonModule, FormsModule,
-    AdvancedSearchDataProvidersRoutingModule,
-    AdvancedSearchDataProvidersModule
-
-  ],
-  declarations: [
-    OpenaireAdvancedSearchDataProvidersComponent
-   ],
-  providers:[FreeGuard, IsRouteEnabled],
-  exports: [
-    OpenaireAdvancedSearchDataProvidersComponent
-     ]
-})
-export class LibAdvancedSearchDataProvidersModule { }
diff --git a/src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts b/src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts
index 24e9895..b4c1bc7 100644
--- a/src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts
+++ b/src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts
@@ -3,12 +3,13 @@ import { RouterModule } from '@angular/router';
 
 import{OpenaireAdvancedSearchDatasetsComponent} from './advancedSearchDatasets.component';
 import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
+import {Properties} from '../../utils/properties';
 
 @NgModule({
   imports: [
     RouterModule.forChild([
      	{ path: '', component: OpenaireAdvancedSearchDatasetsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-          redirect: '/error'
+          redirect: '/error', api: Properties.adminToolsAPIURL, community :Properties.adminToolsCommunity
         }, canDeactivate: [PreviousRouteRecorder] }
 
     ])
diff --git a/src/app/searchPages/advanced/advancedSearchOrganizations-routing.module.ts b/src/app/searchPages/advanced/advancedSearchOrganizations-routing.module.ts
deleted file mode 100644
index c7bf1ad..0000000
--- a/src/app/searchPages/advanced/advancedSearchOrganizations-routing.module.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-
-import{OpenaireAdvancedSearchOrganizationsComponent} from './advancedSearchOrganizations.component';
-import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
-
-@NgModule({
-  imports: [
-    RouterModule.forChild([
-     	{ path: '', component: OpenaireAdvancedSearchOrganizationsComponent , canActivate: [FreeGuard, IsRouteEnabled], data: {
-          redirect: '/error'
-        },canDeactivate: [PreviousRouteRecorder]}
-
-    ])
-  ]
-})
-export class AdvancedSearchOrganizationsRoutingModule { }
diff --git a/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts b/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts
deleted file mode 100644
index cc9339e..0000000
--- a/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import {Component, Input, ViewChild} from '@angular/core';
-
-
-@Component({
-    selector: 'openaire-advanced-search-organizations',
-    template: `
-    <advanced-search-organizations>
-    </advanced-search-organizations>
-
-    `
- })
-
-export class OpenaireAdvancedSearchOrganizationsComponent {
-
-
-}
diff --git a/src/app/searchPages/advanced/advancedSearchOrganizations.module.ts b/src/app/searchPages/advanced/advancedSearchOrganizations.module.ts
deleted file mode 100644
index c4cdd3d..0000000
--- a/src/app/searchPages/advanced/advancedSearchOrganizations.module.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { NgModule}            from '@angular/core';
-import { CommonModule }        from '@angular/common';
-import { FormsModule }         from '@angular/forms';
-
-import{ AdvancedSearchOrganizationsRoutingModule} from './advancedSearchOrganizations-routing.module';
-import{OpenaireAdvancedSearchOrganizationsComponent} from './advancedSearchOrganizations.component';
-
-
-
- import {AdvancedSearchOrganizationsModule, FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
-
-@NgModule({
-  imports: [
-    CommonModule, FormsModule,
-    AdvancedSearchOrganizationsModule,
-   AdvancedSearchOrganizationsRoutingModule
-
-  ],
-  declarations: [
-    OpenaireAdvancedSearchOrganizationsComponent
-   ],
-  providers:[FreeGuard, IsRouteEnabled],
-  exports: [
-    OpenaireAdvancedSearchOrganizationsComponent
-     ]
-})
-export class LibAdvancedSearchOrganizationsModule { }
diff --git a/src/app/searchPages/advanced/advancedSearchProjects-routing.module.ts b/src/app/searchPages/advanced/advancedSearchProjects-routing.module.ts
deleted file mode 100644
index ae3381a..0000000
--- a/src/app/searchPages/advanced/advancedSearchProjects-routing.module.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-
-import{OpenaireAdvancedSearchProjectsComponent} from './advancedSearchProjects.component';
-import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
-
-@NgModule({
-  imports: [
-    RouterModule.forChild([
-     	{ path: '', component: OpenaireAdvancedSearchProjectsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-          redirect: '/error'
-        }, canDeactivate: [PreviousRouteRecorder] }
-
-    ])
-  ]
-})
-export class AdvancedSearchProjectsRoutingModule { }
diff --git a/src/app/searchPages/advanced/advancedSearchProjects.component.ts b/src/app/searchPages/advanced/advancedSearchProjects.component.ts
deleted file mode 100644
index 50bf7e4..0000000
--- a/src/app/searchPages/advanced/advancedSearchProjects.component.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import {Component, Input, ViewChild} from '@angular/core';
-@Component({
-    selector: 'openaire-advanced-search-projects',
-    template: `
-    <advanced-search-projects>
-    </advanced-search-projects>
-
-    `
- })
-
-export class OpenaireAdvancedSearchProjectsComponent { 
-
-}
diff --git a/src/app/searchPages/advanced/advancedSearchProjects.module.ts b/src/app/searchPages/advanced/advancedSearchProjects.module.ts
deleted file mode 100644
index 41830dc..0000000
--- a/src/app/searchPages/advanced/advancedSearchProjects.module.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { NgModule}            from '@angular/core';
-import { CommonModule }        from '@angular/common';
-import { FormsModule }         from '@angular/forms';
-
-import{ AdvancedSearchProjectsRoutingModule} from './advancedSearchProjects-routing.module';
-import{OpenaireAdvancedSearchProjectsComponent} from './advancedSearchProjects.component';
-
-
- import {AdvancedSearchProjectsModule, FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
-
-@NgModule({
-  imports: [
-    CommonModule, FormsModule,
-    AdvancedSearchProjectsModule,
-   AdvancedSearchProjectsRoutingModule
-
-  ],
-  declarations: [
-    OpenaireAdvancedSearchProjectsComponent
-   ],
-  providers:[FreeGuard, IsRouteEnabled],
-  exports: [
-    OpenaireAdvancedSearchProjectsComponent
-     ]
-})
-export class LibAdvancedSearchProjectsModule { }
diff --git a/src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts b/src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts
index c4fec9e..2c1e39c 100644
--- a/src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts
+++ b/src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts
@@ -3,12 +3,13 @@ import { RouterModule } from '@angular/router';
 
 import{OpenaireAdvancedSearchPublicationsComponent} from './advancedSearchPublications.component';
 import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
+import {Properties} from '../../utils/properties';
 
 @NgModule({
   imports: [
     RouterModule.forChild([
      	{ path: '', component: OpenaireAdvancedSearchPublicationsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-          redirect: '/error'
+          redirect: '/error', api: Properties.adminToolsAPIURL, community :Properties.adminToolsCommunity
         }, canDeactivate: [PreviousRouteRecorder] }
 
     ])
diff --git a/src/app/searchPages/dataProviders/compatibleDataProviders-routing.module.ts b/src/app/searchPages/dataProviders/compatibleDataProviders-routing.module.ts
deleted file mode 100644
index 2205c73..0000000
--- a/src/app/searchPages/dataProviders/compatibleDataProviders-routing.module.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-
-import{OpenaireSearchCompatibleDataprovidersComponent} from './compatibleDataProviders.component';
-import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
-
-@NgModule({
-  imports: [
-    RouterModule.forChild([
-     	{ path: '', component: OpenaireSearchCompatibleDataprovidersComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-          redirect: '/error'
-        }, canDeactivate: [PreviousRouteRecorder]  }
-
-    ])
-  ]
-})
-export class CompatibleDataProvidersRoutingModule { }
diff --git a/src/app/searchPages/dataProviders/compatibleDataProviders.component.ts b/src/app/searchPages/dataProviders/compatibleDataProviders.component.ts
deleted file mode 100644
index d74440b..0000000
--- a/src/app/searchPages/dataProviders/compatibleDataProviders.component.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import {Component, Input, ViewChild} from '@angular/core';
-import { ActivatedRoute} from '@angular/router';
-
-@Component({
-    selector: 'openaire-search-content-providers',
-    template: `
-
-    <search-content-providers>
-    </search-content-providers>
-
-    `
-
-})
-export class OpenaireSearchCompatibleDataprovidersComponent {
-
-}
diff --git a/src/app/searchPages/dataProviders/compatibleDataProviders.module.ts b/src/app/searchPages/dataProviders/compatibleDataProviders.module.ts
deleted file mode 100644
index 4196f9a..0000000
--- a/src/app/searchPages/dataProviders/compatibleDataProviders.module.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { NgModule}            from '@angular/core';
-import { CommonModule }        from '@angular/common';
-import { FormsModule }         from '@angular/forms';
-
-import{ CompatibleDataProvidersRoutingModule} from './compatibleDataProviders-routing.module';
-import{OpenaireSearchCompatibleDataprovidersComponent} from './compatibleDataProviders.component';
-
-
-import { FreeGuard,PreviousRouteRecorder, IsRouteEnabled, CompatibleDataProvidersModule} from 'ng-openaire-library';
-
-@NgModule({
-  imports: [
-    CommonModule, FormsModule,
-    CompatibleDataProvidersModule,
-    CompatibleDataProvidersRoutingModule
-
-  ],
-  declarations: [
-    OpenaireSearchCompatibleDataprovidersComponent
-   ],
-  providers:[FreeGuard, IsRouteEnabled],
-  exports: [
-    OpenaireSearchCompatibleDataprovidersComponent
-     ]
-})
-export class LibCompatibleDataProvidersModule { }
diff --git a/src/app/searchPages/dataProviders/compatibleDataProvidersTable-routing.module.ts b/src/app/searchPages/dataProviders/compatibleDataProvidersTable-routing.module.ts
deleted file mode 100644
index c5b68a6..0000000
--- a/src/app/searchPages/dataProviders/compatibleDataProvidersTable-routing.module.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-
-import{SearchCompatibleDataprovidersTableComponent} from './compatibleDataProvidersTable.component';
-import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
-
-@NgModule({
-  imports: [
-    RouterModule.forChild([
-     	{ path: '', component: SearchCompatibleDataprovidersTableComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-          redirect: '/error'
-        }, canDeactivate: [PreviousRouteRecorder] }
-
-    ])
-  ]
-})
-export class CompatibleDataProvidersTableRoutingModule { }
diff --git a/src/app/searchPages/dataProviders/compatibleDataProvidersTable.component.ts b/src/app/searchPages/dataProviders/compatibleDataProvidersTable.component.ts
deleted file mode 100644
index 9639868..0000000
--- a/src/app/searchPages/dataProviders/compatibleDataProvidersTable.component.ts
+++ /dev/null
@@ -1,193 +0,0 @@
-import {Component, Input, ViewChild} from '@angular/core';
-import {Location} from '@angular/common';
-import { ActivatedRoute} from '@angular/router';
-import {SearchPageTableViewComponent } from '../searchUtils/searchPageTableView.component';
-import { ErrorCodes, SearchFields,SearchDataprovidersService, SearchUtilsClass, Filter, Value } from 'ng-openaire-library';
-import {Properties} from '../../utils/properties';
-
-@Component({
-    selector: 'search-content-providers-table',
-    template: `
-
-    <search-page-table    pageTitle="OpenAIRE Content Providers Table"
-                          type="content providers" entityType="dataprovider" [(filters)] = "filters"
-                          [(results)] = "results"  [(searchUtils)] = "searchUtils"
-                          [showResultCount]=false
-                          [disableForms]="disableForms"
-                          [searchViewLink]="'/search/content-providers'"
-                          searchFormClass="compatibleDatasourcesTableSearchForm"
-                          formPlaceholderText="Search for OpenAIRE Content Providers">
-    </search-page-table>
-    `
-
-})
-export class SearchCompatibleDataprovidersTableComponent {
-  private errorCodes: ErrorCodes;
-
-  public results =[];
-  public filters =[];
-  public baseUrl:string;
-  public searchUtils:SearchUtilsClass = new SearchUtilsClass();
-  public sub: any; public subResults: any;
-  public _location:Location;
-  public searchFields:SearchFields = new SearchFields();
-  public refineFields: string[] =  this.searchFields.COMPATIBLE_DATAPROVIDER_FIELDS;
-
-  /*public CSV: any = {  "columnNames":  [ "Title", "Type", "Coutries", "Compatibility" ],
-                        "export":[]
-                     };
-  public CSVDownloaded = false;
-  public csvParams: string;
-  public resourcesQuery = "&query=((oaftype exact datasource) not(datasourcecompatibilityid = UNKNOWN) not(datasourcecompatibilityid = notCompatible) not(datasourcetypeuiid = other))";*/
-
-  public disableForms: boolean = false;
-
-  @ViewChild (SearchPageTableViewComponent) searchPage : SearchPageTableViewComponent ;
-
-  constructor (private route: ActivatedRoute, private _searchDataprovidersService: SearchDataprovidersService ) {
-    this.errorCodes = new ErrorCodes();
-    this.searchUtils.status = this.errorCodes.LOADING;
-    this.baseUrl = Properties.getLinkToSearchCompatibleDataProvidersTable();
-  }
-
-  public ngOnInit() {
-    this.searchPage.refineFields = this.refineFields;
-    this.sub =  this.route.queryParams.subscribe(params => {
-      this.searchUtils.keyword = (params['keyword']?params['keyword']:'');
-      //this.searchUtils.page = (params['page']=== undefined)?1:+params['page'];
-      this.filters = this.createFilters();
-      this.searchPage.getParametersFromUrl(params);
-      this._getResults();
-    });
-  }
-
-  public ngOnDestroy() {
-    if(this.sub){
-      this.sub.unsubscribe();
-    }
-    if(this.subResults){
-      this.subResults.unsubscribe();
-    }  }
-    private _getResults(){
-        //this.csvParams = this.resourcesQuery+"&type=datasources";
-
-      //var errorCodes:ErrorCodes = new ErrorCodes();
-      this.searchUtils.status = this.errorCodes.LOADING;
-      this.disableForms = true;
-      this.results = [];
-      this.searchUtils.totalResults = 0;
-
-      let size: number = 0;
-      this.subResults = this._searchDataprovidersService.searchCompatibleDataprovidersTable().subscribe(
-          data => {
-              size = data;
-              if(size > 0) {
-                this.subResults = this._searchDataprovidersService.searchCompatibleDataproviders("", null, 1, size, []).subscribe(
-                    data => {
-                        this.searchUtils.totalResults = data[0];
-                        console.info("search Content Providers [total results:"+this.searchUtils.totalResults+"]");
-                        this.results = data[1];
-
-                        this.searchPage.checkSelectedFilters(this.filters);
-
-                        //var errorCodes:ErrorCodes = new ErrorCodes();
-                        this.searchUtils.status = this.errorCodes.DONE;
-                        if(this.searchUtils.totalResults == 0 ){
-                          this.searchUtils.status = this.errorCodes.NONE;
-                        }
-                        this.disableForms = false;
-                        this.searchPage.triggerInitialLoad();
-                        this.searchPage.transform(this.results);
-                    },
-                    err => {
-                        console.log(err);
-                         //TODO check erros (service not available, bad request)
-                        // if( ){
-                        //   this.searchUtils.status = ErrorCodes.ERROR;
-                        // }
-                        //var errorCodes:ErrorCodes = new ErrorCodes();
-                        //this.searchUtils.status = errorCodes.ERROR;
-                        if(err.status == '404') {
-                          this.searchUtils.status = this.errorCodes.NOT_FOUND;
-                        } else if(err.status == '500') {
-                          this.searchUtils.status = this.errorCodes.ERROR;
-                        } else {
-                          this.searchUtils.status = this.errorCodes.NOT_AVAILABLE;
-                        }
-
-                        this.disableForms = false;
-
-                    }
-                );
-              } else {
-                this.searchPage.checkSelectedFilters(this.filters);
-
-                //var errorCodes:ErrorCodes = new ErrorCodes();
-                this.searchUtils.status = this.errorCodes.NONE;
-                this.disableForms = false;
-              }
-          },
-          err => {
-              console.log(err);
-               //TODO check erros (service not available, bad request)
-              // if( ){
-              //   this.searchUtils.status = ErrorCodes.ERROR;
-              // }
-              //var errorCodes:ErrorCodes = new ErrorCodes();
-              //this.searchUtils.status = errorCodes.ERROR;
-              if(err.status == '404') {
-                this.searchUtils.status = this.errorCodes.NOT_FOUND;
-              } else if(err.status == '500') {
-                this.searchUtils.status = this.errorCodes.ERROR;
-              } else {
-                this.searchUtils.status = this.errorCodes.NOT_AVAILABLE;
-              }
-          }
-      );
-
-    }
-  private setFilters(){
-    //TODO set filters from
-  }
-
-  private createFilters():Filter[] {
-    var filter_names=["Type","Compatibility Level"];
-    var filter_ids=["datasourcetypeuiid","datasourcecompatibilityname"];
-    var searchFields = new SearchFields();
-    var filter_original_ids = searchFields.COMPATIBLE_DATAPROVIDER_FIELDS;
-    var value_names=[
-      /*[
-      "Institutional Publication Repository","Thematic Publication Repository", "Other Publication Repository",
-     "Institutional Repositories Aggregators",
-     "Thematic Repositories Aggregators", "Other Repositories Aggregators",
-      "Data Repositories", "Data Repositories Aggregators", "Journals", "Journals Aggregators", "CRIS Systems", "Publication Catalogues"],
-      */
-      [
-      "Institutional Repository", "Thematic Repository", "Publication Repository",
-      "Institutional Repository Aggregator",
-      "Thematic Repositories Aggregators", "Publication Repository Aggregator",
-      "Data Repository", "Data Repository Aggregator", "CRIS Systems", "Publication Catalogue"],
-
-
-
-
-      ["OpenAIRE Basic (DRIVER OA)","OpenAIRE 2.0 (EC funding)", "OpenAIRE 2.0+ (DRIVER OA, EC funding)", "OpenAIRE 3.0 (OA, funding)","OpenAIRE Data (funded, referenced datasets)"]];
-
-    var value_original_ids=[
-      ["pubsrepository::institutional","pubsrepository::thematic", "pubsrepository::unknown", "aggregator::pubsrepository::institutional","aggregator::pubsrepository::thematic","aggregator::pubsrepository::unknown",
-      "datarepository::unknown", "aggregator::datarepository", "cris", "pubscatalogue::unknown"],
-      //["driver","openaire2.0", "driver-openaire2.0", "openaire3.0","openaire2.0_data"]
-    ["OpenAIRE Basic (DRIVER OA)","OpenAIRE 2.0 (EC funding)", "OpenAIRE 2.0+ (DRIVER OA, EC funding)", "OpenAIRE 3.0 (OA, funding)","OpenAIRE Data (funded, referenced datasets)"]];
-    var filters: Filter[] =[];
-    for(var i =0 ; i < filter_names.length;i++){
-      var values:Value[] = [];
-      for(var j =0 ; j < value_names[i].length;j++){
-        var value:Value = {name: value_names[i][j], id: value_original_ids[i][j], number:j, selected:false}
-        values.push(value);
-      }
-       var filter:Filter = {title: filter_names[i], filterId: filter_ids[i], originalFilterId:  filter_original_ids[i], values : values, countSelectedValues:0, "filterOperator": 'or' };
-       filters.push(filter);
-    }
-    return filters;
-    }
-}
diff --git a/src/app/searchPages/dataProviders/compatibleDataProvidersTable.module.ts b/src/app/searchPages/dataProviders/compatibleDataProvidersTable.module.ts
deleted file mode 100644
index ef3d75d..0000000
--- a/src/app/searchPages/dataProviders/compatibleDataProvidersTable.module.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { NgModule}            from '@angular/core';
-import { CommonModule }        from '@angular/common';
-import { FormsModule }         from '@angular/forms';
-
-import{SearchCompatibleDataprovidersTableComponent} from './compatibleDataProvidersTable.component';
-
-
-import {SearchPageTableViewModule} from '../searchUtils/searchPageTableView.module';
-import {CompatibleDataProvidersTableRoutingModule} from './compatibleDataProvidersTable-routing.module';
-import { FreeGuard,PreviousRouteRecorder, IsRouteEnabled, SearchFormModule, DataProvidersServiceModule} from 'ng-openaire-library';
-
-
-@NgModule({
-  imports: [
-    CommonModule, FormsModule,
-    DataProvidersServiceModule,
-     SearchFormModule, SearchPageTableViewModule, CompatibleDataProvidersTableRoutingModule
-
-  ],  providers:[FreeGuard, IsRouteEnabled],
-  declarations: [
-    SearchCompatibleDataprovidersTableComponent
-   ],
-  exports: [
-    SearchCompatibleDataprovidersTableComponent
-     ]
-})
-export class CompatibleDataProvidersTableModule { }
diff --git a/src/app/searchPages/dataProviders/entityRegistries-routing.module.ts b/src/app/searchPages/dataProviders/entityRegistries-routing.module.ts
deleted file mode 100644
index 425c00e..0000000
--- a/src/app/searchPages/dataProviders/entityRegistries-routing.module.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-
-import{OpenaireSearchEntityRegistriesComponent} from './entityRegistries.component';
-import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
-
-@NgModule({
-  imports: [
-    RouterModule.forChild([
-     	{ path: '', component: OpenaireSearchEntityRegistriesComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-          redirect: '/error'
-        }, canDeactivate: [PreviousRouteRecorder]  }
-
-    ])
-  ]
-})
-export class EntityRegistriesRoutingModule { }
diff --git a/src/app/searchPages/dataProviders/entityRegistries.component.ts b/src/app/searchPages/dataProviders/entityRegistries.component.ts
deleted file mode 100644
index 82336f9..0000000
--- a/src/app/searchPages/dataProviders/entityRegistries.component.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import {Component, Input, ViewChild} from '@angular/core';
-import { ActivatedRoute} from '@angular/router';
-
-@Component({
-    selector: 'openaire-search-entity-registries',
-    template: `
-
-    <search-entity-registries>
-    </search-entity-registries>
-
-    `
-
-})
-export class OpenaireSearchEntityRegistriesComponent {
-
-}
diff --git a/src/app/searchPages/dataProviders/entityRegistries.module.ts b/src/app/searchPages/dataProviders/entityRegistries.module.ts
deleted file mode 100644
index 492125a..0000000
--- a/src/app/searchPages/dataProviders/entityRegistries.module.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { NgModule}            from '@angular/core';
-import { CommonModule }        from '@angular/common';
-import { FormsModule }         from '@angular/forms';
-
-import{ EntityRegistriesRoutingModule} from './entityRegistries-routing.module';
-import{OpenaireSearchEntityRegistriesComponent} from './entityRegistries.component';
-
-import {EntityRegistriesModule, FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
-
-@NgModule({
-  imports: [
-    CommonModule, FormsModule,
-    EntityRegistriesModule, EntityRegistriesRoutingModule
-
-  ],
-  declarations: [
-    OpenaireSearchEntityRegistriesComponent
-   ],
-  providers:[FreeGuard, IsRouteEnabled],
-  exports: [
-    OpenaireSearchEntityRegistriesComponent
-     ]
-})
-export class LibEntityRegistriesModule { }
diff --git a/src/app/searchPages/dataProviders/entityRegistriesTable-routing.module.ts b/src/app/searchPages/dataProviders/entityRegistriesTable-routing.module.ts
deleted file mode 100644
index 70004b2..0000000
--- a/src/app/searchPages/dataProviders/entityRegistriesTable-routing.module.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-
-import{SearchEntityRegistriesTableComponent} from './entityRegistriesTable.component';
-import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
-
-@NgModule({
-  imports: [
-    RouterModule.forChild([
-     	{ path: '', component: SearchEntityRegistriesTableComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-          redirect: '/error'
-        }, canDeactivate: [PreviousRouteRecorder]  }
-
-    ])
-  ]
-})
-export class EntityRegistriesTableRoutingModule { }
diff --git a/src/app/searchPages/dataProviders/entityRegistriesTable.component.ts b/src/app/searchPages/dataProviders/entityRegistriesTable.component.ts
deleted file mode 100644
index 21368b8..0000000
--- a/src/app/searchPages/dataProviders/entityRegistriesTable.component.ts
+++ /dev/null
@@ -1,202 +0,0 @@
-import {Component, Input, ViewChild} from '@angular/core';
-import { ActivatedRoute} from '@angular/router';
-import {SearchPageTableViewComponent } from '../searchUtils/searchPageTableView.component';
-import {ErrorCodes, SearchFields,SearchDataprovidersService, SearchUtilsClass, Filter, Value } from 'ng-openaire-library';
-
-import {Properties} from '../../utils/properties';
-
-@Component({
-    selector: 'search-entity-registries-table',
-    template: `
-
-    <search-page-table pageTitle="Registries/ Databases"
-                       type="content providers" entityType="dataprovider" [(filters)] = "filters"
-                       [(results)] = "results" [(searchUtils)] = "searchUtils"
-                       [showResultCount]=false
-                       [disableForms]="disableForms"
-                       [searchViewLink]="'/search/entity-registries'"
-                       searchFormClass="entityRegistriesTableSearchForm"
-                       formPlaceholderText="Search for Registries/ Databases">
-    </search-page-table>
-
-    `
-
-})
-export class SearchEntityRegistriesTableComponent {
-  private errorCodes: ErrorCodes;
-
-  public results =[];
-  public filters =[];
-  public baseUrl:string;
-  public searchUtils:SearchUtilsClass = new SearchUtilsClass();
-  public sub: any; public subResults: any;
-  public _location:Location;
-  public searchFields:SearchFields = new SearchFields();
-  public refineFields: string[] =  this.searchFields.ENTITY_REGISTRIES_FIELDS;
-  public disableForms: boolean = false;
-
-  @ViewChild (SearchPageTableViewComponent) searchPage : SearchPageTableViewComponent ;
-
-  constructor (private route: ActivatedRoute, private _searchDataprovidersService: SearchDataprovidersService ) {
-    this.errorCodes = new ErrorCodes();
-    this.searchUtils.status = this.errorCodes.LOADING;
-  }
-
-  public ngOnInit() {
-    this.searchPage.refineFields = this.refineFields;
-    this.sub =  this.route.queryParams.subscribe(params => {
-      this.searchUtils.keyword = (params['keyword']?params['keyword']:'');
-      //this.searchUtils.page = (params['page']=== undefined)?1:+params['page'];
-      this.filters = this.createFilters();
-
-      this.searchPage.getParametersFromUrl(params);
-      this._getResults("", false, this.searchUtils.page);
-    });
-  }
-
-  public ngOnDestroy() {
-    if(this.sub){
-      this.sub.unsubscribe();
-    }
-    if(this.subResults){
-      this.subResults.unsubscribe();
-    }  }
-    private _getResults(parameters:string,refine:boolean, page: number){
-      //var errorCodes:ErrorCodes = new ErrorCodes();
-      this.searchUtils.status = this.errorCodes.LOADING;
-      this.disableForms = true;
-      this.results = [];
-      this.searchUtils.totalResults = 0;
-
-      let size: number = 0;
-      this.subResults = this._searchDataprovidersService.searchEntityRegistriesTable().subscribe(
-          data => {
-              size = data;
-              if(size > 0) {
-                this.subResults = this._searchDataprovidersService.searchEntityRegistries("",null, page, size, []).subscribe(
-                    data => {
-                        this.searchUtils.totalResults = data[0];
-                        console.info("search Entity Registries [total results:"+this.searchUtils.totalResults+"]");
-                        this.results = data[1];
-                        this.searchPage.checkSelectedFilters(this.filters);
-
-                        //var errorCodes:ErrorCodes = new ErrorCodes();
-                        this.searchUtils.status = this.errorCodes.DONE;
-                        if(this.searchUtils.totalResults == 0 ){
-                          this.searchUtils.status = this.errorCodes.NONE;
-                        }
-                        this.disableForms = false;
-                        this.searchPage.triggerInitialLoad();
-                        this.searchPage.transform(this.results);
-                    },
-                    err => {
-                        console.log(err);
-                         //TODO check erros (service not available, bad request)
-                        // if( ){
-                        //   this.searchUtils.status = ErrorCodes.ERROR;
-                        // }
-                        //var errorCodes:ErrorCodes = new ErrorCodes();
-                        //this.searchUtils.status = errorCodes.ERROR;
-                        if(err.status == '404') {
-                          this.searchUtils.status = this.errorCodes.NOT_FOUND;
-                        } else if(err.status == '500') {
-                          this.searchUtils.status = this.errorCodes.ERROR;
-                        } else {
-                          this.searchUtils.status = this.errorCodes.NOT_AVAILABLE;
-                        }
-
-                        this.disableForms = false;
-
-                    }
-                );
-              } else {
-                this.searchPage.checkSelectedFilters(this.filters);
-
-                //var errorCodes:ErrorCodes = new ErrorCodes();
-                this.searchUtils.status = this.errorCodes.NONE;
-                this.disableForms = false;
-              }
-          },
-          err => {
-              console.log(err);
-               //TODO check erros (service not available, bad request)
-              // if( ){
-              //   this.searchUtils.status = ErrorCodes.ERROR;
-              // }
-              //var errorCodes:ErrorCodes = new ErrorCodes();
-              //this.searchUtils.status = errorCodes.ERROR;
-              if(err.status == '404') {
-                this.searchUtils.status = this.errorCodes.NOT_FOUND;
-              } else if(err.status == '500') {
-                this.searchUtils.status = this.errorCodes.ERROR;
-              } else {
-                this.searchUtils.status = this.errorCodes.NOT_AVAILABLE;
-              }
-          }
-      );
-/*
-       this.subResults = this._searchDataprovidersService.searchEntityRegistries(parameters,(refine)?this.searchPage.getRefineFieldsQuery():null, page, size, []).subscribe(
-          data => {
-              this.searchUtils.totalResults = data[0];
-              console.info("search Entity Registries: [Parameters:"+parameters+" ]  [total results:"+this.searchUtils.totalResults+"]");
-              this.results = data[1];
-              this.searchPage.checkSelectedFilters(this.filters);
-              this.searchPage.updateBaseUrlWithParameters(this.filters);
-              var errorCodes:ErrorCodes = new ErrorCodes();
-              this.searchUtils.status = errorCodes.DONE;
-              if(this.searchUtils.totalResults == 0 ){
-                this.searchUtils.status = errorCodes.NONE;
-              }
-              //this.searchPage.closeLoading();
-              this.disableForms = false;
-
-          },
-          err => {
-              console.log(err);
-               //TODO check erros (service not available, bad request)
-              // if( ){
-              //   this.searchUtils.status = ErrorCodes.ERROR;
-              // }
-              var errorCodes:ErrorCodes = new ErrorCodes();
-              this.searchUtils.status = errorCodes.ERROR;
-              //this.searchPage.closeLoading();
-              this.disableForms = false;
-
-          }
-      );
-*/
-    }
-  private setFilters(){
-    //TODO set filters from
-  }
-
-
-  private createFilters():Filter[] {
-    var filter_names=["Type","Compatibility Level"];
-    var filter_ids=["datasourcetypename","datasourcecompatibilityname"];
-    var searchFields = new SearchFields();
-    var filter_original_ids = searchFields.ENTITY_REGISTRIES_FIELDS;
-    var value_names=[
-      ["Funder database","Registry of repositories","Scholarly Comm. Infrastructure","Registry","Information Space","Web Source"],
-
-      ["OpenAIRE Basic (DRIVER OA)","OpenAIRE 2.0 (EC funding)", "OpenAIRE 2.0+ (DRIVER OA, EC funding)", "OpenAIRE 3.0 (OA, funding)","OpenAIRE Data (funded, referenced datasets)"]];
-
-    var value_original_ids=[
-      ["Funder database","Registry of repositories","Scholarly Comm. Infrastructure","Registry","Information Space","Web Source"],
-      //["entityregistry::projects","entityregistry::repositories","scholarcomminfra","entityregistry","infospace","websource"],
-      //["driver","openaire2.0", "driver-openaire2.0", "openaire3.0","openaire2.0_data"]
-    ["OpenAIRE Basic (DRIVER OA)","OpenAIRE 2.0 (EC funding)", "OpenAIRE 2.0+ (DRIVER OA, EC funding)", "OpenAIRE 3.0 (OA, funding)","OpenAIRE Data (funded, referenced datasets)"]];
-
-    var filters: Filter[] =[];
-    for(var i =0 ; i < filter_names.length;i++){
-      var values:Value[] = [];
-      for(var j =0 ; j < value_names[i].length;j++){
-        var value:Value = {name: value_names[i][j], id: value_original_ids[i][j], number:j, selected:false}
-        values.push(value);
-      }
-       var filter:Filter = {title: filter_names[i], filterId: filter_ids[i], originalFilterId:  filter_original_ids[i], values : values, countSelectedValues:0, "filterOperator": 'or' };
-       filters.push(filter);
-    }
-    return filters;
-    }
-}
diff --git a/src/app/searchPages/dataProviders/entityRegistriesTable.module.ts b/src/app/searchPages/dataProviders/entityRegistriesTable.module.ts
deleted file mode 100644
index 8ac5d50..0000000
--- a/src/app/searchPages/dataProviders/entityRegistriesTable.module.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { NgModule}            from '@angular/core';
-import { CommonModule }        from '@angular/common';
-import { FormsModule }         from '@angular/forms';
-
-import{SearchEntityRegistriesTableComponent} from './entityRegistriesTable.component';
-import {SearchPageTableViewModule} from '../searchUtils/searchPageTableView.module';
-import {EntityRegistriesTableRoutingModule} from './entityRegistriesTable-routing.module';
-import { FreeGuard,PreviousRouteRecorder, IsRouteEnabled, SearchFormModule, DataProvidersServiceModule} from 'ng-openaire-library';
-
-@NgModule({
-  imports: [
-    CommonModule, FormsModule,
-    DataProvidersServiceModule,
-     SearchFormModule, SearchPageTableViewModule, EntityRegistriesTableRoutingModule
-
-  ],  providers:[FreeGuard, IsRouteEnabled],
-  declarations: [
-    SearchEntityRegistriesTableComponent
-   ],
-  exports: [
-    SearchEntityRegistriesTableComponent
-     ]
-})
-export class EntityRegistriesTableModule { }
diff --git a/src/app/searchPages/dataProviders/journals-routing.module.ts b/src/app/searchPages/dataProviders/journals-routing.module.ts
deleted file mode 100644
index 2ed7999..0000000
--- a/src/app/searchPages/dataProviders/journals-routing.module.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-
-import{OpenaireSearchJournalsComponent} from './journals.component';
-import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
-
-@NgModule({
-  imports: [
-    RouterModule.forChild([
-     	{ path: '', component: OpenaireSearchJournalsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-          redirect: '/error'
-        }, canDeactivate: [PreviousRouteRecorder]  }
-
-    ])
-  ]
-})
-export class JournalsRoutingModule { }
diff --git a/src/app/searchPages/dataProviders/journals.component.ts b/src/app/searchPages/dataProviders/journals.component.ts
deleted file mode 100644
index e54fae6..0000000
--- a/src/app/searchPages/dataProviders/journals.component.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import {Component, Input, ViewChild} from '@angular/core';
-import { ActivatedRoute} from '@angular/router';
-
-@Component({
-    selector: 'openaire-search-journals',
-    template: `
-
-    <search-journals>
-    </search-journals>
-    `
-
-})
-export class OpenaireSearchJournalsComponent {
-}
diff --git a/src/app/searchPages/dataProviders/journals.module.ts b/src/app/searchPages/dataProviders/journals.module.ts
deleted file mode 100644
index cafa2b0..0000000
--- a/src/app/searchPages/dataProviders/journals.module.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { NgModule}            from '@angular/core';
-import { CommonModule }        from '@angular/common';
-import { FormsModule }         from '@angular/forms';
-
-import{ JournalsRoutingModule} from './journals-routing.module';
-import{OpenaireSearchJournalsComponent} from './journals.component';
-import { FreeGuard,PreviousRouteRecorder, IsRouteEnabled, JournalsModule} from 'ng-openaire-library';
-
-@NgModule({
-  imports: [
-    CommonModule, FormsModule, JournalsRoutingModule, JournalsModule
-
-  ],
-  declarations: [
-    OpenaireSearchJournalsComponent
-   ],
-  providers:[FreeGuard, IsRouteEnabled],
-  exports: [
-    OpenaireSearchJournalsComponent
-     ]
-})
-export class LibJournalsModule { }
diff --git a/src/app/searchPages/dataProviders/journalsTable-routing.module.ts b/src/app/searchPages/dataProviders/journalsTable-routing.module.ts
deleted file mode 100644
index 71dfbcb..0000000
--- a/src/app/searchPages/dataProviders/journalsTable-routing.module.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-
-import{SearchJournalsTableComponent} from './journalsTable.component';
-import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
-
-@NgModule({
-  imports: [
-    RouterModule.forChild([
-     	{ path: '', component: SearchJournalsTableComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-          redirect: '/error'
-        } , canDeactivate: [PreviousRouteRecorder] }
-
-    ])
-  ]
-})
-export class JournalsTableRoutingModule { }
diff --git a/src/app/searchPages/dataProviders/journalsTable.component.ts b/src/app/searchPages/dataProviders/journalsTable.component.ts
deleted file mode 100644
index 0a75c6d..0000000
--- a/src/app/searchPages/dataProviders/journalsTable.component.ts
+++ /dev/null
@@ -1,188 +0,0 @@
-import {Component, Input, ViewChild} from '@angular/core';
-import { ActivatedRoute} from '@angular/router';
-import {SearchPageTableViewComponent } from '../searchUtils/searchPageTableView.component';
-import {ErrorCodes, SearchFields,SearchDataprovidersService, SearchUtilsClass, Filter, Value } from 'ng-openaire-library';
-import {Properties} from '../../utils/properties';
-
-
-@Component({
-    selector: 'search-journals-table',
-    template: `
-
-    <search-page-table    pageTitle="OpenAIRE Journals Table"
-                          type="content providers" entityType="dataprovider" [(filters)] = "filters"
-                          [(results)] = "results"  [(searchUtils)] = "searchUtils"
-                          [showResultCount]=false
-                          [disableForms]="disableForms"
-                          [searchViewLink]="'/search/journals'"
-                          searchFormClass="journalsTableSearchForm"
-                          formPlaceholderText="Search for Journals">
-    </search-page-table>
-    `
-
-})
-export class SearchJournalsTableComponent {
-  private errorCodes: ErrorCodes;
-
-  public results =[];
-  public filters =[];
-  public baseUrl:string;
-  public searchUtils:SearchUtilsClass = new SearchUtilsClass();
-  public sub: any; public subResults: any;
-  public _location:Location;
-  public searchFields:SearchFields = new SearchFields();
-  public refineFields: string[] =  this.searchFields.JOURNAL_FIELDS;
-
-  /*public CSV: any = {  "columnNames":  [ "Title", "Type", "Coutries", "Compatibility" ],
-                        "export":[]
-                     };
-  public CSVDownloaded = false;
-  public csvParams: string;
-  public resourcesQuery = "&query=((oaftype exact datasource) not(datasourcecompatibilityid = UNKNOWN) not(datasourcecompatibilityid = notCompatible) not(datasourcetypeuiid = other))";*/
-
-  public disableForms: boolean = false;
-
-  @ViewChild (SearchPageTableViewComponent) searchPage : SearchPageTableViewComponent ;
-
-  constructor (private route: ActivatedRoute, private _searchDataprovidersService: SearchDataprovidersService ) {
-    this.errorCodes = new ErrorCodes();
-    this.searchUtils.status = this.errorCodes.LOADING;
-    this.baseUrl = Properties.getLinkToSearchJournalsTable();
-  }
-
-  public ngOnInit() {
-    this.searchPage.refineFields = this.refineFields;
-    this.sub =  this.route.queryParams.subscribe(params => {
-      this.searchUtils.keyword = (params['keyword']?params['keyword']:'');
-      //this.searchUtils.page = (params['page']=== undefined)?1:+params['page'];
-      this.filters = this.createFilters();
-      this.searchPage.getParametersFromUrl(params);
-      this._getResults();
-    });
-  }
-
-  public ngOnDestroy() {
-    if(this.sub){
-      this.sub.unsubscribe();
-    }
-    if(this.subResults){
-      this.subResults.unsubscribe();
-    }  }
-    private _getResults(){
-        //this.csvParams = this.resourcesQuery+"&type=datasources";
-
-      //var errorCodes:ErrorCodes = new ErrorCodes();
-      this.searchUtils.status = this.errorCodes.LOADING;
-      this.disableForms = true;
-      this.results = [];
-      this.searchUtils.totalResults = 0;
-
-      let size: number = 0;
-      this.subResults = this._searchDataprovidersService.searchJournalsTable().subscribe(
-          data => {
-              size = data;
-              if(size > 0) {
-                this.subResults = this._searchDataprovidersService.searchJournals("", null, 1, size, []).subscribe(
-                    data => {
-                        this.searchUtils.totalResults = data[0];
-                        console.info("search Journals [total results:"+this.searchUtils.totalResults+"]");
-                        this.results = data[1];
-
-                        this.searchPage.checkSelectedFilters(this.filters);
-
-                        //var errorCodes:ErrorCodes = new ErrorCodes();
-                        this.searchUtils.status = this.errorCodes.DONE;
-                        if(this.searchUtils.totalResults == 0 ){
-                          this.searchUtils.status = this.errorCodes.NONE;
-                        }
-                        this.disableForms = false;
-                        this.searchPage.triggerInitialLoad();
-                        this.searchPage.transform(this.results);
-                    },
-                    err => {
-                        console.log(err);
-                         //TODO check erros (service not available, bad request)
-                        // if( ){
-                        //   this.searchUtils.status = ErrorCodes.ERROR;
-                        // }
-                        //var errorCodes:ErrorCodes = new ErrorCodes();
-                        //this.searchUtils.status = errorCodes.ERROR;
-                        if(err.status == '404') {
-                          this.searchUtils.status = this.errorCodes.NOT_FOUND;
-                        } else if(err.status == '500') {
-                          this.searchUtils.status = this.errorCodes.ERROR;
-                        } else {
-                          this.searchUtils.status = this.errorCodes.NOT_AVAILABLE;
-                        }
-
-                        this.disableForms = false;
-
-                    }
-                );
-              } else {
-                this.searchPage.checkSelectedFilters(this.filters);
-
-                //var errorCodes:ErrorCodes = new ErrorCodes();
-                this.searchUtils.status = this.errorCodes.NONE;
-                this.disableForms = false;
-              }
-          },
-          err => {
-              console.log(err);
-               //TODO check erros (service not available, bad request)
-              // if( ){
-              //   this.searchUtils.status = ErrorCodes.ERROR;
-              // }
-              //var errorCodes:ErrorCodes = new ErrorCodes();
-              //this.searchUtils.status = errorCodes.ERROR;
-              if(err.status == '404') {
-                this.searchUtils.status = this.errorCodes.NOT_FOUND;
-              } else if(err.status == '500') {
-                this.searchUtils.status = this.errorCodes.ERROR;
-              } else {
-                this.searchUtils.status = this.errorCodes.NOT_AVAILABLE;
-              }
-          }
-      );
-
-    }
-  private setFilters(){
-    //TODO set filters from
-  }
-
-  private createFilters():Filter[] {
-    var filter_names=["Type","Compatibility Level"];
-    var filter_ids=["datasourcetypeuiid","datasourcecompatibilityname"];
-    var searchFields = new SearchFields();
-    var filter_original_ids = searchFields.JOURNAL_FIELDS;
-    var value_names=[
-      /*[
-      "Institutional Publication Repository","Thematic Publication Repository", "Other Publication Repository",
-     "Institutional Repositories Aggregators",
-     "Thematic Repositories Aggregators", "Other Repositories Aggregators",
-      "Data Repositories", "Data Repositories Aggregators", "Journals", "Journals Aggregators", "CRIS Systems", "Publication Catalogues"],
-      */
-      ["Journal", "Journal Aggregator\/Publisher"],
-
-
-
-
-      ["OpenAIRE Basic (DRIVER OA)","OpenAIRE 2.0 (EC funding)", "OpenAIRE 2.0+ (DRIVER OA, EC funding)", "OpenAIRE 3.0 (OA, funding)","OpenAIRE Data (funded, referenced datasets)"]];
-
-    var value_original_ids=[
-      ["pubsrepository::journal", "aggregator::pubsrepository::journals"],
-      //["driver","openaire2.0", "driver-openaire2.0", "openaire3.0","openaire2.0_data"]
-    ["OpenAIRE Basic (DRIVER OA)","OpenAIRE 2.0 (EC funding)", "OpenAIRE 2.0+ (DRIVER OA, EC funding)", "OpenAIRE 3.0 (OA, funding)","OpenAIRE Data (funded, referenced datasets)"]];
-    var filters: Filter[] =[];
-    for(var i =0 ; i < filter_names.length;i++){
-      var values:Value[] = [];
-      for(var j =0 ; j < value_names[i].length;j++){
-        var value:Value = {name: value_names[i][j], id: value_original_ids[i][j], number:j, selected:false}
-        values.push(value);
-      }
-       var filter:Filter = {title: filter_names[i], filterId: filter_ids[i], originalFilterId:  filter_original_ids[i], values : values, countSelectedValues:0, "filterOperator": 'or' };
-       filters.push(filter);
-    }
-    return filters;
-    }
-}
diff --git a/src/app/searchPages/dataProviders/journalsTable.module.ts b/src/app/searchPages/dataProviders/journalsTable.module.ts
deleted file mode 100644
index 3e46d8b..0000000
--- a/src/app/searchPages/dataProviders/journalsTable.module.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { NgModule}            from '@angular/core';
-import { CommonModule }        from '@angular/common';
-import { FormsModule }         from '@angular/forms';
-
-import{SearchJournalsTableComponent} from './journalsTable.component';
-
-
-import {SearchPageTableViewModule} from '../searchUtils/searchPageTableView.module';
-import {JournalsTableRoutingModule} from './journalsTable-routing.module';
-import { FreeGuard,PreviousRouteRecorder, IsRouteEnabled, SearchFormModule, DataProvidersServiceModule} from 'ng-openaire-library';
-
-
-@NgModule({
-  imports: [
-    CommonModule, FormsModule,
-    DataProvidersServiceModule,
-     SearchFormModule, SearchPageTableViewModule, JournalsTableRoutingModule
-
-  ],  providers:[FreeGuard, IsRouteEnabled],
-  declarations: [
-    SearchJournalsTableComponent
-   ],
-  exports: [
-    SearchJournalsTableComponent
-     ]
-})
-export class JournalsTableModule { }
diff --git a/src/app/searchPages/searchUtils/searchPageTableView.component.ts b/src/app/searchPages/searchUtils/searchPageTableView.component.ts
index 607b34a..131cec0 100644
--- a/src/app/searchPages/searchUtils/searchPageTableView.component.ts
+++ b/src/app/searchPages/searchUtils/searchPageTableView.component.ts
@@ -4,9 +4,8 @@ import { Subject } from 'rxjs/Subject';
 import {Location} from '@angular/common';
 import { DataTableDirective } from 'angular-datatables';
 
-import {SearchFields, DOI, StringUtils,ModalLoading,ErrorCodes, PiwikService, SearchDataprovidersService} from 'ng-openaire-library';
+import {SearchFields, DOI, StringUtils,ModalLoading,ErrorCodes,OpenaireProperties,PiwikService, SearchDataprovidersService} from 'ng-openaire-library';
 import {Meta, SearchUtilsClass, Filter, Value, SearchFilterComponent, SearchFilterModalComponent } from 'ng-openaire-library';
-import {Properties} from '../../utils/properties';
 
 @Component({
     selector: 'search-page-table',
@@ -66,9 +65,9 @@ export class SearchPageTableViewComponent  implements OnInit, AfterViewInit {
         this.updateTitle(this.pageTitle);
         this.updateDescription("Openaire, search, repositories, open access, type, content provider, funder, project, " + this.type + "," +this.pageTitle);
         if(typeof window !== 'undefined') {
-          this.updateUrl(Properties.getBaseLink()+location.pathname);
+          this.updateUrl(OpenaireProperties.getBaseLink()+location.pathname);
         }
-        if(Properties.isPiwikTrackEnabled() && (typeof document !== 'undefined')){
+        if(OpenaireProperties.isPiwikTrackEnabled() && (typeof document !== 'undefined')){
           this.piwiksub = this._piwikService.trackView(this.pageTitle).subscribe();
         }
    }
diff --git a/src/app/searchPages/simple/searchDataProviders-routing.module.ts b/src/app/searchPages/simple/searchDataProviders-routing.module.ts
index 21ead85..9e9e418 100644
--- a/src/app/searchPages/simple/searchDataProviders-routing.module.ts
+++ b/src/app/searchPages/simple/searchDataProviders-routing.module.ts
@@ -3,12 +3,13 @@ import { RouterModule } from '@angular/router';
 
 import{OpenaireSearchDataprovidersComponent} from './searchDataproviders.component';
 import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
+import {Properties} from '../../utils/properties';
 
 @NgModule({
   imports: [
     RouterModule.forChild([
      	{ path: '', component: OpenaireSearchDataprovidersComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-          redirect: '/error'
+          redirect: '/error', api: Properties.adminToolsAPIURL, community :Properties.adminToolsCommunity
         }, canDeactivate: [PreviousRouteRecorder]  }
 
     ])
diff --git a/src/app/searchPages/simple/searchDatasets-routing.module.ts b/src/app/searchPages/simple/searchDatasets-routing.module.ts
index 1d28931..262e30f 100644
--- a/src/app/searchPages/simple/searchDatasets-routing.module.ts
+++ b/src/app/searchPages/simple/searchDatasets-routing.module.ts
@@ -2,14 +2,14 @@ import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 
 import{OpenaireSearchDatasetsComponent} from './searchDatasets.component';
-import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
-
+import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled, EnvironmentSpecificResolver} from 'ng-openaire-library';
+import {Properties} from '../../utils/properties';
 @NgModule({
   imports: [
     RouterModule.forChild([
      	{ path: '', component: OpenaireSearchDatasetsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-          redirect: '/error'
-        }, canDeactivate: [PreviousRouteRecorder]  }
+          redirect: '/error', api: Properties.adminToolsAPIURL, community :Properties.adminToolsCommunity
+        }, canDeactivate: [PreviousRouteRecorder] , resolve: { envSpecific: EnvironmentSpecificResolver  }},
 
     ])
   ]
diff --git a/src/app/searchPages/simple/searchDatasets.component.ts b/src/app/searchPages/simple/searchDatasets.component.ts
index 8a0231f..908118e 100644
--- a/src/app/searchPages/simple/searchDatasets.component.ts
+++ b/src/app/searchPages/simple/searchDatasets.component.ts
@@ -1,14 +1,31 @@
 import {Component, Input, ViewChild} from '@angular/core';
- 
+import {ActivatedRoute} from '@angular/router';
+
 @Component({
     selector: 'openaire-search-datasets',
     template: `
 
-    <search-datasets>
+    <search-datasets
+    openaireLink="https://beta.explore.openaire.eu/search/find/datasets"
+                [(advancedSearchParameters)]=advancedSearchParameters
+                [(connectCommunityId)]=connectCommunityId>
     </search-datasets>
     `
 })
 
 export class OpenaireSearchDatasetsComponent {
+  advancedSearchParameters:any={community: "%22egi%7C%7CEGI%20Federation%22", co: "and"};
+  connectCommunityId:string;
+  constructor(  private  route: ActivatedRoute) {
+  }
+  ngOnInit() {
+    this.route.queryParams.subscribe(data => {
 
+      if(data['community'] && data['community']!=""){
+        var id= decodeURIComponent(data['community']);
+        this.connectCommunityId = id.slice(1,id.length - 1);
+        console.log("HEREEEE"+this.connectCommunityId);
+      }
+    });
+  }
 }
diff --git a/src/app/searchPages/simple/searchOrganizations-routing.module.ts b/src/app/searchPages/simple/searchOrganizations-routing.module.ts
index 6dfabf7..37e6935 100644
--- a/src/app/searchPages/simple/searchOrganizations-routing.module.ts
+++ b/src/app/searchPages/simple/searchOrganizations-routing.module.ts
@@ -3,12 +3,13 @@ import { RouterModule } from '@angular/router';
 
 import{OpenaireSearchOrganizationsComponent} from './searchOrganizations.component';
 import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
+import {Properties} from '../../utils/properties';
 
 @NgModule({
   imports: [
     RouterModule.forChild([
      	{ path: '', component: OpenaireSearchOrganizationsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-          redirect: '/error'
+          redirect: '/error', api: Properties.adminToolsAPIURL, community :Properties.adminToolsCommunity
         }, canDeactivate: [PreviousRouteRecorder] }
 
     ])
diff --git a/src/app/searchPages/simple/searchProjects-routing.module.ts b/src/app/searchPages/simple/searchProjects-routing.module.ts
index 73fee35..6e70d0d 100644
--- a/src/app/searchPages/simple/searchProjects-routing.module.ts
+++ b/src/app/searchPages/simple/searchProjects-routing.module.ts
@@ -3,12 +3,13 @@ import { RouterModule } from '@angular/router';
 
 import{OpenaireSearchProjectsComponent} from './searchProjects.component';
 import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
+import {Properties} from '../../utils/properties';
 
 @NgModule({
   imports: [
     RouterModule.forChild([
      	{ path: '', component: OpenaireSearchProjectsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-          redirect: '/error'
+          redirect: '/error', api: Properties.adminToolsAPIURL, community :Properties.adminToolsCommunity
         }, canDeactivate: [PreviousRouteRecorder]  }
 
     ])
diff --git a/src/app/searchPages/simple/searchPublications-routing.module.ts b/src/app/searchPages/simple/searchPublications-routing.module.ts
index fbe0489..31e7d59 100644
--- a/src/app/searchPages/simple/searchPublications-routing.module.ts
+++ b/src/app/searchPages/simple/searchPublications-routing.module.ts
@@ -3,12 +3,13 @@ import { RouterModule } from '@angular/router';
 
 import{OpenaireSearchPublicationsComponent} from './searchPublications.component';
 import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
+import {Properties} from '../../utils/properties';
 
 @NgModule({
   imports: [
     RouterModule.forChild([
      	{ path: '', component: OpenaireSearchPublicationsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
-          redirect: '/error'
+          redirect: '/error', api: Properties.adminToolsAPIURL, community :Properties.adminToolsCommunity
         }, canDeactivate: [PreviousRouteRecorder]  }
 
     ])
diff --git a/src/app/searchPages/simple/searchPublications.component.ts b/src/app/searchPages/simple/searchPublications.component.ts
index d5051da..37dd072 100644
--- a/src/app/searchPages/simple/searchPublications.component.ts
+++ b/src/app/searchPages/simple/searchPublications.component.ts
@@ -1,10 +1,13 @@
 import {Component, Input, ViewChild} from '@angular/core';
+import {ActivatedRoute} from '@angular/router';
 
 @Component({
     selector: 'openaire-search-publications',
     template: `
 
-    <search-publications>
+    <search-publications  openaireLink="https://beta.explore.openaire.eu/search/find/publications"
+                 [(advancedSearchParameters)]=advancedSearchParameters
+                 [(connectCommunityId)]=connectCommunityId>
     </search-publications>
 
     `
@@ -12,5 +15,18 @@ import {Component, Input, ViewChild} from '@angular/core';
 })
 export class OpenaireSearchPublicationsComponent {
 
+ advancedSearchParameters:any={community: "%22egi%7C%7CEGI%20Federation%22", co: "and"};
+ connectCommunityId:string;
+ constructor(  private  route: ActivatedRoute) {
+ }
+ ngOnInit() {
+   this.route.queryParams.subscribe(data => {
 
+     if(data['community'] && data['community']!=""){
+       var id= decodeURIComponent(data['community']);
+       this.connectCommunityId = id.slice(1,id.length - 1);
+       console.log("HEREEEE"+this.connectCommunityId);
+     }
+   });
+ }
 }
diff --git a/src/app/searchPages/simple/searchSoftware-routing.module.ts b/src/app/searchPages/simple/searchSoftware-routing.module.ts
index a7da5a8..9e7e7a3 100644
--- a/src/app/searchPages/simple/searchSoftware-routing.module.ts
+++ b/src/app/searchPages/simple/searchSoftware-routing.module.ts
@@ -3,11 +3,14 @@ import { RouterModule } from '@angular/router';
 
 import {OpenaireSearchSoftwareComponent} from './searchSoftware.component';
 import {FreeGuard,PreviousRouteRecorder, IsRouteEnabled} from 'ng-openaire-library';
+import {Properties} from '../../utils/properties';
 
 @NgModule({
   imports: [
     RouterModule.forChild([
-     	{ path: '', component: OpenaireSearchSoftwareComponent, canActivate: [FreeGuard, IsRouteEnabled], canDeactivate: [PreviousRouteRecorder]  }
+     	{ path: '', component: OpenaireSearchSoftwareComponent, canActivate: [FreeGuard, IsRouteEnabled], canDeactivate: [PreviousRouteRecorder], data: {
+          redirect: '/error', api: Properties.adminToolsAPIURL, community :Properties.adminToolsCommunity
+        }  }
 
     ])
   ]
diff --git a/src/app/searchPages/simple/searchSoftware.component.ts b/src/app/searchPages/simple/searchSoftware.component.ts
index da673ff..7e54263 100644
--- a/src/app/searchPages/simple/searchSoftware.component.ts
+++ b/src/app/searchPages/simple/searchSoftware.component.ts
@@ -1,14 +1,31 @@
 import {Component, Input, ViewChild} from '@angular/core';
+import {ActivatedRoute} from '@angular/router';
 
 @Component({
     selector: 'openaire-search-software',
     template: `
 
-    <search-software>
+    <search-software
+    openaireLink="https://beta.explore.openaire.eu/search/find/software"
+                [(advancedSearchParameters)]=advancedSearchParameters
+                [(connectCommunityId)]=connectCommunityId>
     </search-software>
     `
 })
 
 export class OpenaireSearchSoftwareComponent {
+  advancedSearchParameters:any={community: "%22egi%7C%7CEGI%20Federation%22", co: "and"};
+  connectCommunityId:string;
+  constructor(  private  route: ActivatedRoute) {
+  }
+  ngOnInit() {
+    this.route.queryParams.subscribe(data => {
 
+      if(data['community'] && data['community']!=""){
+        var id= decodeURIComponent(data['community']);
+        this.connectCommunityId = id.slice(1,id.length - 1);
+        console.log("HEREEEE"+this.connectCommunityId);
+      }
+    });
+  }
 }
diff --git a/src/app/utils/properties.ts b/src/app/utils/properties.ts
index 86a4ccd..5c3a90c 100644
--- a/src/app/utils/properties.ts
+++ b/src/app/utils/properties.ts
@@ -1,418 +1,5 @@
 export class Properties {
-    private static productionMode:boolean = false;
-    private static enablePiwikTrack:boolean = false;
-    private static enableHelper:boolean = false;
-    private static useCache:boolean = true;
-
-    //base url
-    private static baseLink = "https://demo.openaire.eu";
-
-    //landing Pages
-    private static baseSearchLink="/";
-    private static searchLinkToPublication = "search/publication?articleId=";
-    private static searchLinkToProject = "search/project?projectId=";
-    private static searchLinkToDataProvider = "search/dataprovider?datasourceId=";
-    private static searchLinkToDataset = "search/dataset?datasetId=";
-    private static searchLinkToOrganization = "search/organization?organizationId=";
-    //Search pages
-    private static searchLinkToPublications = "search/find/publications";
-    private static searchLinkToDataProviders = "search/find/dataproviders";
-    private static searchLinkToProjects = "search/find/projects";
-    private static searchLinkToDatasets = "search/find/datasets";
-    private static searchLinkToSoftware = "search/find/software";
-    private static searchLinkToOrganizations = "search/find/organizations";
-    private static searchLinkToPeople = "search/find/people";
-    public static searchLinkToCompatibleDataProviders = "search/content-providers";
-    public static searchLinkToCompatibleDataProvidersTable = "search/content-providers-table";
-    public static searchLinkToEntityRegistriesDataProviders = "search/entity-registries";
-    public static searchLinkToEntityRegistriesDataProvidersTable = "search/entity-registries-table";
-    public static searchLinkToJournals = "search/journals";
-    public static searchLinkToJournalsTable = "search/journals-table";
-
-    //Advanced Search for pages
-    public static searchLinkToAdvancedPublications = "search/advanced/publications";
-    public static searchLinkToAdvancedProjects = "search/advanced/projects";
-    public static searchLinkToAdvancedDatasets = "search/advanced/datasets";
-    public static searchLinkToAdvancedSoftware = "search/advanced/software";
-    public static searchLinkToAdvancedDataProviders = "search/advanced/dataproviders";
-    public static searchLinkToAdvancedOrganizations = "search/advanced/organizations";
-    public static searchLinkToAdvancedPeople = "search/advanced/people";
-
-
-    private static metricsAPIURL = "https://beta.services.openaire.eu/usagestats/";
-    private static framesAPIURL = "https://beta.openaire.eu/stats3/";
-
-    private static loginAPIURL = "http://rudie.di.uoa.gr:8080/dnet%2Dopenaire%2Dusers%2D1.0.0%2DSNAPSHOT/api/users/authenticates"
-    //"http://scoobydoo.di.uoa.gr:8080/uoa-user-management-1.0.0-SNAPSHOT/api/users/authenticates";
-    private static loginAPIURL_pm = "https://beta.services.openaire.eu/uoa-user-management/api/users/authenticates";
-
-    private static claimsAPIURL = "http://scoobydoo.di.uoa.gr:8080/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/";
-    private static claimsAPIURL_pm = "https://beta.services.openaire.eu/claims/rest/claimsService/";
-
-     private static searchAPIURLLAst_pm     = "https://beta.services.openaire.eu/search/v2/api/";
-     private static searchAPIURLLAst     = "https://beta.services.openaire.eu/search/v2/api/";
-//    private static searchAPIURLLAst     = "http://scoobydoo.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/";
-
-    private static searchResourcesAPIURL_pm     = "https://beta.services.openaire.eu/search/v2/api/resources";
-    private static searchResourcesAPIURL     = "https://beta.services.openaire.eu/search/v2/api/resources";
-    // private static searchResourcesAPIURL     = "http://scoobydoo.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/resources";
-
-
-    private static csvAPIURL_pm = "https://beta.services.openaire.eu/search/v2/api/";//publications?format=csv
-    // private static csvAPIURL = "http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/";//publications?format=csv
-
-   private static csvAPIURL = "https://beta.services.openaire.eu/search/v2/api/";//publications?format=csv
-
-    private static searchCrossrefAPIURL = "https://api.crossref.org/works";
-    // private static searchDataciteAPIURL = "https://search.datacite.org/api";
-    private static searchDataciteAPIURL = "https://api.datacite.org/works";
-
-    private static searchOrcidURL    = "https://pub.orcid.org/";
-
-    // Identifiers
-    private static pmidURL    = "http://www.ncbi.nlm.nih.gov/pubmed/";
-    private static doiURL     = "https://dx.doi.org/";
-    private static cordisURL  = "http://cordis.europa.eu/projects/";
-    private static pmcURL     = "http://europepmc.org/articles/";
-    private static handleURL  = "http://hdl.handle.net/";
-
-    // Zenodo's url
-    private static zenodo   = "https://zenodo.org/";
-    // Open access link
-    private static openAccess = "https://www.openaire.eu/support/faq#article-id-234";
-    // Open access repository link
-    private static openAccessRepo = "https://www.openaire.eu/support/faq#article-id-310";
-    // FP7 link
-    private static fp7Guidlines = "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme";
-    // H2020 link
-    private static h2020Guidlines = "https://www.openaire.eu/oa-publications/h2020/open-access-in-horizon-2020";
-    // ERC Guidlines
-    private static ercGuidlines = "http://erc.europa.eu/sites/default/files/document/file/ERC_Open_Access_Guidelines-revised_2014.pdf";
-    // helpdesk link
-    private static helpdesk = "https://www.openaire.eu/support/helpdesk";
-
-    private static uploadService_pm = "https://demo.openaire.eu/upload";
-    private static uploadService = "http://scoobydoo.di.uoa.gr:8000/upload";
-
-    private static vocabulariesAPI ="https://beta.services.openaire.eu/provision/mvc/vocabularies/";
-
-    private static piwikBaseUrl =" https://analytics.openaire.eu/piwik.php?idsite=6";
-
-
-    private static loginUrl ="http://rudie.di.uoa.gr:8080/dnet-openaire-users-2.0.0-SNAPSHOT/openid_connect_login";
-    //"http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/openid_connect_login";
-    private static loginUrl_pm ="https://beta.services.openaire.eu/uoa-user-management/openid_connect_login";
-
-    private static logoutUrl ="https://aai.openminted.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=";
-    private static logoutUrl_pm ="https://aai.openminted.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=";
-
-    private static logoutOpenaireUrl ="http://dl067.madgik.di.uoa.gr/idp/profile/Logout";
-    private static logoutOpenaireUrl_pm ="http://dl067.madgik.di.uoa.gr/idp/profile/Logout";
-
-
-
-    private static cookieDomain =".di.uoa.gr";
-    private static cookieDomain_pm =".openaire.eu";
-
-    private static feedbackmail ="openaire.test@gmail.com";
-
-    private static helperPageUrl ="http://scoobydoo.di.uoa.gr:16000/api/page/route";
-
-    private static cache ="http://scoobydoo.di.uoa.gr:3000/get?url=";
-    private static cache_pm ="https://demo.openaire.eu/cache/get?url=";
-
-
-
-    public static getBaseLink():string{
-      return this.baseLink;
-    }
-
-    //landing Pages' getters
-    public static getsearchLinkToPublication():string{
-      return this.baseSearchLink + this.searchLinkToPublication;
-    }
-    public static getsearchLinkToDataset():string{
-      return this.baseSearchLink + this.searchLinkToDataset;
-    }
-    public static getsearchLinkToProject():string{
-      return this.baseSearchLink + this.searchLinkToProject;
-    }
-
-    public static getsearchLinkToOrganization():string{
-      return  this.searchLinkToOrganization;
-    }
-    public static getsearchLinkToDataProvider():string{
-      return  this.searchLinkToDataProvider;
-    }
-    //searchPages
-    public static getLinkToSearchPublications():string{
-      return this.baseSearchLink + this.searchLinkToPublications;
-    }
-    public static getLinkToSearchProjects():string{
-      return this.baseSearchLink + this.searchLinkToProjects;
-    }
-    public static getLinkToSearchDataProviders():string{
-      return this.baseSearchLink + this.searchLinkToDataProviders;
-    }
-    public static getLinkToSearchCompatibleDataProviders():string{
-      return this.baseSearchLink + this.searchLinkToCompatibleDataProviders;
-    }
-    public static getLinkToSearchCompatibleDataProvidersTable():string{
-      return this.baseSearchLink + this.searchLinkToCompatibleDataProvidersTable;
-    }
-    public static getLinkToSearchEntityRegistries():string{
-      return this.baseSearchLink + this.searchLinkToEntityRegistriesDataProviders;
-    }
-    public static getLinkToSearchEntityRegistriesTable():string{
-      return this.baseSearchLink + this.searchLinkToEntityRegistriesDataProvidersTable;
-    }
-    public static getLinkToSearchJournals():string{
-      return this.baseSearchLink + this.searchLinkToJournals;
-    }
-    public static getLinkToSearchJournalsTable():string{
-      return this.baseSearchLink + this.searchLinkToJournalsTable;
-    }
-    public static getLinkToSearchDatasets():string{
-      return this.baseSearchLink + this.searchLinkToDatasets;
-    }
-    public static getLinkToSearchSoftware():string{
-      return this.baseSearchLink + this.searchLinkToSoftware;
-    }
-    public static getLinkToSearchOrganizations():string{
-      return this.baseSearchLink + this.searchLinkToOrganizations;
-    }
-    public static getLinkToSearchPeople():string{
-        return this.baseSearchLink + this.searchLinkToPeople;
-    }
-
-    //Advanced searchPages
-    public static getLinkToAdvancedSearchPublications():string{
-      return this.baseSearchLink + this.searchLinkToAdvancedPublications;
-    }
-    public static getLinkToAdvancedSearchProjects():string{
-      return this.baseSearchLink + this.searchLinkToAdvancedProjects;
-    }
-    public static getLinkToAdvancedSearchDataProviders():string{
-      return this.baseSearchLink + this.searchLinkToAdvancedDataProviders;
-    }
-    public static getLinkToAdvancedSearchDatasets():string{
-      return this.baseSearchLink + this.searchLinkToAdvancedDatasets;
-    }
-    public static getLinkToAdvancedSearchSoftware():string{
-      return this.baseSearchLink + this.searchLinkToAdvancedSoftware;
-    }
-    public static getLinkToAdvancedSearchOrganizations():string{
-      return this.baseSearchLink + this.searchLinkToAdvancedOrganizations;
-    }
-    public static getLinkToAdvancedSearchPeople():string{
-        return this.baseSearchLink + this.searchLinkToAdvancedPeople;
-    }
-
-    // Services - APIs' getters
-    // public static getSearchAPIURL():string{
-    //   return this.searchAPIURL;
-    // }
-    // Services - APIs' getters
-    public static getCsvAPIURL(): string {
-      if(this.productionMode){
-        return this.csvAPIURL_pm;
-      }else{
-        return this.csvAPIURL;
-      }
-        // return this.csvAPIURL;
-    }
-
-    public static getFramesAPIURL(): string {
-        return this.framesAPIURL;
-    }
-
-    public static getMetricsAPIURL(): string {
-        return this.metricsAPIURL;
-    }
-
-    public static getLoginAPIURL(): string {
-      if(this.productionMode){
-        return this.loginAPIURL_pm;
-      }else{
-        return this.loginAPIURL;
-      }
-        // return this.loginAPIURL;
-    }
-
-    public static getSearchAPIURLLast():string{
-      if(this.productionMode){
-        return this.searchAPIURLLAst_pm;
-      }else{
-        return this.searchAPIURLLAst;
-      }
-      // return this.searchAPIURLLAst;
-    }
-    //query using full query:
-    //
-    public static getSearchResourcesAPIURL():string{
-      if(this.productionMode){
-        return this.searchResourcesAPIURL_pm;
-      }else{
-        return this.searchResourcesAPIURL;
-      }
-      // return this.searchResourcesAPIURL;
-    }
-    public static getSearchAPIURLForEntity(entityType:string):string{
-      var suffix = "";
-      if(entityType == "project"){
-        suffix="projects/";
-      }else if(entityType == "publication"){
-        suffix="publications/";
-      }else if(entityType == "dataset"){
-        suffix="datasets/";
-      } else if(entityType == "software"){
-        suffix="software/";
-      }else if(entityType == "organization"){
-        suffix="organizations/";
-      }else if(entityType == "dataprovider"){
-        suffix="datasources/";
-      }else if(entityType == "person"){
-        suffix="people/";
-      }
-      return (this.productionMode?this.searchAPIURLLAst_pm:this.searchAPIURLLAst) + suffix;
-    }
-
-    public static getClaimsAPIURL():string{
-      if(this.productionMode){
-        return this.claimsAPIURL_pm;
-      }else{
-        return this.claimsAPIURL;
-      }
-    }
-    public static getSearchCrossrefAPIURL():string{
-        return this.searchCrossrefAPIURL;
-    }
-    public static getSearchDataciteAPIURL():string{
-        return this.searchDataciteAPIURL;
-    }
-    public static getSearchOrcidURL():string{
-        return this.searchOrcidURL;
-    }
-
-    // Identifiers' getters
-    public static getPmidURL():string{
-        return this.pmidURL;
-    }
-    public static getDoiURL():string{
-        return this.doiURL;
-    }
-    public static getCordisURL():string{
-        return this.cordisURL;
-    }
-    public static getPmcURL():string{
-        return this.pmcURL;
-    }
-    public static getHandleURL():string{
-        return this.handleURL;
-    }
-
-    // Zenodo's getter
-    public static getZenodoURL():string{
-        return this.zenodo;
-    }
-    // Open access getter
-    public static getOpenAccess():string{
-        return this.openAccess;
-    }
-    // Open access repository getter
-    public static getOpenAccessRepo():string{
-        return this.openAccessRepo;
-    }
-    // FP7 link getter
-    public static getFP7Guidlines():string{
-        return this.fp7Guidlines;
-    }
-    // H2020 link getter
-    public static getH2020Guidlines():string{
-        return this.h2020Guidlines;
-    }
-    // ERC Guidlines getter
-    public static getERCGuidlines():string{
-        return this.ercGuidlines;
-    }
-    // helpdesk link getter
-    public static getHelpdesk():string{
-        return this.helpdesk;
-    }
-
-
-    //upload service for bulk claim - upload csv file
-    public static getUploadServiceUrl():string{
-      if(this.productionMode){
-        return this.uploadService_pm;
-      }else{
-        return this.uploadService;
-      }
-    }
-    //vocabularies API
-    public static getVocabulariesAPI():string{
-        return this.vocabulariesAPI;
-    }
-    public static getPiwikBaseURL():string{
-        return this.piwikBaseUrl;
-    }
-    public static isPiwikTrackEnabled():boolean{
-        return this.enablePiwikTrack;
-    }
-    public static getLoginURL():string{
-      if(this.productionMode){
-        return this.loginUrl_pm;
-      }else{
-        return this.loginUrl;
-      }
-    }
-    public static getLogoutURL():string{
-      if(this.productionMode){
-        return this.logoutUrl_pm;
-      }else{
-        return this.logoutUrl;
-      }
-    }
-    public static getLogoutOpenaireURL():string{
-      if(this.productionMode){
-        return this.logoutOpenaireUrl_pm;
-      }else{
-        return this.logoutOpenaireUrl;
-      }
-    }
-    public static getCookieDomain():string{
-      if(this.productionMode){
-        return this.cookieDomain_pm;
-      }else{
-        return this.cookieDomain;
-      }
-    }
-    public static getFeedbackMail():string{
-      return this.feedbackmail;
-  }
-  public static getHelperPageUrl():string{
-    return this.helperPageUrl;
-  }
-  public static isHelperEnabled():boolean{
-    return this.enableHelper;
-  }
-  public static getCacheUrl():string{
-    if(this.productionMode){
-      return this.cache_pm;
-    }else{
-      return this.cache;
-    }
-  }
-  public static isCacheEnabled():boolean{
-    return this.useCache;
-  }
-}
-export class ErrorCodes {
-  public LOADING = 0;
-  public DONE = 1;
-  public NONE = 2;
-  public ERROR = 3;
-  public NOT_AVAILABLE = 4;
-  public OUT_OF_BOUND = 5;
-  public NOT_FOUND = 6;
+  public static adminToolsAPIURL = "http://duffy.di.uoa.gr:8080/uoa-admin-tools";
+    public static adminToolsAPIURL_pm = "http://duffy.di.uoa.gr:8080/uoa-admin-tools";
+    public static adminToolsCommunity = "egi";
 }
diff --git a/src/assets/chart.png b/src/assets/chart.png
new file mode 100644
index 0000000..5d46834
Binary files /dev/null and b/src/assets/chart.png differ
diff --git a/src/assets/connect-custom.css b/src/assets/connect-custom.css
new file mode 100644
index 0000000..160c4ee
--- /dev/null
+++ b/src/assets/connect-custom.css
@@ -0,0 +1,21 @@
+.tm-toolbar .uk-subnav-line .custom-connect-li {
+   display: block;
+  background:#DEAF50 !important; color:#fff !important;
+
+}
+.custom-connect-toolbar   ul.uk-subnav.uk-subnav-line{
+  background-color: #FFC700 !important;
+  }
+
+  .custom-connect-toolbar .inner {
+       background-color: #FFC700 !important;
+  }
+
+  .custom-connect-toolbar{
+    border-top-color:#FFC700 !important;
+  }
+.custom-footer{
+ position:relative;
+ bottom:0;
+ left:0;
+}
diff --git a/src/assets/discover-custom.css b/src/assets/discover-custom.css
index 62280be..5f84811 100644
--- a/src/assets/discover-custom.css
+++ b/src/assets/discover-custom.css
@@ -1,38 +1,4 @@
 
-.tm-toolbar .uk-subnav-line .custom-explore-li {
-   display: block;
-  background:#Fb6e50 !important; color:#fff !important;
-
-}
-
-.custom-explore-toolbar   ul.uk-subnav.uk-subnav-line{
-  background-color: #f25f30 !important;
-  }
-
-  .custom-explore-toolbar .inner {
-       background-color: #f25f30 !important;
-  }
-
-  .custom-explore-toolbar{
-    border-top-color:#f25f30 !important;
-  }
-  .tm-toolbar .uk-subnav-line .custom-connect-li {
-     display: block;
-    background:#DEAF50 !important; color:#fff !important;
-
-  }
-
-  .custom-connect-toolbar   ul.uk-subnav.uk-subnav-line{
-    background-color: #FFC700 !important;
-    }
-
-    .custom-connect-toolbar .inner {
-         background-color: #FFC700 !important;
-    }
-
-    .custom-connect-toolbar{
-      border-top-color:#FFC700 !important;
-    }
 .custom-footer{
    position:relative;
    bottom:0;
diff --git a/src/assets/env-properties.json b/src/assets/env-properties.json
new file mode 100644
index 0000000..b7925b4
--- /dev/null
+++ b/src/assets/env-properties.json
@@ -0,0 +1,93 @@
+{
+  "enablePiwikTrack" : false,
+  "enableHelper" : false,
+  "useCache" : true,
+  "metricsAPIURL" : "https://beta.services.openaire.eu/usagestats/",
+  "framesAPIURL" : "https://beta.openaire.eu/stats3/",
+  "claimsAPIURL" : "http://scoobydoo.di.uoa.gr:8080/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/",
+
+   "searchAPIURLLAst"     : "https://beta.services.openaire.eu/search/v2/api/",
+
+  "searchResourcesAPIURL"     : "https://beta.services.openaire.eu/search/v2/api/resources",
+
+
+
+  "csvAPIURL" : "http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/reports",
+
+  "searchCrossrefAPIURL" : "https://api.crossref.org/works",
+  "searchDataciteAPIURL" : "https://api.datacite.org/works",
+
+  "searchOrcidURL"    : "https://pub.orcid.org/",
+
+  "pmidURL"    : "http://www.ncbi.nlm.nih.gov/pubmed/",
+  "doiURL"     : "https://dx.doi.org/",
+  "cordisURL"  : "http://cordis.europa.eu/projects/",
+  "pmcURL"     : "http://europepmc.org/articles/",
+  "handleURL"  : "http://hdl.handle.net/",
+
+  "zenodo"   : "https://zenodo.org/",
+  "openAccess" : "https://www.openaire.eu/support/faq#article-id-234",
+  "openAccessRepo" : "https://www.openaire.eu/support/faq#article-id-310",
+  "fp7Guidlines" : "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme",
+  "h2020Guidlines" : "https://www.openaire.eu/oa-publications/h2020/open-access-in-horizon-2020",
+  "ercGuidlines" : "http://erc.europa.eu/sites/default/files/document/file/ERC_Open_Access_Guidelines-revised_2014.pdf",
+  "helpdesk" : "https://www.openaire.eu/support/helpdesk",
+
+  "uploadService" : "http://scoobydoo.di.uoa.gr:8000/upload",
+
+  "vocabulariesAPI" :"https://beta.services.openaire.eu/provision/mvc/vocabularies/",
+
+  "piwikBaseUrl" :" https://analytics.openaire.eu/piwik.php?idsite:6",
+
+
+  "loginUrl" :"http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/openid_connect_login",
+
+  "logoutUrl" :"https://aai.openminted.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo:",
+
+  "logoutOpenaireUrl" :"http://dl067.madgik.di.uoa.gr/idp/profile/Logout",
+
+  "cookieDomain" :".di.uoa.gr",
+
+  "feedbackmail" :"openaire.test@gmail.com",
+
+  "helperPageUrl" :"http://scoobydoo.di.uoa.gr:16000/api/page/route",
+
+  "cacheUrl" :"http://scoobydoo.di.uoa.gr:3000/get?url=",
+
+  "adminToolsAPIURL" :"http://duffy.di.uoa.gr:8080/uoa-admin-tools",
+
+  "adminToolsCommunity" :"openaire",
+
+  "csvLimit":  2000,
+  "pagingLimit":  20,
+  "resultsPerPage":  10,
+
+  "baseLink" : "https://demo.openaire.eu",
+
+  "searchLinkToPublication" : "/search/publication?articleId:",
+  "searchLinkToProject" : "/search/project?projectId:",
+  "searchLinkToDataProvider" : "/search/dataprovider?datasourceId:",
+  "searchLinkToDataset" : "/search/dataset?datasetId:",
+  "searchLinkToOrganization" : "/search/organization?organizationId:",
+
+  "searchLinkToPublications" : "/search/find/publications",
+  "searchLinkToDataProviders" : "/search/find/dataproviders",
+  "searchLinkToProjects" : "/search/find/projects",
+  "searchLinkToDatasets" : "/search/find/datasets",
+  "searchLinkToSoftware" : "/search/find/software",
+  "searchLinkToOrganizations" : "/search/find/organizations",
+  "searchLinkToCompatibleDataProviders" : "/search/content-providers",
+  "searchLinkToCompatibleDataProvidersTable" : "/search/content-providers-table",
+  "searchLinkToEntityRegistriesDataProviders" : "/search/entity-registries",
+  "searchLinkToEntityRegistriesDataProvidersTable" : "/search/entity-registries-table",
+  "searchLinkToJournals" : "/search/journals",
+  "searchLinkToJournalsTable" : "/search/journals-table",
+
+  "searchLinkToAdvancedPublications" : "/search/advanced/publications",
+  "searchLinkToAdvancedProjects" : "/search/advanced/projects",
+  "searchLinkToAdvancedDatasets" : "/search/advanced/datasets",
+  "searchLinkToAdvancedSoftware" : "/search/advanced/software",
+  "searchLinkToAdvancedDataProviders" : "/search/advanced/dataproviders",
+  "searchLinkToAdvancedOrganizations" : "/search/advanced/organizations",
+  "searchLinkToAdvancedPeople" : "/search/advanced/people"
+}
diff --git a/src/assets/logo-large-connect.png b/src/assets/logo-large-connect.png
new file mode 100644
index 0000000..e3d95b8
Binary files /dev/null and b/src/assets/logo-large-connect.png differ
diff --git a/src/assets/logo-small-connect.png b/src/assets/logo-small-connect.png
new file mode 100644
index 0000000..08fd7cd
Binary files /dev/null and b/src/assets/logo-small-connect.png differ
diff --git a/src/assets/pub-per-pr.png b/src/assets/pub-per-pr.png
new file mode 100644
index 0000000..28c508c
Binary files /dev/null and b/src/assets/pub-per-pr.png differ
diff --git a/src/assets/stats1.png b/src/assets/stats1.png
new file mode 100644
index 0000000..94f211d
Binary files /dev/null and b/src/assets/stats1.png differ
diff --git a/src/index.html b/src/index.html
index ca94157..ba8f349 100644
--- a/src/index.html
+++ b/src/index.html
@@ -92,6 +92,7 @@ $(document).ready(function(){
       <link rel="stylesheet" href="assets/common/theme.css">
       <link rel="stylesheet" href="assets/common/custom.css">
       <link rel="stylesheet" href="assets/discover-custom.css">
+      <link rel="stylesheet" href="assets/connect-custom.css">
 
       <!-- <script async src="assets/common/theme.js"></script> -->