diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 25520aa..d16a1f3 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -31,8 +31,8 @@ const routes: Routes = [
 		loadChildren: () => import('./get-started/get-started.module').then(m => m.GetStartedModule)
 	},
 	{
-		path: 'faq',
-		loadChildren: () => import('./faq/faq.module').then(m => m.FaqModule),
+		path: 'faqs',
+		loadChildren: () => import('./faqs/faqs.module').then(m => m.FaqsModule),
 		canLoad: [isDevelopmentGuard]
 	},
   {
diff --git a/src/app/faq/faq.component.html b/src/app/faq/faq.component.html
deleted file mode 100644
index 33867bc..0000000
--- a/src/app/faq/faq.component.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="uk-container uk-container-large uk-section uk-section-small uk-padding-remove-bottom">
-	<div class="uk-padding-small uk-padding-remove-horizontal">
-		<breadcrumbs [breadcrumbs]="breadcrumbs"></breadcrumbs>
-	</div>
-</div>
-<div class="uk-container uk-container-large uk-section">
-	<h1>Frequently asked questions<span class="uk-text-primary">.</span></h1>
-</div>
\ No newline at end of file
diff --git a/src/app/faq/faq-routing.module.ts b/src/app/faqs/faq-routing.module.ts
similarity index 68%
rename from src/app/faq/faq-routing.module.ts
rename to src/app/faqs/faq-routing.module.ts
index 6ad91b6..bc0b65d 100644
--- a/src/app/faq/faq-routing.module.ts
+++ b/src/app/faqs/faq-routing.module.ts
@@ -2,12 +2,12 @@ import {NgModule} from '@angular/core';
 import {RouterModule} from '@angular/router';
 
 import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
-import {FaqComponent} from "./faq.component";
+import {FaqsComponent} from "./faqs.component";
 
 @NgModule({
   imports: [
     RouterModule.forChild([
-			{ path: '', component: FaqComponent, canDeactivate: [PreviousRouteRecorder] }
+			{ path: '', component: FaqsComponent, canDeactivate: [PreviousRouteRecorder] }
     ])
   ]
 })
diff --git a/src/app/faqs/faqs.component.html b/src/app/faqs/faqs.component.html
new file mode 100644
index 0000000..d779963
--- /dev/null
+++ b/src/app/faqs/faqs.component.html
@@ -0,0 +1,12 @@
+<div class="uk-background-muted">
+  <div class="uk-container uk-container-large uk-section uk-section-small">
+    <div class="uk-padding-small uk-padding-remove-horizontal">
+      <breadcrumbs [breadcrumbs]="breadcrumbs"></breadcrumbs>
+    </div>
+    <div class="uk-text-center" uk-scrollspy-class>
+      <h1 class="uk-margin-medium-top uk-margin-medium-bottom">Frequently Asked <br> Questions<span
+          class="uk-text-primary">.</span></h1>
+    </div>
+  </div>
+</div>
+<helper *ngIf="pageContents" [texts]="pageContents.top"></helper>
diff --git a/src/app/faq/faq.component.ts b/src/app/faqs/faqs.component.ts
similarity index 91%
rename from src/app/faq/faq.component.ts
rename to src/app/faqs/faqs.component.ts
index da77da3..0a27ab1 100644
--- a/src/app/faq/faq.component.ts
+++ b/src/app/faqs/faqs.component.ts
@@ -10,17 +10,17 @@ import {Subscriber} from "rxjs";
 import {Breadcrumb} from '../openaireLibrary/utils/breadcrumbs/breadcrumbs.component';
 
 @Component({
-  selector: 'faq',
-  templateUrl: 'faq.component.html'
+  selector: 'faqs',
+  templateUrl: 'faqs.component.html'
 })
-export class FaqComponent {
+export class FaqsComponent {
   public pageContents = null;
   public divContents = null;
   
   public url: string = null;
-  public pageTitle: string = "OpenAIRE - Monitor | FAQ";
-  public description: string = "OpenAIRE - Monitor | FAQ";
-	public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'FAQ'}];
+  public pageTitle: string = "OpenAIRE - Monitor | FAQs";
+  public description: string = "OpenAIRE - Monitor | FAQs";
+	public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'FAQs'}];
   public properties: EnvProperties = properties;
   subscriptions = [];
 
@@ -44,7 +44,7 @@ export class FaqComponent {
     this.updateTitle(this.pageTitle);
     this.updateDescription(this.description);
     //this.getDivContents();
-    //this.getPageContents();
+    this.getPageContents();
   }
   
   private getPageContents() {
diff --git a/src/app/faq/faq.module.ts b/src/app/faqs/faqs.module.ts
similarity index 90%
rename from src/app/faq/faq.module.ts
rename to src/app/faqs/faqs.module.ts
index 2debc5b..3d31695 100644
--- a/src/app/faq/faq.module.ts
+++ b/src/app/faqs/faqs.module.ts
@@ -4,7 +4,7 @@ import {RouterModule} from '@angular/router';
 import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
 import {PiwikService}          from '../openaireLibrary/utils/piwik/piwik.service';
 
-import {FaqComponent} from "./faq.component";
+import {FaqsComponent} from "./faqs.component";
 import {FaqRoutingModule} from "./faq-routing.module";
 import {HelperModule} from "../openaireLibrary/utils/helper/helper.module";
 import {Schema2jsonldModule} from "../openaireLibrary/sharedComponents/schema2jsonld/schema2jsonld.module";
@@ -18,13 +18,13 @@ import {IconsModule} from "../openaireLibrary/utils/icons/icons.module";
     Schema2jsonldModule, SEOServiceModule, BreadcrumbsModule, IconsModule
   ],
   declarations: [
-    FaqComponent
+    FaqsComponent
   ],
   exports: [
-    FaqComponent
+    FaqsComponent
   ],
   providers:[
     PreviousRouteRecorder, PiwikService
   ]
 })
-export class FaqModule { }
+export class FaqsModule { }
diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts
index a915e1b..d232da1 100644
--- a/src/app/home/home.component.ts
+++ b/src/app/home/home.component.ts
@@ -260,10 +260,10 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit, IDeactiv
           this.sort(this.stakeholders);
           this.stakeholders = this.publicStakeholders.concat(this.privateStakeholders);
           this.stakeholdersSlider = {
-            stakeholders: this.slider(this.stakeholders),
-            funders: this.slider(this.funders),
-            ris: this.slider(this.ris),
-            organizations: this.slider(this.organizations)
+            stakeholders: this.stakeholderSlider(this.stakeholders),
+            funders: this.stakeholderSlider(this.funders),
+            ris: this.stakeholderSlider(this.ris),
+            organizations: this.stakeholderSlider(this.organizations)
           };
         }
         this.loading = false;
@@ -287,7 +287,7 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit, IDeactiv
     })
   }
   
-  public slider(stakeholders: StakeholderInfo[], size: number = 6): StakeholderInfo[][] {
+  public stakeholderSlider(stakeholders: StakeholderInfo[], size: number = 6): StakeholderInfo[][] {
     let slider: StakeholderInfo[][] = [];
     for (let i = 0; i < (stakeholders.length / size); i++) {
       slider.push(stakeholders.slice(i * size, ((i + 1) * size)));
diff --git a/src/app/home/home.module.ts b/src/app/home/home.module.ts
index 1e26723..72d9bda 100644
--- a/src/app/home/home.module.ts
+++ b/src/app/home/home.module.ts
@@ -18,12 +18,9 @@ import {RefineFieldResultsServiceModule} from "../openaireLibrary/services/refin
 import {SearchResearchResultsServiceModule} from "../openaireLibrary/services/searchResearchResultsService.module";
 import {AlertModalModule} from "../openaireLibrary/utils/modal/alertModal.module";
 import {IconsModule} from "../openaireLibrary/utils/icons/icons.module";
-import {IconsService} from "../openaireLibrary/utils/icons/icons.service";
-import {lock} from "../openaireLibrary/utils/icons/icons";
 import {UrlPrefixModule} from "../openaireLibrary/utils/pipes/url-prefix.module";
 import {LogoUrlPipeModule} from "../openaireLibrary/utils/pipes/logoUrlPipe.module";
 import {SectionScrollModule} from '../openaireLibrary/utils/section-scroll/section-scroll.module';
-import {TabsModule} from '../openaireLibrary/utils/tabs/tabs.module';
 import {LoadingModule} from "../openaireLibrary/utils/loading/loading.module";
 import {BrowseStakeholderModule} from "../browse-stakeholder/browse-stakeholder.module";
 
@@ -31,8 +28,7 @@ import {BrowseStakeholderModule} from "../browse-stakeholder/browse-stakeholder.
   imports: [
     CommonModule, FormsModule, RouterModule, ErrorMessagesModule, OtherPortalsModule,
     HelperModule, Schema2jsonldModule, SEOServiceModule, HomeRoutingModule, SearchResearchResultsServiceModule,
-    RefineFieldResultsServiceModule, AlertModalModule, IconsModule, UrlPrefixModule, LogoUrlPipeModule, SectionScrollModule,
-    TabsModule, LoadingModule, BrowseStakeholderModule
+    RefineFieldResultsServiceModule, AlertModalModule, IconsModule, UrlPrefixModule, LogoUrlPipeModule, SectionScrollModule, LoadingModule, BrowseStakeholderModule
   ],
   declarations: [
     HomeComponent
@@ -46,7 +42,5 @@ import {BrowseStakeholderModule} from "../browse-stakeholder/browse-stakeholder.
   ]
 })
 export class HomeModule {
-  constructor(private iconsService: IconsService) {
-    this.iconsService.registerIcons([lock])
-  }
+  constructor() {}
 }
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary
index 8677e9d..f1618b9 160000
--- a/src/app/openaireLibrary
+++ b/src/app/openaireLibrary
@@ -1 +1 @@
-Subproject commit 8677e9dcd5dbe949b23e102dc8aa374e0e43d170
+Subproject commit f1618b92e8739b4845955c9c4f02a2e1fc31242a
diff --git a/src/assets/monitor-custom.less b/src/assets/monitor-custom.less
index e2a6b84..4c981de 100644
--- a/src/assets/monitor-custom.less
+++ b/src/assets/monitor-custom.less
@@ -31,3 +31,8 @@
 @dotnav-item-hover-background: @monitor-color;
 @dotnav-item-onclick-background: @monitor-color;
 @dotnav-item-active-background: @monitor-color;
+
+/* Graph element for terminology page */
+#graph_element + .uk-sticky-placeholder { 
+	display: none;
+}
diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme
index f902074..1866a89 160000
--- a/src/assets/openaire-theme
+++ b/src/assets/openaire-theme
@@ -1 +1 @@
-Subproject commit f902074e00e01165f489e2fef12aad6551c03ccd
+Subproject commit 1866a893c6b467f5e26a9659e37acaf4071a7f6c
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index f9dfe92..1e35bb3 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -39,9 +39,9 @@ export let properties: EnvProperties = {
   piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=",
   piwikSiteId: "298",
   registryUrl: 'http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/registry/',
-  loginUrl: "http://mpagasas.di.uoa.gr:8080/login-service/openid_connect_login",
-  userInfoUrl: "http://mpagasas.di.uoa.gr:8080/login-service/userInfo",
-  logoutUrl: "http://mpagasas.di.uoa.gr:8080/login-service/openid_logout",
+  loginUrl: "http://mpagasas.di.uoa.gr:19080/login-service/openid_connect_login",
+  userInfoUrl: "http://mpagasas.di.uoa.gr:19080/login-service/userInfo",
+  logoutUrl: "http://mpagasas.di.uoa.gr:19080/login-service/openid_logout",
   cookieDomain: ".di.uoa.gr",
   feedbackmail: "openaire.test@gmail.com",
   cacheUrl: "http://scoobydoo.di.uoa.gr:3000/get?url=",