diff --git a/src/app/library/sharedComponents/sidebar/sideBar.component.html b/src/app/library/sharedComponents/sidebar/sideBar.component.html
index f7dc5d7..d28e6a3 100644
--- a/src/app/library/sharedComponents/sidebar/sideBar.component.html
+++ b/src/app/library/sharedComponents/sidebar/sideBar.component.html
@@ -1,5 +1,5 @@
 <aside id="sidebar_main">
-  <div class="sidebar_main_header">
+  <div *ngIf= "showHeader" class="sidebar_main_header">
     <div *ngIf="name" class="uk-padding-small">
       <div class="uk-text-bold">{{name}}</div>
       <div>Monitor Dashboard</div>
@@ -10,7 +10,7 @@
       <div>{{header.dashboard}}</div>
     </div>
   </div>
-  <div class="menu_section">
+  <div class="menu_section uk-margin-top">
     <ul>
       <ng-template ngFor [ngForOf]="items" let-item let-i="index">
         <li [class.current_section]="isTheActiveMenu(item.route)"
diff --git a/src/app/library/sharedComponents/sidebar/sideBar.component.ts b/src/app/library/sharedComponents/sidebar/sideBar.component.ts
index 271fe0e..8599ca0 100644
--- a/src/app/library/sharedComponents/sidebar/sideBar.component.ts
+++ b/src/app/library/sharedComponents/sidebar/sideBar.component.ts
@@ -11,6 +11,7 @@ export class SideBarComponent implements OnInit {
   // TODO remove it
   @Input() name = null;
   @Input() header: Header = null;
+  @Input() showHeader: boolean = true;
 
   constructor(private router: Router) {
   }
diff --git a/src/app/monitor/monitor.component.html b/src/app/monitor/monitor.component.html
index 5e8209b..7a213db 100644
--- a/src/app/monitor/monitor.component.html
+++ b/src/app/monitor/monitor.component.html
@@ -1,92 +1,145 @@
 <!--disable_transitions -->
-<div class="sidebar_main_swipe  header_full"  [class.sidebar_main_active]="open">
-  <div id="header_main">
-    <nav class="uk-light">
-        <div class="main_logo_top">
-          <div *ngIf="stakeholder && stakeholder.index_name" class="">
-            <div class="uk-text-bold">{{stakeholder.index_name}}</div>
-<!--            <div>Monitor Dashboard</div>-->
-          </div>
-        </div>
-      <a id="sidebar_main_toggle" (click)="toggleOpen()" class="sSwitch sSwitch_left">
-        <span class="sSwitchIcon"></span>
-      </a>
-      <div *ngIf="stakeholder && status === errorCodes.DONE && activeTopic" class="uk-navbar-center">
-        <ul class="uk-navbar-nav">
-          <ng-template ngFor [ngForOf]="stakeholder.topics" let-topic let-i="index">
-            <li *ngIf="topic.isPublic && topic.isActive"
-                [ngClass]="(topic.alias === activeTopic.alias)?'uk-active':''">
-              <a (click)="navigateTo(stakeholder.alias, topic.alias)">{{topic.name}}</a>
-            </li>
-          </ng-template>
-        </ul>
-      </div>
-    </nav>
-  </div>
-  <dashboard-sidebar *ngIf="sideBar && stakeholder" [items]="sideBar.items" [name]="stakeholder.index_name"></dashboard-sidebar>
-  <div *ngIf="activeSubCategory"
-       id="page_content" click-outside-or-esc targetId="page_content" [escClose]="false" (clickOutside)="toggleOpen($event)">
-    <div id="page_content_inner">
-<!--      <div>
-        Filters
-        <input class="uk-input uk-form-width-medium" placeholder="Funding Stream" type="text" name="fund_level_0"
-               [(ngModel)]="fundingL0">
-
-      <input class="uk-input uk-form-width-medium" placeholder="Start year" type="text" name="start_year"
-             [(ngModel)]="startYear">
-        <input class="uk-input uk-form-width-medium" placeholder="End year" type="text" name="end_year"
-               [(ngModel)]="endYear">
-        <button class="uk-button uk-button-primary" (click)="setIndicators()">Apply</button>
-  </div>-->
-      <h5 class="uk-margin uk-margin-top uk-text-bold">Indicators</h5>
-      <div class="uk-grid uk-grid-medium uk-margin-bottom" uk-height-match="target: div > h6">
-        <ng-template ngFor [ngForOf]="activeSubCategory.numbers" let-number let-i="index">
-          <div *ngIf="number.isActive && number.isPublic"
-               [class.uk-width-1-3@m]="number.width === 'small'"
-               [class.uk-width-1-2@m]="number.width === 'medium'"
-               [class.uk-width-1-1]="number.width === 'large'">
-            <div class="md-card"
-                 [attr.uk-tooltip]="number.description">
-              <div class="md-card-content">
-                <span class="uk-text-muted uk-text-small uk-margin-bottom">{{number.name}}</span>
-                <h2 *ngIf="numberResults.get(i)" class="uk-margin-remove">
-                  <span>{{numberResults.get(i) | number}}</span>
-                </h2>
-              </div>
+<div class="double-header stakeholderPage">
+  <div class="">
+    <div id="header_menu" class="uk-width-1-1">
+      <nav class="uk-navbar">
+        <div class="uk-navbar-left">
+          <a *ngIf="stakeholder" class="uk-logo uk-navbar-item ng-star-inserted uk-link uk-margin-small-top"
+             routerlink="/"
+             routerlinkactive="uk-link" href="/">
+            <img *ngIf="stakeholder.logoUrl" [src]="stakeholder.logoUrl" class="uk-responsive-height">
+            <div *ngIf="!stakeholder.logoUrl">
+              {{stakeholder.index_name}}
+            </div>
+          </a>
+          <div class="uk-margin-large-left uk-width-medium ng-star-inserted">
+            <div class="">
+              <form class="uk-search uk-search-default uk-width-1-1  ">
+                <a
+                  class="uk-search-icon-flip uk-icon uk-search-icon" routerlinkactive="uk-link" uk-search-icon=""
+                >
+                  <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"
+                       data-svg="search-icon">
+                    <circle fill="none" stroke="#000" stroke-width="1.1" cx="9" cy="9" r="7"></circle>
+                    <path fill="none" stroke="#000" stroke-width="1.1" d="M14,14 L18,18 L14,14 Z"></path>
+                  </svg>
+                </a><input aria-describedby="sizing-addon2" class="uk-search-input "
+                           name="keyword" type="search" placeholder="Search for..."></form>
             </div>
           </div>
-        </ng-template>
-      </div>
-      <div class="uk-grid uk-grid-medium uk-margin-bottom" uk-height-match="target: div > div > h5">
-        <ng-template ngFor [ngForOf]="activeSubCategory.charts" let-chart let-i="index">
-          <div *ngIf="chart.isActive && chart.isPublic && chartsActiveType.get(i)"
-               [class.uk-width-1-3@m]="chart.width === 'small'"
-               [class.uk-width-1-2@m]="chart.width === 'medium'"
-               [class.uk-width-1-1]="chart.width === 'large'">
-            <div>
-              <h5 class="uk-margin-bottom uk-margin-top">{{chart.name}}</h5>
+        </div>
+
+        <div *ngIf="stakeholder && status === errorCodes.DONE && activeTopic" class="uk-navbar-right uk-margin-right">
+          <ul class="uk-navbar-nav">
+            <li class="uk-active">
+              <a class="uk-margin-remove-bottom "><span>Monitor</span></a>
+            </li>
+            <li>
+              <a class="uk-margin-remove-bottom ">Search</a>
+            </li>
+            <li>
+              <a class="uk-margin-remove-bottom ">Help</a>
+            </li>
+
+          </ul>
+        </div>
+      </nav>
+    </div>
+  </div>
+  <div class="sidebar_main_swipe  header_full" [class.sidebar_main_active]="open">
+    <div id="header_main">
+      <nav class="uk-light">
+        <div class="main_logo_top">
+          <div *ngIf="stakeholder && stakeholder.index_name" class=" ">
+            <div class="uk-text-bold uk-h4 uk-margin-remove-bottom">{{stakeholder.index_name}}</div>
+            <div class="uk-h5 uk-margin-remove">Monitor Dashboard</div>
+          </div>
+        </div>
+        <a id="sidebar_main_toggle" (click)="toggleOpen()" class="sSwitch sSwitch_left uk-margin-left">
+          <span class="sSwitchIcon"></span>
+        </a>
+        <div *ngIf="stakeholder && status === errorCodes.DONE && activeTopic" class="uk-navbar-center">
+          <ul class="uk-navbar-nav">
+            <ng-template ngFor [ngForOf]="stakeholder.topics" let-topic let-i="index">
+              <li *ngIf="topic.isPublic && topic.isActive"
+                  [ngClass]="(topic.alias === activeTopic.alias)?'uk-active':''">
+                <a (click)="navigateTo(stakeholder.alias, topic.alias)" class="uk-margin-remove-bottom uk-h4"
+                ><span>{{topic.name}}</span></a>
+              </li>
+            </ng-template>
+          </ul>
+        </div>
+      </nav>
+    </div>
+    <dashboard-sidebar *ngIf="sideBar && stakeholder" [items]="sideBar.items" [name]="stakeholder.index_name"
+                       [showHeader]=false
+    ></dashboard-sidebar>
+    <div *ngIf="activeSubCategory"
+         id="page_content" click-outside-or-esc targetId="page_content" [escClose]="false"
+         (clickOutside)="toggleOpen($event)">
+      <div id="page_content_inner">
+        <!--      <div>
+                Filters
+                <input class="uk-input uk-form-width-medium" placeholder="Funding Stream" type="text" name="fund_level_0"
+                       [(ngModel)]="fundingL0">
+
+              <input class="uk-input uk-form-width-medium" placeholder="Start year" type="text" name="start_year"
+                     [(ngModel)]="startYear">
+                <input class="uk-input uk-form-width-medium" placeholder="End year" type="text" name="end_year"
+                       [(ngModel)]="endYear">
+                <button class="uk-button uk-button-primary" (click)="setIndicators()">Apply</button>
+          </div>-->
+        <h4 class="uk-margin uk-margin-top uk-text-bold">Indicators</h4>
+        <div class="uk-grid uk-grid-medium uk-margin-bottom" uk-height-match="target: div > h6">
+          <ng-template ngFor [ngForOf]="activeSubCategory.numbers" let-number let-i="index">
+            <div *ngIf="number.isActive && number.isPublic"
+                 [class.uk-width-1-3@m]="number.width === 'small'"
+                 [class.uk-width-1-2@m]="number.width === 'medium'"
+                 [class.uk-width-1-1]="number.width === 'large'">
               <div class="md-card"
-                   [attr.uk-tooltip]="chart.description">
-                <div class="md-card-content uk-text-center">
-                  <div *ngIf="chart.indicatorPaths.length > 1" class="uk-button-group">
-                    <button *ngFor="let indicatorPath of chart.indicatorPaths;"
-                            class="uk-button"
-                            (click)="setActiveChart(i, indicatorPath.type)"
-                            [class.uk-button-secondary]="chartsActiveType.get(i).url === indicatorPath.url">
-                      {{indicatorPath.type}}
-                    </button>
-                  </div>
-                  <iframe *ngIf="chartsActiveType.get(i).source !== 'fake'"
-                          [src]="chartsActiveType.get(i).safeResourceUrl"
-                          class="uk-width-1-1 uk-height-medium"></iframe>
-                  <img *ngIf="chartsActiveType.get(i).source === 'fake'"
-                       [src]="chartsActiveType.get(i).safeResourceUrl"
-                       class="uk-width-1-1 uk-height-medium">
+                   [attr.uk-tooltip]="number.description">
+                <div class="md-card-content">
+                  <span class="uk-text-muted uk-margin-bottom">{{number.name}}</span>
+                  <h2 *ngIf="numberResults.get(i)" class="uk-margin-remove">
+                    <span>{{numberResults.get(i) | number}}</span>
+                  </h2>
                 </div>
               </div>
             </div>
-          </div>
-        </ng-template>
+          </ng-template>
+        </div>
+        <div class="uk-grid uk-grid-medium uk-margin-bottom" uk-height-match="target: div > div > h5">
+          <ng-template ngFor [ngForOf]="activeSubCategory.charts" let-chart let-i="index">
+            <div *ngIf="chart.isActive && chart.isPublic && chartsActiveType.get(i)"
+                 [class.uk-width-1-3@m]="chart.width === 'small'"
+                 [class.uk-width-1-2@m]="chart.width === 'medium'"
+                 [class.uk-width-1-1]="chart.width === 'large'">
+              <div>
+                <h5 class="uk-margin-bottom uk-margin-top">{{chart.name}}</h5>
+                <div class="md-card"
+                     [attr.uk-tooltip]="chart.description">
+                  <div class="md-card-content uk-text-center">
+                    <div *ngIf="chart.indicatorPaths.length > 1" class="uk-button-group">
+                      <button *ngFor="let indicatorPath of chart.indicatorPaths;"
+                              class="uk-button"
+                              (click)="setActiveChart(i, indicatorPath.type)"
+                              [class.uk-button-secondary]="chartsActiveType.get(i).url === indicatorPath.url">
+                        {{indicatorPath.type}}
+                      </button>
+                    </div>
+                    <iframe *ngIf="chartsActiveType.get(i).source !== 'fake'"
+                            [src]="chartsActiveType.get(i).safeResourceUrl"
+                            class="uk-width-1-1 uk-height-medium"></iframe>
+                    <!--                    {{chartsActiveType.get(i).safeResourceUrl}}-->
+                    <img *ngIf="chartsActiveType.get(i).source === 'fake'"
+                         [src]="chartsActiveType.get(i).safeResourceUrl"
+                         class="uk-width-1-1 uk-height-medium">
+                  </div>
+                </div>
+              </div>
+            </div>
+          </ng-template>
+        </div>
       </div>
     </div>
   </div>
diff --git a/src/app/monitor/monitor.component.ts b/src/app/monitor/monitor.component.ts
index 33266ee..c378773 100644
--- a/src/app/monitor/monitor.component.ts
+++ b/src/app/monitor/monitor.component.ts
@@ -15,6 +15,7 @@ import {Category, ChartHelper, IndicatorPath, Stakeholder, SubCategory, Topic} f
 import {StatisticsService} from "../utils/services/statistics.service";
 import {Item, Sidebar} from "../utils/entities/sidebar";
 import {IndicatorUtils} from "../utils/indicator-utils";
+import {StakeholderCreator} from "../utils/entities/stakeholderCreator";
 import {LayoutService} from "../library/sharedComponents/sidebar/layout.service";
 
 @Component({
@@ -61,6 +62,8 @@ export class MonitorComponent implements OnInit, OnDestroy {
   }
 
   public ngOnInit() {
+    this.layoutService.setHasSidebar(false);
+    this.layoutService.setHasHeader(false);
     this.route.data
       .subscribe((data: { envSpecific: EnvProperties }) => {
         this.route.params.subscribe(params => {
@@ -70,7 +73,25 @@ export class MonitorComponent implements OnInit, OnDestroy {
             this.status = this.errorCodes.LOADING;
             this.numberResults = new Map<number, number>();
             this.chartsActiveType = new Map<number, IndicatorPath>();
-            this.stakeholderService.getStakeholderAsObservable().subscribe(stakeholder => {
+            // this.stakeholderService.getStakeholderAsObservable().subscribe(stakeholder => {
+            let stakeholder:Stakeholder = null;
+            if(params['stakeholder']=="fwf"){
+              stakeholder = StakeholderCreator.createFunderFromDefaultProfile("fwf","funder","fwf_________::FWF",
+                "Austrian Science Fund (FWF)","FWF",
+                false,"fwf",true,true, null);
+              stakeholder.logoUrl = "./assets/fwf.png";
+            }else if(params['stakeholder']=="arc"){
+              stakeholder = StakeholderCreator.createFunderFromDefaultProfile("arc","funder","arc_________::ARC",
+                "Australian Research Council (ARC)","ARC",
+                false,"arc",true,true, null);
+                stakeholder.logoUrl = "./assets/arc1.gif";
+            }else{
+              stakeholder = StakeholderCreator.createFunderFromDefaultProfile("ec","funder","ec__________::EC",
+                "European Commission","EC",
+                false,"ec",true,true, null);
+              stakeholder.logoUrl = "./assets/ec.png";
+            }
+
               if(stakeholder) {
                 this.stakeholder = stakeholder;
                 this.seoService.createLinkForCanonicalURL(url, false);
@@ -89,9 +110,9 @@ export class MonitorComponent implements OnInit, OnDestroy {
                 this.status = this.errorCodes.DONE;
                 this.setView(params);
               }
-            }, error => {
-              this.navigateToError();
-            })
+            // }, error => {
+            //   this.navigateToError();
+            // })
           } else {
             this.setView(params);
           }
@@ -179,13 +200,13 @@ export class MonitorComponent implements OnInit, OnDestroy {
         category.subCategories.forEach(subCategory => {
           if (subCategory.alias != null && subCategory.isPublic && subCategory.isActive) {
             subItems.push(new Item(subCategory.name, (
-              this.stakeholder.alias + '/' + this.activeTopic.alias + '/' + category.alias + '/' + subCategory.alias),
+              '/' + this.stakeholder.alias + '/' + this.activeTopic.alias + '/' + category.alias + '/' + subCategory.alias),
               null, null, false));
           }
         });
         const open = this.activeCategory.alias === category.alias;
         items.push(new Item(category.name, (
-          this.stakeholder.alias + '/' + this.activeTopic.alias + '/' + category.alias),
+          '/' +  this.stakeholder.alias + '/' + this.activeTopic.alias + '/' + category.alias),
           subItems, null, open));
       }
     });
diff --git a/src/app/services/stakeholder.service.ts b/src/app/services/stakeholder.service.ts
index 9e792e6..b21e18e 100644
--- a/src/app/services/stakeholder.service.ts
+++ b/src/app/services/stakeholder.service.ts
@@ -4,6 +4,7 @@ import {BehaviorSubject, Observable} from "rxjs";
 import {Indicator, IndicatorPath, Stakeholder} from "../utils/entities/stakeholder";
 import {HelperFunctions} from "../openaireLibrary/utils/HelperFunctions.class";
 import {map} from "rxjs/operators";
+import {StakeholderCreator} from "../utils/entities/stakeholderCreator";
 
 let maps: string[] = ['parameters', 'filters'];
 
diff --git a/src/app/utils/entities/stakeholder.ts b/src/app/utils/entities/stakeholder.ts
index 3553fd9..9629813 100644
--- a/src/app/utils/entities/stakeholder.ts
+++ b/src/app/utils/entities/stakeholder.ts
@@ -19,15 +19,16 @@ export class Stakeholder {
   creationDate: string;
   updateDate: string;
   managers: string[];
+  logoUrl:string;
   topics: Topic[];
 
-  constructor(id: string, type: string, index_id, index_name: string, index_shortName: string, isDefaultProfile: boolean, alias: string, isActive: boolean, isPublic: boolean) {
-    this.initializeFunder(id, type, index_id, index_name, index_shortName, isDefaultProfile, alias, isActive, isPublic);
+  constructor(id: string, type: string, index_id, index_name: string, index_shortName: string, isDefaultProfile: boolean, alias: string, isActive: boolean, isPublic: boolean, logoUrl:string) {
+    this.initializeFunder(id, type, index_id, index_name, index_shortName, isDefaultProfile, alias, isActive, isPublic, logoUrl);
     this.topics = [];
     this.managers = [];
   }
 
-  initializeFunder(id: string, type: string, index_id, index_name: string, index_shortName: string, isDefaultProfile: boolean, alias: string, isActive: boolean, isPublic: boolean) {
+  initializeFunder(id: string, type: string, index_id, index_name: string, index_shortName: string, isDefaultProfile: boolean, alias: string, isActive: boolean, isPublic: boolean, logoUrl:string) {
     this._id = id;
     this.type = type;
     this.index_id = index_id;
@@ -37,10 +38,11 @@ export class Stakeholder {
     this.alias = alias;
     this.isActive = isActive;
     this.isPublic = isPublic;
+    this.logoUrl = logoUrl;
   }
 
   static createECStakeholder(): Stakeholder {
-    let ec: Stakeholder = new Stakeholder("ec", "funder", "ec__________::EC", "European Commission", "EC", false, "ec", true, true);
+    let ec: Stakeholder = new Stakeholder("ec", "funder", "ec__________::EC", "European Commission", "EC", false, "ec", true, true, null);
     //  new Stakeholder('wt','funder','wt__________::WT','Wellcome Trust','WT',false, 'wt',true,true);
     ec.topics.push(ec.createOSTopic(ec));
     ec.topics.push(ec.createImpactTopic());
@@ -335,6 +337,7 @@ export class SubCategory {
   isDefault: boolean;
   charts: Indicator[];
   numbers: Indicator[];
+  recommendedFor:string[];
 
   constructor(name: string, description: string, alias: string, isActive: boolean, isPublic: boolean, isDefault: boolean = true) {
     this._id = null;
@@ -346,6 +349,7 @@ export class SubCategory {
     this.isDefault = isDefault;
     this.charts = [];
     this.numbers = [];
+    this.recommendedFor= [];
   }
 
 }
@@ -361,6 +365,7 @@ export class Indicator {
   isPublic: boolean;
   isDefault: boolean;
   indicatorPaths: IndicatorPath[];
+  recommendedFor:string[];
 
   constructor(name: string, description: string, type: string, width: string, isActive: boolean, isPublic: boolean, indicatorPaths: IndicatorPath[]) {
     this._id = null;
@@ -371,6 +376,7 @@ export class Indicator {
     this.isActive = isActive;
     this.isPublic = isPublic;
     this.indicatorPaths = indicatorPaths;
+    this.recommendedFor = [];
   }
 
 }
diff --git a/src/app/utils/entities/stakeholderCreator.ts b/src/app/utils/entities/stakeholderCreator.ts
index 404c17e..9b8252d 100644
--- a/src/app/utils/entities/stakeholderCreator.ts
+++ b/src/app/utils/entities/stakeholderCreator.ts
@@ -3,7 +3,7 @@ import {Stakeholder,Topic,Category,SubCategory,Indicator, IndicatorPath, ChartHe
 export class StakeholderCreator {
 
   static createFunderDefaultProfile():Stakeholder{
-    let funder:Stakeholder = new Stakeholder(null,"funder","_funder_id_","_funder_name_","_FSN_",true,"deafult_funder",true,true);
+    let funder:Stakeholder = new Stakeholder(null,"funder","_funder_id_","_funder_name_","_FSN_",true,"deafult_funder",true,true, null);
     funder.topics.push(StakeholderCreator.createResearchProductionTopic(funder));
     funder.topics.push(StakeholderCreator.createOpenAccessTopic(funder));
 
@@ -12,25 +12,35 @@ export class StakeholderCreator {
     funder.topics.push(funder.createCollaborationTopic());
     return funder;
   }
-  static createFunderFromDefaultProfile(id: string, type: string, index_id, index_name: string, index_shortName:string , isDefaultProfile: boolean, alias:string , isActive: boolean, isPublic: boolean):Stakeholder{
+  static createFunderFromDefaultProfile(id: string, type: string, index_id, index_name: string, index_shortName:string , isDefaultProfile: boolean, alias:string , isActive: boolean, isPublic: boolean, logoUrl:string):Stakeholder{
     let funder:Stakeholder = StakeholderCreator.createFunderDefaultProfile();
-    funder.initializeFunder(id,type, index_id, index_name, index_shortName, isDefaultProfile, alias, isActive, isPublic);
+    funder.initializeFunder(id,type, index_id, index_name, index_shortName, isDefaultProfile, alias, isActive, isPublic, logoUrl);
     for (let topic of funder.topics) {
       for (let category of topic.categories) {
+        let subTokeep: SubCategory[] = [];
         for (let subCategory of category.subCategories) {
+          let chartsTokeep: Indicator[] = [];
+          if (subCategory.recommendedFor.length == 0 || subCategory.recommendedFor.indexOf(id) != -1) {
+            subTokeep.push(subCategory);
+          }
           for (let indicator of subCategory.charts) {
+            if (indicator.recommendedFor.length == 0 || indicator.recommendedFor.indexOf(id) != -1) {
+              chartsTokeep.push(indicator);
+            }
             for (let indicatorPath of indicator.indicatorPaths) {
-              if(indicatorPath.parameters) {
+              if (indicatorPath.parameters) {
                 Object.keys(indicatorPath.parameters).forEach(key => {
-                  if (indicatorPath.parameters[key].indexOf("_funder_name_")!=-1) {
-                    indicatorPath.parameters[key].replace("_funder_name_", funder.index_name);
-                  } else if (indicatorPath.parameters[key].indexOf("_fsn_")!=-1) {
-                    indicatorPath.parameters[key].toString().replace("_fsn_", funder.index_shortName.toLowerCase());
+                  if (indicatorPath.parameters[key].indexOf("_funder_name_") != -1) {
+                    indicatorPath.parameters[key] = indicatorPath.parameters[key].replace("_funder_name_", funder.index_name);
+                  } else if (indicatorPath.parameters[key].indexOf("_fsn_") != -1) {
+                    indicatorPath.parameters[key] = indicatorPath.parameters[key].toString().replace("_fsn_", funder.index_shortName.toLowerCase());
                   }
                 });
               }
             }
+
           }
+          subCategory.charts = chartsTokeep;
           for (let indicator of subCategory.numbers) {
             for (let indicatorPath of indicator.indicatorPaths) {
               indicatorPath.url = indicatorPath.url.replace("_funder_id_", funder.index_id);
@@ -47,10 +57,11 @@ export class StakeholderCreator {
           }
 
         }
-
+        category.subCategories = subTokeep;
       }
-
     }
+
+      console.log(funder);
     return funder;
   }
 
@@ -59,38 +70,50 @@ export class StakeholderCreator {
 
     let pubCategory:Category =  new Category("Publications","","publications",true,true);
     topic.categories.push(pubCategory);
-    let pubDefSub = StakeholderCreator.createResearchProductionPerType(stakeholder,"Publications", "Publication","publication", "publications");
-    pubCategory.subCategories.push(pubDefSub);
+    // let pubDefSub = StakeholderCreator.createResearchProductionPerType(stakeholder,"Publications", "Publication","publication", "publications");
+    pubCategory.subCategories.push(StakeholderCreator.createResearchProductionPerType(stakeholder,"Publications", "Publication","publication", "publications",0));
+    pubCategory.subCategories.push(StakeholderCreator.createResearchProductionPerType(stakeholder,"Publications", "Publication","publication", "publications",1));
+    pubCategory.subCategories.push(StakeholderCreator.createResearchProductionPerType(stakeholder,"Publications", "Publication","publication", "publications",2));
 
     let dataCategory:Category =  new Category("Research data","","data",true,true);
     topic.categories.push(dataCategory);
-    let dataDefSub = StakeholderCreator.createResearchProductionPerType(stakeholder,"Research data", "Research data","dataset", "datasets");
-    dataCategory.subCategories.push(dataDefSub);
+    dataCategory.subCategories.push(StakeholderCreator.createResearchProductionPerType(stakeholder,"Research data", "Research data","dataset", "datasets",0));
+    dataCategory.subCategories.push(StakeholderCreator.createResearchProductionPerType(stakeholder,"Research data", "Research data","dataset", "datasets",1));
+    dataCategory.subCategories.push(StakeholderCreator.createResearchProductionPerType(stakeholder,"Research data", "Research data","dataset", "datasets",2));
 
     let softwareCategory:Category =  new Category("Software","","software",true,true);
     topic.categories.push(softwareCategory);
-    let softDefSub =  StakeholderCreator.createResearchProductionPerType(stakeholder,"Software", "Software","software", "datasets");
-    softwareCategory.subCategories.push(softDefSub);
+    softwareCategory.subCategories.push(StakeholderCreator.createResearchProductionPerType(stakeholder,"Software", "Software","software", "datasets",0));
+    softwareCategory.subCategories.push(StakeholderCreator.createResearchProductionPerType(stakeholder,"Software", "Software","software", "datasets",1));
+    softwareCategory.subCategories.push(StakeholderCreator.createResearchProductionPerType(stakeholder,"Software", "Software","software", "datasets",2));
 
     let otherCategory:Category =  new Category("Other research products","","other",true,true);
     topic.categories.push(otherCategory);
-    let otherDefSub = StakeholderCreator.createResearchProductionPerType(stakeholder,"Other research products", "Other research product","other", "other");
-    otherCategory.subCategories.push(otherDefSub);
+    otherCategory.subCategories.push(StakeholderCreator.createResearchProductionPerType(stakeholder,"Other research products", "Other research product","other", "other",0));
+    otherCategory.subCategories.push(StakeholderCreator.createResearchProductionPerType(stakeholder,"Other research products", "Other research product","other", "other",1));
+    otherCategory.subCategories.push(StakeholderCreator.createResearchProductionPerType(stakeholder,"Other research products", "Other research product","other", "other",2));
 
 
     return topic;
 
   }
-  static createResearchProductionPerType(stakeholder:Stakeholder,typePlural, typeSingl, dbType, dbTypePlural ):SubCategory{
+  static createResearchProductionPerType(stakeholder:Stakeholder,typePlural, typeSingl, dbType, dbTypePlural, index:number):SubCategory{
 
-    let pubDefSub = new SubCategory(typePlural, null,null,true, true);
-
-    let n_total = new Indicator("Total "+typePlural,null, "number","small",true, true, [new IndicatorPath(null, "search",
-      "/"+dbTypePlural+"/count?fq="+(encodeURIComponent("relfunderid exact "+stakeholder.index_id))+"&format=json", null,["total"])]);
-    n_total.indicatorPaths[0].filters["fundingL0"] = "&fq=relfundinglevel0_name exact "+ChartHelper.prefix+'fundingL0'+ChartHelper.suffix;
-
-    pubDefSub.numbers.push(n_total);
-    if( dbType != "publication") {
+    let fundingFilter = ['',',{"groupFilters":[{"field":"' + dbType + '.project.funding level 0","type":"=","values":["FP7"]}],"op":"AND"}',
+      ',{"groupFilters":[{"field":"' + dbType + '.project.funding level 0","type":"=","values":["H2020"]}],"op":"AND"}'];
+    let categoryTitle=["Overview","FP7","H2020"];
+    let chartTitle=["","FP7 ","H2020 "];
+    let pubDefSub = new SubCategory(categoryTitle[index], null,categoryTitle[index].toLowerCase(),true, true);
+    if(index!=0){
+      pubDefSub.recommendedFor.push("ec");
+    }
+    if(index==0) {
+      let n_total = new Indicator("Total " + typePlural, null, "number", "small", true, true, [new IndicatorPath(null, "search",
+        "/" + dbTypePlural + "/count?fq=" + (encodeURIComponent("relfunderid exact " + stakeholder.index_id)) + "&format=json", null, ["total"])]);
+      n_total.indicatorPaths[0].filters["fundingL0"] = "&fq=relfundinglevel0_name exact " + ChartHelper.prefix + 'fundingL0' + ChartHelper.suffix;
+      pubDefSub.numbers.push(n_total);
+    }
+    if( dbType != "publication" && index == 0) {
       let n_linkedPubs = this.createLinkToIndicator(stakeholder,typePlural,typeSingl, dbType,"Publications","publication");
 
         // new Indicator("Linked with Publications", null, "number", "small", true, true, [new IndicatorPath(null, "search",
@@ -98,9 +121,9 @@ export class StakeholderCreator {
       pubDefSub.numbers.push(n_linkedPubs);
     }
 
-    let res_timeline = new Indicator("",null, "chart","small",true, true,[new IndicatorPath("column", "stats-tool", "chart?json=", '{"library":"HighCharts","chartDescription":{"queries":[{"name":"'+typePlural+'","type":"'+ChartHelper.prefix+'type'+ChartHelper.suffix+'","query":{"select":[{"field":"'+dbType+'","aggregate":"count"},{"field":"'+dbType+'.year","aggregate":null}],"filters":[{"groupFilters":[{"field":"'+dbType+'.project.funder","type":"=","values":["'+ChartHelper.prefix+'funder_name'+ChartHelper.suffix+'"]}],"op":"AND"},{"groupFilters":[{"field":"'+dbType+'.year","type":">=","values":["'+ChartHelper.prefix+'start_year'+ChartHelper.suffix+'"]},{"field":"'+dbType+'.year","type":"<=","values":["'+ChartHelper.prefix+'end_year'+ChartHelper.suffix+'"]}],"op":"AND"}],"entity":"'+dbType+'","profile":"OpenAIRE All-inclusive","limit":"0"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"'+ChartHelper.prefix+'title'+ChartHelper.suffix+'"},"subtitle":{},"yAxis":{"title":{"text":"'+typePlural+'"}},"xAxis":{"title":{"text":"Year"}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":true,"align":"center","verticalAlign":"bottom","layout":"horizontal"},"credits":{"href":null,"enabled":true,"text":"Created by OpenAIRE via HighCharts"}}}', null)]);
-    res_timeline.indicatorPaths[0].parameters = IndicatorPath.createParameters(stakeholder.index_name,typePlural+" timeline","column");
-    res_timeline.indicatorPaths[0].parameters["start_year"] = "2008";
+    let res_timeline = new Indicator("",null, "chart","small",true, true,[new IndicatorPath("column", "stats-tool", "chart?json=", '{"library":"HighCharts","chartDescription":{"queries":[{"name":"'+typePlural+'","type":"'+ChartHelper.prefix+'type'+ChartHelper.suffix+'","query":{"select":[{"field":"'+dbType+'","aggregate":"count"},{"field":"'+dbType+'.year","aggregate":null}],"filters":[{"groupFilters":[{"field":"'+dbType+'.project.funder","type":"=","values":["'+ChartHelper.prefix+'funder_name'+ChartHelper.suffix+'"]}],"op":"AND"},{"groupFilters":[{"field":"'+dbType+'.year","type":">=","values":["'+ChartHelper.prefix+'start_year'+ChartHelper.suffix+'"]},{"field":"'+dbType+'.year","type":"<=","values":["'+ChartHelper.prefix+'end_year'+ChartHelper.suffix+'"]}],"op":"AND"}'+fundingFilter[index]+'],"entity":"'+dbType+'","profile":"OpenAIRE All-inclusive","limit":"0"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"'+ChartHelper.prefix+'title'+ChartHelper.suffix+'"},"subtitle":{},"yAxis":{"title":{"text":"'+typePlural+'"}},"xAxis":{"title":{"text":"Year"}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":true,"align":"center","verticalAlign":"bottom","layout":"horizontal"},"credits":{"href":null,"enabled":true,"text":"Created by OpenAIRE via HighCharts"}}}', null)]);
+    res_timeline.indicatorPaths[0].parameters = IndicatorPath.createParameters(stakeholder.index_name,chartTitle[index] + typePlural+" timeline","column");
+    res_timeline.indicatorPaths[0].parameters["start_year"] = (index == 1?"2014":"2008");
     res_timeline.indicatorPaths[0].parameters["end_year"] = "2020";
     res_timeline.indicatorPaths[0].filters = IndicatorPath.createResultFilters(dbType);
     pubDefSub.charts.push(res_timeline);
@@ -110,70 +133,73 @@ export class StakeholderCreator {
 
       let res_types = new Indicator("", null, "chart", "small", true, true,
         [new IndicatorPath("column", "stats-tool", "chart?json=",
-          '{"library":"HighCharts","chartDescription":{"queries":[{"name":"' + typePlural + '","type":"' + ChartHelper.prefix + 'type' + ChartHelper.suffix + '","query":{"select":[{"field":"' + dbType + '","aggregate":"count"},{"field":"' + dbType + '.classification","aggregate":null}],"filters":[{"groupFilters":[{"field":"' + dbType + '.project.funder","type":"=","values":["' + ChartHelper.prefix + 'funder_name' + ChartHelper.suffix + '"]}],"op":"AND"}],"entity":"' + dbType + '","profile":"OpenAIRE All-inclusive","limit":"0"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"' + ChartHelper.prefix + 'title' + ChartHelper.suffix + '"},"subtitle":{},"yAxis":{"title":{"text":"' + typePlural + '"}},"xAxis":{"title":{"text":"Type"}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":true,"align":"center","verticalAlign":"bottom","layout":"horizontal"},"credits":{"href":null,"enabled":true,"text":"Created by OpenAIRE via HighCharts"}}}', null)]);
-      res_types.indicatorPaths[0].parameters = IndicatorPath.createParameters(stakeholder.index_name, typeSingl + " types", "bar");
+          '{"library":"HighCharts","chartDescription":{"queries":[{"name":"' + typePlural + '","type":"' + ChartHelper.prefix + 'type' + ChartHelper.suffix + '","query":{"select":[{"field":"' + dbType + '","aggregate":"count"},{"field":"' + dbType + '.classification","aggregate":null}],"filters":[{"groupFilters":[{"field":"' + dbType + '.project.funder","type":"=","values":["' + ChartHelper.prefix + 'funder_name' + ChartHelper.suffix + '"]}],"op":"AND"}'+fundingFilter[index]+'],"entity":"' + dbType + '","profile":"OpenAIRE All-inclusive","limit":"0"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"' + ChartHelper.prefix + 'title' + ChartHelper.suffix + '"},"subtitle":{},"yAxis":{"title":{"text":"' + typePlural + '"}},"xAxis":{"title":{"text":"Type"}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":true,"align":"center","verticalAlign":"bottom","layout":"horizontal"},"credits":{"href":null,"enabled":true,"text":"Created by OpenAIRE via HighCharts"}}}', null)]);
+      res_types.indicatorPaths[0].parameters = IndicatorPath.createParameters(stakeholder.index_name, chartTitle[index] + typeSingl + " types", "bar");
       res_types.indicatorPaths[0].filters = IndicatorPath.createResultFilters(dbType);
       pubDefSub.charts.push(res_types);
     }
     let res_access_mode = new Indicator("",null, "chart","small",true, true,[new IndicatorPath("pie", "stats-tool", "chart?json=",
-      '{"library":"HighCharts","chartDescription":{"queries":[{"name":"'+typePlural+'","type":"'+ChartHelper.prefix+'type'+ChartHelper.suffix+'","query":{"select":[{"field":"'+dbType+'","aggregate":"count"},{"field":"'+dbType+'.access mode","aggregate":null}],"filters":[{"groupFilters":[{"field":"'+dbType+'.project.funder","type":"=","values":["'+ChartHelper.prefix+'funder_name'+ChartHelper.suffix+'"]}],"op":"AND"}],"entity":"' + dbType + '","profile":"OpenAIRE All-inclusive","limit":"0"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"'+ChartHelper.prefix+'title'+ChartHelper.suffix+'"},"subtitle":{},"yAxis":{"title":{"text":"'+typePlural+'"}},"xAxis":{"title":{"text":"Year"}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":true,"align":"center","verticalAlign":"bottom","layout":"horizontal"},"credits":{"href":null,"enabled":true,"text":"Created by OpenAIRE via HighCharts"}}}', null)]);
-    res_access_mode.indicatorPaths[0].parameters = IndicatorPath.createParameters(stakeholder.index_name,typeSingl+" acccess mode","pie");
+      '{"library":"HighCharts","chartDescription":{"queries":[{"name":"'+typePlural+'","type":"'+ChartHelper.prefix+'type'+ChartHelper.suffix+'","query":{"select":[{"field":"'+dbType+'","aggregate":"count"},{"field":"'+dbType+'.access mode","aggregate":null}],"filters":[{"groupFilters":[{"field":"'+dbType+'.project.funder","type":"=","values":["'+ChartHelper.prefix+'funder_name'+ChartHelper.suffix+'"]}],"op":"AND"}'+fundingFilter[index]+'],"entity":"' + dbType + '","profile":"OpenAIRE All-inclusive","limit":"0"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"'+ChartHelper.prefix+'title'+ChartHelper.suffix+'"},"subtitle":{},"yAxis":{"title":{"text":"'+typePlural+'"}},"xAxis":{"title":{"text":"Year"}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":true,"align":"center","verticalAlign":"bottom","layout":"horizontal"},"credits":{"href":null,"enabled":true,"text":"Created by OpenAIRE via HighCharts"}}}', null)]);
+    res_access_mode.indicatorPaths[0].parameters = IndicatorPath.createParameters(stakeholder.index_name,chartTitle[index] + typeSingl+" acccess mode","pie");
     res_access_mode.indicatorPaths[0].filters = IndicatorPath.createResultFilters(dbType);
     pubDefSub.charts.push(res_access_mode);
 
-    if( dbType != "publication") {
+
       let res_sci_area = new Indicator("", null, "chart", "small", true, true, [new IndicatorPath("bar", "stats-tool", "chart?json=",
-        '{"library":"HighCharts","chartDescription":{"queries":[{"name":"' + typePlural + '","type":"' + ChartHelper.prefix + 'type' + ChartHelper.suffix + '","query":{"select":[{"field":"' + dbType + '","aggregate":"count"},{"field":"' + dbType + '.project.funding level 1","aggregate":null}],"filters":[{"groupFilters":[{"field":"' + dbType + '.project.funder","type":"=","values":["' + ChartHelper.prefix + 'funder_name' + ChartHelper.suffix + '"]}],"op":"AND"}],"entity":"' + dbType + '","profile":"OpenAIRE All-inclusive","limit":"30"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"' + ChartHelper.prefix + 'title' + ChartHelper.suffix + '"},"subtitle":{},"yAxis":{"title":{"text":"' + typePlural + '"}},"xAxis":{"title":{"text":"Scientific area"}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":false},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":true,"align":"center","verticalAlign":"bottom","layout":"horizontal"},"credits":{"href":null,"enabled":true,"text":"Created by OpenAIRE via HighCharts"}}}', null)]);
-      res_sci_area.indicatorPaths[0].parameters = IndicatorPath.createParameters(stakeholder.index_name, typeSingl + " scientific area", "bar");
+        '{"library":"HighCharts","chartDescription":{"queries":[{"name":"' + typePlural + '","type":"' + ChartHelper.prefix + 'type' + ChartHelper.suffix + '","query":{"select":[{"field":"' + dbType + '","aggregate":"count"},{"field":"' + dbType + '.project.funding level 1","aggregate":null}],"filters":[{"groupFilters":[{"field":"' + dbType + '.project.funder","type":"=","values":["' + ChartHelper.prefix + 'funder_name' + ChartHelper.suffix + '"]}],"op":"AND"}'+fundingFilter[index]+'],"entity":"' + dbType + '","profile":"OpenAIRE All-inclusive","limit":"30"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"' + ChartHelper.prefix + 'title' + ChartHelper.suffix + '"},"subtitle":{},"yAxis":{"title":{"text":"' + typePlural + '"}},"xAxis":{"title":{"text":"Scientific area"}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":false},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":true,"align":"center","verticalAlign":"bottom","layout":"horizontal"},"credits":{"href":null,"enabled":true,"text":"Created by OpenAIRE via HighCharts"}}}', null)]);
+      res_sci_area.indicatorPaths[0].parameters = IndicatorPath.createParameters(stakeholder.index_name, chartTitle[index] + typeSingl + " scientific area", "bar");
       res_sci_area.indicatorPaths[0].filters = IndicatorPath.createResultFilters(dbType);
+      res_sci_area.recommendedFor = ["ec"];
       pubDefSub.charts.push(res_sci_area);
 
       let res_programmes = new Indicator("", null, "chart", "small", true, true, [new IndicatorPath("bar", "stats-tool", "chart?json=",
-        '{"library":"HighCharts","chartDescription":{"queries":[{"name":"' + typePlural + '","type":"' + ChartHelper.prefix + 'type' + ChartHelper.suffix + '","query":{"select":[{"field":"' + dbType + '","aggregate":"count"},{"field":"' + dbType + '.project.funding level 2","aggregate":null}],"filters":[{"groupFilters":[{"field":"' + dbType + '.project.funder","type":"=","values":["' + ChartHelper.prefix + 'funder_name' + ChartHelper.suffix + '"]}],"op":"AND"},{"groupFilters":[{"field":"' + dbType + '.project.funding level 2","type":"!=","values":[" "]}],"op":"AND"}],"entity":"' + dbType + '","profile":"OpenAIRE All-inclusive","limit":"30"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"' + ChartHelper.prefix + 'title' + ChartHelper.suffix + '"},"subtitle":{},"yAxis":{"title":{"text":"' + typePlural + '"}},"xAxis":{"title":{"text":"Programmes"}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":false},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":true,"align":"center","verticalAlign":"bottom","layout":"horizontal"},"credits":{"href":null,"enabled":true,"text":"Created by OpenAIRE via HighCharts"}}}', null)]);
-      res_programmes.indicatorPaths[0].parameters = IndicatorPath.createParameters(stakeholder.index_name, typeSingl + " programmes", "bar");
+        '{"library":"HighCharts","chartDescription":{"queries":[{"name":"' + typePlural + '","type":"' + ChartHelper.prefix + 'type' + ChartHelper.suffix + '","query":{"select":[{"field":"' + dbType + '","aggregate":"count"},{"field":"' + dbType + '.project.funding level 2","aggregate":null}],"filters":[{"groupFilters":[{"field":"' + dbType + '.project.funder","type":"=","values":["' + ChartHelper.prefix + 'funder_name' + ChartHelper.suffix + '"]}],"op":"AND"},{"groupFilters":[{"field":"' + dbType + '.project.funding level 2","type":"!=","values":[" "]}],"op":"AND"}'+fundingFilter[index]+'],"entity":"' + dbType + '","profile":"OpenAIRE All-inclusive","limit":"30"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"' + ChartHelper.prefix + 'title' + ChartHelper.suffix + '"},"subtitle":{},"yAxis":{"title":{"text":"' + typePlural + '"}},"xAxis":{"title":{"text":"Programmes"}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":false},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":true,"align":"center","verticalAlign":"bottom","layout":"horizontal"},"credits":{"href":null,"enabled":true,"text":"Created by OpenAIRE via HighCharts"}}}', null)]);
+      res_programmes.indicatorPaths[0].parameters = IndicatorPath.createParameters(stakeholder.index_name, chartTitle[index] + typeSingl + " programmes", "bar");
       res_programmes.indicatorPaths[0].filters = IndicatorPath.createResultFilters(dbType);
+    res_programmes.recommendedFor = ["ec"];
       pubDefSub.charts.push(res_programmes);
-    }
+
     //{"library":"HighCharts","chartDescription":{"queries":[{"name":"Research Data","type":"bar","query":{"select":[{"field":"dataset","aggregate":"count"},{"field":"dataset.project.funding level 1","aggregate":null}],"filters":[{"groupFilters":[{"field":"dataset.project.funder","type":"=","values":["European Commission"]}],"op":"AND"}],"entity":"dataset","profile":"OpenAIRE All-inclusive","limit":"30"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Scientific Area"},"subtitle":{},"yAxis":{"title":{}},"xAxis":{"title":{}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":false},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":true,"align":"center","verticalAlign":"bottom","layout":"horizontal"},"credits":{"href":null,"enabled":true,"text":"Created by OpenAIRE via HighCharts"}}}
     let datasource = new Indicator("",null, "chart","small",true, true,[new IndicatorPath("bar", "stats-tool", "chart?json=",
-      '{"library":"HighCharts","chartDescription":{"queries":[{"name":"'+typePlural+'","type":"'+ChartHelper.prefix+'type'+ChartHelper.suffix+'","query":{"name":"monitor.'+ChartHelper.prefix+'id'+ChartHelper.suffix+'.'+dbTypePlural+'.datasources"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"'+ChartHelper.prefix+'title'+ChartHelper.suffix+'"},"subtitle":{},"yAxis":{"title":{"text":"'+typePlural+'"}},"xAxis":{"title":{"text":"Content provider"}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":true,"align":"center","verticalAlign":"bottom","layout":"horizontal"},"credits":{"href":null,"enabled":true,"text":"Created by OpenAIRE via HighCharts"}}}', null)]);
-    datasource.indicatorPaths[0].parameters = IndicatorPath.createParameters(stakeholder.index_name,typeSingl+" content provider","bar");
+      '{"library":"HighCharts","chartDescription":{"queries":[{"name":"'+typePlural+'","type":"'+ChartHelper.prefix+'type'+ChartHelper.suffix+'","query":{"name":"monitor.'+ChartHelper.prefix+'id'+ChartHelper.suffix+(index==1?".h2020":(index==2?".fp7":""))+'.'+dbTypePlural+'.datasources"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"'+ChartHelper.prefix+'title'+ChartHelper.suffix+'"},"subtitle":{},"yAxis":{"title":{"text":"'+typePlural+'"}},"xAxis":{"title":{"text":"Content provider"}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":true,"align":"center","verticalAlign":"bottom","layout":"horizontal"},"credits":{"href":null,"enabled":true,"text":"Created by OpenAIRE via HighCharts"}}}', null)]);
+    datasource.indicatorPaths[0].parameters = IndicatorPath.createParameters(stakeholder.index_name,chartTitle[index] + typeSingl+" content provider","bar");
     datasource.indicatorPaths[0].parameters["id"] = stakeholder.index_shortName.toLowerCase();
     pubDefSub.charts.push(datasource);
     if(dbType == "publication") {
       let journal = new Indicator("", null, "chart", "small", true, true, [new IndicatorPath("bar", "stats-tool", "chart?json=",
-        '{"library":"HighCharts","chartDescription":{"queries":[{"name":"' + typePlural + '","type":"' + ChartHelper.prefix + 'type' + ChartHelper.suffix + '","query":{"name":"monitor.' + ChartHelper.prefix + 'id' + ChartHelper.suffix + '.' + dbTypePlural + '.journals"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"' + ChartHelper.prefix + 'title' + ChartHelper.suffix + '"},"subtitle":{},"yAxis":{"title":{"text":"' + typePlural + '"}},"xAxis":{"title":{"text":"Journal"}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":true,"align":"center","verticalAlign":"bottom","layout":"horizontal"},"credits":{"href":null,"enabled":true,"text":"Created by OpenAIRE via HighCharts"}}}', null)]);
-      journal.indicatorPaths[0].parameters = IndicatorPath.createParameters(stakeholder.index_name, typeSingl + " journal", "bar");
+        '{"library":"HighCharts","chartDescription":{"queries":[{"name":"' + typePlural + '","type":"' + ChartHelper.prefix + 'type' + ChartHelper.suffix + '","query":{"name":"monitor.' + ChartHelper.prefix + 'id' + ChartHelper.suffix +(index==1?".h2020":(index==2?".fp7":""))+ '.' + dbTypePlural + '.journals"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"' + ChartHelper.prefix + 'title' + ChartHelper.suffix + '"},"subtitle":{},"yAxis":{"title":{"text":"' + typePlural + '"}},"xAxis":{"title":{"text":"Journal"}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":true,"align":"center","verticalAlign":"bottom","layout":"horizontal"},"credits":{"href":null,"enabled":true,"text":"Created by OpenAIRE via HighCharts"}}}', null)]);
+      journal.indicatorPaths[0].parameters = IndicatorPath.createParameters(stakeholder.index_name, chartTitle[index] + typeSingl + " journal", "bar");
       journal.indicatorPaths[0].parameters["id"] = stakeholder.index_shortName.toLowerCase();
       pubDefSub.charts.push(journal);
 
       let repo = new Indicator("", null, "chart", "small", true, true, [new IndicatorPath("bar", "stats-tool", "chart?json=",
-        '{"library":"HighCharts","chartDescription":{"queries":[{"name":"' + typePlural + '","type":"' + ChartHelper.prefix + 'type' + ChartHelper.suffix + '","query":{"name":"monitor.' + ChartHelper.prefix + 'id' + ChartHelper.suffix + '.' + dbTypePlural + '.repositories"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"' + ChartHelper.prefix + 'title' + ChartHelper.suffix + '"},"subtitle":{},"yAxis":{"title":{"text":"' + typePlural + '"}},"xAxis":{"title":{"text":"Repositories"}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":true,"align":"center","verticalAlign":"bottom","layout":"horizontal"},"credits":{"href":null,"enabled":true,"text":"Created by OpenAIRE via HighCharts"}}}', null)]);
-      repo.indicatorPaths[0].parameters = IndicatorPath.createParameters(stakeholder.index_name, typeSingl + " repositories", "bar");
+        '{"library":"HighCharts","chartDescription":{"queries":[{"name":"' + typePlural + '","type":"' + ChartHelper.prefix + 'type' + ChartHelper.suffix + '","query":{"name":"monitor.' + ChartHelper.prefix + 'id' + ChartHelper.suffix +(index==1?".h2020":(index==2?".fp7":""))+ '.' + dbTypePlural + '.repositories"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"' + ChartHelper.prefix + 'title' + ChartHelper.suffix + '"},"subtitle":{},"yAxis":{"title":{"text":"' + typePlural + '"}},"xAxis":{"title":{"text":"Repositories"}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":true,"align":"center","verticalAlign":"bottom","layout":"horizontal"},"credits":{"href":null,"enabled":true,"text":"Created by OpenAIRE via HighCharts"}}}', null)]);
+      repo.indicatorPaths[0].parameters = IndicatorPath.createParameters(stakeholder.index_name, chartTitle[index] + typeSingl + " repositories", "bar");
       repo.indicatorPaths[0].parameters["id"] = stakeholder.index_shortName.toLowerCase();
       pubDefSub.charts.push(repo);
     }
     if(dbType == "dataset") {
       let repo = new Indicator("", null, "chart", "small", true, true, [new IndicatorPath("bar", "stats-tool", "chart?json=",
-        '{"library":"HighCharts","chartDescription":{"queries":[{"name":"' + typePlural + '","type":"' + ChartHelper.prefix + 'type' + ChartHelper.suffix + '","query":{"name":"monitor.' + ChartHelper.prefix + 'id' + ChartHelper.suffix + '.' + dbTypePlural + '.drepositories"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"' + ChartHelper.prefix + 'title' + ChartHelper.suffix + '"},"subtitle":{},"yAxis":{"title":{"text":"' + typePlural + '"}},"xAxis":{"title":{"text":"Data Repositories"}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":true,"align":"center","verticalAlign":"bottom","layout":"horizontal"},"credits":{"href":null,"enabled":true,"text":"Created by OpenAIRE via HighCharts"}}}', null)]);
-      repo.indicatorPaths[0].parameters = IndicatorPath.createParameters(stakeholder.index_name, typeSingl + " repositories", "bar");
+        '{"library":"HighCharts","chartDescription":{"queries":[{"name":"' + typePlural + '","type":"' + ChartHelper.prefix + 'type' + ChartHelper.suffix + '","query":{"name":"monitor.' + ChartHelper.prefix + 'id' + ChartHelper.suffix + (index==1?".h2020":(index==2?".fp7":""))+'.' + dbTypePlural + '.drepositories"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"' + ChartHelper.prefix + 'title' + ChartHelper.suffix + '"},"subtitle":{},"yAxis":{"title":{"text":"' + typePlural + '"}},"xAxis":{"title":{"text":"Data Repositories"}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":true,"align":"center","verticalAlign":"bottom","layout":"horizontal"},"credits":{"href":null,"enabled":true,"text":"Created by OpenAIRE via HighCharts"}}}', null)]);
+      repo.indicatorPaths[0].parameters = IndicatorPath.createParameters(stakeholder.index_name, chartTitle[index] + typeSingl + " repositories", "bar");
       repo.indicatorPaths[0].parameters["id"] =  stakeholder.index_shortName.toLowerCase();
       pubDefSub.charts.push(repo);
 
       let irepo = new Indicator("", null, "chart", "small", true, true, [new IndicatorPath("bar", "stats-tool", "chart?json=",
-        '{"library":"HighCharts","chartDescription":{"queries":[{"name":"' + typePlural + '","type":"' + ChartHelper.prefix + 'type' + ChartHelper.suffix + '","query":{"name":"monitor.' + ChartHelper.prefix + 'id' + ChartHelper.suffix + '.' + dbTypePlural + '.irepositories"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"' + ChartHelper.prefix + 'title' + ChartHelper.suffix + '"},"subtitle":{},"yAxis":{"title":{"text":"' + typePlural + '"}},"xAxis":{"title":{"text":"Institutional repositories"}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":true,"align":"center","verticalAlign":"bottom","layout":"horizontal"},"credits":{"href":null,"enabled":true,"text":"Created by OpenAIRE via HighCharts"}}}', null)]);
-      irepo.indicatorPaths[0].parameters = IndicatorPath.createParameters(stakeholder.index_name, typeSingl + " institutional repositories", "bar");
+        '{"library":"HighCharts","chartDescription":{"queries":[{"name":"' + typePlural + '","type":"' + ChartHelper.prefix + 'type' + ChartHelper.suffix + '","query":{"name":"monitor.' + ChartHelper.prefix + 'id' + ChartHelper.suffix +(index==1?".h2020":(index==2?".fp7":""))+ '.' + dbTypePlural + '.irepositories"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"' + ChartHelper.prefix + 'title' + ChartHelper.suffix + '"},"subtitle":{},"yAxis":{"title":{"text":"' + typePlural + '"}},"xAxis":{"title":{"text":"Institutional repositories"}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":true,"align":"center","verticalAlign":"bottom","layout":"horizontal"},"credits":{"href":null,"enabled":true,"text":"Created by OpenAIRE via HighCharts"}}}', null)]);
+      irepo.indicatorPaths[0].parameters = IndicatorPath.createParameters(stakeholder.index_name, chartTitle[index] + typeSingl + " institutional repositories", "bar");
       irepo.indicatorPaths[0].parameters["id"] =  stakeholder.index_shortName.toLowerCase();
       pubDefSub.charts.push(irepo);
     }
 
-
-    let pid = new Indicator("",null, "chart","small",true, true,[new IndicatorPath("pie", "stats-tool", "chart?json=",
-      '{"library":"HighCharts","chartDescription":{"queries":[{"name":"'+typePlural+'","type":"'+ChartHelper.prefix+'type'+ChartHelper.suffix+'","query":{"name":"monitor.'+ChartHelper.prefix+'id'+ChartHelper.suffix+'.'+dbTypePlural+'.pidtypes"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"'+ChartHelper.prefix+'title'+ChartHelper.suffix+'"},"subtitle":{},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":true,"align":"center","verticalAlign":"bottom","layout":"horizontal"},"credits":{"href":null,"enabled":true,"text":"Created by OpenAIRE via HighCharts"}}}', null)]);
-    pid.indicatorPaths[0].parameters = IndicatorPath.createParameters(stakeholder.index_name,typeSingl+" PIDs","pie");
-    pid.indicatorPaths[0].parameters["id"] = stakeholder.index_shortName.toLowerCase();
-    pid.indicatorPaths[0].filters = IndicatorPath.createResultFilters(dbType);
-    pubDefSub.charts.push(pid);
+    if(index ==0) {
+      let pid = new Indicator("", null, "chart", "small", true, true, [new IndicatorPath("pie", "stats-tool", "chart?json=",
+        '{"library":"HighCharts","chartDescription":{"queries":[{"name":"' + typePlural + '","type":"' + ChartHelper.prefix + 'type' + ChartHelper.suffix + '","query":{"name":"monitor.' + ChartHelper.prefix + 'id' + ChartHelper.suffix + '.' + dbTypePlural + '.pidtypes"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"' + ChartHelper.prefix + 'title' + ChartHelper.suffix + '"},"subtitle":{},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":true,"align":"center","verticalAlign":"bottom","layout":"horizontal"},"credits":{"href":null,"enabled":true,"text":"Created by OpenAIRE via HighCharts"}}}', null)]);
+      pid.indicatorPaths[0].parameters = IndicatorPath.createParameters(stakeholder.index_name, typeSingl + " PIDs", "pie");
+      pid.indicatorPaths[0].parameters["id"] = stakeholder.index_shortName.toLowerCase();
+      pid.indicatorPaths[0].filters = IndicatorPath.createResultFilters(dbType);
+      pubDefSub.charts.push(pid);
+    }
     return pubDefSub;
   }
   static createOASub(){
diff --git a/src/assets/arc.png b/src/assets/arc.png
new file mode 100644
index 0000000..fbeb0bb
Binary files /dev/null and b/src/assets/arc.png differ
diff --git a/src/assets/arc1.gif b/src/assets/arc1.gif
new file mode 100644
index 0000000..3f3bf6d
Binary files /dev/null and b/src/assets/arc1.gif differ
diff --git a/src/assets/ec.png b/src/assets/ec.png
new file mode 100644
index 0000000..753bd01
Binary files /dev/null and b/src/assets/ec.png differ
diff --git a/src/assets/fwf.png b/src/assets/fwf.png
new file mode 100644
index 0000000..34b2926
Binary files /dev/null and b/src/assets/fwf.png differ
diff --git a/src/assets/fwf1.png b/src/assets/fwf1.png
new file mode 100644
index 0000000..c406e45
Binary files /dev/null and b/src/assets/fwf1.png differ
diff --git a/src/assets/monitor-custom.css b/src/assets/monitor-custom.css
index acf89c8..9fcbcc5 100644
--- a/src/assets/monitor-custom.css
+++ b/src/assets/monitor-custom.css
@@ -22,6 +22,8 @@
     --sidebar-width: 320px;
     --sidebar-font-size: 16px;
     --header-height: 70px;
+
+    --monitor-header-menu-height: 100px;
 }
 
 .refresh-iframe {
@@ -32,3 +34,64 @@
 .rotate-90 {
     transform: rotate(90deg);
 }
+
+/*monitor #header_main{*/
+/*    height: var(--monitor-header-height);*/
+/*}*/
+
+/*.dashboard monitor  .header_full #sidebar_main {*/
+/*    top: var(--monitor-header-height);*/
+
+/*}*/
+
+.double-header  #header_main .uk-navbar-nav > li > a {
+    font-size: 20px;
+    font-family: 'Open Sans';
+}
+
+.double-header .uk-navbar-nav > li.uk-active > a {
+    font-weight: bold;
+}
+.double-header #header_main .uk-navbar-nav > li.uk-active a span {
+    -webkit-box-shadow: inset 0 -2px 0 #FFFFFF;
+    box-shadow: inset 0 -2px 0 #FFFFFF;
+}
+.double-header #header_main .uk-navbar-nav > li a span {
+    padding-bottom: 4px;
+    text-transform: capitalize;
+}
+.double-header #header_main{
+    top: var(--monitor-header-menu-height);
+}
+.double-header #header_menu{
+    position: fixed;
+    top: 0;
+    left: 0;
+    height:var(--monitor-header-menu-height);
+    background:white;
+    z-index: 1215;
+
+}
+.double-header #header_menu .uk-navbar-nav > li.uk-active a span {
+    -webkit-box-shadow: inset 0 -2px 0 #333;
+    box-shadow: inset 0 -2px 0  #333;
+    padding-bottom: 2px;
+
+}
+
+.dashboard .double-header .header_full #sidebar_main {
+    top: calc(var(--header-height) + var(--monitor-header-menu-height));
+}
+
+.dashboard .double-header .header_full #page_content_inner {
+    top:  calc(var(--header-height) + var(--monitor-header-menu-height));
+    position: absolute;
+}
+
+.stakeholderPage  #sidebar_main .menu_section > ul li > a {
+    font-size: 18px;
+}
+
+.double-header .uk-logo img{
+    max-height: 80px;
+}