diff --git a/dashboard/divhelpcontent/class-help-content-form.component.html b/dashboard/divhelpcontent/class-help-content-form.component.html
index 619f4ad9..e791b398 100644
--- a/dashboard/divhelpcontent/class-help-content-form.component.html
+++ b/dashboard/divhelpcontent/class-help-content-form.component.html
@@ -13,13 +13,15 @@
             </h1>
           </a>
         </div>
-        <button class="uk-button uk-button-default uk-margin-right"
-                (click)="resetCustom()" [class.uk-disabled]="!myForm.dirty"
-                [disabled]="!myForm.dirty || showLoading">Reset
-        </button>
-        <button class="uk-button uk-button-primary" [class.uk-disabled]="myForm.invalid || !myForm.dirty || myForm.disabled"
-                (click)="saveCustom()" [disabled]="myForm.invalid ||!myForm.dirty || myForm.disabled || showLoading">Save
-        </button>
+        <div class="uk-width-auto">
+          <button class="uk-button uk-button-default uk-margin-right"
+                  (click)="resetCustom()" [class.uk-disabled]="!myForm.dirty"
+                  [disabled]="!myForm.dirty || showLoading">Reset
+          </button>
+          <button class="uk-button uk-button-primary" [class.uk-disabled]="myForm.invalid || !myForm.dirty || myForm.disabled"
+                  (click)="saveCustom()" [disabled]="myForm.invalid ||!myForm.dirty || myForm.disabled || showLoading">Save
+          </button>
+        </div>
       </div>
     </div>
   </div>
@@ -56,7 +58,7 @@
             </div>
           </div>
           <div [ngClass]="parentClass">
-            <ckeditor (change)="contentChanged()"
+            <ckeditor #ckEditor (change)="contentChanged()"
                       [readonly]="false"
                       debounce="500"
                       [formControl]="myForm.get('content')"
diff --git a/dashboard/divhelpcontent/class-help-content-form.component.ts b/dashboard/divhelpcontent/class-help-content-form.component.ts
index 906040bf..e24c876e 100644
--- a/dashboard/divhelpcontent/class-help-content-form.component.ts
+++ b/dashboard/divhelpcontent/class-help-content-form.component.ts
@@ -1,4 +1,4 @@
-import {Component, OnInit} from '@angular/core';
+import {ChangeDetectorRef, Component, OnInit, ViewChild} from '@angular/core';
 import {ActivatedRoute, Router} from '@angular/router';
 import {UntypedFormBuilder, UntypedFormGroup, Validators} from '@angular/forms';
 import {Page} from '../../utils/entities/adminTool/page';
@@ -9,13 +9,14 @@ import {Subscriber, Subscription, zip} from 'rxjs';
 import {DivHelpContent} from '../../utils/entities/adminTool/div-help-content';
 import {NotificationHandler} from "../../utils/notification-handler";
 import {ClearCacheService} from "../../services/clear-cache.service";
+import {CKEditorComponent} from "ng2-ckeditor";
 
 @Component({
   selector: 'class-content-form',
   templateUrl: './class-help-content-form.component.html',
 })
 export class ClassContentFormComponent implements OnInit {
-  
+
   myForm: UntypedFormGroup;
   portal: string;
   parentClass: string;
@@ -27,25 +28,27 @@ export class ClassContentFormComponent implements OnInit {
   public showLoading: boolean = true;
   private subs: Subscription[] = [];
   public pageHelpContent: DivHelpContent;
-  
+  @ViewChild('ckEditor') ckEditor: CKEditorComponent;
+
   constructor(private route: ActivatedRoute, private _router: Router, private _fb: UntypedFormBuilder,
-              private _helpContentService: HelpContentService, private _clearCacheService: ClearCacheService) {
+              private cdr: ChangeDetectorRef, private _helpContentService: HelpContentService,
+              private _clearCacheService: ClearCacheService) {
   }
-  
+
   ngOnInit() {
     this.portal = (this.route.snapshot.data.portal) ? this.route.snapshot.data.portal : this.route.snapshot.params[this.route.snapshot.data.param];
     this.parentClass = this.route.snapshot.data.parentClass;
     this.subs.push(this.route.queryParams.subscribe(params => {
-        this.pageId = params['pageId'];
-        this.myForm = this.form;
-        this.pageContentId = params['pageContentId'];
-        if (!this.pageId) {
-          this._router.navigate(['../'], {relativeTo: this.route});
-        }
-        this.getInfo(this.pageId);
-      }));
+      this.pageId = params['pageId'];
+      this.myForm = this.form;
+      this.pageContentId = params['pageContentId'];
+      if (!this.pageId) {
+        this._router.navigate(['../'], {relativeTo: this.route});
+      }
+      this.getInfo(this.pageId);
+    }));
   }
-  
+
   ngOnDestroy() {
     this.subs.forEach(value => {
       if (value instanceof Subscriber) {
@@ -53,7 +56,7 @@ export class ClassContentFormComponent implements OnInit {
       }
     });
   }
-  
+
   getInfo(pageId: string) {
     this.showLoading = true;
     let obs = zip(this._helpContentService.getPageByPortal(pageId, this.properties.adminToolsAPIURL, this.portal),
@@ -66,25 +69,44 @@ export class ClassContentFormComponent implements OnInit {
         }
         this.setOptions(results[1]);
         if (!this.pageContentId) {
-         this.updateForm(null);
+          this.updateForm(null);
           this.showLoading = false;
+          this.initCKEditor();
         } else {
-          this.subs.push(this._helpContentService.getDivHelpContent( this.pageContentId, this.properties.adminToolsAPIURL, this.portal).subscribe(pageHelpContent=>{
-            this.pageHelpContent = pageHelpContent;
-            if (this.properties.adminToolsPortalType != this.page.portalType) {
-              this._router.navigate(['../'], {relativeTo: this.route});
-            }
-            this.updateForm(this.pageHelpContent);
-            this.showLoading = false;
-          },
+          this.subs.push(this._helpContentService.getDivHelpContent(this.pageContentId, this.properties.adminToolsAPIURL, this.portal).subscribe(pageHelpContent => {
+              this.pageHelpContent = pageHelpContent;
+              if (this.properties.adminToolsPortalType != this.page.portalType) {
+                this._router.navigate(['../'], {relativeTo: this.route});
+              }
+              this.updateForm(this.pageHelpContent);
+              this.showLoading = false;
+              this.initCKEditor();
+            },
             error => {
-            this.handleError('System error retrieving content by id '+ this.pageContentId, error)
-          }));
+              this.handleError('System error retrieving content by id ' + this.pageContentId, error)
+            }));
         }
       }));
 
   }
 
+  private initCKEditor() {
+    this.cdr.detectChanges();
+    if (this.ckEditor) {
+      this.ckEditor.instance.on('mode', () => {
+        let editor = this.ckEditor.instance;
+        if (editor.mode === 'source') {
+          let editable = editor.editable();
+          editable.attachListener(editable, 'input', () => {
+            this.myForm.get('content').setValue(editor.getData());
+            this.myForm.get('content').markAsDirty();
+            this.cdr.detectChanges();
+          });
+        }
+      });
+    }
+  }
+
   private updateForm(pageHelpContent: DivHelpContent) {
     this.pageHelpContent = pageHelpContent;
     this.myForm = this.form;
@@ -93,48 +115,48 @@ export class ClassContentFormComponent implements OnInit {
       this.myForm.get('divId').disable();
     }
     this.myForm.markAsPristine();
-    
+
   }
 
-  
+
   public setOptions(divIds) {
     this.classOptions = [];
-    for(let divid of divIds){
-      this.classOptions.push({label:divid.name, value:divid._id});
+    for (let divid of divIds) {
+      this.classOptions.push({label: divid.name, value: divid._id});
     }
 
   }
-  
+
   public get form() {
     return this._fb.group({
       divId: ['', Validators.required],
       content: ['', Validators.required],
       isActive: true,
       portal: this.portal,
-      _id : '',
+      _id: '',
     });
 
   }
-  
+
   public reset() {
     this.myForm.patchValue({
       divId: ['', Validators.required],
       content: ['', Validators.required],
       isActive: true,
       portal: '',
-      _id : '',
+      _id: '',
     });
     this.myForm.markAsPristine();
   }
-  
+
   handleError(message: string, error = null) {
-    if(error) {
+    if (error) {
       console.error('Server responded: ' + error);
     }
     NotificationHandler.rise(message, 'danger');
     this.showLoading = false;
   }
-  
+
   public saveCustom() {
     if (this.myForm.valid) {
       this.showLoading = true;
@@ -159,13 +181,13 @@ export class ClassContentFormComponent implements OnInit {
     this.updateForm(this.pageHelpContent);
     this.showLoading = false;
   }
-  
+
   handleUpdateError(message: string, error) {
     console.error('Server responded: ' + error);
     NotificationHandler.rise(message, 'danger');
     this.showLoading = false;
   }
-  
+
   changeStatus() {
     this.myForm.get('isActive').setValue(!this.myForm.get('isActive').value);
     if (this.pageHelpContent && this.myForm.get('isActive').value != this.pageHelpContent.isActive || !this.pageHelpContent && !this.myForm.get('isActive').value) {
@@ -174,7 +196,7 @@ export class ClassContentFormComponent implements OnInit {
       this.myForm.get('isActive').markAsPristine()
     }
   }
-  
+
   contentChanged() {
     if (this.pageHelpContent && this.myForm.get('content').value != this.pageHelpContent.content || !this.pageHelpContent && this.myForm.get('content').value != '') {
       this.myForm.get('content').markAsDirty();
diff --git a/dashboard/helpTexts/page-help-content-form.component.html b/dashboard/helpTexts/page-help-content-form.component.html
index 7cd9ff74..bae2f90b 100644
--- a/dashboard/helpTexts/page-help-content-form.component.html
+++ b/dashboard/helpTexts/page-help-content-form.component.html
@@ -13,13 +13,15 @@
             </h1>
           </a>
         </div>
-        <button class="uk-button uk-button-default uk-margin-right"
-                (click)="resetCustom()" [class.uk-disabled]="!myForm.dirty"
-                [disabled]="!myForm.dirty || showLoading">Reset
-        </button>
-        <button class="uk-button uk-button-primary" [class.uk-disabled]="myForm.invalid || !myForm.dirty || myForm.disabled"
-                (click)="saveCustom()" [disabled]="myForm.invalid ||!myForm.dirty || myForm.disabled || showLoading">Save
-        </button>
+        <div class="uk-width-auto">
+          <button class="uk-button uk-button-default uk-margin-right"
+                  (click)="resetCustom()" [class.uk-disabled]="!myForm.dirty"
+                  [disabled]="!myForm.dirty || showLoading">Reset
+          </button>
+          <button class="uk-button uk-button-primary" [class.uk-disabled]="myForm.invalid || !myForm.dirty || myForm.disabled"
+                  (click)="saveCustom()" [disabled]="myForm.invalid ||!myForm.dirty || myForm.disabled || showLoading">Save
+          </button>
+        </div>
       </div>
     </div>
   </div>
@@ -60,7 +62,7 @@
             </div>
           </div>
           <div [ngClass]="parentClass">
-            <ckeditor (change)="contentChanged()"
+            <ckeditor #ckEditor (change)="contentChanged()"
                       [readonly]="false"
                       debounce="500"
                       [formControl]="myForm.get('content')"
diff --git a/dashboard/helpTexts/page-help-content-form.component.ts b/dashboard/helpTexts/page-help-content-form.component.ts
index 2fa17105..5cba1d54 100644
--- a/dashboard/helpTexts/page-help-content-form.component.ts
+++ b/dashboard/helpTexts/page-help-content-form.component.ts
@@ -1,4 +1,4 @@
-import {Component, OnInit} from '@angular/core';
+import {ChangeDetectorRef, Component, OnInit, ViewChild} from '@angular/core';
 import {ActivatedRoute, Router} from '@angular/router';
 import {UntypedFormBuilder, UntypedFormGroup, Validators} from '@angular/forms';
 import {Page} from '../../utils/entities/adminTool/page';
@@ -10,6 +10,7 @@ import {HelperFunctions} from '../../utils/HelperFunctions.class';
 import {PageHelpContent} from '../../utils/entities/adminTool/page-help-content';
 import {ClearCacheService} from "../../services/clear-cache.service";
 import {NotificationHandler} from "../../utils/notification-handler";
+import {CKEditorComponent} from "ng2-ckeditor";
 
 @Component({
   selector: 'page-content-form',
@@ -29,9 +30,11 @@ export class PageContentFormComponent implements OnInit {
   public showLoading: boolean = true;
   private subs: Subscription[] = [];
   public pageHelpContent: PageHelpContent;
-  
+  @ViewChild('ckEditor') ckEditor: CKEditorComponent;
+
   constructor(private route: ActivatedRoute, private _router: Router, private _fb: UntypedFormBuilder,
-              private _helpContentService: HelpContentService, private _clearCacheService: ClearCacheService) {
+              private cdr: ChangeDetectorRef, private _helpContentService: HelpContentService,
+              private _clearCacheService: ClearCacheService) {
   }
   
   ngOnInit() {
@@ -80,12 +83,30 @@ export class PageContentFormComponent implements OnInit {
           this.updateForm(this.pageHelpContent);
         }
         this.showLoading = false;
+        this.initCKEditor();
       },
       error => this.handleError('System error retrieving page with id: ' + pageId, error)
     ));
     
   }
 
+  private initCKEditor() {
+    this.cdr.detectChanges();
+    if(this.ckEditor) {
+      this.ckEditor.instance.on('mode', () => {
+        let editor = this.ckEditor.instance;
+        if (editor.mode === 'source') {
+          let editable = editor.editable();
+          editable.attachListener(editable, 'input', () => {
+            this.myForm.get('content').setValue(editor.getData());
+            this.myForm.get('content').markAsDirty();
+            this.cdr.detectChanges();
+          });
+        }
+      });
+    }
+  }
+
   private updateForm(pageHelpContent: PageHelpContent) {
     this.pageHelpContent = pageHelpContent;
     this.myForm = this.form;
diff --git a/dashboard/sharedComponents/page-content/page-content.component.ts b/dashboard/sharedComponents/page-content/page-content.component.ts
index ec9f0f86..bc1b1da9 100644
--- a/dashboard/sharedComponents/page-content/page-content.component.ts
+++ b/dashboard/sharedComponents/page-content/page-content.component.ts
@@ -122,7 +122,9 @@ export class PageContentComponent implements OnInit, AfterViewInit, OnDestroy {
 
   ngOnDestroy() {
     this.subscriptions.forEach(subscription => {
-      if (subscription instanceof (ResizeObserver || IntersectionObserver)) {
+      if (typeof ResizeObserver !== "undefined" && subscription instanceof ResizeObserver) {
+        subscription.disconnect();
+      } else if (typeof ResizeObserver !== "undefined" && subscription instanceof IntersectionObserver) {
         subscription.disconnect();
       }
     });
diff --git a/dashboard/sharedComponents/sidebar/layout.service.ts b/dashboard/sharedComponents/sidebar/layout.service.ts
index 4bd6bfa3..ed91e514 100644
--- a/dashboard/sharedComponents/sidebar/layout.service.ts
+++ b/dashboard/sharedComponents/sidebar/layout.service.ts
@@ -85,7 +85,7 @@ export class LayoutService {
     this.subscriptions.forEach(subscription => {
       if (subscription instanceof Subscriber) {
         subscription.unsubscribe();
-      } else if (subscription instanceof ResizeObserver) {
+      } else if (typeof ResizeObserver !== "undefined" && subscription instanceof ResizeObserver) {
         subscription.disconnect();
       }
     })
diff --git a/landingPages/dataProvider/dataProvider.component.html b/landingPages/dataProvider/dataProvider.component.html
index ab80b5bc..a20df43e 100644
--- a/landingPages/dataProvider/dataProvider.component.html
+++ b/landingPages/dataProvider/dataProvider.component.html
@@ -55,22 +55,19 @@
           </div>
 
           <ng-template #graph_and_feedback_template>
-            <div class="uk-flex uk-margin-small-top uk-margin-small-bottom" [class.uk-invisible]="!dataProviderInfo">
+            <div class="uk-flex uk-flex-between uk-flex-wrap uk-margin-small-bottom uk-margin-small-top" [class.uk-invisible]="!dataProviderInfo">
               <!-- Last Index Info-->
-              <div class="uk-width-2-3@m uk-width-1-2">
-                <icon name="graph" customClass="text-graph"></icon>
-                <span class="uk-margin-small-left uk-text-baseline">
-                  <span class="uk-text-meta">Powered by </span>
-                  <a href="https://graph.openaire.eu" target="_blank" class="text-graph">OpenAIRE Research Graph</a>
-                </span>
-                <span *ngIf="indexUpdateDate" class="uk-text-baseline uk-text-meta">
-                  . Last update of records in OpenAIRE: {{indexUpdateDate | date: 'MMM dd, yyyy'}}
-                </span>
-              </div>
+              <a href="https://graph.openaire.eu" target="_blank" class="uk-width-1-1 uk-width-auto@l">
+                <img src="assets/common-assets/openaire-badge-1.png" alt="Powered by OpenAIRE graph" style="height: 15px;">
+              </a>
+              <span *ngIf="indexUpdateDate" class="uk-text-baseline uk-text-meta uk-width-1-1 uk-width-auto@l">
+                Last update of records in OpenAIRE: {{indexUpdateDate | date: 'MMM dd, yyyy'}}
+              </span>
+
               <!--Feedback-->
-              <div *ngIf="properties.reCaptchaSiteKey" class="uk-width-expand uk-text-right">
-                <span class="uk-text-meta uk-text-xsmall">See an issue?</span>
-                <a (click)="showFeedback = true; scroll()" class="uk-text-xsmall"> Report it here</a>
+              <div *ngIf="properties.reCaptchaSiteKey" class="uk-width-1-1 uk-width-auto@l">
+                <span class="uk-text-meta uk-text-xsmall">Found an issue? </span>
+                <a (click)="showFeedback = true; scroll()" class="uk-text-xsmall">Give us feedback</a>
               </div>
             </div>
           </ng-template>
diff --git a/landingPages/organization/organization.component.html b/landingPages/organization/organization.component.html
index f720c53c..426c44d4 100644
--- a/landingPages/organization/organization.component.html
+++ b/landingPages/organization/organization.component.html
@@ -54,22 +54,19 @@
 
           <!-- Graph and feedback -->
           <ng-template #graph_and_feedback_template>
-            <div class="uk-flex uk-margin-small-top uk-margin-small-bottom" [class.uk-invisible]="!organizationInfo">
+            <div class="uk-flex uk-flex-between uk-flex-wrap uk-margin-small-bottom uk-margin-small-top" [class.uk-invisible]="!organizationInfo">
               <!-- Last Index Info-->
-              <div class="uk-width-2-3@m uk-width-1-2">
-                <icon name="graph" customClass="text-graph"></icon>
-                <span class="uk-margin-small-left uk-text-baseline">
-                  <span class="uk-text-meta">Powered by </span>
-                  <a href="https://graph.openaire.eu" target="_blank" class="text-graph">OpenAIRE Research Graph</a>
-                </span>
-                <span *ngIf="indexUpdateDate" class="uk-text-baseline uk-text-meta">
-                  . Last update of records in OpenAIRE: {{indexUpdateDate | date: 'MMM dd, yyyy'}}
-                </span>
-              </div>
+              <a href="https://graph.openaire.eu" target="_blank" class="uk-width-1-1 uk-width-auto@l">
+                <img src="assets/common-assets/openaire-badge-1.png" alt="Powered by OpenAIRE graph" style="height: 15px;">
+              </a>
+              <span *ngIf="indexUpdateDate" class="uk-text-baseline uk-text-meta uk-width-1-1 uk-width-auto@l">
+                Last update of records in OpenAIRE: {{indexUpdateDate | date: 'MMM dd, yyyy'}}
+              </span>
+
               <!--Feedback-->
-              <div *ngIf="properties.reCaptchaSiteKey" class="uk-width-expand uk-text-right">
-                <span class="uk-text-meta uk-text-xsmall">See an issue?</span>
-                <a (click)="showFeedback = true; scroll()" class="uk-text-xsmall"> Report it here</a>
+              <div *ngIf="properties.reCaptchaSiteKey" class="uk-width-1-1 uk-width-auto@l">
+                <span class="uk-text-meta uk-text-xsmall">Found an issue? </span>
+                <a (click)="showFeedback = true; scroll()" class="uk-text-xsmall">Give us feedback</a>
               </div>
             </div>
           </ng-template>
diff --git a/landingPages/project/project.component.html b/landingPages/project/project.component.html
index 6905df01..813953a2 100644
--- a/landingPages/project/project.component.html
+++ b/landingPages/project/project.component.html
@@ -94,22 +94,19 @@
           </div>
 
           <ng-template #graph_and_feedback_template>
-            <div class="uk-flex uk-margin-small-top uk-margin-small-bottom" [class.uk-invisible]="!projectInfo">
+            <div class="uk-flex uk-flex-between uk-flex-wrap uk-margin-small-bottom uk-margin-small-top" [class.uk-invisible]="!projectInfo">
               <!-- Last Index Info-->
-              <div class="uk-width-2-3@m uk-width-1-2">
-                <icon name="graph" customClass="text-graph"></icon>
-                <span class="uk-margin-small-left uk-text-baseline">
-                  <span class="uk-text-meta">Powered by </span>
-                  <a href="https://graph.openaire.eu" target="_blank" class="text-graph">OpenAIRE Research Graph</a>
-                </span>
-                <span *ngIf="indexUpdateDate" class="uk-text-baseline uk-text-meta">
-                  . Last update of records in OpenAIRE: {{indexUpdateDate | date: 'MMM dd, yyyy'}}
-                </span>
-              </div>
+              <a href="https://graph.openaire.eu" target="_blank" class="uk-width-1-1 uk-width-auto@l">
+                <img src="assets/common-assets/openaire-badge-1.png" alt="Powered by OpenAIRE graph" style="height: 15px;">
+              </a>
+              <span *ngIf="indexUpdateDate" class="uk-text-baseline uk-text-meta uk-width-1-1 uk-width-auto@l">
+                Last update of records in OpenAIRE: {{indexUpdateDate | date: 'MMM dd, yyyy'}}
+              </span>
+
               <!--Feedback-->
-              <div *ngIf="properties.reCaptchaSiteKey" class="uk-width-expand uk-text-right">
-                <span class="uk-text-meta uk-text-xsmall">See an issue?</span>
-                <a (click)="showFeedback = true; scroll()" class="uk-text-xsmall"> Report it here</a>
+              <div *ngIf="properties.reCaptchaSiteKey" class="uk-width-1-1 uk-width-auto@l">
+                <span class="uk-text-meta uk-text-xsmall">Found an issue? </span>
+                <a (click)="showFeedback = true; scroll()" class="uk-text-xsmall">Give us feedback</a>
               </div>
             </div>
           </ng-template>
diff --git a/landingPages/result/resultLanding.component.html b/landingPages/result/resultLanding.component.html
index 3c5a5ee6..dd5d400c 100644
--- a/landingPages/result/resultLanding.component.html
+++ b/landingPages/result/resultLanding.component.html
@@ -94,7 +94,7 @@
             <div class="uk-flex uk-flex-between uk-flex-wrap uk-margin-small-bottom uk-margin-small-top" [class.uk-invisible]="!resultLandingInfo">
               <!-- Last Index Info-->
               <a href="https://graph.openaire.eu" target="_blank" class="uk-width-1-1 uk-width-auto@l">
-                <img src="assets/common-assets/openaire-badge-1.png" alt="Powered by OpenAIRE graph" style="height: 14px;">
+                <img src="assets/common-assets/openaire-badge-1.png" alt="Powered by OpenAIRE graph" style="height: 15px;">
               </a>
               <span *ngIf="indexUpdateDate" class="uk-text-baseline uk-text-meta uk-width-1-1 uk-width-auto@l">
                 Last update of records in OpenAIRE: {{indexUpdateDate | date: 'MMM dd, yyyy'}}
@@ -102,7 +102,7 @@
 
               <!--Feedback-->
               <div *ngIf="properties.reCaptchaSiteKey" class="uk-width-1-1 uk-width-auto@l">
-                <span class="uk-text-meta uk-text-xsmall">See an issue? </span>
+                <span class="uk-text-meta uk-text-xsmall">Found an issue? </span>
                 <a (click)="feedbackClicked()" class="uk-text-xsmall">Give us feedback</a>
               </div>
             </div>
diff --git a/searchPages/searchUtils/newSearchPage.component.html b/searchPages/searchUtils/newSearchPage.component.html
index b2e4ed18..385ff5c0 100644
--- a/searchPages/searchUtils/newSearchPage.component.html
+++ b/searchPages/searchUtils/newSearchPage.component.html
@@ -326,16 +326,12 @@
                                [isDisabled]="disabled" [isMobile]="mobile">
                 </search-paging>
               </div>
-              <div *ngIf="showIndexInfo && searchUtils.status !== errorCodes.LOADING" class="uk-margin-large-top uk-grid uk-child-width-1-2 uk-text-small">
+              <div *ngIf="showIndexInfo && searchUtils.status !== errorCodes.LOADING" class="uk-margin-large-top uk-flex uk-flex-between uk-flex-wrap uk-text-small">
                 <!-- Last Index Info-->
-                <div>
-                  <icon name="graph" customClass="text-graph"></icon>
-                  <span class="uk-margin-small-left uk-text-baseline">
-                      <span class="uk-text-meta">Powered by </span>
-                      <a href="https://graph.openaire.eu" target="_blank" class="text-graph">OpenAIRE Research Graph</a>
-                    </span>
-                </div>
-                <div class="uk-text-right">
+                <a href="https://graph.openaire.eu" target="_blank" class="uk-width-1-1 uk-width-auto@m">
+                  <img src="assets/common-assets/openaire-badge-1.png" alt="Powered by OpenAIRE graph" style="height: 17px;">
+                </a>
+                <div class="uk-width-1-1 uk-width-auto@m">
                     <span *ngIf="indexUpdateDate" class="uk-text-baseline uk-text-meta">
                       <a *ngIf="properties.showLastIndexInformationLink" class="uk-link" [href]="properties.lastIndexInformationLink" target="_blank">Last update</a>
                       <span *ngIf="!(properties.showLastIndexInformationLink)">Last update</span>