Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/landingPages/dataProvider/dataProvider.service.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/landingPages/dataProvider/dataProvider.service.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/landingPages/dataProvider/dataProvider.service.ts	(revision 53464)
@@ -54,11 +54,12 @@
     }
 
     parseDataproviderAggregationStatus(data: any): any {
-        var aggregationStatus: {"fundedContent": string, "indexRecords": string} = null;
+        var aggregationStatus: {"fundedContent": string, "indexRecords": string, "fulltexts": string} = null;
         if(data != null && data[0] != null) {
-          aggregationStatus = {"fundedContent": "-1", "indexRecords": "-1"};
+          aggregationStatus = {"fundedContent": "-1", "indexRecords": "-1", "fulltexts": "-1"};
           aggregationStatus.fundedContent = data[0].fundedContent;
           aggregationStatus.indexRecords = data[0].indexRecords;
+          aggregationStatus.fulltexts = data[0].fulltexts;
         }
         return aggregationStatus;
     }
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/landingPages/dataset/dataset.component.html
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/landingPages/dataset/dataset.component.html	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/landingPages/dataset/dataset.component.html	(revision 53464)
@@ -6,7 +6,7 @@
 
     <div *ngIf="warningMessage.length > 0" class="uk-alert uk-alert-warning  uk-margin-large-top" role="alert">{{warningMessage}}</div>
     <div *ngIf="errorMessage.length > 0" class="uk-alert uk-alert-danger  uk-margin-large-top" role="alert">{{errorMessage}}</div>
-    <div [style.display]="showLoading ? 'inline' : 'none'" class="uk-animation-fade uk-margin-large-top  uk-width-1-1" role="alert"><img class="loading-gif  uk-align-center" ></div>
+    <div [style.display]="showLoading ? 'inline' : 'none'" class="uk-animation-fade uk-margin-large-top  uk-width-1-1" role="alert"><span class="loading-gif  uk-align-center" ></span></div>
 
     <div *ngIf="datasetInfo != null" uk-grid class="uk-grid-large">
         <div class="uk-width-expand@m uk-width-1-1@s">
@@ -51,6 +51,7 @@
                 </showSubjects>
                 </li>
             </ul>
+            <hr *ngIf="datasetInfo.description" >
 
             <div *ngIf="datasetInfo.description" class="uk-margin-bottom uk-text-justify descriptionText">
               {{datasetInfo.description}}
@@ -87,9 +88,9 @@
                        <span *ngIf="datasetInfo.relatedResearchResults" class="uk-badge uk-badge-notification">
                            {{relatedResearchResultsNum | number}}
                        </span> -->
-                       <span class="uk-badge uk-badge-notification">
-                           {{relatedResearchResultsNum | number}}
-                       </span>
+                       <!-- <span class="uk-badge uk-badge-notification"> -->
+                           ({{relatedResearchResultsNum | number}})
+                       <!-- </span> -->
                    </a>
                    <div class="uk-accordion-content">
                      <!-- <div *ngIf="!datasetInfo.relatedResearchResults" class = "uk-alert  uk-alert-primary">
@@ -98,7 +99,7 @@
                      <div *ngIf="datasetInfo.relatedResearchResults"> -->
                      <div>
                          <div *ngFor="let provenanceaction of getKeys(datasetInfo.relatedResearchResults)">
-                             <div class="uk-text-large uk-margin-bottom">{{provenanceaction}}</div>
+                             <div class="uk-text-large">{{provenanceaction}}</div>
 
                              <tabTable [percentageName]="trust" [info]="datasetInfo.relatedResearchResults.get(provenanceaction)" [(properties)]=properties></tabTable>
                          </div>
@@ -113,9 +114,9 @@
                         <span *ngIf="datasetInfo.similarResearchResults" class="uk-badge uk-badge-notification">
                             {{datasetInfo.similarResearchResults.length | number}}
                         </span> -->
-                        <span class="uk-badge uk-badge-notification">
-                            {{datasetInfo.similarResearchResults.length | number}}
-                        </span>
+                        <!-- <span class="uk-badge uk-badge-notification"> -->
+                            ({{datasetInfo.similarResearchResults.length | number}})
+                        <!-- </span> -->
                     </a>
                     <div class="uk-accordion-content">
                       <!-- <div *ngIf="!datasetInfo.similarResearchResults" class = "uk-alert  uk-alert-primary" >
@@ -148,106 +149,6 @@
                   </li>
             </ul>
 
-            <!-- <ul class="uk-tab uk-visible@m" uk-tab="connect: #tab-content">
-                <li (click)="activeTab='Related Research Results'"
-                    [class]="activeTab == 'Related Research Results'?'uk-active':''">
-                     <a>
-                         Related Research Results
-                         <span class="uk-badge uk-badge-notification">
-                             {{relatedResearchResultsNum | number}}
-                         </span>
-                     </a>
-                 </li>
-
-                <li (click)="activeTab='Similar Research Results'"
-                    [class]="activeTab == 'Similar Research Results'?'uk-active':''">
-                    <a>
-                        Similar Research Results
-                        <span *ngIf="!datasetInfo.similarResearchResults" class="uk-badge uk-badge-notification">0</span>
-                        <span *ngIf="datasetInfo.similarResearchResults" class="uk-badge uk-badge-notification">
-                            {{datasetInfo.similarResearchResults.length | number}}
-                        </span>
-                    </a>
-                </li>
-
-                <li (click)="metricsClicked=true; activeTab='Metrics'"
-                    [class]="activeTab == 'Metrics'?'uk-active':''">
-                    <a>
-                        Metrics
-                    </a>
-                </li>
-            </ul> -->
-
-            <!-- <button class="uk-button uk-button-default uk-hidden@m" type="button">
-              <span uk-navbar-toggle-icon></span> <span class="uk-margin-small-left">{{activeTab}}</span>
-            </button>
-
-            <ul id="toggle-small-tabs" class="uk-subnav uk-subnav-pill uk-dropdown uk-hidden@m" uk-switcher="connect: #tab-content" uk-dropdown="mode: click" uk-toggle="target: #toggle-small-tabs">
-              <li (click)="activeTab='Related Research Results'"
-                  [class]="activeTab == 'Related Research Results'?'uk-active':''">
-                     <a>
-                         Related Research Results
-                         <span class="uk-badge uk-badge-notification">
-                             {{relatedResearchResultsNum | number}}
-                         </span>
-                     </a>
-                 </li>
-
-                <li (click)="activeTab='Similar Research Results'"
-                    [class]="activeTab == 'Similar Research Results'?'uk-active':''">
-                    <a>
-                        Similar Research Results
-                        <span *ngIf="!datasetInfo.similarResearchResults" class="uk-badge uk-badge-notification">0</span>
-                        <span *ngIf="datasetInfo.similarResearchResults" class="uk-badge uk-badge-notification">
-                            {{datasetInfo.similarResearchResults.length | number}}
-                        </span>
-                    </a>
-                </li>
-
-                <li (click)="metricsClicked=true; activeTab='Metrics'"
-                    [class]="activeTab == 'Metrics'?'uk-active':''">
-                    <a>
-                        Metrics
-                    </a>
-                </li>
-            </ul> -->
-
-            <!-- <div class="uk-margin custom-tab-content">
-                <div *ngIf="activeTab=='Related Research Results'" class="uk-animation-fade">
-                    <div *ngIf="!datasetInfo.relatedResearchResults" class = "uk-alert  uk-alert-primary" >
-                        No related research results available
-                    </div>
-                    <div *ngIf="datasetInfo.relatedResearchResults && datasetInfo.relatedResearchResults.size > 0">
-
-                        <div *ngFor="let provenanceaction of getKeys(datasetInfo.relatedResearchResults)">
-                            <div class="uk-text-large">{{provenanceaction}}</div>
-
-                            <tabTable [percentageName]="trust" [info]="datasetInfo.relatedResearchResults.get(provenanceaction)" [(properties)]=properties></tabTable>
-                        </div>
-                    </div>
-                </div>
-
-                <div *ngIf="activeTab=='Similar Research Results'" class="uk-animation-fade">
-                    <div  *ngIf="!datasetInfo.similarResearchResults"  class = "uk-alert  uk-alert-primary" >
-                        No similar research results available
-                    </div>
-                    <div *ngIf="datasetInfo.similarResearchResults">
-                        <tabTable [percentageName]="similarity" [info]="datasetInfo.similarResearchResults" [(properties)]=properties></tabTable>
-                    </div>
-                </div>
-                <div *ngIf="activeTab=='Metrics'" class="uk-animation-fade">
-                    <metrics [pageViews]="pageViews"
-                        [id]="datasetId" [entityType]="'results'" [entity]="'Research Data'"
-                        (metricsResults)="metricsResults($event)" [(properties)] = properties>
-                    </metrics>
-                    <i-frame *ngIf="metricsClicked && totalViews > 0"
-                        [url]=viewsFrameUrl width="100%" height="250">
-                    </i-frame>
-                    <i-frame *ngIf="metricsClicked && totalDownloads > 0"
-                        [url]=downloadsFrameUrl width="100%" height="250">
-                    </i-frame>
-                </div>
-          </div> -->
         </div>
 
         <div class="uk-width-large@m uk-width-1-1@s">
@@ -259,7 +160,7 @@
           <altmetrics *ngIf="datasetInfo.identifiers && datasetInfo.identifiers.get('doi')"
              id="{{datasetInfo.identifiers.get('doi')[0]}}" type="doi">
           </altmetrics >
-            <ul class="uk-list ">
+            <ul class="uk-list uk-margin-remove-bottom ">
 
                 <li *ngIf="datasetInfo.hostedBy_collectedFrom && datasetInfo.hostedBy_collectedFrom.length > 0">
                     <availableOn [availableOn]="datasetInfo.hostedBy_collectedFrom"></availableOn>
@@ -296,86 +197,51 @@
                 </li-->
 
                 <li>
-                  <ul uk-accordion class="uk-padding-remove citation-accordion">
-                      <li>
-                        <div class="sideInfoTitle uk-accordion-title cite-this-button uk-width-1-1" type="button">
-                          Cite this research data
-                        </div>
-                          <div class="uk-accordion-content">
-                            <citeThis [result]="datasetInfo" [id]="datasetId" type="research data"></citeThis>
-                          </div>
-                      </li>
-                  </ul>
-                </li>
-                <!--li>
-                  <ul uk-accordion class="uk-padding-remove">
-                      <li>
-                        <button class="uk-button uk-button-primary uk-accordion-title link-to-button  uk-width-1-1" type="button">
-                          <span class="uk-icon" >
-                                 <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="link" ratio="1"><path fill="none" stroke="#000" stroke-width="1.1" d="M10.625,12.375 L7.525,15.475 C6.825,16.175 5.925,16.175 5.225,15.475 L4.525,14.775 C3.825,14.074 3.825,13.175 4.525,12.475 L7.625,9.375"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M9.325,7.375 L12.425,4.275 C13.125,3.575 14.025,3.575 14.724,4.275 L15.425,4.975 C16.125,5.675 16.125,6.575 15.425,7.275 L12.325,10.375"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M7.925,11.875 L11.925,7.975"></path></svg></span>
-                          <span>Link this research data to</span>
-                        </button>
-                          <div class="uk-accordion-content">
-                            <ul class="uk-nav uk-dropdown-nav uk-padding-small" >
-                                <li><a class="uk-width-1-1" [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[datasetId,'dataset','project'])"   routerLinkActive="router-link-active" routerLink="/participate/direct-claim" >
-                                   Projects</a></li>
-                                <li><a  class="uk-width-1-1" [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[datasetId,'dataset','context'])"   routerLinkActive="router-link-active" routerLink="/participate/direct-claim" >
-                                   Communities</a></li>
-                                <li><a   class="uk-width-1-1"  [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[datasetId,'dataset','result'])"   routerLinkActive="router-link-active" routerLink="/participate/direct-claim" >
-                                  Other research results</a></li>
-                            </ul>
-                          </div>
-                      </li>
-                  </ul>
 
-                </li-->
+                  <div class="sideInfoTitle   cite-this-button uk-width-1-1" type="button">
+                    Cite this research data
+                  </div>
+                  <div class=" ">
+                    <citeThis [result]="datasetInfo" [id]="datasetId" type="research data"></citeThis>
+                  </div>
 
+                </li>
 
             </ul>
+            <button   class="   uk-button portal-button   uk-width-1-1 ">
+              <span class="uk-icon">
+                   <svg icon="link" ratio="1" xmlns="http://www.w3.org/2000/svg" width="25" viewBox="0 0 20 20" height="25"><path d="M10.625,12.375 L7.525,15.475 C6.825,16.175 5.925,16.175 5.225,15.475 L4.525,14.775 C3.825,14.074 3.825,13.175 4.525,12.475 L7.625,9.375" fill="none" stroke="#000" stroke-width="1.1"></path><path d="M9.325,7.375 L12.425,4.275 C13.125,3.575 14.025,3.575 14.724,4.275 L15.425,4.975 C16.125,5.675 16.125,6.575 15.425,7.275 L12.325,10.375" fill="none" stroke="#000" stroke-width="1.1"></path><path d="M7.925,11.875 L11.925,7.975" fill="none" stroke="#000" stroke-width="1.1"></path></svg>
+                 </span> Link this dataset to...
+            </button>
 
+          <div   uk-dropdown="pos: bottom-left; mode:click" style="background: transparent !important;box-shadow: none; max-width: 70px !important; min-width: 70px !important;">
+              <ul class="uk-iconnav uk-iconnav-vertical">
+                <li  uk-tooltip="pos:right;" title="<div class='tooltip-custom-font-size   '>Projects</div>">
+                  <a   class="   uk-icon-button portal-button  shadowBox"  style="padding: 6px;" [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[datasetId,'dataset','project'])"   routerLinkActive="router-link-active" routerLink="/participate/direct-claim" >
+                    <span class="uk-icon" >
+                       <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="album" ratio="1"><rect x="5" y="2" width="10" height="1"></rect><rect x="3" y="4" width="14" height="1"></rect><rect fill="none" stroke="#000" x="1.5" y="6.5" width="17" height="11"></rect></svg></span>
+                  </a>
+                </li>
+                 <li  uk-tooltip="pos:right;" title="<div class='tooltip-custom-font-size  '>Communities</div>">
+                   <a   class="   uk-icon-button portal-button shadowBox"  style="padding: 6px;" [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[datasetId,'dataset','context'])"   routerLinkActive="router-link-active" routerLink="/participate/direct-claim" >
+                     <span class="uk-icon"  >
+                          <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="users" ratio="1"><circle fill="none" stroke="#000" stroke-width="1.1" cx="7.7" cy="8.6" r="3.5"></circle><path fill="none" stroke="#000" stroke-width="1.1" d="M1,18.1 C1.7,14.6 4.4,12.1 7.6,12.1 C10.9,12.1 13.7,14.8 14.3,18.3"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M11.4,4 C12.8,2.4 15.4,2.8 16.3,4.7 C17.2,6.6 15.7,8.9 13.6,8.9 C16.5,8.9 18.8,11.3 19.2,14.1"></path></svg></span>
+                   </a>
+                 </li>
+                 <li uk-tooltip="pos:right;" title="<div class='tooltip-custom-font-size  uk-margin-small'>Other research results</div>">
+                   <a   class="   uk-icon-button portal-button  shadowBox"  style="padding: 6px;"  [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[datasetId,'dataset','result'])"   routerLinkActive="router-link-active" routerLink="/participate/direct-claim" >
+                     <span class="uk-icon" >
+                          <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="copy" ratio="1"><rect fill="none" stroke="#000" x="3.5" y="2.5" width="12" height="16"></rect><polyline fill="none" stroke="#000" points="5 0.5 17.5 0.5 17.5 17"></polyline></svg></span>
+                   </a>
+                 </li>
 
+             </ul>
+          </div>
+
         </div>
       </div>
     </div>
-    <!-- Claiming FAB -->
-        <div class="uk-inline">
-           <div   class="   uk-float-right  " style="z-index: 200; bottom: 55px; position: fixed; right: 45%;">
-             <!--a style="padding: 30px; box-shadow: 0 1px 10px #444444" class="   uk-icon-button uk-button-primary  shadowBox"   uk-tooltip="pos:left;" title="<div class='tooltip-custom-font-size uk-light '>Link this publication to</div>">
-               <span class="uk-icon">
-                    <svg icon="link" ratio="1" xmlns="http://www.w3.org/2000/svg" width="40" viewBox="0 0 20 20" height="40"><path d="M10.625,12.375 L7.525,15.475 C6.825,16.175 5.925,16.175 5.225,15.475 L4.525,14.775 C3.825,14.074 3.825,13.175 4.525,12.475 L7.625,9.375" fill="none" stroke="#000" stroke-width="1.1"></path><path d="M9.325,7.375 L12.425,4.275 C13.125,3.575 14.025,3.575 14.724,4.275 L15.425,4.975 C16.125,5.675 16.125,6.575 15.425,7.275 L12.325,10.375" fill="none" stroke="#000" stroke-width="1.1"></path><path d="M7.925,11.875 L11.925,7.975" fill="none" stroke="#000" stroke-width="1.1"></path></svg>
-                  </span>
-             </a-->
-             <button style=" box-shadow: 0 1px 10px #444444" class="   uk-button uk-button-danger  ">
-               <span class="uk-icon">
-                    <svg icon="link" ratio="1" xmlns="http://www.w3.org/2000/svg" width="25" viewBox="0 0 20 20" height="25"><path d="M10.625,12.375 L7.525,15.475 C6.825,16.175 5.925,16.175 5.225,15.475 L4.525,14.775 C3.825,14.074 3.825,13.175 4.525,12.475 L7.625,9.375" fill="none" stroke="#000" stroke-width="1.1"></path><path d="M9.325,7.375 L12.425,4.275 C13.125,3.575 14.025,3.575 14.724,4.275 L15.425,4.975 C16.125,5.675 16.125,6.575 15.425,7.275 L12.325,10.375" fill="none" stroke="#000" stroke-width="1.1"></path><path d="M7.925,11.875 L11.925,7.975" fill="none" stroke="#000" stroke-width="1.1"></path></svg>
-                  </span> Link this dataset to
-             </button>
 
-           <div   uk-dropdown="pos: top-right; mode:click" style="background: transparent !important;box-shadow: none; max-width: 70px !important; min-width: 70px !important;">
-               <ul class="uk-iconnav uk-iconnav-vertical">
-                 <li  uk-tooltip="pos:left;" title="<div class='tooltip-custom-font-size uk-light  '>Projects</div>">
-                   <a   class="   uk-icon-button uk-button-primary  shadowBox"  style="padding: 6px;" [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[datasetId,'dataset','project'])"   routerLinkActive="router-link-active" routerLink="/participate/direct-claim" >
-                     <span class="uk-icon" >
-                        <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="album" ratio="1"><rect x="5" y="2" width="10" height="1"></rect><rect x="3" y="4" width="14" height="1"></rect><rect fill="none" stroke="#000" x="1.5" y="6.5" width="17" height="11"></rect></svg></span>
-                   </a>
-                 </li>
-                  <li  uk-tooltip="pos:left;" title="<div class='tooltip-custom-font-size uk-light '>Communities</div>">
-                    <a   class="   uk-icon-button uk-button-primary  shadowBox"  style="padding: 6px;" [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[datasetId,'dataset','context'])"   routerLinkActive="router-link-active" routerLink="/participate/direct-claim" >
-                      <span class="uk-icon"  >
-                           <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="users" ratio="1"><circle fill="none" stroke="#000" stroke-width="1.1" cx="7.7" cy="8.6" r="3.5"></circle><path fill="none" stroke="#000" stroke-width="1.1" d="M1,18.1 C1.7,14.6 4.4,12.1 7.6,12.1 C10.9,12.1 13.7,14.8 14.3,18.3"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M11.4,4 C12.8,2.4 15.4,2.8 16.3,4.7 C17.2,6.6 15.7,8.9 13.6,8.9 C16.5,8.9 18.8,11.3 19.2,14.1"></path></svg></span>
-                    </a>
-                  </li>
-                  <li uk-tooltip="pos:left;" title="<div class='tooltip-custom-font-size uk-light uk-margin-small'>Other research results</div>">
-                    <a   class="   uk-icon-button uk-button-primary  shadowBox"  style="padding: 6px;"  [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[datasetId,'dataset','result'])"   routerLinkActive="router-link-active" routerLink="/participate/direct-claim" >
-                      <span class="uk-icon" >
-                           <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="copy" ratio="1"><rect fill="none" stroke="#000" x="3.5" y="2.5" width="12" height="16"></rect><polyline fill="none" stroke="#000" points="5 0.5 17.5 0.5 17.5 17"></polyline></svg></span>
-                    </a>
-                  </li>
-
-              </ul>
-           </div>
-           </div>
 </div>
 </div>
 </div>
-</div>
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/dataProviders/entityRegistries.component.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/dataProviders/entityRegistries.component.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/dataProviders/entityRegistries.component.ts	(revision 53464)
@@ -19,7 +19,7 @@
                  [(results)] = "results" [(searchUtils)] = "searchUtils"
                  [baseUrl] = "baseUrl" [showResultCount]=false
                  (queryChange)="queryChanged($event)"
-                 [csvParams]="csvParams" csvPath="resources"
+                 [csvParams]="csvParams" csvPath="datasources"
                  [disableForms]="disableForms"
                  [tableViewLink]="'/search/entity-registries-table'"
                  searchFormClass="entityRegistriesSearchForm">
@@ -52,7 +52,7 @@
   public disableForms: boolean = false;
 
   @ViewChild (SearchPageComponent) searchPage : SearchPageComponent ;
-  public resourcesQuery = "&query=((oaftype exact datasource) and(datasourcetypeuiid = other))";
+  public resourcesQuery = "((oaftype exact datasource) and(datasourcetypeuiid = other))";
   public csvParams: string;
 properties:EnvProperties;
   constructor (private route: ActivatedRoute, private _searchDataprovidersService: SearchDataprovidersService ) {
@@ -85,7 +85,9 @@
       this.filters = this.createFilters();
 
       var queryParameters = this.searchPage.getIndexQueryParametersFromUrl(params);
-      this._getResults(queryParameters, false, this.searchUtils.page, this.searchUtils.size);
+      var csvParameters = this.searchPage.getQueryParametersFromUrl(params);
+
+      this._getResults(queryParameters, csvParameters, false, this.searchUtils.page, this.searchUtils.size);
     });
   }
 
@@ -96,8 +98,12 @@
     if(this.subResults){
       this.subResults.unsubscribe();
     }  }
-    private _getResults(parameters:string,refine:boolean, page: number, size: number){
-        this.csvParams = parameters+this.resourcesQuery+"&type=datasources";
+    private _getResults(parameters:string, csv_parameters:string, refine:boolean, page: number, size: number){
+      if(csv_parameters.indexOf("fq=") != -1) {
+        this.csvParams = csv_parameters+" and "+this.resourcesQuery;
+      } else {
+        this.csvParams = csv_parameters+"&fq="+this.resourcesQuery;
+      }
 
       //var errorCodes:ErrorCodes = new ErrorCodes();
       this.searchUtils.status = this.errorCodes.LOADING;
@@ -151,7 +157,9 @@
   public queryChanged($event) {
     var parameters = $event.index;
     console.info("queryChanged: Execute search query "+parameters);
-    this._getResults(parameters, false, this.searchUtils.page, this.searchUtils.size);
+    var csv_parameters = $event.value;
+
+    this._getResults(parameters, csv_parameters, false, this.searchUtils.page, this.searchUtils.size);
   }
   private createFilters():Filter[] {
     var filter_names=["Type","Compatibility Level"];
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/dataProviders/compatibleDataProvidersTable.component.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/dataProviders/compatibleDataProvidersTable.component.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/dataProviders/compatibleDataProvidersTable.component.ts	(revision 53464)
@@ -167,7 +167,7 @@
   }
 
   private createFilters():Filter[] {
-    var filter_names=["Type","Compatibility Level"];
+    var filter_names=["Type","Compatibility"];
     var filter_ids=["datasourcetypeuiid","datasourcecompatibilityname"];
     var searchFields = new SearchFields();
     var filter_original_ids = searchFields.COMPATIBLE_DATAPROVIDER_FIELDS;
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/dataProviders/compatibleDataProviders.component.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/dataProviders/compatibleDataProviders.component.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/dataProviders/compatibleDataProviders.component.ts	(revision 53464)
@@ -20,7 +20,7 @@
                     [(results)] = "results"  [(searchUtils)] = "searchUtils"
                     [baseUrl] = "baseUrl" [showResultCount]=false
                     (queryChange)="queryChanged($event)"
-                    [csvParams]="csvParams" csvPath="resources"
+                    [csvParams]="csvParams" csvPath="datasources"
                     [disableForms]="disableForms"
                     [tableViewLink]="'/search/content-providers-table'"
                     searchFormClass="compatibleDatasourcesSearchForm">
@@ -48,7 +48,7 @@
                         "export":[]
                      };
   public CSVDownloaded = false;
-  public resourcesQuery = '&query=((oaftype exact datasource) not(datasourcecompatibilityid = UNKNOWN) not(datasourcecompatibilityid = notCompatible) not(datasourcetypeuiid = other) not(datasourcetypeuiid exact "pubsrepository::journal") not(datasourcetypeuiid exact "aggregator::pubsrepository::journals"))';
+  public resourcesQuery = '((oaftype exact datasource) not(datasourcecompatibilityid = UNKNOWN) not(datasourcecompatibilityid = notCompatible) not(datasourcetypeuiid = other) not(datasourcetypeuiid exact "pubsrepository::journal") not(datasourcetypeuiid exact "aggregator::pubsrepository::journals"))';
   public csvParams: string;
   public disableForms: boolean = false;
 properties:EnvProperties;
@@ -82,8 +82,10 @@
       this.searchUtils.page = (params['page']=== undefined)?1:+params['page'];
       this.filters = this.createFilters();
       var queryParameters = this.searchPage.getIndexQueryParametersFromUrl(params);
+      var csvParameters = this.searchPage.getQueryParametersFromUrl(params);
+
       console.info("|"+queryParameters+"|");
-      this._getResults(queryParameters, false, this.searchUtils.page, this.searchUtils.size);
+      this._getResults(queryParameters, csvParameters, false, this.searchUtils.page, this.searchUtils.size);
     });
   }
 
@@ -94,8 +96,12 @@
     if(this.subResults){
       this.subResults.unsubscribe();
     }  }
-    private _getResults(parameters:string,refine:boolean, page: number, size: number){
-        this.csvParams = parameters+this.resourcesQuery+"&type=datasources";
+    private _getResults(parameters:string, csv_parameters:string, refine:boolean, page: number, size: number){
+      if(csv_parameters.indexOf("fq=") != -1) {
+        this.csvParams = csv_parameters+" and "+this.resourcesQuery;
+      } else {
+        this.csvParams = csv_parameters+"&fq="+this.resourcesQuery;
+      }
 
       //var errorCodes:ErrorCodes = new ErrorCodes();
       this.searchUtils.status = this.errorCodes.LOADING;
@@ -148,9 +154,11 @@
 
   public queryChanged($event) {
     var parameters = $event.index;
+    var csv_parameters = $event.value;
+
     console.info("queryChanged: Execute search query "+parameters);
 
-    this._getResults(parameters, false, this.searchUtils.page, this.searchUtils.size);
+    this._getResults(parameters, csv_parameters, false, this.searchUtils.page, this.searchUtils.size);
   }
   private createFilters():Filter[] {
     var filter_names=["Type","Compatibility Level"];
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/landingPages/orp/orp.component.html
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/landingPages/orp/orp.component.html	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/landingPages/orp/orp.component.html	(revision 53464)
@@ -4,7 +4,7 @@
       <div class="uk-container uk-margin-top orp">
         <div *ngIf="warningMessage.length > 0" class="uk-alert uk-alert-warning  uk-margin-large-top" role="alert">{{warningMessage}}</div>
         <div *ngIf="errorMessage.length > 0" class="uk-alert uk-alert-danger  uk-margin-large-top" role="alert">{{errorMessage}}</div>
-        <div [style.display]="showLoading ? 'inline' : 'none'" class="uk-animation-fade uk-margin-large-top  uk-width-1-1" role="alert"><img class="loading-gif  uk-align-center" ></div>
+        <div [style.display]="showLoading ? 'inline' : 'none'" class="uk-animation-fade uk-margin-large-top  uk-width-1-1" role="alert"><span class="loading-gif  uk-align-center" ></span></div>
 
         <div *ngIf="orpInfo != null" uk-grid class="uk-grid-large">
           <div class="uk-width-expand@m uk-width-1-1@s">
@@ -40,7 +40,7 @@
                 </showSubjects>
               </li>
             </ul>
-
+            <hr *ngIf="orpInfo.description">
             <div *ngIf="orpInfo.description" class="uk-margin-bottom uk-text-justify descriptionText">
               {{orpInfo.description}}
             </div>
@@ -49,14 +49,14 @@
               <li *ngIf="orpInfo.relatedResearchResults" (click)="activeTab='Related Research Results'">
                 <a class="uk-accordion-title" href="#">
                   Related Research Results
-                  <span class="uk-badge uk-badge-notification">
-                   {{relatedResearchResultsNum | number}}
-                  </span>
+                  <!-- <span class="uk-badge uk-badge-notification"> -->
+                   ({{relatedResearchResultsNum | number}})
+                  <!-- </span> -->
                 </a>
                 <div class="uk-accordion-content">
                   <div>
                     <div *ngFor="let provenanceaction of getKeys(orpInfo.relatedResearchResults)">
-                      <div class="uk-text-large uk-margin-bottom">{{provenanceaction}}</div>
+                      <div class="uk-text-large">{{provenanceaction}}</div>
                       <tabTable [percentageName]="trust" [info]="orpInfo.relatedResearchResults.get(provenanceaction)" [(properties)]=properties></tabTable>
                     </div>
                   </div>
@@ -66,9 +66,9 @@
               <li *ngIf="orpInfo.similarResearchResults" (click)="activeTab='Similar Research Results'">
                 <a class="uk-accordion-title" href="#">
                   Similar Research Results
-                  <span class="uk-badge uk-badge-notification">
-                    {{orpInfo.similarResearchResults.length | number}}
-                  </span>
+                  <!-- <span class="uk-badge uk-badge-notification"> -->
+                    ({{orpInfo.similarResearchResults.length | number}})
+                  <!-- </span> -->
                 </a>
                 <div class="uk-accordion-content">
                   <div>
@@ -131,25 +131,51 @@
                   </dl>
               </li>
               <li>
-                <ul uk-accordion class="uk-padding-remove citation-accordion">
-                  <li>
-                    <div class="sideInfoTitle uk-accordion-title cite-this-button uk-width-1-1" type="button">
-                      Cite this research product
-                    </div>
-                    <div class="uk-accordion-content">
-                      <citeThis [result]="orpInfo" [id]="orpId" type="other research product"></citeThis>
-                    </div>
-                  </li>
-                </ul>
+
+                <div class="sideInfoTitle  cite-this-button uk-width-1-1" type="button">
+                  Cite this research product
+                </div>
+                <div class="">
+                  <citeThis [result]="orpInfo" [id]="orpId" type="other research product"></citeThis>
+                </div>
+
               </li>
             </ul>
+            <button   class="   uk-button portal-button uk-width-1-1  ">
+              <span class="uk-icon">
+                <svg icon="link" ratio="1" xmlns="http://www.w3.org/2000/svg" width="25" viewBox="0 0 20 20" height="25"><path d="M10.625,12.375 L7.525,15.475 C6.825,16.175 5.925,16.175 5.225,15.475 L4.525,14.775 C3.825,14.074 3.825,13.175 4.525,12.475 L7.625,9.375" fill="none" stroke="#000" stroke-width="1.1"></path><path d="M9.325,7.375 L12.425,4.275 C13.125,3.575 14.025,3.575 14.724,4.275 L15.425,4.975 C16.125,5.675 16.125,6.575 15.425,7.275 L12.325,10.375" fill="none" stroke="#000"  stroke-width="1.1"></path><path d="M7.925,11.875 L11.925,7.975" fill="none" stroke="#000" stroke-width="1.1"></path></svg>
+              </span> Link this product to...
+            </button>
+
+            <div   uk-dropdown="pos: bottom-left; mode:click" style="background: transparent !important;box-shadow: none; max-width: 70px !important; min-width: 70px !important;">
+              <ul class="uk-iconnav uk-iconnav-vertical">
+                <li  uk-tooltip="pos:right;" title="<div class='tooltip-custom-font-size   '>Projects</div>">
+                  <a   class="   uk-icon-button portal-button shadowBox"  style="padding: 6px;" [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[orpId,'orp','project'])"   routerLinkActive="router-link-active" routerLink="/participate/direct-claim" >
+                    <span class="uk-icon" >
+                      <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="album" ratio="1"><rect x="5" y="2" width="10" height="1"></rect><rect x="3" y="4" width="14" height="1"></rect><rect fill="none" stroke="#000" x="1.5" y="6.5" width="17" height="11"></rect></svg></span>
+                  </a>
+                </li>
+                <li  uk-tooltip="pos:right;" title="<div class='tooltip-custom-font-size   '>Communities</div>">
+                  <a   class="   uk-icon-button portal-button shadowBox"  style="padding: 6px;" [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[orpId,'orp','context'])"   routerLinkActive="router-link-active" routerLink="/participate/direct-claim" >
+                    <span class="uk-icon"  >
+                    <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="users" ratio="1"><circle fill="none" stroke="#000" stroke-width="1.1" cx="7.7" cy="8.6" r="3.5"></circle><path fill="none" stroke="#000" stroke-width="1.1" d="M1,18.1 C1.7,14.6 4.4,12.1 7.6,12.1 C10.9,12.1 13.7,14.8 14.3,18.3"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M11.4,4 C12.8,2.4 15.4,2.8 16.3,4.7 C17.2,6.6 15.7,8.9 13.6,8.9 C16.5,8.9 18.8,11.3 19.2,14.1"></path></svg></span>
+                  </a>
+                </li>
+                <li uk-tooltip="pos:right;" title="<div class='tooltip-custom-font-size   uk-margin-small'>Other research results</div>">
+                  <a   class="   uk-icon-button portal-button shadowBox"  style="padding: 6px;"  [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[orpId,'orp','result'])"   routerLinkActive="router-link-active" routerLink="/participate/direct-claim" >
+                    <span class="uk-icon" >
+                      <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="copy" ratio="1"><rect fill="none" stroke="#000" x="3.5" y="2.5" width="12" height="16"></rect><polyline fill="none" stroke="#000" points="5 0.5 17.5 0.5 17.5 17"></polyline></svg></span>
+                  </a>
+                </li>
+              </ul>
+            </div>
           </div>
         </div>
       </div>
       <!-- Claiming FAB -->
-      <div class="uk-inline">
+      <!--div class="uk-inline">
         <div   class="   uk-float-right  " style="z-index: 200; bottom: 55px; position: fixed; right: 45%;">
-          <button style=" box-shadow: 0 1px 10px #444444" class="   uk-button uk-button-danger  ">
+          <button   class="   uk-button uk-button-danger  ">
             <span class="uk-icon">
               <svg icon="link" ratio="1" xmlns="http://www.w3.org/2000/svg" width="25" viewBox="0 0 20 20" height="25"><path d="M10.625,12.375 L7.525,15.475 C6.825,16.175 5.925,16.175 5.225,15.475 L4.525,14.775 C3.825,14.074 3.825,13.175 4.525,12.475 L7.625,9.375" fill="none" stroke="#000" stroke-width="1.1"></path><path d="M9.325,7.375 L12.425,4.275 C13.125,3.575 14.025,3.575 14.724,4.275 L15.425,4.975 C16.125,5.675 16.125,6.575 15.425,7.275 L12.325,10.375" fill="none" stroke="#000"  stroke-width="1.1"></path><path d="M7.925,11.875 L11.925,7.975" fill="none" stroke="#000" stroke-width="1.1"></path></svg>
             </span> Link this product to
@@ -177,8 +203,9 @@
               </li>
             </ul>
           </div>
+
          </div>
-       </div>
+       </div-->
      </div>
    </div>
  </div>
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/landingPages/dataProvider/dataProvider.component.html
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/landingPages/dataProvider/dataProvider.component.html	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/landingPages/dataProvider/dataProvider.component.html	(revision 53464)
@@ -5,7 +5,7 @@
 <div class="uk-container uk-margin-top datasource">
     <div *ngIf="warningMessage.length > 0" class="uk-alert uk-alert-warning  uk-margin-large-top" role="alert">{{warningMessage}}</div>
     <div *ngIf="errorMessage.length > 0" class="uk-alert uk-alert-danger  uk-margin-large-top" role="alert">{{errorMessage}}</div>
-    <div [style.display]="showLoading ? 'inline' : 'none'" class="uk-animation-fade uk-margin-large-top  uk-width-1-1" role="alert"><img class="loading-gif  uk-align-center" ></div>
+    <div [style.display]="showLoading ? 'inline' : 'none'" class="uk-animation-fade uk-margin-large-top  uk-width-1-1" role="alert"><span class="loading-gif  uk-align-center" ></span></div>
 
     <div *ngIf="dataProviderInfo != null" uk-grid class="uk-grid-large">
 
@@ -41,11 +41,11 @@
             </span>
 
             <ul class="uk-list">
-                <li *ngIf="dataProviderInfo.aggregationStatus && dataProviderInfo.aggregationStatus.fundedContent != -1"><span class="uk-text-bold">Results with funding information: </span>
+                <li *ngIf="dataProviderInfo.aggregationStatus && dataProviderInfo.aggregationStatus.fundedContent && dataProviderInfo.aggregationStatus.fundedContent != -1"><span class="uk-text-bold">Results with funding information: </span>
                     {{dataProviderInfo.aggregationStatus.fundedContent | number}}
                 </li>
-                <li *ngIf="dataProviderInfo.aggregationStatus && dataProviderInfo.aggregationStatus.indexRecords != -1"><span class="uk-text-bold">Collected full-texts: </span>
-                    {{dataProviderInfo.aggregationStatus.indexRecords | number}}
+                <li *ngIf="dataProviderInfo.aggregationStatus && dataProviderInfo.aggregationStatus.fulltexts && dataProviderInfo.aggregationStatus.fulltexts != -1"><span class="uk-text-bold">Collected full-texts: </span>
+                    {{dataProviderInfo.aggregationStatus.fulltexts | number}}
                 </li>
                 <li *ngIf="dataProviderInfo.oaiPmhURL"><span class="uk-text-bold">OAI-PMH: </span>
                         <span class="uk-button-text">
@@ -80,9 +80,9 @@
 
                     <li *ngIf="dataProviderInfo.tabs2.indexOf('Publications') != -1" (click)="search('publicationsTab', 1, 10); activeTab='Publications'">
                         <a class="uk-accordion-title" href="#">Publications
-                          <span class="uk-badge uk-badge-notification">
-                              {{fetchPublications.searchUtils.totalResults | number}}
-                          </span>
+                          <!-- <span class="uk-badge uk-badge-notification"> -->
+                              ({{fetchPublications.searchUtils.totalResults | number}})
+                          <!-- </span> -->
                         </a>
                         <div class="uk-accordion-content">
                           <publicationsTab *ngIf="activeTab=='Publications'"
@@ -93,9 +93,9 @@
                     </li>
                     <li *ngIf="dataProviderInfo.tabs2.indexOf('Research Data') != -1" (click)="search('datasetsTab', 1, 10); activeTab='Research Data'">
                         <a class="uk-accordion-title" href="#">Research Data
-                          <span class="uk-badge uk-badge-notification">
-                              {{fetchDatasets.searchUtils.totalResults | number}}
-                          </span>
+                          <!-- <span class="uk-badge uk-badge-notification"> -->
+                              ({{fetchDatasets.searchUtils.totalResults | number}})
+                          <!-- </span> -->
                         </a>
                         <div class="uk-accordion-content">
                           <p>
@@ -109,9 +109,9 @@
 
                     <li *ngIf="dataProviderInfo.tabs2.indexOf('Software') != -1" (click)="search('softwareTab', 1, 10); activeTab='Software'">
                         <a class="uk-accordion-title" href="#">Software
-                          <span class="uk-badge uk-badge-notification">
-                              {{fetchSoftware.searchUtils.totalResults | number}}
-                          </span>
+                          <!-- <span class="uk-badge uk-badge-notification"> -->
+                              ({{fetchSoftware.searchUtils.totalResults | number}})
+                          <!-- </span> -->
                         </a>
                         <div class="uk-accordion-content">
                           <softwareTab *ngIf="activeTab=='Software'"
@@ -123,9 +123,9 @@
 
                     <li *ngIf="dataProviderInfo.tabs2.indexOf('Other Research Products') != -1" (click)="search('orpsTab', 1, 10); activeTab='Other Research Products'">
                         <a class="uk-accordion-title" href="#">Other Research Products
-                          <span class="uk-badge uk-badge-notification">
-                              {{fetchOrps.searchUtils.totalResults | number}}
-                          </span>
+                          <!-- <span class="uk-badge uk-badge-notification"> -->
+                              ({{fetchOrps.searchUtils.totalResults | number}})
+                          <!-- </span> -->
                         </a>
                         <div class="uk-accordion-content">
                           <orpsTab *ngIf="activeTab=='Other Research Products'"
@@ -137,9 +137,9 @@
 
                     <li *ngIf="dataProviderInfo.tabs2.indexOf('Projects') != -1" (click)="search('projectsTab', 1, 10); activeTab='Projects'">
                         <a class="uk-accordion-title" href="#">Projects
-                          <span class="uk-badge uk-badge-notification">
-                              {{fetchProjects.searchUtils.totalResults | number}}
-                          </span>
+                          <!-- <span class="uk-badge uk-badge-notification"> -->
+                              ({{fetchProjects.searchUtils.totalResults | number}})
+                          <!-- </span> -->
                         </a>
                         <div class="uk-accordion-content">
                           <projectsTab *ngIf="activeTab=='Projects'"
@@ -150,9 +150,9 @@
                     </li>
                     <li *ngIf="dataProviderInfo.tabs2.indexOf('Content Providers') != -1" (click)="search('datasourcesTab', 1, 10); activeTab='Content Providers'">
                         <a class="uk-accordion-title" href="#">Content Providers
-                          <span class="uk-badge uk-badge-notification">
-                              {{fetchDataproviders.searchUtils.totalResults | number}}
-                          </span>
+                          <!-- <span class="uk-badge uk-badge-notification"> -->
+                              ({{fetchDataproviders.searchUtils.totalResults | number}})
+                          <!-- </span> -->
                         </a>
                         <div class="uk-accordion-content">
                           <datasourcesTab *ngIf="activeTab=='Content Providers'"
@@ -163,9 +163,9 @@
                     </li>
                     <li *ngIf="dataProviderInfo.tabs2.indexOf('Organizations') != -1" (click)="search('organizationsTab', 1, 10); activeTab='Organizations'">
                         <a class="uk-accordion-title" href="#">Organizations
-                          <span class="uk-badge uk-badge-notification">
-                              {{dataProviderInfo.organizations.length | number}}
-                          </span>
+                          <!-- <span class="uk-badge uk-badge-notification"> -->
+                              ({{dataProviderInfo.organizations.length | number}})
+                          <!-- </span> -->
                         </a>
                         <div class="uk-accordion-content">
                           <organizationsTab *ngIf="activeTab=='Organizations'"
@@ -197,9 +197,9 @@
 
                             <div *ngIf="(fetchPublications.searchUtils.status == errorCodes.DONE || fetchDatasets.searchUtils.status == errorCodes.DONE)">
                               <p class="uk-text-bold">Latest Research Result Timeline</p>
-                              <i-frame  [url]=docsTimelineUrl width="800" height="350"></i-frame>
+                              <i-frame  [url]=docsTimelineUrl width="100%" height="350"></i-frame>
                               <p class="uk-text-bold">Research Result Types</p>
-                              <i-frame [url]=docsTypesUrl width="800" height="350"></i-frame>
+                              <i-frame [url]=docsTypesUrl width="100%" height="350"></i-frame>
                             </div>
 
 
@@ -206,17 +206,17 @@
                               <div *ngIf="fetchPublications.searchUtils.totalResults > 0 || (fetchDatasets.searchUtils.totalResults > 0)">
 
                                     <p class="uk-text-bold">Funders in Research Results of content provider</p>
-                                    <i-frame  [url]=docsFunderUrl width="800" height="350"></i-frame>
+                                    <i-frame  [url]=docsFunderUrl width="100%" height="350"></i-frame>
 
                               </div>
                               <div *ngIf="fetchPublications.searchUtils.totalResults > 0 ">
                                   <p class="uk-text-bold">Projects with most Publications</p>
-                                  <i-frame [url]=pubsProjectsUrl width="800" height="350"></i-frame>
+                                  <i-frame [url]=pubsProjectsUrl width="100%" height="350"></i-frame>
                               </div>
                               <div *ngIf="(fetchDatasets.searchUtils.totalResults > 0)">
                                     <div>
                                         <p class="uk-text-bold">Projects with most Research Data</p>
-                                        <i-frame  [url]=dataProjectsUrl width="800" height="350"></i-frame>
+                                        <i-frame  [url]=dataProjectsUrl width="100%" height="350"></i-frame>
                                     </div>
                               </div>
                             </div>
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/landingPages/organization/organization.component.html
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/landingPages/organization/organization.component.html	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/landingPages/organization/organization.component.html	(revision 53464)
@@ -5,7 +5,7 @@
 <div class="uk-container uk-margin-top organization">
     <div *ngIf="warningMessage.length > 0" class="uk-alert uk-alert-warning  uk-margin-large-top" role="alert">{{warningMessage}}</div>
     <div *ngIf="errorMessage.length > 0" class="uk-alert uk-alert-danger  uk-margin-large-top" role="alert">{{errorMessage}}</div>
-    <div [style.display]="showLoading ? 'inline' : 'none'"class="uk-animation-fade uk-margin-large-top  uk-width-1-1" role="alert"><img class="loading-gif  uk-align-center" ></div>
+    <div [style.display]="showLoading ? 'inline' : 'none'"class="uk-animation-fade uk-margin-large-top  uk-width-1-1" role="alert"><span class="loading-gif  uk-align-center" ></span></div>
 
     <div *ngIf="organizationInfo != null" uk-grid class="uk-grid-large">
         <div class="uk-width-expand@m uk-width-1-1@s">
@@ -19,9 +19,9 @@
                <li (click)="activeTab='Publications'; searchPublicationsInit()">
                    <a class="uk-accordion-title" href="#">
                      Publications
-                     <span class="uk-badge uk-badge-notification">
-                       {{fetchPublications.searchUtils.totalResults | number}}
-                     </span>
+                     <!-- <span class="uk-badge uk-badge-notification"> -->
+                       ({{fetchPublications.searchUtils.totalResults | number}})
+                     <!-- </span> -->
                    </a>
                    <div class="uk-accordion-content">
                      <errorMessages [status]="[fetchPublications.searchUtils.status]" [type]="'publications'" tab_error_class=true></errorMessages>
@@ -44,9 +44,9 @@
                 <li (click)="activeTab='Projects'; projectsClicked=true;">
                     <a class="uk-accordion-title" href="#">
                         Projects
-                        <span class="uk-badge uk-badge-notification">
-                          {{fetchProjects.searchUtils.totalResultsNoFilters | number}}
-                        </span>
+                        <!-- <span class="uk-badge uk-badge-notification"> -->
+                          ({{fetchProjects.searchUtils.totalResultsNoFilters | number}})
+                        <!-- </span> -->
                     </a>
                     <div class="uk-accordion-content">
                       <searchingProjectsTab *ngIf="projectsClicked" [(fetchProjects)]="fetchProjects" [organizationId]="organizationId" [(properties)]=properties></searchingProjectsTab>
@@ -56,9 +56,9 @@
                  <li (click)="activeTab='Content Providers'; searchDataprovidersInit()">
                      <a class="uk-accordion-title" href="#">
                          Content Providers
-                         <span class="uk-badge uk-badge-notification">
-                             {{fetchDataproviders.searchUtils.totalResults | number}}
-                         </span>
+                         <!-- <span class="uk-badge uk-badge-notification"> -->
+                             ({{fetchDataproviders.searchUtils.totalResults | number}})
+                         <!-- </span> -->
                      </a>
                      <div class="uk-accordion-content">
                        <errorMessages [status]="[fetchDataproviders.searchUtils.status]" [type]="'content providers'" tab_error_class=true></errorMessages>
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/landingPages/project/project.component.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/landingPages/project/project.component.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/landingPages/project/project.component.ts	(revision 53464)
@@ -171,7 +171,7 @@
        + "\n<!--"
        + "\ndocument.write('<div id=\"oa_widget\"></div>');"
        + "\ndocument.write('<script type=\"text/javascript\""
-       + "\nsrc=\"https://openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId="
+       + "\nsrc=\"https://www.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId="
        + this.projectId + "&type=publication\"></script>');"
        + "\n-->"
        + "\n</script>";
@@ -181,7 +181,7 @@
        + "\n<!--"
        + "\ndocument.write('<div id=\"oa_widget\"></div>');"
        + "\ndocument.write('<script type=\"text/javascript\""
-       + "\nsrc=\"https://openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId="
+       + "\nsrc=\"https://www.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId="
        + this.projectId + "&type=dataset\"></script>');"
        + "\n-->"
        + "\n</script>";
@@ -191,7 +191,7 @@
        + "\n<!--"
        + "\ndocument.write('<div id=\"oa_widget\"></div>');"
        + "\ndocument.write('<script type=\"text/javascript\""
-       + "\nsrc=\"https://openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId="
+       + "\nsrc=\"https://www.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId="
        + this.projectId + "&type=software\"></script>');"
        + "\n-->"
        + "\n</script>";
@@ -201,7 +201,7 @@
          + "\n<!--"
          + "\ndocument.write('<div id=\"oa_widget\"></div>');"
          + "\ndocument.write('<script type=\"text/javascript\""
-         + "\nsrc=\"https://openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId="
+         + "\nsrc=\"https://www.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId="
          + this.projectId + "&type=other\"></script>');"
          + "\n-->"
          + "\n</script>";
@@ -367,9 +367,9 @@
   this.downloadsFrameUrl = this.properties.framesAPIURL+'merge.php?com=query&data=[{"query":"projRepoDownloads","projTitle":"'+this.projectId+'","table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"","yaxisheaders":["Monthly downloads"],"generalxaxis":"","theme":0,"in":[]}]&info_types=["column"]&stacking=&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true&persistent=false';
 
   //stats tab charts
-  this.chartScientificResultsUrl='https://www.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"projScient","projTitle":"'+this.projectId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "spline", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Research Results"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [" "], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
-  this.chartAccessModeUrl='https://www.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"projOA","projTitle":"'+this.projectId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "pie", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Research Results"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [" "], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
-  this.chartDatasourcesUrl= 'https://www.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"projPubsRepos","projTitle":"'+this.projectId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "bar", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Research Results"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [" "], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
+  this.chartScientificResultsUrl='https://www.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"projScient","projTitle":"'+this.projectId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "spline", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Research Results"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [" "], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=100%&h=250';
+  this.chartAccessModeUrl='https://www.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"projOA","projTitle":"'+this.projectId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "pie", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Research Results"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [" "], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=100%&h=250';
+  this.chartDatasourcesUrl= 'https://www.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"projPubsRepos","projTitle":"'+this.projectId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "bar", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Research Results"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [" "], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=100%&h=250';
 
   this.showLoading = false;
 }
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/find/search.component.html
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/find/search.component.html	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/find/search.component.html	(revision 53464)
@@ -1,21 +1,30 @@
+<div class="image-front-topbar  uk-section-default uk-position-relative" uk-scrollspy="{&quot;target&quot;:&quot;[uk-scrollspy-class]&quot;,&quot;cls&quot;:&quot;uk-animation-fade&quot;,&quot;delay&quot;:false}" tm-header-transparent="light">
+  <div uk-height-viewport="offset-top: true;offset-bottom: 60" style="box-sizing: border-box;  " class=" uk-background-norepeat uk-background-cover uk-background-bottom-center uk-section uk-padding-remove-bottom uk-flex uk-flex-middle uk-background-fixed generalSearchForm">
+    <div class="uk-position-cover" style="background-color: rgba(255, 255, 255, 0.37);"></div>
+    <div class="uk-container">
+        <div class="uk-position-relative">
 
 
-<div id="tm-main" class=" uk-section  uk-margin-small-top tm-middle"   >
-<div uk-grid uk-grid>
+           <div   class="uk-container">
+             <div   class="uk-width-1-1">
+                 <a *ngIf = "advancedSearchLink && advancedSearchLink.length > 0" routerLinkActive="router-link-active" class="uk-float-right  uk-light  portal-color uk-margin-small-bottom" [routerLink]=advancedSearchLink >Advanced search for {{activeTab}}
+                 </a>
+                 <search-form [(keyword)]=keyword (keywordChange)="keywordChanged($event)" placeholderText="Search for research results, projects, content providers & organizations in OpenAIRE"></search-form>
+              </div>
+
+
+           </div>
+        </div>
+     </div>
+  </div>
+</div>
+
+
+<div id="tm-main" class=" uk-section uk-padding-remove-top tm-middle"   >
+<div uk-grid  >
 <div class="tm-main uk-width-1-1@s uk-width-1-1@m  uk-width-1-1@l uk-row-first ">
 <div  class="">
 
-    <div class="uk-width-1-1  ">
-      <div    class="uk-background-norepeat uk-background-cover uk-section uk-flex uk-flex-middle generalSearchForm">
-       <div   class="uk-width-1-1">
-          <search-form [(keyword)]=keyword (keywordChange)="keywordChanged($event)" placeholderText="Search for research results, software, other research products, projects, content providers, organizations in OpenAIRE information space"></search-form>
-          <a *ngIf = "advancedSearchLink && advancedSearchLink.length > 0" routerLinkActive="router-link-active" class="uk-float-right  uk-light" [routerLink]=advancedSearchLink >Advanced search for {{activeTab}}<span class="uk-icon">
-              <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="chevron-right" ratio="1"><polyline fill="none" stroke="#000" stroke-width="1.03" points="7 4 13 10 7 16"></polyline></svg>
-              </span>
-          </a>
-        </div>
-      </div>
-    </div>
     <div  class=" uk-margin-small-top uk-container uk-container-small">
       <div class="uk-grid uk-margin-top">
         <ul class=" uk-tab uk-tab-left uk-width-1-5 uk-visible@m" uk-tab="animation: uk-animation-fade">
@@ -22,7 +31,7 @@
                 <li *ngIf="showPublications" (click)="searchPublications()" [class]="activeTab == 'publications'?'uk-active':''">
                    <a>
                        Publications
-                       <span   [class]="(fetchPublications.searchUtils.status != errorCodes.LOADING && keyword.length > 0)?'uk-badge uk-badge-notification':''"> {{((fetchPublications.searchUtils.status != errorCodes.LOADING && keyword.length > 0)? (fetchPublications.searchUtils.totalResults | number) :'')}}</span>
+                       <span    > {{((fetchPublications.searchUtils.status != errorCodes.LOADING && keyword.length > 0)? '('+ (fetchPublications.searchUtils.totalResults | number) +')' :'')}}</span>
 
                    </a>
                </li>
@@ -29,7 +38,7 @@
                <li *ngIf="showDatasets" (click)="searchDatasets()" [class]="activeTab == 'research data'?'uk-active':''">
                    <a>
                        Research Data
-                       <span   [class]="(fetchDatasets.searchUtils.status != errorCodes.LOADING && keyword.length > 0)?'uk-badge uk-badge-notification':''"> {{((fetchDatasets.searchUtils.status != errorCodes.LOADING && keyword.length > 0)? (fetchDatasets.searchUtils.totalResults | number) :'')}}</span>
+                       <span    > {{((fetchDatasets.searchUtils.status != errorCodes.LOADING && keyword.length > 0)? '('+(fetchDatasets.searchUtils.totalResults | number) +')':'')}}</span>
 
                    </a>
                </li>
@@ -36,7 +45,7 @@
                <li *ngIf="showSoftware" (click)="searchSoftware()" [class]="activeTab == 'software'?'uk-active':''">
                    <a>
                        Software
-                       <span   [class]="(fetchSoftware.searchUtils.status != errorCodes.LOADING && keyword.length > 0)?'uk-badge uk-badge-notification':''"> {{((fetchSoftware.searchUtils.status != errorCodes.LOADING && keyword.length > 0)? (fetchSoftware.searchUtils.totalResults | number) :'')}}</span>
+                       <span    > {{((fetchSoftware.searchUtils.status != errorCodes.LOADING && keyword.length > 0)? '('+(fetchSoftware.searchUtils.totalResults | number)+')' :'')}}</span>
 
                    </a>
                </li>
@@ -43,7 +52,7 @@
                <li *ngIf="showOrps" (click)="searchOrps()" [class]="activeTab == 'other research products'?'uk-active':''">
                    <a>
                        Other Research Products
-                       <span   [class]="(fetchOrps.searchUtils.status != errorCodes.LOADING && keyword.length > 0)?'uk-badge uk-badge-notification':''"> {{((fetchOrps.searchUtils.status != errorCodes.LOADING && keyword.length > 0)? (fetchOrps.searchUtils.totalResults | number) :'')}}</span>
+                       <span    > {{((fetchOrps.searchUtils.status != errorCodes.LOADING && keyword.length > 0)? '('+(fetchOrps.searchUtils.totalResults | number) +')':'')}}</span>
 
                    </a>
                </li>
@@ -50,7 +59,7 @@
                <li *ngIf="showProjects" (click)="searchProjects()" [class]="activeTab == 'projects'?'uk-active':''">
                    <a>
                        Projects
-                       <span   [class]="(fetchProjects.searchUtils.status != errorCodes.LOADING && keyword.length > 0)?'uk-badge uk-badge-notification':''"> {{((fetchProjects.searchUtils.status != errorCodes.LOADING && keyword.length > 0)? (fetchProjects.searchUtils.totalResults | number) :'')}}</span>
+                       <span    > {{((fetchProjects.searchUtils.status != errorCodes.LOADING && keyword.length > 0)? '('+(fetchProjects.searchUtils.totalResults | number) +')':'')}}</span>
 
                    </a>
                </li>
@@ -57,7 +66,7 @@
                <li *ngIf="showDataProviders" (click)="searchDataProviders()" [class]="activeTab == 'content providers'?'uk-active':''">
                    <a>
                        Content Providers
-                       <span   [class]="(fetchDataproviders.searchUtils.status != errorCodes.LOADING && keyword.length > 0)?'uk-badge uk-badge-notification':''"> {{((fetchDataproviders.searchUtils.status != errorCodes.LOADING && keyword.length > 0)? (fetchDataproviders.searchUtils.totalResults | number) :'')}}</span>
+                       <span   > {{((fetchDataproviders.searchUtils.status != errorCodes.LOADING && keyword.length > 0)? '('+(fetchDataproviders.searchUtils.totalResults | number) +')':'')}}</span>
 
                    </a>
                </li>
@@ -64,7 +73,7 @@
                <li *ngIf="showOrganizations" (click)="searchOrganizations()" [class]="activeTab == 'organizations'?'uk-active':''">
                    <a>
                        Organizations
-                       <span   [class]="(fetchOrganizations.searchUtils.status != errorCodes.LOADING && keyword.length > 0)?'uk-badge uk-badge-notification':''"> {{((fetchOrganizations.searchUtils.status != errorCodes.LOADING && keyword.length > 0)? (fetchOrganizations.searchUtils.totalResults | number) :'')}}</span>
+                       <span    > {{((fetchOrganizations.searchUtils.status != errorCodes.LOADING && keyword.length > 0)? '('+(fetchOrganizations.searchUtils.totalResults | number)+')' :'')}}</span>
                    </a>
                </li>
             </ul>
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/advanced/advancedSearchOrps.component.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/advanced/advancedSearchOrps.component.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/advanced/advancedSearchOrps.component.ts	(revision 53464)
@@ -23,7 +23,8 @@
                  [csvParams]="csvParams" csvPath="other" simpleSearchLink="/search/find/other"
                  [disableForms]="disableForms"
                  [loadPaging]="loadPaging"
-                 [oldTotalResults]="oldTotalResults" [(connectCommunityId)]=connectCommunityId [piwikSiteId]=piwikSiteId >
+                 [oldTotalResults]="oldTotalResults" [(connectCommunityId)]=connectCommunityId [piwikSiteId]=piwikSiteId
+                 searchFormClass="orpsSearchForm">
     </advanced-search-page>
 
     `
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts	(revision 53464)
@@ -24,7 +24,8 @@
                  [csvParams]="csvParams" csvPath="datasources" simpleSearchLink="/search/find/dataproviders"
                  [disableForms]="disableForms"
                  [loadPaging]="loadPaging"
-                 [oldTotalResults]="oldTotalResults" [piwikSiteId]=piwikSiteId>
+                 [oldTotalResults]="oldTotalResults" [piwikSiteId]=piwikSiteId
+                 searchFormClass="datasourcesSearchForm">
     </advanced-search-page>
 
     `
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts	(revision 53464)
@@ -23,7 +23,8 @@
                  [csvParams]="csvParams" csvPath="organizations" simpleSearchLink="/search/find/organizations"
                  [disableForms]="disableForms"
                  [loadPaging]="loadPaging"
-                 [oldTotalResults]="oldTotalResults"  [piwikSiteId]=piwikSiteId>
+                 [oldTotalResults]="oldTotalResults"  [piwikSiteId]=piwikSiteId
+                 searchFormClass="organizationsSearchForm">
     </advanced-search-page>
 
     `
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/advanced/advancedSearchDatasets.component.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/advanced/advancedSearchDatasets.component.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/advanced/advancedSearchDatasets.component.ts	(revision 53464)
@@ -23,7 +23,8 @@
                  [csvParams]="csvParams" csvPath="datasets" simpleSearchLink="/search/find/datasets"
                  [disableForms]="disableForms"
                  [loadPaging]="loadPaging"
-                 [oldTotalResults]="oldTotalResults" [(connectCommunityId)]=connectCommunityId [piwikSiteId]=piwikSiteId >
+                 [oldTotalResults]="oldTotalResults" [(connectCommunityId)]=connectCommunityId [piwikSiteId]=piwikSiteId
+                 searchFormClass="datasetsSearchForm">
     </advanced-search-page>
 
     `
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/advanced/advancedSearchProjects.component.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/advanced/advancedSearchProjects.component.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/advanced/advancedSearchProjects.component.ts	(revision 53464)
@@ -22,7 +22,8 @@
                  [csvParams]="csvParams" csvPath="projects" simpleSearchLink="/search/find/projects"
                  [disableForms]="disableForms"
                  [loadPaging]="loadPaging"
-                 [oldTotalResults]="oldTotalResults"  [piwikSiteId]=piwikSiteId>
+                 [oldTotalResults]="oldTotalResults"  [piwikSiteId]=piwikSiteId
+                 searchFormClass="projectsSearchForm">
     </advanced-search-page>
 
     `
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/advanced/advancedSearchSoftware.component.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/advanced/advancedSearchSoftware.component.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/advanced/advancedSearchSoftware.component.ts	(revision 53464)
@@ -23,7 +23,8 @@
                  [csvParams]="csvParams" csvPath="software" simpleSearchLink="/search/find/software"
                  [disableForms]="disableForms"
                  [loadPaging]="loadPaging"
-                 [oldTotalResults]="oldTotalResults" [(connectCommunityId)]=connectCommunityId [piwikSiteId]=piwikSiteId>
+                 [oldTotalResults]="oldTotalResults" [(connectCommunityId)]=connectCommunityId [piwikSiteId]=piwikSiteId
+                 searchFormClass="softwareSearchForm">
     </advanced-search-page>
 
     `
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/advanced/advancedSearchPublications.component.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/advanced/advancedSearchPublications.component.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/advanced/advancedSearchPublications.component.ts	(revision 53464)
@@ -25,7 +25,8 @@
                  [loadPaging]="loadPaging"
                  [oldTotalResults]="oldTotalResults"
                  [(openaireLink)]=openaireLink
-                 [(connectCommunityId)]=connectCommunityId  [piwikSiteId]=piwikSiteId>
+                 [(connectCommunityId)]=connectCommunityId  [piwikSiteId]=piwikSiteId
+                 searchFormClass="publicationsSearchForm">
     </advanced-search-page>
     `
  })
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/searchForm.component.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/searchForm.component.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/searchForm.component.ts	(revision 53464)
@@ -8,16 +8,12 @@
     template: `
 
         <form [class]="(isDisabled)?'uk-margin uk-text-center uk-margin-top uk-disabled':'uk-margin uk-text-center uk-margin-top'">
-                 <input type="text" class="uk-input  uk-width-1-2" [placeholder]="placeholderText" aria-describedby="sizing-addon2"  [(ngModel)]="keyword"  name="keyword" >
-                    <button *ngIf="!link" (click)="keywordChanged()"  type="submit" class=" uk-button uk-button-danger">
-                    <span class="uk-icon">
-                    <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="search" ratio="1"><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>
-                    </span>Search
+                 <input type="text" class="uk-input  uk-width-xlarge" [placeholder]="placeholderText" aria-describedby="sizing-addon2"  [(ngModel)]="keyword"  name="keyword" >
+                    <button *ngIf="!link" (click)="keywordChanged()"  type="submit" class=" uk-button  portal-button">
+                    <span class="uk-icon" ><svg width="30" height="30" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="search" ratio="1.5"><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></span>
                   </button>
-                  <button *ngIf="link"  class=" uk-button uk-button-danger" (click)="goTo()"  type="submit" >
-                    <span class="uk-icon">
-                    <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="search" ratio="1"><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>
-                    </span>Search
+                  <button *ngIf="link"   (click)="goTo()"  type="submit" class=" uk-button portal-button uk-padding uk-padding-remove-top uk-padding-remove-bottom ">
+                    <span class="uk-icon" ><svg width="30" height="30" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="search" ratio="1.5"><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></span>
                   </button>
         </form>
     `
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/advancedSearchForm.component.html
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/advancedSearchForm.component.html	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/advancedSearchForm.component.html	(revision 53464)
@@ -1,5 +1,14 @@
 
-    <form [class]="(isDisabled )?'uk-disabled advancedSearchForm uk-tile uk-margin-small-top':'advancedSearchForm uk-tile   uk-margin-small-top'">
+    <form [class]="(isDisabled )?'uk-disabled advancedSearchForm uk-tile uk-margin-small-top uk-padding-small':'advancedSearchForm uk-tile   uk-margin-small-top uk-padding-small'">
+      <div class="uk-article-title custom-article-title uk-text-center">
+        {{pageTitle}}
+      </div>
+      <a  *ngIf = "simpleSearchLink && simpleSearchLink.length > 0" routerLinkActive="router-link-active" [routerLink]=simpleSearchLink style="z-index:1;"
+         [class]="(disableForms)?'uk-float-right uk-disabled uk-link-muted uk-button portal-color uk-text-secondary uk-margin-right ':'uk-float-right uk-button portal-color uk-text-secondary uk-margin-right '" >Simple search
+        <!--span class="uk-icon">
+        <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="chevron-right" ratio="1"><polyline fill="none" stroke="#000" stroke-width="1.03" points="7 4 13 10 7 16"></polyline></svg>
+      </span-->
+    </a>
     <table  class=" uk-table uk-table-responsive uk-table-small" >
         <tr *ngFor="let selectedField of selectedFields; let i = index" class="-row  ">
                 <td *ngIf ="i==0 " class="">Search for:</td>
@@ -52,8 +61,10 @@
               </span></td>
         </tr>
         </table>
-        <div  class="-row uk-text-right">
-          <button (click)="queryChanged()"  type="submit" class="uk-button uk-button-danger">Search</button>
+        <div  class=" uk-text-center">
+          <button (click)="queryChanged()"  type="submit" class=" uk-button portal-background-color uk-padding uk-padding-remove-top uk-padding-remove-bottom ">
+            <span class="uk-icon" ><svg width="30" height="30" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="search" ratio="1.5"><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></span>
+          </button>
         </div>
 
     </form>
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/browseEntities.component.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/browseEntities.component.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/browseEntities.component.ts	(revision 53464)
@@ -15,7 +15,7 @@
     selector: 'browse-entities',
     template: `
 <div>
-  <!--div *ngIf="status == errorCodes.LOADING" class="uk-animation-fade uk-margin-large-top  uk-width-1-1" role="alert"><img class="loading-gif  uk-align-center" ></div>
+  <!--div *ngIf="status == errorCodes.LOADING" class="uk-animation-fade uk-margin-large-top  uk-width-1-1" role="alert"><span class="loading-gif  uk-align-center" ></span></div>
   <div *ngIf="status == errorCodes.NONE" class="uk-alert uk-alert-primary uk-animation-fade" role="alert">No Results found</div>
   <div *ngIf="status == errorCodes.ERROR" class="uk-alert uk-alert-warning uk-animation-fade" role="alert">An Error Occured</div>
   <div *ngIf="status == errorCodes.NOT_AVAILABLE" class="uk-alert uk-alert-danger" role="alert">Service temprorarily unavailable. Please try again later.</div>
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/browseStatistic.component.html
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/browseStatistic.component.html	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/browseStatistic.component.html	(revision 53464)
@@ -7,8 +7,8 @@
           <a class = " filterItem"  [queryParams]="routerHelper.createQueryParam(filter.filterId,quote(value.id))" routerLinkActive="router-link-active" [routerLink]=baseUrl>
           <span class="filterName"><div title = "{{value.name}}">{{_formatName(value)}} </div></span> <span class="filterNumber" > ({{value.number | number}})</span></a>
         </li>
-        <li *ngIf= " filter.values.length > 5  " class= " uk-margin-remove-top">
-          <a href="#modal-{{filter.filterId}}" uk-toggle class="uk-button uk-button-text">View more <!--span class="uk-text-muted">View more </span>
+        <li *ngIf= " filter.values.length > 5  " class= "uk-padding-small-top">
+          <a href="#modal-{{filter.filterId}}" uk-toggle class="uk-text-secondary  ">View more <!--span class="uk-text-muted">View more </span>
             <span class="uk-icon">
             <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="triangle-right" ratio="1"><polygon points="8 5 13 10 8 15"></polygon></svg>
             </span-->
@@ -42,11 +42,22 @@
           <button class="uk-modal-close-default" type="button" uk-close></button>
 
           <h4 class="tm-article-subtitle">{{filter.title}}</h4>
+          <div class="uk-grid uk-margin-left uk-margin-right">
+            <input   class="uk-input   uk-margin-small-bottom uk-width-1-2  " name="filter-keyword"  placeholder="Search for {{filter.title}}" type="text" [(ngModel)]="keyword">
+            <select   [(ngModel)]="sortBy"      class="uk-select  uk-margin-small-bottom uk-width-1-2 uk-padding-remove"  name="select_order"   >
+              <option  value="num"  >Sort by results number</option>
+              <option  value="name"  >Sort by name</option>
+            </select>
+          </div>
+
           <ul *ngIf="filter.values.length > 0" class="uk-list uk-list-line   browseFilters">
-            <li *ngFor= "let value of filter.values"><!--a [href]="baseUrl+'?'+filter.filterId+'='+value.id">{{_formatName(value)}} ({{value.number}})</a-->
+            <ng-container *ngFor = "let value of getValues(filter,sortBy)">
+            <li *ngIf="filterKeywords(value.name)" ><!--*ngFor= "let value of filter.values"--><!--a [href]="baseUrl+'?'+filter.filterId+'='+value.id">{{_formatName(value)}} ({{value.number}})</a-->
+
             <a class = "uk-modal-close filterItem" [queryParams]="routerHelper.createQueryParam(filter.filterId,quote(value.id))" routerLinkActive="router-link-active" [routerLink]=baseUrl>
               <span class="filterName"><div title = "{{value.name}}">{{_formatName(value)}} </div></span> <span class="filterNumber" > ({{value.number | number}})</span></a>
             </li>
+          </ng-container>
           </ul>
         </div>
       </div>
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/advancedSearchForm.component.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/advancedSearchForm.component.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/advancedSearchForm.component.ts	(revision 53464)
@@ -18,7 +18,8 @@
   @Input() fieldIdsMap;
   @Input() selectedFields:AdvancedField[];
   @Input() isDisabled: boolean = false;
-
+  @Input() simpleSearchLink;
+  @Input() pageTitle;
   @Output() queryChange  = new EventEmitter();
   newFieldId:string;
   newFieldName:string;
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/searchPage.component.html
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/searchPage.component.html	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/searchPage.component.html	(revision 53464)
@@ -1,49 +1,32 @@
-<div id="tm-main" class=" uk-section  uk-margin-small-top tm-middle"   >
-  <div uk-grid >
-    <div class="tm-main uk-width-1-1@s uk-width-1-1@m  uk-width-1-1@l uk-row-first ">
-      <div class="">
+<div class="image-front-topbar  uk-section-default uk-position-relative" uk-scrollspy="{&quot;target&quot;:&quot;[uk-scrollspy-class]&quot;,&quot;cls&quot;:&quot;uk-animation-fade&quot;,&quot;delay&quot;:false}" tm-header-transparent="light">
+  <div style=" min-height: 350px;"  [class]="' uk-background-norepeat uk-background-cover uk-background-bottom-center uk-section uk-padding-remove-bottom uk-flex uk-flex-middle uk-background-fixed '+searchFormClass">
+    <div class="uk-position-cover" style="/*background-color: rgba(255, 255, 255, 0.37);*/"></div>
+    <div class="uk-container">
+        <div class="uk-position-relative">
 
-        <div   [class]="'uk-background-norepeat uk-background-cover uk-section uk-flex uk-flex-middle uk- light '+searchFormClass" >
 
-          <div   class="uk-width-1-1">
-            <div   class="uk-width-1-1">
-              <search-form [isDisabled]="disableForms" [(keyword)]="searchUtils.keyword" (keywordChange)="keywordChanged($event)" [placeholderText]="formPlaceholderText"></search-form>
-            </div>
-            <div   class="uk-width-1-1  ">
+           <div   class="uk-container ">
+             <div   class="uk-width-1-1">
+               <!--link to advanced search -->
+               <a *ngIf = "advancedSearchLink && advancedSearchLink.length > 0" routerLinkActive="router-link-active" [class]="((disableForms)?'uk-float-right   uk-disabled uk-link-muted uk-light ':'uk-float-right  uk-light') +' portal-color uk-margin-small-bottom'" [routerLink]=advancedSearchLink [queryParams]=advancedSearchParameters >
+                 <span class=" ">Advanced search</span>
+               </a>
+               <search-form [isDisabled]="disableForms" [(keyword)]="searchUtils.keyword" (keywordChange)="keywordChanged($event)" [placeholderText]="formPlaceholderText"></search-form>
 
-              <div *ngIf="countFilters()>0" class = "uk-container uk-width-1-2@m uk-width-1-2@s uk-align-center uk-text-center uk-text-small whiteText uk-padding-small">
-                <a  *ngIf="countFilters()>1" (click)="clearFilters()" [class]="((disableForms)?'uk-disabled uk-link-muted':'')+' uk-button uk-button-default uk-margin-small-right'">
-                 Clear All
-                </a>
-                <span *ngIf = "searchUtils.keyword.length > 0">Keywords: <span [innerHtml]="searchUtils.keyword"></span>
-                <a (click) = "clearKeywords() " title="Remove keywords" [class]="(disableForms)?'uk-icon-button icon-button-small   uk-margin-small-right uk-disabled':'uk-icon-button icon-button-small   uk-margin-small-right'"><span class=" clickable " aria-hidden="true"><span class="uk-icon ">
-                  <svg width="16" height="16" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="close" ratio="0.8"><path fill="none" stroke="#000" stroke-width="1.06" d="M16,16 L4,4"></path><path fill="none" stroke="#000" stroke-width="1.06" d="M16,4 L4,16"></path></svg>
-                  </span></span></a>
-                </span>
-                <span *ngFor="let filter of filters " >
-                  <span *ngIf = "filter.countSelectedValues > 0"> <span class="uk-text-bold">{{filter.title}}:</span>
-                    <span *ngFor="let value of getSelectedValues(filter); let i = index;  let end = last; " ><span [innerHtml]="(value.name.length > 25)?value.name.substring(0,25)+'...':value.name" [title]="value.name"></span>
-                    <a [title]="'Remove '+value.name"(click) = "removeFilter(value, filter) " [class]="(disableForms)?'uk-icon-button icon-button-small   uk-margin-small-right uk-disabled':'uk-icon-button icon-button-small   uk-margin-small-right'"><span class=" clickable" aria-hidden="true"><span class="uk-icon">
-                      <svg width="16" height="16" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="close" ratio="0.8"><path fill="none" stroke="#000" stroke-width="1.06" d="M16,16 L4,4"></path><path fill="none" stroke="#000" stroke-width="1.06" d="M16,4 L4,16"></path></svg>
-                      </span></span></a>
-                      <!--span *ngIf="!end" class=" uk-margin-small-right ">, </span-->
-                    </span>
-                  </span>
-                </span>
+             </div>
 
 
-              </div>
-              <div *ngIf= "showUnknownFilters"  class = " uk-text-center ">
-                <a (click) = "clearFilters() " >Try new Query</a>
-              </div>
-              <!--link to advanced search -->
-              <a *ngIf = "advancedSearchLink && advancedSearchLink.length > 0" routerLinkActive="router-link-active" [class]="((disableForms)?'uk-float-right   uk-disabled uk-link-muted uk-light ':'uk-float-right  uk-light') +' whiteText uk-padding-small uk-button-text'" [routerLink]=advancedSearchLink [queryParams]=advancedSearchParameters >
-                <span class="uk-padding-small">More search options</span>
-              </a>
-            </div>
+           </div>
+        </div>
+     </div>
+  </div>
+</div>
 
-          </div>
-        </div>
+
+<div id="tm-main" class=" uk-section  uk-padding-remove-top  tm-middle"   >
+  <div uk-grid >
+    <div class="tm-main uk-width-1-1@s uk-width-1-1@m  uk-width-1-1@l uk-row-first ">
+      <div class="">
         <div  class="uk-container">
           <helper position="top"></helper>
           <div  [class]="(showRefine)? 'uk-width-3-5@m  uk-width-3-5@l  uk-width-1-1@s' :'uk-width-1-1'">
@@ -54,6 +37,49 @@
               <div id="offcanvas-usage" uk-offcanvas>
                 <div class="uk-offcanvas-bar">
                   <button class="uk-offcanvas-close" type="button" uk-close></button>
+                  <div   class="uk-width-1-1   uk-margin-small-bottom ">
+
+                    <div *ngIf="countFilters()>0" class="uk-margin-small-bottom">
+
+                      <span *ngIf = "searchUtils.keyword.length > 0"><span class="uk-text-bold">Keywords:</span>
+                      <a (click) = "clearKeywords() " title="Remove keywords" [class]="((disableForms)?'  uk-disabled':'  ')+' uk-margin-small-right portal-color '"><span class=" clickable " aria-hidden="true"><span class="uk-icon ">
+                        <svg width="16" height="16" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="close" ratio="0.8"><path fill="none" stroke="#000" stroke-width="1.6" d="M16,16 L4,4"></path><path fill="none" stroke="#000" stroke-width="1.6" d="M16,4 L4,16"></path></svg>
+                        </span></span></a>
+                      <span [innerHtml]="searchUtils.keyword"></span>
+
+                      </span>
+                      <div *ngFor="let filter of filters " >
+                        <span *ngIf = "filter.countSelectedValues > 0"> <span class="uk-text-bold">{{filter.title}}:</span>
+                          <span *ngFor="let value of getSelectedValues(filter); let i = index;  let end = last; " >
+                            <a [title]="'Remove '+value.name"(click) = "removeFilter(value, filter) " [class]="((disableForms)?'  uk-disabled':'  ')+'  portal-color '"><span class=" clickable" aria-hidden="true"><span class="uk-icon">
+                              <svg width="16" height="16" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="close" ratio="0.8"><path fill="none" stroke="#000" stroke-width="1.6" d="M16,16 L4,4"></path><path fill="none" stroke="#000" stroke-width="1.6" d="M16,4 L4,16"></path></svg>
+                              </span></span></a>
+                            <span [innerHtml]="(value.name.length > 25)?value.name.substring(0,25)+'...':value.name" [title]="value.name"></span>
+
+                            <span *ngIf="!end" class="   ">, </span>
+                          </span>
+                        </span>
+                      </div>
+
+
+                    </div>
+                    <div class="uk-margin-small-bottom uk-margin-small-top">
+                      <a  *ngIf="countFilters()>1" (click)="clearFilters()" [class]="((disableForms)?'uk-disabled uk-link-muted':'')+' uk-margin-small-right  portal-link  '">
+                       Clear All
+                      </a>
+
+                      <a   *ngIf= "showUnknownFilters" class = " uk-margin-small-right portal-link  " (click) = "clearFilters() " >Try new Query</a>
+                      <span *ngIf="tableViewLink" class="uk-margin-medium-right">
+                        <a routerLinkActive="router-link-active" [class]="(disableForms)?'uk-disabled uk-link-muted':''" [routerLink]=tableViewLink >
+                          <span class="uk-margin-small-right uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" ratio="1"><rect x="2" y="2" width="3" height="3"></rect><rect x="8" y="2" width="3" height="3"></rect><rect x="14" y="2" width="3" height="3"></rect><rect x="2" y="8" width="3" height="3"></rect><rect x="8" y="8" width="3" height="3"></rect><rect x="14" y="8" width="3" height="3"></rect><rect x="2" y="14" width="3" height="3"></rect><rect x="8" y="14" width="3" height="3"></rect><rect x="14" y="14" width="3" height="3"></rect></svg></span>
+                        </a>
+
+                        <span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="table" ratio="1"><rect x="1" y="3" width="18" height="1"></rect><rect x="1" y="7" width="18" height="1"></rect><rect x="1" y="11" width="18" height="1"></rect><rect x="1" y="15" width="18" height="1"></rect></svg></span>
+                      </span>
+                      <search-download [type]="csvPath" [csvParams]="csvParams" [totalResults]="searchUtils.totalResults"></search-download>
+                    </div>
+
+                  </div>
                   <div class="uk-text-large">Filter By:</div>
                   <search-filter  *ngFor="let filter of filters "  [addShowMore]=false [isDisabled]="disableForms" [filter]="filter"  [showResultCount]=showResultCount (onFilterChange)="filterChanged($event)"  [(connectCommunityId)]=connectCommunityId></search-filter>
                 </div>
@@ -64,12 +90,54 @@
 
 
           <div  class="uk-grid uk-width-1-1">
-            <div  *ngIf="showRefine" class="helper-left-right search-filters uk-visible@m">
+            <div  *ngIf="showRefine" class=" uk-margin-top helper-left-right search-filters uk-visible@m">
                <helper position="left" before="true"></helper>
+               <div   class="uk-width-1-1   uk-margin-small-bottom ">
+
+                 <div *ngIf="countFilters()>0" class="uk-margin-small-bottom">
+
+                   <span *ngIf = "searchUtils.keyword.length > 0"><span class="uk-text-bold">Keywords:</span>
+                   <a (click) = "clearKeywords() " title="Remove keywords" [class]="((disableForms)?'  uk-disabled':'  ')+'  portal-color '"><span class=" clickable " aria-hidden="true"><span class="uk-icon ">
+                     <svg width="16" height="16" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="close" ratio="0.8"><path fill="none" stroke="#000" stroke-width="1.6" d="M16,16 L4,4"></path><path fill="none" stroke="#000" stroke-width="1.6" d="M16,4 L4,16"></path></svg>
+                     </span></span></a>
+                   <span [innerHtml]="searchUtils.keyword"></span>
+
+                   </span>
+                   <div *ngFor="let filter of filters " >
+                     <span *ngIf = "filter.countSelectedValues > 0"> <span class="uk-text-bold">{{filter.title}}:</span>
+                       <span *ngFor="let value of getSelectedValues(filter); let i = index;  let end = last; " >
+                         <a [title]="'Remove '+value.name"(click) = "removeFilter(value, filter) " [class]="((disableForms)?'  uk-disabled':'  ')+'  portal-color '"><span class=" clickable" aria-hidden="true"><span class="uk-icon">
+                           <svg width="16" height="16" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="close" ratio="0.8"><path fill="none" stroke="#000" stroke-width="1.6" d="M16,16 L4,4"></path><path fill="none" stroke="#000" stroke-width="1.6" d="M16,4 L4,16"></path></svg>
+                           </span></span></a>
+                         <span [innerHtml]="(value.name.length > 25)?value.name.substring(0,25)+'...':value.name" [title]="value.name"></span>
+
+                         <span *ngIf="!end" class="   ">, </span>
+                       </span>
+                     </span>
+                   </div>
+
+
+                 </div>
+                 <div class="uk-margin-small-bottom uk-margin-small-top">
+                   <a  *ngIf="countFilters()>1" (click)="clearFilters()" [class]="((disableForms)?'uk-disabled uk-link-muted':'')+'  uk-margin-small-right  portal-link '">
+                    Clear All
+                   </a>
+
+                   <a   *ngIf= "showUnknownFilters" class = "  portal-link uk-margin-small-right " (click) = "clearFilters() " >Try new Query</a>
+                   <span *ngIf="tableViewLink" class="uk-margin-medium-right">
+                     <a routerLinkActive="router-link-active" [class]="(disableForms)?'uk-disabled uk-link-muted':''" [routerLink]=tableViewLink >
+                       <span class="uk-margin-small-right uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" ratio="1"><rect x="2" y="2" width="3" height="3"></rect><rect x="8" y="2" width="3" height="3"></rect><rect x="14" y="2" width="3" height="3"></rect><rect x="2" y="8" width="3" height="3"></rect><rect x="8" y="8" width="3" height="3"></rect><rect x="14" y="8" width="3" height="3"></rect><rect x="2" y="14" width="3" height="3"></rect><rect x="8" y="14" width="3" height="3"></rect><rect x="14" y="14" width="3" height="3"></rect></svg></span>
+                     </a>
+
+                     <span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="table" ratio="1"><rect x="1" y="3" width="18" height="1"></rect><rect x="1" y="7" width="18" height="1"></rect><rect x="1" y="11" width="18" height="1"></rect><rect x="1" y="15" width="18" height="1"></rect></svg></span>
+                   </span>
+                   <search-download [type]="csvPath" [csvParams]="csvParams" [totalResults]="searchUtils.totalResults"></search-download>
+                </div>
+               </div>
                <search-filter  *ngFor="let filter of filters " [isDisabled]="disableForms" [filter]="filter"  [showResultCount]=showResultCount (onFilterChange)="filterChanged($event)"  [(connectCommunityId)]=connectCommunityId></search-filter>
                <helper position="left" before="false"></helper>
             </div>
-            <helper *ngIf="!showRefine" class="helper-left-right uk-visible@m" position="left"></helper>
+            <helper *ngIf="!showRefine" class="uk-margin-top helper-left-right uk-visible@m" position="left"></helper>
 
             <div class="uk-width-expand@m uk-width-1-1@s uk-first-column">
             <!-- <div [class]="(showRefine)?'uk-width-expand@m uk-first-column':''" > -->
@@ -77,8 +145,8 @@
               <div  class="uk-align-center uk-margin-remove-bottom">
                 <search-paging [type]="type" [loadPaging]="loadPaging" [oldTotalResults]="oldTotalResults" [(searchUtils)] = "searchUtils"  [(results)] = "results"  [(baseUrl)] = "baseUrl" [(parameterNames)] = "parameterNames" [(parameterValues)] = "parameterValues" ></search-paging>
               </div>
-
-              <div  *ngIf="tableViewLink || searchUtils.totalResults <= csvLimit"  class="uk-width-1-1@s uk-hidden@m">
+ <!-- *ngIf="tableViewLink || searchUtils.totalResults <= csvLimit"  -->
+              <!-- <div  class="uk-width-1-1@s uk-hidden@m">
                 <span *ngIf="tableViewLink" class="uk-margin-medium-right">
                   <a routerLinkActive="router-link-active" [class]="(disableForms)?'uk-disabled uk-link-muted':''" [routerLink]=tableViewLink >
                     <span class="uk-margin-small-right uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" ratio="1"><rect x="2" y="2" width="3" height="3"></rect><rect x="8" y="2" width="3" height="3"></rect><rect x="14" y="2" width="3" height="3"></rect><rect x="2" y="8" width="3" height="3"></rect><rect x="8" y="8" width="3" height="3"></rect><rect x="14" y="8" width="3" height="3"></rect><rect x="2" y="14" width="3" height="3"></rect><rect x="8" y="14" width="3" height="3"></rect><rect x="14" y="14" width="3" height="3"></rect></svg></span>
@@ -87,7 +155,7 @@
                   <span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="table" ratio="1"><rect x="1" y="3" width="18" height="1"></rect><rect x="1" y="7" width="18" height="1"></rect><rect x="1" y="11" width="18" height="1"></rect><rect x="1" y="15" width="18" height="1"></rect></svg></span>
                 </span>
                 <search-download [type]="csvPath" [csvParams]="csvParams" [totalResults]="searchUtils.totalResults"></search-download>
-              </div>
+              </div> -->
 
               <div *ngIf="(searchUtils.page <= pagingLimit)" class="uk-margin-top">
                 <search-result    *ngIf="!tableView"
@@ -109,10 +177,9 @@
               <helper class="uk-hidden@m" position="left" styleName="uk-width-1-1@s"></helper>
               <helper class="uk-hidden@m" position="right" styleName="uk-width-1-1@s"></helper>
             </div>
-
-            <div *ngIf="tableViewLink || searchUtils.totalResults <= csvLimit" class="helper-left-right uk-visible@m">
+            <div class="uk-margin-top helper-left-right uk-visible@m">
               <helper position="right" before="true"></helper>
-              <div>
+              <!-- <div>
                 <span *ngIf="tableViewLink" class="uk-margin-medium-right">
                   <a routerLinkActive="router-link-active" [class]="(disableForms)?'uk-disabled uk-link-muted':''" [routerLink]=tableViewLink >
                     <span class="uk-margin-small-right uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" ratio="1"><rect x="2" y="2" width="3" height="3"></rect><rect x="8" y="2" width="3" height="3"></rect><rect x="14" y="2" width="3" height="3"></rect><rect x="2" y="8" width="3" height="3"></rect><rect x="8" y="8" width="3" height="3"></rect><rect x="14" y="8" width="3" height="3"></rect><rect x="2" y="14" width="3" height="3"></rect><rect x="8" y="14" width="3" height="3"></rect><rect x="14" y="14" width="3" height="3"></rect></svg></span>
@@ -121,10 +188,10 @@
                   <span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="table" ratio="1"><rect x="1" y="3" width="18" height="1"></rect><rect x="1" y="7" width="18" height="1"></rect><rect x="1" y="11" width="18" height="1"></rect><rect x="1" y="15" width="18" height="1"></rect></svg></span>
                 </span>
                 <search-download [type]="csvPath" [csvParams]="csvParams" [totalResults]="searchUtils.totalResults"></search-download>
-              </div>
+              </div> -->
               <helper position="right" before="false"></helper>
             </div>
-            <helper *ngIf="!tableViewLink && searchUtils.totalResults > csvLimit" class="helper-left-right uk-visible@m" position="right"></helper>
+            <!-- <helper *ngIf="!tableViewLink && searchUtils.totalResults > csvLimit" class="helper-left-right uk-visible@m" position="right"></helper> -->
           </div>
           <!-- <div [class]="(showRefine)? 'uk-width-3-5@m  uk-width-3-5@l  uk-width-1-1@s uk-align-center uk-margin-remove-bottom' : 'uk-width-1-1'">
             <search-paging [loadPaging]="loadPaging" [type]="type" [oldTotalResults]="oldTotalResults" [(searchUtils)] = "searchUtils"  [(results)] = "results"  [(baseUrl)] = "baseUrl" [(parameterNames)] = "parameterNames" [(parameterValues)] = "parameterValues" ></search-paging>
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/searchResult.component.html
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/searchResult.component.html	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/searchResult.component.html	(revision 53464)
@@ -3,17 +3,17 @@
   <div *ngIf="status == errorCodes.ERROR" class="uk-alert uk-alert-warning uk-animation-fade" role="alert">An Error Occured</div>
   <div *ngIf="status == errorCodes.OUT_OF_BOUND" class="uk-alert uk-alert-warning uk-animation-fade" role="alert">Requested page out of bounds</div>
   <div *ngIf="status == errorCodes.NOT_AVAILABLE" class="uk-alert uk-alert-danger uk-animation-fade" role="alert">Service not available</div>
-  <div *ngIf="status == errorCodes.LOADING && showLoading"   class="uk-animation-fade uk-margin-large-top  uk-width-1-1" role="alert"><img class="loading-gif  uk-align-center" ></div-->
+  <div *ngIf="status == errorCodes.LOADING && showLoading"   class="uk-animation-fade uk-margin-large-top  uk-width-1-1" role="alert"><span class="loading-gif  uk-align-center" ></span></div-->
   <errorMessages [status]="[status]" [type]="'results'"></errorMessages>
 
     <li *ngFor="let result of results" class="uk-animation-fade">
         <!-- <h4 class = "{{result.title.accessMode}} {{result.title.sc39}}" [title] = result.title.accessMode > -->
-        <h4  [title] = result.title.accessMode >
+        <h5  [title] = result.title.accessMode >
             <a [queryParams]="routerHelper.createQueryParam(urlParam,result.id)" routerLinkActive="router-link-active" routerLink="/search/{{type}}">
               <p *ngIf="result['title'].name || result.acronym"><span *ngIf="result.acronym">{{result.acronym}}</span><span *ngIf="result.acronym && result['title'].name">-</span><span *ngIf="result['title'].name" [innerHTML]="result['title'].name"></span><span *ngIf="result.code"> ({{result.code}})</span></p>
               <p *ngIf="!result['title'].name && !result.acronym">[no title available]<span *ngIf="result.code"> ({{result.code}})</span></p>
             </a>
-        </h4>
+        </h5>
         <span *ngIf="result.types && result.types.length > 0" [class]="'uk-label custom-label label-blue label-'+result.entityType" title="Type">{{result.types.join(", ")}}</span>
         <span *ngIf="result.programmingLanguages && result.programmingLanguages.length > 0" class="uk-label custom-label  label-progrLanguage " title="Programming Language">{{result.programmingLanguages.join(", ")}}</span>
         <span *ngIf="result.languages && result.languages.length > 0" class="uk-label custom-label  label-language " title="Language">{{result.languages.join(", ")}}</span>
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/searchPageTableView.component.html
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/searchPageTableView.component.html	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/searchPageTableView.component.html	(revision 53464)
@@ -1,7 +1,27 @@
-<div id="tm-main" class=" uk-section  uk-margin-small-top tm-middle"   >
+<div class="image-front-topbar  uk-section-default uk-position-relative" uk-scrollspy="{&quot;target&quot;:&quot;[uk-scrollspy-class]&quot;,&quot;cls&quot;:&quot;uk-animation-fade&quot;,&quot;delay&quot;:false}" tm-header-transparent="light">
+  <div style=" min-height: 350px;"  [class]="' uk-background-norepeat uk-background-cover uk-background-bottom-center uk-section uk-padding-remove-bottom uk-flex uk-flex-middle uk-background-fixed '+searchFormClass">
+    <div class="uk-position-cover" style="/*background-color: rgba(255, 255, 255, 0.37);*/"></div>
+    <div class="uk-container">
+        <div class="uk-position-relative">
+
+
+           <div   class="uk-container ">
+             <div   class="uk-width-1-1">
+               <search-form [isDisabled]="disableForms" [(keyword)]="searchUtils.keyword" (keywordChange)="keywordChanged($event)"  [placeholderText]="formPlaceholderText"></search-form>
+             </div>
+
+
+           </div>
+        </div>
+     </div>
+  </div>
+</div>
+
+<div id="tm-main" class=" uk-section uk-padding-remove-top tm-middle"   >
   <div uk-grid uk-grid>
     <div class="tm-main uk-width-1-1@s uk-width-1-1@m  uk-width-1-1@l uk-row-first ">
-      <div   [class]="'uk-background-norepeat uk-background-cover uk-section uk-flex uk-flex-middle '+searchFormClass" >
+
+      <!--div   [class]="'uk-background-norepeat uk-background-cover uk-section uk-flex uk-flex-middle '+searchFormClass" >
         <div   class="uk-width-1-1">
           <div   class="uk-width-1-1">
             <search-form [isDisabled]="disableForms" [(keyword)]="searchUtils.keyword" (keywordChange)="keywordChanged($event)"  [placeholderText]="formPlaceholderText"></search-form>
@@ -28,7 +48,8 @@
             </div>
           </div>
         </div>
-      </div>
+      </div!-->
+
       <div  class="uk-container">
         <helper position="top"></helper>
         <div  class="uk-width-2-3@m  uk-width-2-3@l  uk-width-1-1@s">
@@ -39,6 +60,42 @@
             <div id="offcanvas-usage" uk-offcanvas>
               <div class="uk-offcanvas-bar">
                 <button class="uk-offcanvas-close" type="button" uk-close></button>
+                <div *ngIf="isFiltered()" class = "  ">
+                  <span *ngIf = "searchUtils.keyword.length > 0"><span class="uk-text-bold">Keywords:</span>
+                  <a (click) = "clearKeywords() " title="Remove keywords" [class]="((disableForms)?'  uk-disabled':'  ')+' portal-color '"><span class=" clickable " aria-hidden="true"><span class="uk-icon ">
+                    <svg width="16" height="16" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="close" ratio="0.8"><path fill="none" stroke="#000" stroke-width="1.6" d="M16,16 L4,4"></path><path fill="none" stroke="#000" stroke-width="1.6" d="M16,4 L4,16"></path></svg>
+                    </span></span></a>
+                  <span [innerHtml]="searchUtils.keyword"></span>
+
+                  </span>
+                  <div *ngFor="let filter of filters " >
+                    <span *ngIf = "filter.countSelectedValues > 0"> <span class="uk-text-bold">{{filter.title}}:</span>
+                      <span *ngFor="let value of getSelectedValues(filter); let i = index;  let end = last; " >
+                        <a [title]="'Remove '+value.name"(click) = "removeFilter(value, filter) " [class]="((disableForms)?'  uk-disabled':'  ')+'  portal-color '"><span class=" clickable" aria-hidden="true"><span class="uk-icon">
+                          <svg width="16" height="16" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="close" ratio="0.8"><path fill="none" stroke="#000" stroke-width="1.6" d="M16,16 L4,4"></path><path fill="none" stroke="#000" stroke-width="1.6" d="M16,4 L4,16"></path></svg>
+                          </span></span></a>
+                        <span [innerHtml]="(value.name.length > 25)?value.name.substring(0,25)+'...':value.name" [title]="value.name"></span>
+
+                        <span *ngIf="!end" class="   ">, </span>
+                      </span>
+                    </span>
+                  </div>
+                  <div class="uk-margin-small-bottom uk-margin-small-top">
+                    <a  *ngIf="countFilters()>1" (click)="clearFilters()" [class]="((disableForms)?'uk-disabled uk-link-muted':'')+' uk-margin-small-right portal-link '">
+                   Clear All
+                  </a>
+                  <div *ngIf="searchViewLink" class="uk-width-1-1@s uk-hidden@m">
+                    <p>
+                      <span class="uk-margin-small-right uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" ratio="1"><rect x="2" y="2" width="3" height="3"></rect><rect x="8" y="2" width="3" height="3"></rect><rect x="14" y="2" width="3" height="3"></rect><rect x="2" y="8" width="3" height="3"></rect><rect x="8" y="8" width="3" height="3"></rect><rect x="14" y="8" width="3" height="3"></rect><rect x="2" y="14" width="3" height="3"></rect><rect x="8" y="14" width="3" height="3"></rect><rect x="14" y="14" width="3" height="3"></rect></svg></span>
+
+                      <a routerLinkActive="router-link-active" [class]="(disableForms && !enableSearchView)?'uk-disabled uk-link-muted':''" [routerLink]=searchViewLink >
+                        <span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="table" ratio="1"><rect x="1" y="3" width="18" height="1"></rect><rect x="1" y="7" width="18" height="1"></rect><rect x="1" y="11" width="18" height="1"></rect><rect x="1" y="15" width="18" height="1"></rect></svg></span>
+                      </a>
+                    </p>
+                  </div>
+                </div>
+
+                </div>
                 <div class="uk-text-large">Filter By:</div>
                 <search-filter  *ngFor="let filter of filters " [addShowMore]=false [isDisabled]="disableForms" [filter]="filter"  [showResultCount]=showResultCount (change)="filterChanged($event)" (toggleModal)="toggleModal($event)"></search-filter>
               </div>
@@ -47,19 +104,55 @@
           </div>
         </div>
 
-        <div  class="uk-grid uk-width-1-1">
-          <div *ngIf="filters.length > 0" class="helper-left-right search-filters uk-visible@m">
+        <div  class="uk-grid uk-width-1-1 uk-margin-top">
+          <div *ngIf="filters.length > 0" class="  uk-margin-top helper-left-right search-filters uk-visible@m">
             <helper position="left" before="true"></helper>
+            <div  class = "  ">
+              <span *ngIf = "searchUtils.keyword.length > 0"><span class="uk-text-bold">Keywords:</span>
+              <a (click) = "clearKeywords() " title="Remove keywords" [class]="((disableForms)?'  uk-disabled':'  ')+' portal-color '"><span class=" clickable " aria-hidden="true"><span class="uk-icon ">
+                <svg width="16" height="16" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="close" ratio="0.8"><path fill="none" stroke="#000" stroke-width="1.6" d="M16,16 L4,4"></path><path fill="none" stroke="#000" stroke-width="1.6" d="M16,4 L4,16"></path></svg>
+                </span></span></a>
+              <span [innerHtml]="searchUtils.keyword"></span>
+
+              </span>
+              <div *ngFor="let filter of filters "  class="uk-margin-small-bottom">
+                <span *ngIf = "filter.countSelectedValues > 0"> <span class="uk-text-bold">{{filter.title}}:</span>
+                  <span *ngFor="let value of getSelectedValues(filter); let i = index;  let end = last; " >
+                    <a [title]="'Remove '+value.name"(click) = "removeFilter(value, filter) " [class]="((disableForms)?'  uk-disabled':'  ')+'  portal-color '"><span class=" clickable" aria-hidden="true"><span class="uk-icon">
+                      <svg width="16" height="16" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="close" ratio="0.8"><path fill="none" stroke="#000" stroke-width="1.6" d="M16,16 L4,4"></path><path fill="none" stroke="#000" stroke-width="1.6" d="M16,4 L4,16"></path></svg>
+                      </span></span></a>
+                    <span [innerHtml]="(value.name.length > 25)?value.name.substring(0,25)+'...':value.name" [title]="value.name"></span>
+
+                    <span *ngIf="!end" class="   ">, </span>
+                  </span>
+                </span>
+              </div>
+              <div class="uk-margin-small-bottom ">
+                <a  *ngIf="countFilters()>1" (click)="clearFilters()" [class]="((disableForms)?'uk-disabled uk-link-muted':'')+' uk-margin-small-right portal-link '">
+               Clear All
+              </a>
+               <div *ngIf="searchViewLink" class="uk-width-1-1@s ">
+                <p>
+                  <span class="uk-margin-small-right uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" ratio="1"><rect x="2" y="2" width="3" height="3"></rect><rect x="8" y="2" width="3" height="3"></rect><rect x="14" y="2" width="3" height="3"></rect><rect x="2" y="8" width="3" height="3"></rect><rect x="8" y="8" width="3" height="3"></rect><rect x="14" y="8" width="3" height="3"></rect><rect x="2" y="14" width="3" height="3"></rect><rect x="8" y="14" width="3" height="3"></rect><rect x="14" y="14" width="3" height="3"></rect></svg></span>
+
+                  <a routerLinkActive="router-link-active" [class]="(disableForms && !enableSearchView)?'uk-disabled uk-link-muted':''" [routerLink]=searchViewLink >
+                    <span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="table" ratio="1"><rect x="1" y="3" width="18" height="1"></rect><rect x="1" y="7" width="18" height="1"></rect><rect x="1" y="11" width="18" height="1"></rect><rect x="1" y="15" width="18" height="1"></rect></svg></span>
+                  </a>
+                </p>
+              </div>
+            </div>
+
+            </div>
             <search-filter  *ngFor="let filter of filters " [isDisabled]="disableForms" [filter]="filter"  [showResultCount]=showResultCount (change)="filterChanged($event)" (toggleModal)="toggleModal($event)"></search-filter>
             <helper position="left" before="false"></helper>
           </div>
-          <helper *ngIf="filters.length == 0" class="helper-left-right uk-visible@m" position="left"></helper>
+          <helper *ngIf="filters.length == 0" class="uk-margin-top helper-left-right uk-visible@m" position="left"></helper>
 
           <div class="uk-width-expand@m uk-width-1-1@s uk-first-column custom-dataTable-content" >
             <div *ngIf="openaireLink"> <a class="uk-margin-top   uk-button uk-button-text"  [href]=openaireLink target="_blank" >Results in OpenAIRE</a></div>
             <div *ngIf="searchUtils.totalResults > 0" class="uk-align-center uk-margin-remove-bottom">
               <div class="searchPaging uk-panel uk-margin-top uk-grid uk-margin-bottom">
-                <span class="uk-h6 uk-width-1-1@s uk-width-1-2@m">
+                <span class="uk-width-1-1@s uk-width-1-2@m">
                   {{searchUtils.totalResults | number}} {{type}}, page {{searchUtils.page | number}} of {{(totalPages()) | number}}
                 </span>
                 <span class="float-children-right-at-medium margin-small-top-at-small uk-width-1-1@s uk-width-1-2@m">
@@ -68,7 +161,7 @@
               </div>
             </div>
 
-            <div *ngIf="searchViewLink" class="uk-width-1-1@s uk-hidden@m">
+            <!-- <div *ngIf="searchViewLink" class="uk-width-1-1@s uk-hidden@m">
               <p>
                 <span class="uk-margin-small-right uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" ratio="1"><rect x="2" y="2" width="3" height="3"></rect><rect x="8" y="2" width="3" height="3"></rect><rect x="14" y="2" width="3" height="3"></rect><rect x="2" y="8" width="3" height="3"></rect><rect x="8" y="8" width="3" height="3"></rect><rect x="14" y="8" width="3" height="3"></rect><rect x="2" y="14" width="3" height="3"></rect><rect x="8" y="14" width="3" height="3"></rect><rect x="14" y="14" width="3" height="3"></rect></svg></span>
 
@@ -76,7 +169,7 @@
                   <span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="table" ratio="1"><rect x="1" y="3" width="18" height="1"></rect><rect x="1" y="7" width="18" height="1"></rect><rect x="1" y="11" width="18" height="1"></rect><rect x="1" y="15" width="18" height="1"></rect></svg></span>
                 </a>
               </p>
-            </div>
+            </div> -->
 
             <div *ngIf="searchUtils.totalResults <= 0" class="errors-in-searchTableView">
               <errorMessages [status]="[searchUtils.status]" [type]="'results'"></errorMessages>
@@ -170,7 +263,7 @@
 
             <div *ngIf="searchUtils.totalResults > 0" class="uk-align-center uk-margin-remove-bottom">
               <div class="searchPaging uk-panel uk-margin-top uk-grid uk-margin-bottom">
-                <span class="uk-h6 uk-width-1-1@s uk-width-1-2@m">
+                <span class="uk-width-1-1@s uk-width-1-2@m">
                   {{searchUtils.totalResults | number}} {{type}}, page {{searchUtils.page | number}} of {{(totalPages()) | number}}
                 </span>
                 <span class="float-children-right-at-medium margin-small-top-at-small uk-width-1-1@s uk-width-1-2@m">
@@ -183,7 +276,7 @@
             <helper class="uk-hidden@m" position="right" styleName="uk-width-1-1@s"></helper>
           </div>
 
-          <div *ngIf="searchViewLink" class="helper-left-right uk-visible@m">
+          <!-- <div *ngIf="searchViewLink" class="helper-left-right uk-visible@m">
             <helper position="right" before="true"></helper>
             <span class="uk-margin-small-right uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" ratio="1"><rect x="2" y="2" width="3" height="3"></rect><rect x="8" y="2" width="3" height="3"></rect><rect x="14" y="2" width="3" height="3"></rect><rect x="2" y="8" width="3" height="3"></rect><rect x="8" y="8" width="3" height="3"></rect><rect x="14" y="8" width="3" height="3"></rect><rect x="2" y="14" width="3" height="3"></rect><rect x="8" y="14" width="3" height="3"></rect><rect x="14" y="14" width="3" height="3"></rect></svg></span>
 
@@ -192,7 +285,7 @@
             </a>
             <helper position="right" before="false"></helper>
           </div>
-          <helper *ngIf="!searchViewLink" class="helper-left-right uk-visible@m" position="right"></helper>
+          <helper *ngIf="!searchViewLink" class="helper-left-right uk-visible@m" position="right"></helper> -->
         </div>
 
         <helper position="bottom"></helper>
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/browseStatistic.component.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/browseStatistic.component.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/browseStatistic.component.ts	(revision 53464)
@@ -24,6 +24,8 @@
   private _maxCharacters = 30;
   public viewAll = false;
   public routerHelper:RouterHelper = new RouterHelper();
+  keyword = "";
+  sortBy = "num";
   constructor () {
 
   }
@@ -40,5 +42,35 @@
   private _formatName(value){
     return value.name+" ";//(((value.name+" ("+value.number+")").length >this._maxCharacters)?(value.name.substring(0,(this._maxCharacters - (" ("+value.number+")").length - ('...').length))+"..."):value.name)
   }
+  filterKeywords(value){
+    if(this.keyword.length > 0){
+      if(value.toLowerCase().indexOf(this.keyword.toLowerCase()) ==-1){
+        return false;
+      }
+    }
+    return true;
+  }
 
+  getValues(filter, sortBy:string = "num"):any{
+
+    if(sortBy == "name"){
+      var array = filter.values.slice();
+      array.sort((n1,n2)=> {
+        if (n1.name > n2.name) {
+            return 1;
+        }
+
+        if (n1.name < n2.name) {
+            return -1;
+        }
+
+        return 0;
+      });
+      return array;
+    }else{
+      return filter.values;
+    }
+
+
+  }
 }
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/searchFilter.component.html
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/searchFilter.component.html	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/searchFilter.component.html	(revision 53464)
@@ -1,7 +1,7 @@
 
 <ul *ngIf= "filter.values.length >0" class="uk-list">
 <li class="uk-open">
-    <h5  class="uk-margin-bottom-remove sideInfoTitle">{{_formatTitle(filter.title,filter.values.length)}}
+    <h5  class="uk-margin-bottom-remove searchFilterTitle">{{_formatTitle(filter.title,filter.values.length)}}
     </h5>
     <div  aria-expanded="false">
       <div class="searchFilterBoxValues ">
@@ -11,7 +11,7 @@
            {{_formatName(value)}} </div></span>
            <span class="filterNumber" *ngIf = "showResultCount === true" >  ({{value.number|number}})</span>
         </div>
-        <hr *ngIf="filter.countSelectedValues > 0 && (filter.values.length-filter.countSelectedValues ) > 0 " class="uk-grid-divider uk-margin-small">
+        <!-- <hr *ngIf="filter.countSelectedValues > 0 && (filter.values.length-filter.countSelectedValues ) > 0 " class="uk-grid-divider uk-margin-small"--> 
         <div *ngFor = "let value of getNotSelectedValues(filter,'num').slice(0,(!addShowMore?getNotSelectedValues(filter,'num').length:5-getSelectedValues(filter,'num').length))" class = "uk-animation-fade filterItem">
 
            <span class="filterName"><div title = "{{value.name}}"> <input [disabled]="isDisabled" [(ngModel)]="value.selected" type="checkbox" (ngModelChange)="filterChange(value.selected)" />
@@ -20,7 +20,7 @@
         </div>
 
         <a *ngIf=" addShowMore && (filter.values.length) > 5" (click)="open()"
-          [class]="(isDisabled)?'uk-disabled uk-link-muted uk-button uk-button-text uk-text-secondary':'uk-button uk-button-text uk-text-secondary'">View more
+          [class]="(isDisabled)?'uk-disabled uk-link-muted   uk-text-secondary':'  uk-text-secondary'">View more
         </a>
 
 
@@ -32,7 +32,7 @@
               {{filter.title}}
             </h5>
 
-            <div *ngIf="filter.values.length >= 99" class="uk-alert uk-alert-primary   uk-text-center uk-margin-right uk-margin-left">Showing top {{filter.values.length}} values. </div>
+            <div *ngIf="filter.values.length >= 99" class="uk-alert uk-alert-primary   uk-text-center uk-margin-right uk-margin-left uk-margin-small-top uk-margin-small-bottom  ">Showing top {{filter.values.length}} values. </div>
             <div class="uk-grid uk-margin-left uk-margin-right">
               <input   class="uk-input   uk-margin-small-bottom uk-width-1-2  " name="filter-keyword"  placeholder="Search for {{filter.title}}" type="text" [(ngModel)]="keyword">
               <select *ngIf = "showResultCount === true" [(ngModel)]="sortBy"      class="uk-select  uk-margin-small-bottom uk-width-1-2 uk-padding-remove"  name="select_order"  (ngModelChange)="sortByChanged = true;" >
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/searchPaging.component.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/searchPaging.component.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/searchPaging.component.ts	(revision 53464)
@@ -6,10 +6,10 @@
     selector: 'search-paging',
     template: `
     <div class= "searchPaging uk-panel uk-margin-top uk-grid uk-margin-bottom">
-      <div class="uk-h6 uk-width-1-1@s uk-width-1-2@m" *ngIf="results && searchUtils.totalResults > 0">
+      <div class="uk-width-1-1@s uk-width-1-2@m" *ngIf="results && searchUtils.totalResults > 0">
         {{searchUtils.totalResults|number}} {{type}}, page {{searchUtils.page | number}} of {{(totalPages(searchUtils.totalResults)|number)}}
       </div>
-      <div class="uk-h6 uk-width-1-1@s uk-width-1-2@m" *ngIf="!loadPaging && oldTotalResults > 0 && searchUtils.status == errorCodes.LOADING">
+      <div class="uk-width-1-1@s uk-width-1-2@m" *ngIf="!loadPaging && oldTotalResults > 0 && searchUtils.status == errorCodes.LOADING">
         {{oldTotalResults|number}} {{type}}, page {{searchUtils.page | number}} of {{(totalPages(oldTotalResults)|number)}}
       </div>
       <div class="float-children-right-at-medium margin-small-top-at-small uk-width-1-1@s uk-width-1-2@m" *ngIf="results && searchUtils.totalResults > searchUtils.size">
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/searchDownload.component.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/searchDownload.component.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/searchDownload.component.ts	(revision 53464)
@@ -10,14 +10,18 @@
 @Component({
     selector: 'search-download',
     template: `
-        <span class="uk-margin-large-right" *ngIf="totalResults > 0 && totalResults <= csvLimit">
-            <!--span class="clickable" (click)="downloadfile(downloadURLAPI+type+'?format=csv&page=0&size='+totalResults+csvParams,type+'-report-'+totalResults)"-->
+        <a class="uk-margin-large-right" *ngIf="totalResults > 0 && totalResults <= csvLimit">
             <span class="clickable" (click)="downloadfile(downloadURLAPI+'?type='+type+'&format=csv'+csvParams,type+'-report-'+totalResults)">
                 <span aria-hidden="true" class="glyphicon glyphicon-download"></span>
                 <span  class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="download" ratio="1"><polyline fill="none" stroke="#000" points="14,10 9.5,14.5 5,10"></polyline><rect x="3" y="17" width="13" height="1"></rect><line fill="none" stroke="#000" x1="9.5" y1="13.91" x2="9.5" y2="3"></line></svg></span> (CSV)
             </span>
+        </a>
+        <span class="uk-margin-large-right cursor-not-allowed" *ngIf="totalResults > csvLimit"
+                    [attr.uk-tooltip]="'pos:right'"
+                    [title]="'Download up to '+csvLimit+' results'">
+            <span aria-hidden="true" class="glyphicon glyphicon-download"></span>
+            <span  class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="download" ratio="1"><polyline fill="none" stroke="#000" points="14,10 9.5,14.5 5,10"></polyline><rect x="3" y="17" width="13" height="1"></rect><line fill="none" stroke="#000" x1="9.5" y1="13.91" x2="9.5" y2="3"></line></svg></span> (CSV)
         </span>
-    <!--modal-alert></modal-alert-->
     <modal-loading></modal-loading>
     <modal-alert #AlertModalCsvError></modal-alert>
     `
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/advancedSearchForm.module.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/advancedSearchForm.module.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/advancedSearchForm.module.ts	(revision 53464)
@@ -1,6 +1,7 @@
 import { NgModule}            from '@angular/core';
 import { CommonModule }        from '@angular/common';
 import { FormsModule }         from '@angular/forms';
+import { RouterModule } from '@angular/router';
 
 import{AdvancedSearchFormComponent} from './advancedSearchForm.component';
 import {EntitiesAutocompleteModule} from '../../utils/entitiesAutoComplete/entitiesAutoComplete.module';
@@ -10,7 +11,7 @@
 
 @NgModule({
   imports: [
-    CommonModule, FormsModule,    EntitiesAutocompleteModule,   StaticAutocompleteModule, DateFilterModule
+    CommonModule, FormsModule,  RouterModule,  EntitiesAutocompleteModule,   StaticAutocompleteModule, DateFilterModule
   ],
   declarations: [
     AdvancedSearchFormComponent,
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/searchPageTableView.component.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/searchPageTableView.component.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/searchPageTableView.component.ts	(revision 53464)
@@ -61,7 +61,6 @@
   @ViewChild (ModalLoading) loading : ModalLoading ;
   private searchFieldsHelper:SearchFields = new SearchFields();
   private queryParameters: Map<string, string>  = new Map<string,string>();
-  public countFilters= 0;
   public parameterNames:string[] =[];
   public parameterValues:string[] =[];
 
@@ -429,7 +428,7 @@
               */
               if(filter.title == "Type") {
                 field = "type";
-              } else if(filter.title == "Compatibility Level") {
+              } else if(filter.title == "Compatibility") {
                 field = "compatibility";
               } else if(filter.title == "Funder") {
                 field = "funder";
@@ -526,4 +525,16 @@
     public encode(param: string): string {
       return StringUtils.URIEncode(param);
     }
+    public countFilters():number{
+      var filters=0;
+      for (let filter of this.filters){
+         if(filter.countSelectedValues > 0){
+             filters+=filter.countSelectedValues;
+         }
+       }
+      if(this.searchUtils.keyword.length > 0 ){
+        filters++;
+      }
+      return filters;
+    }
 }
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/advancedSearchPage.component.html
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/advancedSearchPage.component.html	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/advancedSearchPage.component.html	(revision 53464)
@@ -1,30 +1,42 @@
-<div id="tm-main" class=" uk-section  uk-margin-small-top tm-middle">
+<div class="image-front-topbar  uk-section-default uk-position-relative" uk-scrollspy="{&quot;target&quot;:&quot;[uk-scrollspy-class]&quot;,&quot;cls&quot;:&quot;uk-animation-fade&quot;,&quot;delay&quot;:false}" tm-header-transparent="light">
+  <div  style="box-sizing: border-box;  " [class]="' uk-background-norepeat uk-background-cover uk-background-bottom-center uk-section uk-padding-remove-bottom uk-flex uk-flex-middle uk-background-fixed advancedSearchFormBackground '+searchFormClass">
+    <div class="uk-position-cover" style="/*background-color: rgba(255, 255, 255, 0.37);*/"></div>
+    <div class="uk-width-1-1">
+        <div class="uk-position-relative">
+
+
+           <div   class="uk-container uk-margin-large-top">
+                <advanced-search-form
+                   [entityType] = "entityType"
+                   [(fieldIds)]="fieldIds"
+                   [(fieldIdsMap)]="fieldIdsMap"
+                   [(selectedFields)]="selectedFields"
+                   (queryChange)="queryChanged($event)"
+                   [isDisabled]="disableForms"
+                   [simpleSearchLink]=simpleSearchLink
+                   [pageTitle]=pageTitle
+                   >
+               </advanced-search-form>
+           </div>
+        </div>
+     </div>
+  </div>
+</div>
+
+
+
+<div id="tm-main" class="   tm-middle">
   <div uk-grid uk-grid>
     <div class="tm-main uk-width-1-1@s uk-width-1-1@m  uk-width-1-1@l uk-row-first ">
-      <div class="uk-container uk-margin-top">
-        <div class="uk-article-title custom-article-title">
-          {{pageTitle}}
-        </div>
+      <div class="uk-container  ">
+
         <div>
-          <a  *ngIf = "simpleSearchLink && simpleSearchLink.length > 0" routerLinkActive="router-link-active" [routerLink]=simpleSearchLink style="z-index:1;"
-             [class]="(disableForms)?'uk-float-right uk-disabled uk-link-muted uk-button uk-button-text uk-text-secondary uk-margin-right uk-margin-top':'uk-float-right uk-button uk-button-text uk-text-secondary uk-margin-right uk-margin-top'" >Simple search
-            <!--span class="uk-icon">
-            <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="chevron-right" ratio="1"><polyline fill="none" stroke="#000" stroke-width="1.03" points="7 4 13 10 7 16"></polyline></svg>
-          </span-->
-        </a>
-          <advanced-search-form
-              [entityType] = "entityType"
-              [(fieldIds)]="fieldIds"
-              [(fieldIdsMap)]="fieldIdsMap"
-              [(selectedFields)]="selectedFields"
-              (queryChange)="queryChanged($event)"
-              [isDisabled]="disableForms">
-          </advanced-search-form>
+
           <div class="uk-width-1-1">
             <helper position="top"></helper>
           </div>
-          <div class="uk-width-1-1 uk-grid helper-grid" >
-            <helper class="helper-left-right uk-visible@m" position="left"></helper>
+          <div class="uk-width-1-1 uk-grid helper-grid uk-padding-large uk-padding-remove-top" >
+            <helper class="uk-margin-top helper-left-right uk-visible@m" position="left"></helper>
             <div class="uk-width-expand@m uk-with-1-1@s">
               <div *ngIf="openaireLink"> <a class="uk-margin-top   uk-button uk-button-text"  [href]=openaireLink target="_blank" >Results in OpenAIRE</a></div>
               <div  class="uk-align-center uk-margin-remove-bottom">
@@ -31,7 +43,7 @@
                 <search-paging [type]="type" [loadPaging]="loadPaging" [oldTotalResults]="oldTotalResults" [(searchUtils)] = "searchUtils"  [(results)] = "results" [(baseUrl)] = "searchUtils.baseUrl"  [(parameterNames)] = "parameterNames" [(parameterValues)] = "parameterValues"   ></search-paging>
               </div>
 
-              <search-download *ngIf="searchUtils.totalResults <= csvLimit" class="uk-width-1-1@s uk-hidden@m" [type]="csvPath" [csvParams]="csvParams" [totalResults]="searchUtils.totalResults" ></search-download>
+              <search-download class="uk-width-1-1@s uk-hidden@m" [type]="csvPath" [csvParams]="csvParams" [totalResults]="searchUtils.totalResults" ></search-download>
 
               <div *ngIf="(searchUtils.page <= pagingLimit)" class="uk-margin-top">
                 <search-result  [results]="results"
@@ -52,12 +64,12 @@
               <helper class="uk-hidden@m" position="left" styleName="uk-width-1-1@s"></helper>
               <helper class="uk-hidden@m" position="right" styleName="uk-width-1-1@s"></helper>
             </div>
-            <div *ngIf="searchUtils.totalResults <= csvLimit" class="uk-visible@m helper-left-right">
+            <div class="uk-visible@m uk-margin-top helper-left-right">
               <helper position="right" before="true"></helper>
               <search-download [type]="csvPath" [csvParams]="csvParams" [totalResults]="searchUtils.totalResults" ></search-download>
               <helper position="right" before="false"></helper>
             </div>
-            <helper *ngIf="searchUtils.totalResults > csvLimit" class="helper-left-right uk-visible@m" position="right"></helper>
+            <!-- <helper *ngIf="searchUtils.totalResults > csvLimit" class="uk-margin-top helper-left-right uk-visible@m" position="right"></helper> -->
           </div>
 
           <div class="uk-width-1-1">
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/tabResult.component.html
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/tabResult.component.html	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/tabResult.component.html	(revision 53464)
@@ -14,12 +14,12 @@
             </span>
            </a>
        </div> -->
-       <h4  [title] = result.title.accessMode >
+       <h5  [title] = result.title.accessMode >
            <a [queryParams]="routerHelper.createQueryParam(urlParam,result.id)" routerLinkActive="router-link-active" routerLink="/search/{{type}}">
              <p *ngIf="result['title'].name || result.acronym"><span *ngIf="result.acronym">{{result.acronym}}</span><span *ngIf="result.acronym && result['title'].name">-</span><span *ngIf="result['title'].name" [innerHTML]="result['title'].name"></span><span *ngIf="result.code"> ({{result.code}})</span></p>
              <p *ngIf="!result['title'].name && !result.acronym">[no title available]<span *ngIf="result.code"> ({{result.code}})</span></p>
            </a>
-       </h4>
+       </h5>
 
        <div>
          <span *ngIf="result['authors'] != undefined">
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/advancedSearchPage.component.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/advancedSearchPage.component.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/searchUtils/advancedSearchPage.component.ts	(revision 53464)
@@ -40,6 +40,7 @@
   @Input() oldTotalResults: number = 0;
   @Input() openaireLink: string;
   @Input() connectCommunityId: string;
+  @Input() searchFormClass: string = "searchForm";
   piwiksub: any;
   public parameterNames:string[] =[];
   public parameterValues:string[] =[];
@@ -275,7 +276,7 @@
        if(this.fieldIdsMap[id]["param"] == parameter){
          return this.fieldIdsMap[id]["operator"];
        }
-     }    
+     }
    }
    // for loading
    public openLoading(){
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/dataProviders/journals.component.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/dataProviders/journals.component.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/dataProviders/journals.component.ts	(revision 53464)
@@ -21,7 +21,7 @@
                     [(results)] = "results"  [(searchUtils)] = "searchUtils"
                     [baseUrl] = "baseUrl" [showResultCount]=false
                     (queryChange)="queryChanged($event)"
-                    [csvParams]="csvParams" csvPath="resources"
+                    [csvParams]="csvParams" csvPath="datasources"
                     [disableForms]="disableForms"
                     searchFormClass="journalsSearchForm">
     </search-page>
@@ -49,7 +49,7 @@
                         "export":[]
                      };
   public CSVDownloaded = false;
-  public resourcesQuery = '&query=((oaftype exact datasource) not(datasourcecompatibilityid = UNKNOWN) not(datasourcecompatibilityid = notCompatible) and (datasourcetypeuiid exact "pubsrepository::journal" or datasourcetypeuiid exact "aggregator::pubsrepository::journals" ))';
+  public resourcesQuery = '((oaftype exact datasource) not(datasourcecompatibilityid = UNKNOWN) not(datasourcecompatibilityid = notCompatible) and (datasourcetypeuiid exact "pubsrepository::journal" or datasourcetypeuiid exact "aggregator::pubsrepository::journals" ))';
   //"&query=((oaftype exact datasource) not(datasourcecompatibilityid = UNKNOWN) not(datasourcecompatibilityid = notCompatible) not(datasourcetypeuiid = other))";
   public csvParams: string;
   public disableForms: boolean = false;
@@ -85,7 +85,9 @@
       this.filters = this.createFilters();
       var queryParameters = this.searchPage.getIndexQueryParametersFromUrl(params);
       console.info("|"+queryParameters+"|");
-      this._getResults(queryParameters, false, this.searchUtils.page, this.searchUtils.size);
+      var csvParameters = this.searchPage.getQueryParametersFromUrl(params);
+
+      this._getResults(queryParameters, csvParameters, false, this.searchUtils.page, this.searchUtils.size);
     });
   }
 
@@ -96,8 +98,12 @@
     if(this.subResults){
       this.subResults.unsubscribe();
     }  }
-    private _getResults(parameters:string,refine:boolean, page: number, size: number){
-        this.csvParams = parameters+this.resourcesQuery+"&type=datasources";
+    private _getResults(parameters:string, csv_parameters:string, refine:boolean, page: number, size: number){
+      if(csv_parameters.indexOf("fq=") != -1) {
+        this.csvParams = csv_parameters+" and "+this.resourcesQuery;
+      } else {
+        this.csvParams = csv_parameters+"&fq="+this.resourcesQuery;
+      }
 
       //var errorCodes:ErrorCodes = new ErrorCodes();
       this.searchUtils.status = this.errorCodes.LOADING;
@@ -151,8 +157,9 @@
   public queryChanged($event) {
     var parameters = $event.index;
     console.info("queryChanged: Execute search query "+parameters);
+    var csv_parameters = $event.value;
 
-    this._getResults(parameters, false, this.searchUtils.page, this.searchUtils.size);
+    this._getResults(parameters,csv_parameters, false, this.searchUtils.page, this.searchUtils.size);
   }
   private createFilters():Filter[] {
     var filter_names=["Type","Compatibility Level"];
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/dataProviders/entityRegistriesTable.component.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/dataProviders/entityRegistriesTable.component.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/searchPages/dataProviders/entityRegistriesTable.component.ts	(revision 53464)
@@ -188,7 +188,7 @@
 
 
   private createFilters():Filter[] {
-    var filter_names=["Type","Compatibility Level"];
+    var filter_names=["Type","Compatibility"];
     var filter_ids=["datasourcetypename","datasourcecompatibilityname"];
     var searchFields = new SearchFields();
     var filter_original_ids = searchFields.ENTITY_REGISTRIES_FIELDS;
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/connect/connectHelper.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/connect/connectHelper.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/connect/connectHelper.ts	(revision 53464)
@@ -1,13 +1,15 @@
 export class ConnectHelper{
 
   public static  getCommunityFromDomain(domain:string):string{
-    // domain = "beta.egi.openaire.eu"; for testing
+    domain = "test.explore.openaire.eu"; //for testing
     if(domain.indexOf("openaire.eu") == -1){
       return null;
     }
-    if(domain.indexOf("beta")!=-1){
+    if(domain.indexOf("beta.")!=-1){
       domain = domain.substr(domain.indexOf(".")+1,domain.length);
       domain = domain.substr(0,domain.indexOf("."));
+    }else if(domain.indexOf("test.")!=-1){
+      return null;
     }else{
       domain = domain.substr(0,domain.indexOf("."));
     }
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/landingPages/dataProvider/statisticsTab.component.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/landingPages/dataProvider/statisticsTab.component.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/landingPages/dataProvider/statisticsTab.component.ts	(revision 53464)
@@ -11,9 +11,9 @@
 
       <div *ngIf="searchPublicationsComponent.searchUtils.status == errorCodes.DONE || searchDatasetsComponent.searchUtils.status == errorCodes.DONE">
         <p class="uk-text-bold">Latest Documents Timeline</p>
-        <i-frame  [url]=docsTimelineUrl width="800" height="350"></i-frame>
+        <i-frame  [url]=docsTimelineUrl width="100%" height="350"></i-frame>
         <p class="uk-text-bold">Documents Types</p>
-        <i-frame [url]=docsTypesUrl width="800" height="350"></i-frame>
+        <i-frame [url]=docsTypesUrl width="100%" height="350"></i-frame>
       </div>
 
 
@@ -20,15 +20,15 @@
       <div *ngIf="(searchPublicationsComponent.searchUtils.totalResults > 0)">
           <div>
             <p class="uk-text-bold">Funders in content providers Publications</p>
-            <i-frame  [url]=docsFunderUrl width="800" height="350"></i-frame>
+            <i-frame  [url]=docsFunderUrl width="100%" height="350"></i-frame>
             <p class="uk-text-bold">Projects with most Publications</p>
-            <i-frame [url]=pubsProjectsUrl width="800" height="350"></i-frame>
+            <i-frame [url]=pubsProjectsUrl width="100%" height="350"></i-frame>
 
       </div>
       <div *ngIf="(searchDatasetsComponent.searchUtils.totalResults > 0)">
           <div>
             <p class="uk-text-bold">Projects with most Research Data</p>
-            <i-frame  [url]=dataProjectsUrl width="800" height="350"></i-frame>
+            <i-frame  [url]=dataProjectsUrl width="100%" height="350"></i-frame>
 
           </div>
       </div>
@@ -56,11 +56,11 @@
 
     ngOnInit() {
 
-      this.docsTimelineUrl ='https://www.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcYear","dtsrcName":"'+this.id+'","table": "result", "fields": [{"fld": "number", "agg": "count", "type": "line", "yaxis":1, "c":true}], "xaxis":{"name": "year", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Documents"], "in": [{"f":0, "text": "Yearly"}], "filters": [{"name":"year","max":"2016","min":"1997"},{"name": "result_datasources-datasource-name", "values":[""], "to": "-1"}],"having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": "Year"}&w=600&h=250';
-      this.docsTypesUrl = 'https://www.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcPubs","dtsrcName":"'+this.id+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "pie", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Documents"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
-      this.docsFunderUrl =' https://www.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcPubsFund","dtsrcName":"'+this.id+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "pie", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Documents"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
-      this.dataProjectsUrl ='https://www.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcProjData","dtsrcName":"'+this.id+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "bar", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Datasets"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
-      this.pubsProjectsUrl ='https://www.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcProjPubs","dtsrcName":"'+this.id+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "bar", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Publications"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
+      this.docsTimelineUrl ='https://www.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcYear","dtsrcName":"'+this.id+'","table": "result", "fields": [{"fld": "number", "agg": "count", "type": "line", "yaxis":1, "c":true}], "xaxis":{"name": "year", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Documents"], "in": [{"f":0, "text": "Yearly"}], "filters": [{"name":"year","max":"2016","min":"1997"},{"name": "result_datasources-datasource-name", "values":[""], "to": "-1"}],"having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": "Year"}&w=100%&h=250';
+      this.docsTypesUrl = 'https://www.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcPubs","dtsrcName":"'+this.id+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "pie", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Documents"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=100%&h=250';
+      this.docsFunderUrl =' https://www.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcPubsFund","dtsrcName":"'+this.id+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "pie", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Documents"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=100%&h=250';
+      this.dataProjectsUrl ='https://www.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcProjData","dtsrcName":"'+this.id+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "bar", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Datasets"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=100%&h=250';
+      this.pubsProjectsUrl ='https://www.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcProjPubs","dtsrcName":"'+this.id+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "bar", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Publications"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=100%&h=250';
     }
 
     ngOnDestroy() {}
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/landingPages/dataProvider/dataProvider.component.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/landingPages/dataProvider/dataProvider.component.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/landingPages/dataProvider/dataProvider.component.ts	(revision 53464)
@@ -255,11 +255,11 @@
                this.downloadsFrameUrl = this.properties.framesAPIURL +'merge.php?com=query&data=[{"query":"dtsrcDownloadsTimeline","dtsrcName":"'+this.datasourceId+'","table":"","fields":[{"fld":"sum","agg":"sum","type":"chart","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"","yaxisheaders":["Monthly downloads"],"generalxaxis":"","theme":0,"in":[]}]&info_types=["spline"]&stacking=&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true';
                */
 
-               this.docsTimelineUrl ='https://www.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcYear","dtsrcName":"'+this.datasourceId+'","table": "result", "fields": [{"fld": "number", "agg": "count", "type": "line", "yaxis":1, "c":true}], "xaxis":{"name": "year", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": -30, "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Research Results"], "in": [{"f":0, "text": "Yearly"}], "filters": [{"name":"year","max":"2016","min":"1997"},{"name": "result_datasources-datasource-name", "values":[""], "to": "-1"}],"having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": "Year"}&w=600&h=250';
-               this.docsTypesUrl = 'https://www.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcPubs","dtsrcName":"'+this.datasourceId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "pie", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Research Results"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
-               this.docsFunderUrl =' https://www.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcPubsFund","dtsrcName":"'+this.datasourceId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "pie", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Research Results"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
-               this.dataProjectsUrl ='https://www.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcProjData","dtsrcName":"'+this.datasourceId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "bar", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Research Data"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
-               this.pubsProjectsUrl ='https://www.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcProjPubs","dtsrcName":"'+this.datasourceId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "bar", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Publications"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
+               this.docsTimelineUrl ='https://www.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcYear","dtsrcName":"'+this.datasourceId+'","table": "result", "fields": [{"fld": "number", "agg": "count", "type": "line", "yaxis":1, "c":true}], "xaxis":{"name": "year", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": -30, "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Research Results"], "in": [{"f":0, "text": "Yearly"}], "filters": [{"name":"year","max":"2016","min":"1997"},{"name": "result_datasources-datasource-name", "values":[""], "to": "-1"}],"having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": "Year"}&w=100%&h=250';
+               this.docsTypesUrl = 'https://www.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcPubs","dtsrcName":"'+this.datasourceId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "pie", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Research Results"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=100%&h=250';
+               this.docsFunderUrl =' https://www.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcPubsFund","dtsrcName":"'+this.datasourceId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "pie", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Research Results"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=100%&h=250';
+               this.dataProjectsUrl ='https://www.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcProjData","dtsrcName":"'+this.datasourceId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "bar", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Research Data"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=100%&h=250';
+               this.pubsProjectsUrl ='https://www.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcProjPubs","dtsrcName":"'+this.datasourceId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "bar", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Publications"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=100%&h=250';
 
                //if({"name": "Publications", "content": "publicationsTab"} in this.dataProviderInfo.tabs) {
                //if(this.dataProviderInfo.tabs.some(function (tab) {
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/landingPages/project/project.component.html
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/landingPages/project/project.component.html	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/landingPages/project/project.component.html	(revision 53464)
@@ -5,7 +5,7 @@
 <div id="project" class="uk-container uk-margin-top project">
     <div *ngIf="warningMessage.length > 0" class="uk-alert uk-alert-warning uk-margin-large-top" role="alert">{{warningMessage}}</div>
     <div *ngIf="errorMessage.length > 0" class="uk-alert uk-alert-danger  uk-margin-large-top" role="alert">{{errorMessage}}</div>
-    <div [style.display]="showLoading ? 'inline' : 'none'" class="uk-animation-fade uk-margin-large-top  uk-width-1-1" role="alert"><img class="loading-gif  uk-align-center" ></div>
+    <div [style.display]="showLoading ? 'inline' : 'none'" class="uk-animation-fade uk-margin-large-top  uk-width-1-1" role="alert"><span class="loading-gif  uk-align-center" ></span></div>
 
     <div *ngIf="projectInfo != null" uk-grid class="uk-grid-large">
         <div class="uk-width-expand@m uk-width-1-1@s">
@@ -83,9 +83,9 @@
                <li (click)="activeTab='Publications'; searchPublicationsInit()">
                    <a class="uk-accordion-title" href="#">
                      Publications
-                     <span class="uk-badge uk-badge-notification">
-                         {{fetchPublications.searchUtils.totalResults | number}}
-                     </span>
+                     <!-- <span class="uk-badge uk-badge-notification"> -->
+                         ({{fetchPublications.searchUtils.totalResults | number}})
+                     <!-- </span> -->
                    </a>
                    <div class="uk-accordion-content">
                      <errorMessages [status]="[fetchPublications.searchUtils.status]" [type]="'publications'" tab_error_class=true></errorMessages>
@@ -108,9 +108,9 @@
                 <li (click)="activeTab='Research Data'; searchDatasetsInit()">
                     <a class="uk-accordion-title" href="#">
                         Research Data
-                        <span class="uk-badge uk-badge-notification">
-                            {{fetchDatasets.searchUtils.totalResults | number}}
-                        </span>
+                        <!-- <span class="uk-badge uk-badge-notification"> -->
+                            ({{fetchDatasets.searchUtils.totalResults | number}})
+                        <!-- </span> -->
                     </a>
                     <div class="uk-accordion-content">
                       <errorMessages [status]="[fetchDatasets.searchUtils.status]" [type]="'research data'" tab_error_class=true></errorMessages>
@@ -134,9 +134,9 @@
                  <li (click)="activeTab='Software'; searchSoftwareInit()">
                      <a class="uk-accordion-title" href="#">
                          Software
-                         <span class="uk-badge uk-badge-notification">
-                             {{fetchSoftware.searchUtils.totalResults | number}}
-                         </span>
+                         <!-- <span class="uk-badge uk-badge-notification"> -->
+                             ({{fetchSoftware.searchUtils.totalResults | number}})
+                         <!-- </span> -->
                      </a>
                      <div class="uk-accordion-content">
                        <errorMessages [status]="[fetchSoftware.searchUtils.status]" [type]="'software'" tab_error_class=true></errorMessages>
@@ -160,9 +160,9 @@
                   <li (click)="activeTab='Other Research Products'; searchOrpsInit()">
                       <a class="uk-accordion-title" href="#">
                           Other Research Products
-                          <span class="uk-badge uk-badge-notification">
-                              {{fetchOrps.searchUtils.totalResults | number}}
-                          </span>
+                          <!-- <span class="uk-badge uk-badge-notification"> -->
+                              ({{fetchOrps.searchUtils.totalResults | number}})
+                          <!-- </span> -->
                       </a>
                       <div class="uk-accordion-content">
                         <errorMessages [status]="[fetchOrps.searchUtils.status]" [type]="'other research products'" tab_error_class=true></errorMessages>
@@ -194,11 +194,11 @@
 
                          <div>
                            <p class="uk-text-bold">Research Results</p>
-                           <i-frame  [url]=chartScientificResultsUrl width="800" height="350"></i-frame>
+                           <i-frame  [url]=chartScientificResultsUrl width="100%" height="350"></i-frame>
                            <p class="uk-text-bold">Access Mode of Research Results</p>
-                           <i-frame [url]=chartAccessModeUrl width="800" height="350"></i-frame>
+                           <i-frame [url]=chartAccessModeUrl width="100%" height="350"></i-frame>
                            <p class="uk-text-bold">By Datasource of Research Results</p>
-                           <i-frame  [url]=chartDatasourcesUrl width="800" height="350"></i-frame>
+                           <i-frame  [url]=chartDatasourcesUrl width="100%" height="350"></i-frame>
                          </div>
                      </div>
                    </div>
@@ -371,11 +371,11 @@
 
                       <div>
                         <p class="uk-text-bold">Research Results</p>
-                        <i-frame  [url]=chartScientificResultsUrl width="800" height="350"></i-frame>
+                        <i-frame  [url]=chartScientificResultsUrl width="100%" height="350"></i-frame>
                         <p class="uk-text-bold">Access Mode of Research Results</p>
-                        <i-frame [url]=chartAccessModeUrl width="800" height="350"></i-frame>
+                        <i-frame [url]=chartAccessModeUrl width="100%" height="350"></i-frame>
                         <p class="uk-text-bold">By Datasource of Research Results</p>
-                        <i-frame  [url]=chartDatasourcesUrl width="800" height="350"></i-frame>
+                        <i-frame  [url]=chartDatasourcesUrl width="100%" height="350"></i-frame>
                       </div>
                   </div>
                 </div>
@@ -419,12 +419,17 @@
                      <ul class="uk-list">
                        <li>
                          <a class="clickable" uk-toggle="target: #publications_dynamic; animation:uk-animation-fade"><span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="code" ratio="1"><polyline fill="none" stroke="#000" stroke-width="1.01" points="13,4 19,10 13,16"></polyline><polyline fill="none" stroke="#000" stroke-width="1.01" points="7,4 1,10 7,16"></polyline></svg></span> Include in your site (HTML)</a>
-                         <div hidden id="publications_dynamic">
-                             <button class="uk-button uk-button-default publ_clipboard_btn" data-clipboard-target="#publ_clipboard">
-                                 Copy to clipboard
-                                 <span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="copy" ratio="1"><rect fill="none" stroke="#000" x="3.5" y="2.5" width="12" height="16"></rect><polyline fill="none" stroke="#000" points="5 0.5 17.5 0.5 17.5 17"></polyline></svg></span>
-                             </button>
-                             <pre><code id="publ_clipboard">{{publications_dynamic}}</code></pre>
+                         <div hidden id="publications_dynamic" class="widget-box uk-padding-small uk-card uk-card-default ">
+                           <div class="  uk-alert uk-alert-primary uk-padding-small uk-margin-remove-bottom uk-margin-right">
+                             For further information please contact us <a href="mailto:helpdesk@openaire.eu">helpdesk@openaire.eu</a>
+                           </div>
+                             <div class="uk-grid">
+                               <a class="    publ_clipboard_btn uk-padding-remove-left uk-margin-small-left uk-text-right uk-width-1-1 " data-clipboard-target="#publ_clipboard" title="Copy to clipboard">
+                                    <span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="copy" ratio="1"><rect fill="none" stroke="#000" x="3.5" y="2.5" width="12" height="16"></rect><polyline fill="none" stroke="#000" points="5 0.5 17.5 0.5 17.5 17"></polyline></svg></span>
+                               </a>
+                              </div>
+
+                             <pre class="box-content uk-padding-remove-bottom uk-margin-remove-bottom"><code id="publ_clipboard">{{publications_dynamic}}</code></pre>
                          </div>
                        </li>
                        <li>
@@ -452,12 +457,16 @@
                     <ul class="uk-list">
                       <li>
                         <a class="clickable" uk-toggle="target: #datasets_dynamic; animation:uk-animation-fade"><span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="code" ratio="1"><polyline fill="none" stroke="#000" stroke-width="1.01" points="13,4 19,10 13,16"></polyline><polyline fill="none" stroke="#000" stroke-width="1.01" points="7,4 1,10 7,16"></polyline></svg></span> Include in your site (HTML) </a>
-                        <div hidden id="datasets_dynamic">
-                            <button class="uk-button uk-button-default datasets_clipboard_btn" data-clipboard-target="#datasets_clipboard">
-                                Copy to clipboard
-                                <span  class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="copy" ratio="1"><rect fill="none" stroke="#000" x="3.5" y="2.5" width="12" height="16"></rect><polyline fill="none" stroke="#000" points="5 0.5 17.5 0.5 17.5 17"></polyline></svg></span>
-                            </button>
-                            <pre><code id="datasets_clipboard">{{datasets_dynamic}}</code></pre>
+                        <div hidden id="datasets_dynamic"  class="widget-box uk-padding-small uk-card uk-card-default ">
+                          <div class="  uk-alert uk-alert-primary uk-padding-small uk-margin-remove-bottom uk-margin-right">
+                            For further information please contact us <a href="mailto:helpdesk@openaire.eu">helpdesk@openaire.eu</a>
+                          </div>
+                          <div class="uk-grid">
+                            <a class="    datasets_clipboard_btn uk-padding-remove-left uk-margin-small-left uk-text-right uk-width-1-1 " data-clipboard-target="#datasets_clipboard" title="Copy to clipboard">
+                                 <span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="copy" ratio="1"><rect fill="none" stroke="#000" x="3.5" y="2.5" width="12" height="16"></rect><polyline fill="none" stroke="#000" points="5 0.5 17.5 0.5 17.5 17"></polyline></svg></span>
+                            </a>
+                           </div>
+                            <pre  class="box-content uk-padding-remove-bottom uk-margin-remove-bottom"><code id="datasets_clipboard">{{datasets_dynamic}}</code></pre>
                         </div>
                     </li>
                     <li>
@@ -483,22 +492,25 @@
               </ul>
 
             </div>
-            <!--ul uk-accordion class="uk-padding-remove">
-                <li>
-                  <button class="uk-button uk-button-primary uk-accordion-title link-to-button  uk-width-1-1" type="button">
-                    <span class="uk-icon" >
-                           <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="link" ratio="1"><path fill="none" stroke="#000" stroke-width="1.1" d="M10.625,12.375 L7.525,15.475 C6.825,16.175 5.925,16.175 5.225,15.475 L4.525,14.775 C3.825,14.074 3.825,13.175 4.525,12.475 L7.625,9.375"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M9.325,7.375 L12.425,4.275 C13.125,3.575 14.025,3.575 14.724,4.275 L15.425,4.975 C16.125,5.675 16.125,6.575 15.425,7.275 L12.325,10.375"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M7.925,11.875 L11.925,7.975"></path></svg></span>
-                    <span>Link this project to</span>
-                  </button>
-                    <div class="uk-accordion-content">
-                      <ul class="uk-nav uk-dropdown-nav uk-padding-small" >
-                        <li><a   class="uk-width-1-1"  [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[projectId,'project','result'])"   routerLinkActive="router-link-active" routerLink="/participate/direct-claim" >
-                          Other research results</a></li>
-                      </ul>
-                    </div>
-                </li>
-            </ul-->
+            <button   class="   uk-button portal-button uk-margin-small-top uk-width-1-1">
+              <span class="uk-icon">
+                   <svg icon="link" ratio="1" xmlns="http://www.w3.org/2000/svg" width="25" viewBox="0 0 20 20" height="25"><path d="M10.625,12.375 L7.525,15.475 C6.825,16.175 5.925,16.175 5.225,15.475 L4.525,14.775 C3.825,14.074 3.825,13.175 4.525,12.475 L7.625,9.375" fill="none" stroke="#000" stroke-width="1.1"></path><path d="M9.325,7.375 L12.425,4.275 C13.125,3.575 14.025,3.575 14.724,4.275 L15.425,4.975 C16.125,5.675 16.125,6.575 15.425,7.275 L12.325,10.375" fill="none" stroke="#000" stroke-width="1.1"></path><path d="M7.925,11.875 L11.925,7.975" fill="none" stroke="#000" stroke-width="1.1"></path></svg>
+                 </span> Link this project to...
+            </button>
+
+          <div   uk-dropdown="pos: bottom-left; mode:click" style="background: transparent !important;box-shadow: none; max-width: 70px !important; min-width: 70px !important;" class=" uk-margin-remove-top uk-padding-small">
+              <ul class="uk-iconnav uk-iconnav-vertical">
+                 <li uk-tooltip="pos:right;" title="<div class='tooltip-custom-font-size uk-margin-small'>Research results</div>">
+                   <a   class="   uk-icon-button portal-button shadowBox"  style="padding: 6px;"  [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[projectId,'project','result'])"   routerLinkActive="router-link-active" routerLink="/participate/direct-claim" >
+                     <span class="uk-icon" >
+                          <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="copy" ratio="1"><rect fill="none" stroke="#000" x="3.5" y="2.5" width="12" height="16"></rect><polyline fill="none" stroke="#000" points="5 0.5 17.5 0.5 17.5 17"></polyline></svg></span>
+                   </a>
+                 </li>
+
+             </ul>
           </div>
+
+          </div>
           <!--metrics [pageViews]="pageViews" shortView=true
               [id]="projectId" [entityType]="'projects'" [entity]="'Project'"
               (metricsResults)="metricsResults($event)" [(properties)] = properties>
@@ -509,14 +521,14 @@
     <modal-loading></modal-loading>
     <modal-alert #AlertModalCsvError></modal-alert>
     <!-- Claiming FAB -->
-    <div class="uk-inline">
+    <!--div class="uk-inline">
        <div   class="   uk-float-right  " style="z-index: 200; bottom: 55px; position: fixed; right: 45%;">
-         <!--a style="padding: 30px; box-shadow: 0 1px 10px #444444" class="   uk-icon-button uk-button-primary  shadowBox"   uk-tooltip="pos:left;" title="<div class='tooltip-custom-font-size uk-light '>Link this publication to</div>">
+         < !--a style="padding: 30px; box-shadow: 0 1px 10px #444444" class="   uk-icon-button uk-button-primary  shadowBox"   uk-tooltip="pos:left;" title="<div class='tooltip-custom-font-size uk-light '>Link this publication to</div>">
            <span class="uk-icon">
                 <svg icon="link" ratio="1" xmlns="http://www.w3.org/2000/svg" width="40" viewBox="0 0 20 20" height="40"><path d="M10.625,12.375 L7.525,15.475 C6.825,16.175 5.925,16.175 5.225,15.475 L4.525,14.775 C3.825,14.074 3.825,13.175 4.525,12.475 L7.625,9.375" fill="none" stroke="#000" stroke-width="1.1"></path><path d="M9.325,7.375 L12.425,4.275 C13.125,3.575 14.025,3.575 14.724,4.275 L15.425,4.975 C16.125,5.675 16.125,6.575 15.425,7.275 L12.325,10.375" fill="none" stroke="#000" stroke-width="1.1"></path><path d="M7.925,11.875 L11.925,7.975" fill="none" stroke="#000" stroke-width="1.1"></path></svg>
               </span>
-         </a-->
-         <button style=" box-shadow: 0 1px 10px #444444" class="   uk-button uk-button-danger  ">
+         </a- ->
+         <button   class="   uk-button uk-button-danger  ">
            <span class="uk-icon">
                 <svg icon="link" ratio="1" xmlns="http://www.w3.org/2000/svg" width="25" viewBox="0 0 20 20" height="25"><path d="M10.625,12.375 L7.525,15.475 C6.825,16.175 5.925,16.175 5.225,15.475 L4.525,14.775 C3.825,14.074 3.825,13.175 4.525,12.475 L7.625,9.375" fill="none" stroke="#000" stroke-width="1.1"></path><path d="M9.325,7.375 L12.425,4.275 C13.125,3.575 14.025,3.575 14.724,4.275 L15.425,4.975 C16.125,5.675 16.125,6.575 15.425,7.275 L12.325,10.375" fill="none" stroke="#000" stroke-width="1.1"></path><path d="M7.925,11.875 L11.925,7.975" fill="none" stroke="#000" stroke-width="1.1"></path></svg>
               </span> Link this project to
@@ -534,7 +546,7 @@
           </ul>
        </div>
        </div>
-    </div>
+    </div-->
 </div>
 </div>
 </div>
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/landingPages/htmlProjectReport/htmlProjectReport.component.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/landingPages/htmlProjectReport/htmlProjectReport.component.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/landingPages/htmlProjectReport/htmlProjectReport.component.ts	(revision 53464)
@@ -21,7 +21,7 @@
 
       <div class="uk-container uk-margin-top">
           <div *ngIf="warningMessage" class="uk-alert uk-alert-warning" role="alert">{{warningMessage}}</div>
-          <div [style.display]="showLoading ? 'inline' : 'none'" class="uk-animation-fade uk-margin-large-top  uk-width-1-1" role="alert"><img class="loading-gif  uk-align-center" ></div>
+          <div [style.display]="showLoading ? 'inline' : 'none'" class="uk-animation-fade uk-margin-large-top  uk-width-1-1" role="alert"><span class="loading-gif  uk-align-center" ></span></div>
 
           <div *ngIf="!showLoading && !warningMessage">
             <h1 *ngIf="header1">{{header1}}</h1>
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/landingPages/landing-utils/showTitle.component.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/landingPages/landing-utils/showTitle.component.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/landingPages/landing-utils/showTitle.component.ts	(revision 53464)
@@ -4,7 +4,7 @@
 @Component({
     selector: 'showTitle',
     template: `
-        <h2 *ngIf="title != undefined">
+        <h2 *ngIf="title != undefined" class="landingTitle">
             <span   *ngIf="title['url'] != undefined && title['url'] != null && title['url'] != ''"
                     class="custom-external">
 
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/landingPages/landing-utils/fundedBy.component.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/landingPages/landing-utils/fundedBy.component.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/landingPages/landing-utils/fundedBy.component.ts	(revision 53464)
@@ -78,7 +78,7 @@
     public buildFundingTooltip(item: { "id": string, "acronym": string, "title": string,
                         "funderShortname": string, "funderName": string,
                         "funding": string, "code": string, "provenanceAction": string, inline: boolean}) {
-      let tooltipContent: string = "<div class='tooltip-custom-font-size uk-light uk-padding-small'>";
+      let tooltipContent: string = "<div class='tooltip-custom-font-size uk-padding-small'>";
 
       if(item.title) {
           tooltipContent += "<h5>"+item.title+"</h5>";
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/landingPages/publication/publication.component.html
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/landingPages/publication/publication.component.html	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/landingPages/publication/publication.component.html	(revision 53464)
@@ -5,7 +5,7 @@
 <div class="uk-container uk-margin-top publication">
     <div *ngIf="warningMessage.length > 0" class="uk-alert uk-alert-warning  uk-margin-large-top" role="alert">{{warningMessage}}</div>
     <div *ngIf="errorMessage.length > 0" class="uk-alert uk-alert-danger  uk-margin-large-top" role="alert">{{errorMessage}}</div>
-    <div [style.display]="showLoading ? 'inline' : 'none'" class="uk-animation-fade uk-margin-large-top  uk-width-1-1" role="alert"><img class="loading-gif  uk-align-center" ></div>
+    <div [style.display]="showLoading ? 'inline' : 'none'" class="uk-animation-fade uk-margin-large-top  uk-width-1-1" role="alert"><span class="loading-gif  uk-align-center" ></span></div>
 
     <div  *ngIf="publicationInfo != null"  uk-grid class="uk-grid-large">
         <div class="uk-width-expand@m uk-width-1-1@s">
@@ -77,38 +77,12 @@
                 </showSubjects>
                 </li>
               </ul>
-
+              <hr *ngIf="publicationInfo.description">
               <div *ngIf="publicationInfo.description" class="uk-margin-bottom uk-text-justify descriptionText">
                 {{publicationInfo.description}}
               </div>
 
 
-           <!--div class="uk-clearfix"><div class="uk-button-group uk-float-right  uk-margin-top">
-               <button class="uk-button uk-button-small uk-button-action">
-                 <span class="uk-icon" >
-                        <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="link" ratio="1"><path fill="none" stroke="#000" stroke-width="1.1" d="M10.625,12.375 L7.525,15.475 C6.825,16.175 5.925,16.175 5.225,15.475 L4.525,14.775 C3.825,14.074 3.825,13.175 4.525,12.475 L7.625,9.375"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M9.325,7.375 L12.425,4.275 C13.125,3.575 14.025,3.575 14.724,4.275 L15.425,4.975 C16.125,5.675 16.125,6.575 15.425,7.275 L12.325,10.375"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M7.925,11.875 L11.925,7.975"></path></svg></span>
-                 Link this publication to
-               </button>
-               <div class="uk-inline">
-                   <button class="uk-button uk-button-small uk-button-action" type="button">
-                     <span class="uk-icon" >
-                            <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="link" ratio="1"><path fill="none" stroke="#000" stroke-width="1.1" d="M10.625,12.375 L7.525,15.475 C6.825,16.175 5.925,16.175 5.225,15.475 L4.525,14.775 C3.825,14.074 3.825,13.175 4.525,12.475 L7.625,9.375"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M9.325,7.375 L12.425,4.275 C13.125,3.575 14.025,3.575 14.724,4.275 L15.425,4.975 C16.125,5.675 16.125,6.575 15.425,7.275 L12.325,10.375"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M7.925,11.875 L11.925,7.975"></path></svg></span>
-                     Link this publication to
-                     <span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="triangle-down" ratio="1"><polygon points="5 7 15 7 10 12"></polygon></svg></span>
-                   </button>
-                   <div uk-dropdown="mode: click; boundary: ! .uk-button-group; boundary-align: true;"
-                   class="uk-dropdown uk-dropdown-boundary uk-dropdown-bottom-left" style="top: 40px;    left: -236.5px;">
-                       <ul class="uk-nav uk-dropdown-nav uk-padding-small" >
-                           <li><a class="uk-width-1-1" [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[articleId,'publication','project'])"   routerLinkActive="router-link-active" routerLink="/participate/direct-claim" >
-                              Projects</a></li>
-                           <li><a  class="uk-width-1-1"[queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[articleId,'publication','context'])"   routerLinkActive="router-link-active" routerLink="/participate/direct-claim" >
-                              Communities</a></li>
-                           <li><a   class="uk-width-1-1"  [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[articleId,'publication','result'])"   routerLinkActive="router-link-active" routerLink="/participate/direct-claim" >
-                             Other research results</a></li>
-                       </ul>
-                   </div>
-               </div>
-           </div></div-->
 
 
 
@@ -121,9 +95,9 @@
                      <span *ngIf="publicationInfo.references" class="uk-badge uk-badge-notification">
                          {{publicationInfo.references.length | number}}
                      </span> -->
-                     <span class="uk-badge uk-badge-notification">
-                         {{publicationInfo.references.length | number}}
-                     </span>
+                     <!-- <span class="uk-badge uk-badge-notification"> -->
+                         ({{publicationInfo.references.length | number}})
+                     <!-- </span> -->
                  </a>
                  <div class="uk-accordion-content">
                    <!-- <div *ngIf="!publicationInfo.references" class = "uk-alert  uk-alert-primary" >
@@ -159,9 +133,9 @@
                       <span *ngIf="publicationInfo.relatedResearchResults" class="uk-badge uk-badge-notification">
                           {{relatedResearchResultsNum | number}}
                       </span> -->
-                      <span class="uk-badge uk-badge-notification">
-                          {{relatedResearchResultsNum | number}}
-                      </span>
+                      <!-- <span class="uk-badge uk-badge-notification"> -->
+                          ({{relatedResearchResultsNum | number}})
+                      <!-- </span> -->
                   </a>
                   <div class="uk-accordion-content">
                     <!-- <div *ngIf="!publicationInfo.relatedResearchResults" class = "uk-alert  uk-alert-primary">
@@ -170,7 +144,7 @@
                     <div *ngIf="publicationInfo.relatedResearchResults"> -->
                     <div>
                         <div *ngFor="let provenanceaction of getKeys(publicationInfo.relatedResearchResults)">
-                            <div class="uk-text-large uk-margin-bottom">{{provenanceaction}}</div>
+                            <div class="uk-text-large">{{provenanceaction}}</div>
 
                             <tabTable [percentageName]="trust" [info]="publicationInfo.relatedResearchResults.get(provenanceaction)" [(properties)]=properties></tabTable>
                         </div>
@@ -185,9 +159,9 @@
                        <span *ngIf="publicationInfo.similarResearchResults" class="uk-badge uk-badge-notification">
                            {{publicationInfo.similarResearchResults.length | number}}
                        </span> -->
-                       <span class="uk-badge uk-badge-notification">
-                           {{publicationInfo.similarResearchResults.length | number}}
-                       </span>
+                       <!-- <span class="uk-badge uk-badge-notification"> -->
+                           ({{publicationInfo.similarResearchResults.length | number}})
+                       <!-- </span> -->
                    </a>
                    <div class="uk-accordion-content">
                      <!-- <div *ngIf="!publicationInfo.similarResearchResults" class = "uk-alert  uk-alert-primary" >
@@ -208,9 +182,9 @@
                         <span *ngIf="publicationInfo.organizations" class="uk-badge uk-badge-notification">
                             {{publicationInfo.organizations.length | number}}
                         </span> -->
-                        <span class="uk-badge uk-badge-notification">
-                            {{publicationInfo.organizations.length | number}}
-                        </span>
+                        <!-- <span class="uk-badge uk-badge-notification"> -->
+                            ({{publicationInfo.organizations.length | number}})
+                        <!-- </span> -->
                     </a>
                     <div class="uk-accordion-content">
                       <!-- <div *ngIf="!publicationInfo.organizations" class = "uk-alert  uk-alert-primary">
@@ -269,9 +243,9 @@
                          <span *ngIf="publicationInfo.bioentities" class="uk-badge uk-badge-notification">
                              {{publicationInfo.bioentitiesNum | number}}
                          </span> -->
-                         <span class="uk-badge uk-badge-notification">
-                             {{bioentitiesNum | number}}
-                         </span>
+                         <!-- <span class="uk-badge uk-badge-notification"> -->
+                             ({{bioentitiesNum | number}})
+                         <!-- </span> -->
                      </a>
                      <div class="uk-accordion-content">
                        <div *ngIf="publicationInfo.bioentities && bioentitiesNum > pageSize" class="uk-margin-bottom">
@@ -308,9 +282,9 @@
                           <span *ngIf="publicationInfo.software" class="uk-badge uk-badge-notification">
                               {{publicationInfo.software.length | number}}
                           </span> -->
-                          <span class="uk-badge uk-badge-notification">
-                              {{publicationInfo.software.length | number}}
-                          </span>
+                          <!-- <span class="uk-badge uk-badge-notification"> -->
+                              ({{publicationInfo.software.length | number}})
+                          <!-- </span> -->
                       </a>
                       <div class="uk-accordion-content">
                         <div *ngIf="publicationInfo.software && publicationInfo.software.length > pageSize" class="uk-margin-bottom">
@@ -354,292 +328,6 @@
                     </li>
             </ul>
 
-            <!-- <ul class="uk-tab uk-visible@l" uk-tab="connect: #tab-content">
-                <li *ngIf="publicationInfo.references" (click)="activeTab='References'"
-                    [class]="activeTab == 'References'?'uk-active':''">
-                    <a>
-                        References
-                        <span *ngIf="publicationInfo.references" class="uk-badge uk-badge-notification">
-                            {{publicationInfo.references.length | number}}
-                        </span>
-                    </a>
-                </li>
-                <li *ngIf="publicationInfo.relatedResearchResults" (click)="activeTab='Related Research Results'"
-                    [class]="activeTab == 'Related Research Results'?'uk-active':''">
-                    <a>
-                        Related Research Results
-                        <span class="uk-badge uk-badge-notification">
-                            {{relatedResearchResultsNum | number}}
-                        </span>
-                    </a>
-                </li>
-                <li *ngIf="publicationInfo.similarResearchResults" (click)="activeTab='Similar Research Results'"
-                    [class]="activeTab == 'Similar Research Results'?'uk-active':''">
-                    <a>
-                        Similar Research Results
-                        <span *ngIf="!publicationInfo.similarResearchResults" class="uk-badge uk-badge-notification">0</span>
-                        <span *ngIf="publicationInfo.similarResearchResults" class="uk-badge uk-badge-notification">
-                            {{publicationInfo.similarResearchResults.length | number}}
-                        </span>
-                    </a>
-                </li>
-                <li *ngIf="publicationInfo.organizations" (click)="activeTab='Related Organizations'"
-                    [class]="activeTab == 'Related Organizations'?'uk-active':''">
-                    <a>
-                        Related Organizations
-                        <span *ngIf="!publicationInfo.organizations" class="uk-badge uk-badge-notification">0</span>
-                        <span *ngIf="publicationInfo.organizations" class="uk-badge uk-badge-notification">
-                            {{publicationInfo.organizations.length | number}}
-                        </span>
-                    </a>
-                </li>
-                <li *ngIf="publicationInfo.bioentities" (click)="activeTab='Bioentities'"
-                    [class]="activeTab == 'Bioentities'?'uk-active':''">
-                    <a>
-                        Bioentities
-                        <span class="uk-badge uk-badge-notification">{{bioentitiesNum | number}}</span>
-                    </a>
-                </li>
-                <li *ngIf="publicationInfo.software" (click)="activeTab='Software'"
-                    [class]="activeTab == 'Software'?'uk-active':''">
-                    <a>
-                        Software
-                        <span class="uk-badge uk-badge-notification">{{publicationInfo.software.length | number}}</span>
-                    </a>
-                </li>
-                <li (click)="metricsClicked=true; activeTab='Metrics'"
-                    [class]="activeTab == 'Metrics'?'uk-active':''">
-                    <a>
-                        Metrics
-                    </a>
-                </li>
-            </ul> -->
-
-            <!-- <button class="uk-button uk-button-default uk-hidden@l" type="button">
-              <span uk-navbar-toggle-icon></span> <span class="uk-margin-small-left">{{activeTab}}</span>
-            </button>
-
-            <ul id="toggle-small-tabs" class="uk-subnav uk-subnav-pill uk-dropdown uk-hidden@l" uk-switcher="connect: #tab-content" uk-dropdown="mode: click" uk-toggle="target: #toggle-small-tabs">
-                <li *ngIf="publicationInfo.references" (click)="activeTab='References'"
-                    [class]="activeTab == 'References'?'uk-active':''">
-                  <a>
-                    References
-                    <span *ngIf="!publicationInfo.references" class="uk-badge uk-badge-notification">0</span>
-                    <span *ngIf="publicationInfo.references" class="uk-badge uk-badge-notification">
-                        {{publicationInfo.references.length | number}}
-                    </span>
-                  </a>
-                </li>
-                <li *ngIf="publicationInfo.relatedResearchResults" (click)="activeTab='Related Research Results'"
-                    [class]="activeTab == 'Related Research Results'?'uk-active':''">
-                  <a>
-                    Related Research Results
-                    <span class="uk-badge uk-badge-notification">
-                        {{relatedResearchResultsNum | number}}
-                    </span>
-                  </a>
-                </li>
-                <li *ngIf="publicationInfo.similarResearchResults" (click)="activeTab='Similar Research Results'"
-                    [class]="activeTab == 'Similar Research Results'?'uk-active':''">
-                  <a>
-                    Similar Research Results
-                    <span *ngIf="!publicationInfo.similarResearchResults" class="uk-badge uk-badge-notification">0</span>
-                    <span *ngIf="publicationInfo.similarResearchResults" class="uk-badge uk-badge-notification">
-                        {{publicationInfo.similarResearchResults.length | number}}
-                    </span>
-                  </a>
-                </li>
-                <li *ngIf="publicationInfo.organizations" (click)="activeTab='Related Organizations'"
-                    [class]="activeTab == 'Related Organizations'?'uk-active':''">
-                  <a>
-                    Related Organizations
-                    <span *ngIf="!publicationInfo.organizations" class="uk-badge uk-badge-notification">0</span>
-                    <span *ngIf="publicationInfo.organizations" class="uk-badge uk-badge-notification">
-                        {{publicationInfo.organizations.length | number}}
-                    </span>
-                  </a>
-                </li>
-                <li *ngIf="publicationInfo.bioentities" (click)="activeTab='Bioentities'"
-                    [class]="activeTab == 'Bioentities'?'uk-active':''">
-                  <a>
-                    Bioentities
-                    <span class="uk-badge uk-badge-notification">{{bioentitiesNum | number}}</span>
-                  </a>
-                </li>
-                <li *ngIf="publicationInfo.software" (click)="activeTab='Software'"
-                    [class]="activeTab == 'Software'?'uk-active':''">
-                  <a>
-                    Software
-                    <span class="uk-badge uk-badge-notification">{{publicationInfo.software.length | number}}</span>
-                  </a>
-                </li>
-                <li (click)="metricsClicked=true; activeTab='Metrics'"
-                    [class]="activeTab == 'Metrics'?'uk-active':''">
-                  <a>
-                    Metrics
-                  </a>
-                </li>
-            </ul> -->
-
-            <!-- <div class="uk-margin custom-tab-content">
-                <div *ngIf="activeTab == 'References'" class="uk-animation-fade">
-                    <div *ngIf="!publicationInfo.references" class = "uk-alert  uk-alert-primary" >
-                        No references available
-                    </div>
-
-                    <div *ngIf="publicationInfo.references">
-
-                        <div *ngIf="publicationInfo.references && publicationInfo.references.length > pageSize" class="uk-margin-bottom">
-                          <span class="uk-h6">{{publicationInfo.references.length | number}} references, page {{referencesPage | number}} of {{totalPages(publicationInfo.references.length) | number}}</span>
-                          <paging-no-load class="uk-float-right" [currentPage]="referencesPage" [totalResults]="publicationInfo.references.length" [size]="pageSize" (pageChange)="updateReferencesPage($event)"></paging-no-load>
-                        </div>
-
-                        <div *ngFor="let item of publicationInfo.references.slice((referencesPage-1)*pageSize, referencesPage*pageSize)">
-                            <p *ngIf=" item && item['url']"
-                                class="custom-external custom-icon">
-                                <a href="{{item['url']}}" target="_blank">
-                                    {{item['name']}}
-                                </a>
-                            </p>
-                            <p  *ngIf="!item['url']" class="pseudo-external custom-icon">
-                                {{item['name']}}
-                            </p>
-                        </div>
-                    </div>
-                </div>
-
-                <div *ngIf="activeTab == 'Related Research Results'" class="uk-animation-fade">
-                    <div *ngIf="!publicationInfo.relatedResearchResults" class = "uk-alert  uk-alert-primary">
-                        No related research results available
-                    </div>
-                    <div *ngIf="publicationInfo.relatedResearchResults">
-                        <div *ngFor="let provenanceaction of getKeys(publicationInfo.relatedResearchResults)">
-                            <div class="uk-text-large uk-margin-bottom">{{provenanceaction}}</div>
-
-                            <tabTable [percentageName]="trust" [info]="publicationInfo.relatedResearchResults.get(provenanceaction)" [(properties)]=properties></tabTable>
-                        </div>
-                    </div>
-                </div>
-
-
-                <div *ngIf="activeTab == 'Similar Research Results'" class="uk-animation-fade">
-                    <div *ngIf="!publicationInfo.similarResearchResults" class = "uk-alert  uk-alert-primary">
-                        No similar research results available
-                    </div>
-                    <div *ngIf="publicationInfo.similarResearchResults">
-
-                        <tabTable [percentageName]="similarity" [info]="publicationInfo.similarResearchResults" [(properties)]=properties></tabTable>
-                    </div>
-                </div>
-
-                <div *ngIf="activeTab == 'Related Organizations'" class="uk-animation-fade">
-                    <div *ngIf="!publicationInfo.organizations" class = "uk-alert  uk-alert-primary">
-                        No related organizations available
-                    </div>
-                    <div *ngIf="publicationInfo.organizations">
-                        <div *ngIf="publicationInfo.organizations && publicationInfo.organizations.length > pageSize" class="uk-margin-bottom">
-                          <span class="uk-text-bold">{{publicationInfo.organizations.length | number}} organizations, page {{organizationsPage | number}} of {{totalPages(publicationInfo.organizations.length) | number}}</span>
-                          <paging-no-load class="uk-float-right" [currentPage]="organizationsPage" [totalResults]="publicationInfo.organizations.length" [size]="pageSize" (pageChange)="updateOrganizationsPage($event)"></paging-no-load>
-                        </div>
-
-                        <table class="uk-table uk-table-small uk-table-divider uk-table-middle ">
-                            <tbody>
-                                <tr *ngFor="let organization of publicationInfo.organizations.slice((organizationsPage-1)*pageSize, organizationsPage*pageSize)">
-                                    <td>
-                                        <a *ngIf="(organization['id']) && ((organization['name']) || (organization['shortname']))"
-                                            [queryParams]="{organizationId: organization.id}" routerLinkActive="router-link-active" routerLink="/search/organization">
-                                                {{organization['name']}}
-                                                <span *ngIf="organization.name && organization.shortname"> ( </span>
-                                                <span *ngIf="organization.shortname">{{organization.shortname}}</span>
-                                                <span *ngIf="organization.name && organization.shortname"> ) </span>
-                                        </a>
-                                        <p *ngIf="(!organization['id']) && ((organization['name']) || (organization['shortname']))">
-                                            {{organization['name']}}
-                                            <span *ngIf="organization.name && organization.shortname"> ( </span>
-                                            <span *ngIf="organization.shortname">{{organization.shortname}}</span>
-                                            <span *ngIf="organization.name && organization.shortname"> ) </span>
-                                        </p>
-                                        <div *ngIf="organization.country">{{organization.country}}</div>
-                                        <div *ngIf="organization.websiteUrl">Website url:
-                                            <a href="{{organization.websiteUrl}}" target="_blank">{{organization.websiteUrl}}</a>
-                                        </div>
-                                    </td>
-                                    <td>
-                                        <div *ngIf="organization['trust']" title="{{organization['trust']}}%" >
-                                          <div class="uk-text-center">{{organization['trust']}}%</div>
-                                          <progress class="uk-progress uk-margin-remove" value="{{organization['trust']}}" max="100"></progress>
-                                        </div>
-                                        <div *ngIf="!organization['trust']">
-                                            <p>no trust available</p>
-                                        </div>
-                                    </td>
-                                </tr>
-                            </tbody>
-                        </table>
-
-
-                    </div>
-                </div>
-
-                <div *ngIf="activeTab=='Bioentities'" class="uk-animation-fade">
-                    <div *ngIf="publicationInfo.bioentities && bioentitiesNum > pageSize" class="uk-margin-bottom">
-                      <span class="uk-text-bold"> {{bioentitiesNum | number}} bioentities, page {{bioentitiesPage | number}} of {{totalPages(bioentitiesNum) | number}}</span>
-                      <paging-no-load class="uk-float-right" [currentPage]="bioentitiesPage" [totalResults]="bioentitiesNum" [size]="pageSize" (pageChange)="updateBioentitiesPage($event)"></paging-no-load>
-                    </div>
-
-                    <table id="bioentitiesTable" class="uk-table ">
-                        <tbody>
-                          <ng-container *ngFor="let key of getKeys(publicationInfo.bioentities) let i=index">
-                              <tr *ngFor="let keyIn of keysToArray(publicationInfo.bioentities.get(key)).slice((bioentitiesPage-1)*pageSize, bioentitiesPage*pageSize)">
-                                  <td class="uk-text-center" *ngIf="keyIn">
-                                      <span class="custom-external custom-icon">
-                                          <a href="{{publicationInfo.bioentities.get(key).get(keyIn)}}"
-                                              target="_blank">
-                                              {{keyIn}}
-                                          </a>
-                                      </span>
-                                  </td>
-                                  <td class="uk-text-center">
-                                      {{key}}
-                                  </td>
-                              </tr>
-                            </ng-container>
-                        </tbody>
-                    </table>
-                </div>
-                <div *ngIf="activeTab == 'Software'" class="uk-animation-fade">
-                    <div *ngIf="publicationInfo.software && publicationInfo.software.length > pageSize" class="uk-margin-bottom">
-                      <span class="uk-text-bold">{{publicationInfo.software.length | number}} software results, page {{softwarePage | number}} of {{totalPages(publicationInfo.software.length) | number}}</span>
-                      <paging-no-load class="uk-float-right" [currentPage]="softwarePage" [totalResults]="publicationInfo.software.length" [size]="pageSize" (pageChange)="updateSoftwarePage($event)"></paging-no-load>
-                    </div>
-
-                    <table id="softwareTable" class="uk-table ">
-                        <tbody>
-                            <tr *ngFor="let item of publicationInfo.software.slice((softwarePage-1)*pageSize, softwarePage*pageSize)" class="uk-text-center">
-                                <td>
-                                    <span class="custom-external custom-icon">
-                                        <a href="{{item.url}}" target="_blank">
-                                            {{item.name}}
-                                        </a>
-                                    </span>
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </div>
-                <div *ngIf="activeTab == 'Metrics'" class="uk-animation-fade">
-                    <metrics [pageViews]="pageViews"
-                        [id]="articleId" [entityType]="'results'" [entity]="'Publication'"
-                        (metricsResults)="metricsResults($event)" [(properties)] = properties>
-                    </metrics>
-                    <i-frame *ngIf="metricsClicked && totalViews>0"
-                        [url]=viewsFrameUrl width="100%" height="250">
-                    </i-frame>
-                    <i-frame *ngIf="metricsClicked && totalDownloads>0"
-                        [url]=downloadsFrameUrl width="100%" height="250">
-                    </i-frame>
-                </div>
-          </div> -->
         </div>
 
         <div class="uk-width-large@m uk-width-1-1@s">
@@ -651,7 +339,7 @@
           <altmetrics  *ngIf="publicationInfo.identifiers && publicationInfo.identifiers.get('doi')"
               id="{{publicationInfo.identifiers.get('doi')[0]}}" type="doi">
           </altmetrics>
-            <ul class="uk-list">
+            <ul class="uk-list uk-margin-remove-bottom">
                 <li *ngIf="publicationInfo.hostedBy_collectedFrom && publicationInfo.hostedBy_collectedFrom.length > 0">
                     <availableOn [availableOn]="publicationInfo.hostedBy_collectedFrom"></availableOn>
                 </li>
@@ -684,82 +372,50 @@
                   </metrics-->
                 </li>
                 <li>
-                  <ul uk-accordion class="uk-padding-remove citation-accordion">
-                      <li>
-                        <div class=" sideInfoTitle uk-accordion-title cite-this-button uk-width-1-1" type="button">
-                          Cite this publication
-                        </div>
-                          <div class="uk-accordion-content">
+
+                          <div class=" sideInfoTitle  cite-this-button uk-width-1-1" type="button">
+                            Cite this publication
+                          </div>
+                          <div class=" ">
                             <citeThis [result]="publicationInfo" [id]="articleId" type="publication"></citeThis>
                           </div>
-                      </li>
-                  </ul>
-
                 </li>
             </ul>
-          </div>
-        </div>
-    </div>
-    <!-- Claiming FAB -->
 
-     <!--div   class=" uk-width-1-1 linkButtonsBox  " style="z-index: 200; bottom: 0px; position: fixed; right: 0px; ">
-       <div class="uk-align-center uk-width-large uk-margin-small-top uk-margin-small-bottom">
-       <span class="uk-icon">
-            <svg icon="link" ratio="1" xmlns="http://www.w3.org/2000/svg" width="25" viewBox="0 0 20 20" height="25"><path d="M10.625,12.375 L7.525,15.475 C6.825,16.175 5.925,16.175 5.225,15.475 L4.525,14.775 C3.825,14.074 3.825,13.175 4.525,12.475 L7.625,9.375" fill="none" stroke="#000" stroke-width="1.1"></path><path d="M9.325,7.375 L12.425,4.275 C13.125,3.575 14.025,3.575 14.724,4.275 L15.425,4.975 C16.125,5.675 16.125,6.575 15.425,7.275 L12.325,10.375" fill="none" stroke="#000" stroke-width="1.1"></path><path d="M7.925,11.875 L11.925,7.975" fill="none" stroke="#000" stroke-width="1.1"></path></svg>
-          </span> Link this publication to
-          <a   class="   uk-icon-button uk-button-primary  shadowBox"  style="padding: 6px;" [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[articleId,'publication','project'])"   routerLinkActive="router-link-active" routerLink="/participate/direct-claim"
-          uk-tooltip="pos:left;" title="<div class='tooltip-custom-font-size uk-light  '>Projects</div>" >
-            <span class="uk-icon" >
-               <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="album" ratio="1"><rect x="5" y="2" width="10" height="1"></rect><rect x="3" y="4" width="14" height="1"></rect><rect fill="none" stroke="#000" x="1.5" y="6.5" width="17" height="11"></rect></svg></span>
-          </a>
-          <a   class="   uk-icon-button uk-button-primary  shadowBox"  style="padding: 6px;" [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[articleId,'publication','context'])"   routerLinkActive="router-link-active" routerLink="/participate/direct-claim"
-           uk-tooltip="pos:left;" title="<div class='tooltip-custom-font-size uk-light '>Communities</div>">
-            <span class="uk-icon"  >
-                 <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="users" ratio="1"><circle fill="none" stroke="#000" stroke-width="1.1" cx="7.7" cy="8.6" r="3.5"></circle><path fill="none" stroke="#000" stroke-width="1.1" d="M1,18.1 C1.7,14.6 4.4,12.1 7.6,12.1 C10.9,12.1 13.7,14.8 14.3,18.3"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M11.4,4 C12.8,2.4 15.4,2.8 16.3,4.7 C17.2,6.6 15.7,8.9 13.6,8.9 C16.5,8.9 18.8,11.3 19.2,14.1"></path></svg></span>
-          </a>
-          <a   class="   uk-icon-button uk-button-primary  shadowBox"  style="padding: 6px;" [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[articleId,'publication','result'])"   routerLinkActive="router-link-active" routerLink="/participate/direct-claim"
-          uk-tooltip="pos:left;" title="<div class='tooltip-custom-font-size uk-light uk-margin-small'>Other research results</div>">
-            <span class="uk-icon" >
-                 <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="copy" ratio="1"><rect fill="none" stroke="#000" x="3.5" y="2.5" width="12" height="16"></rect><polyline fill="none" stroke="#000" points="5 0.5 17.5 0.5 17.5 17"></polyline></svg></span>
-          </a>
-        </div>
-     </div-->
-    <div class="uk-inline">
+            <button  class="  uk-button portal-button   uk-width-1-1 ">
+             <span class="uk-icon">
+                  <svg icon="link" ratio="1" xmlns="http://www.w3.org/2000/svg" width="25" viewBox="0 0 20 20" height="25"><path d="M10.625,12.375 L7.525,15.475 C6.825,16.175 5.925,16.175 5.225,15.475 L4.525,14.775 C3.825,14.074 3.825,13.175 4.525,12.475 L7.625,9.375" fill="none" stroke="#000" stroke-width="1.1"></path><path d="M9.325,7.375 L12.425,4.275 C13.125,3.575 14.025,3.575 14.724,4.275 L15.425,4.975 C16.125,5.675 16.125,6.575 15.425,7.275 L12.325,10.375" fill="none" stroke="#000" stroke-width="1.1"></path><path d="M7.925,11.875 L11.925,7.975" fill="none" stroke="#000" stroke-width="1.1"></path></svg>
+                </span> Link this publication to...
+           </button>
 
+           <div   class=" uk-margin-remove-top uk-padding-small" uk-dropdown="pos: bottom-left; mode:click" style="background: transparent !important;box-shadow: none; max-width: 70px !important; min-width: 70px !important;">
+               <ul class="uk-iconnav uk-iconnav-vertical">
+                 <li  uk-tooltip="pos:right;" title="<div class='tooltip-custom-font-size   '>Projects</div>">
+                   <a   class="      uk-icon-button portal-button shadowBox"  style="padding: 6px;" [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[articleId,'publication','project'])"   routerLinkActive="router-link-active" routerLink="/participate/direct-claim">
+                     <span class="uk-icon" >
+                        <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="album" ratio="1"><rect x="5" y="2" width="10" height="1"></rect><rect x="3" y="4" width="14" height="1"></rect><rect fill="none" stroke="#000" x="1.5" y="6.5" width="17" height="11"></rect></svg></span>
+                   </a>
+                 </li>
+                  <li  uk-tooltip="pos:right;" title="<div class='tooltip-custom-font-size  '>Communities</div>">
+                    <a   class="     uk-icon-button portal-button shadowBox"  style="padding: 6px;" [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[articleId,'publication','context'])"   routerLinkActive="router-link-active" routerLink="/participate/direct-claim" >
+                      <span class="uk-icon"  >
+                           <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="users" ratio="1"><circle fill="none" stroke="#000" stroke-width="1.1" cx="7.7" cy="8.6" r="3.5"></circle><path fill="none" stroke="#000" stroke-width="1.1" d="M1,18.1 C1.7,14.6 4.4,12.1 7.6,12.1 C10.9,12.1 13.7,14.8 14.3,18.3"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M11.4,4 C12.8,2.4 15.4,2.8 16.3,4.7 C17.2,6.6 15.7,8.9 13.6,8.9 C16.5,8.9 18.8,11.3 19.2,14.1"></path></svg></span>
+                    </a>
+                  </li>
+                  <li uk-tooltip="pos:right;" title="<div class='tooltip-custom-font-size uk-margin-small'>Other research results</div>">
+                    <a   class="    uk-icon-button portal-button shadowBox"  style="padding: 6px;" [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[articleId,'publication','result'])"   routerLinkActive="router-link-active" routerLink="/participate/direct-claim" >
+                      <span class="uk-icon" >
+                           <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="copy" ratio="1"><rect fill="none" stroke="#000" x="3.5" y="2.5" width="12" height="16"></rect><polyline fill="none" stroke="#000" points="5 0.5 17.5 0.5 17.5 17"></polyline></svg></span>
+                    </a>
+                  </li>
 
-       <div   class="   uk-float-right  " style="z-index: 200; bottom: 55px; position: fixed; right: 45%;">
-          <button  class="   uk-button uk-button-danger shadowBox ">
-           <span class="uk-icon">
-                <svg icon="link" ratio="1" xmlns="http://www.w3.org/2000/svg" width="25" viewBox="0 0 20 20" height="25"><path d="M10.625,12.375 L7.525,15.475 C6.825,16.175 5.925,16.175 5.225,15.475 L4.525,14.775 C3.825,14.074 3.825,13.175 4.525,12.475 L7.625,9.375" fill="none" stroke="#000" stroke-width="1.1"></path><path d="M9.325,7.375 L12.425,4.275 C13.125,3.575 14.025,3.575 14.724,4.275 L15.425,4.975 C16.125,5.675 16.125,6.575 15.425,7.275 L12.325,10.375" fill="none" stroke="#000" stroke-width="1.1"></path><path d="M7.925,11.875 L11.925,7.975" fill="none" stroke="#000" stroke-width="1.1"></path></svg>
-              </span> Link this publication to
-         </button>
+              </ul>
+           </div>
+          </div>
 
-       <div   uk-dropdown="pos: top-right; mode:click" style="background: transparent !important;box-shadow: none; max-width: 70px !important; min-width: 70px !important;">
-           <ul class="uk-iconnav uk-iconnav-vertical">
-             <li  uk-tooltip="pos:left;" title="<div class='tooltip-custom-font-size uk-light  '>Projects</div>">
-               <a   class="   uk-icon-button uk-button-primary  shadowBox"  style="padding: 6px;" [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[articleId,'publication','project'])"   routerLinkActive="router-link-active" routerLink="/participate/direct-claim">
-                 <span class="uk-icon" >
-                    <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="album" ratio="1"><rect x="5" y="2" width="10" height="1"></rect><rect x="3" y="4" width="14" height="1"></rect><rect fill="none" stroke="#000" x="1.5" y="6.5" width="17" height="11"></rect></svg></span>
-               </a>
-             </li>
-              <li  uk-tooltip="pos:left;" title="<div class='tooltip-custom-font-size uk-light '>Communities</div>">
-                <a   class="   uk-icon-button uk-button-primary  shadowBox"  style="padding: 6px;" [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[articleId,'publication','context'])"   routerLinkActive="router-link-active" routerLink="/participate/direct-claim" >
-                  <span class="uk-icon"  >
-                       <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="users" ratio="1"><circle fill="none" stroke="#000" stroke-width="1.1" cx="7.7" cy="8.6" r="3.5"></circle><path fill="none" stroke="#000" stroke-width="1.1" d="M1,18.1 C1.7,14.6 4.4,12.1 7.6,12.1 C10.9,12.1 13.7,14.8 14.3,18.3"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M11.4,4 C12.8,2.4 15.4,2.8 16.3,4.7 C17.2,6.6 15.7,8.9 13.6,8.9 C16.5,8.9 18.8,11.3 19.2,14.1"></path></svg></span>
-                </a>
-              </li>
-              <li uk-tooltip="pos:left;" title="<div class='tooltip-custom-font-size uk-light uk-margin-small'>Other research results</div>">
-                <a   class="   uk-icon-button uk-button-primary  shadowBox"  style="padding: 6px;" [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[articleId,'publication','result'])"   routerLinkActive="router-link-active" routerLink="/participate/direct-claim" >
-                  <span class="uk-icon" >
-                       <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="copy" ratio="1"><rect fill="none" stroke="#000" x="3.5" y="2.5" width="12" height="16"></rect><polyline fill="none" stroke="#000" points="5 0.5 17.5 0.5 17.5 17"></polyline></svg></span>
-                </a>
-              </li>
-
-          </ul>
-       </div>
-       </div>
+        </div>
     </div>
-
+   
 </div>
 </div>
 </div>
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/landingPages/landing-utils/citeThis/citeThis.component.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/landingPages/landing-utils/citeThis/citeThis.component.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/landingPages/landing-utils/citeThis/citeThis.component.ts	(revision 53464)
@@ -13,9 +13,10 @@
       <!--dt class="title">Cite this {{type}}</dt-->
       <dd class="line"  >
         <select class="select" id="citations" name="citeselect" [(ngModel)]="selectedStyle" (ngModelChange)="styleChanged()">
+          <option   value="0">select a citation style</option>
           <option *ngFor=" let  style of this.citation.templates let i = index" [value]="style">{{style}}</option>
         </select>
-        <div id="citation" class="box-content uk-padding-small" [innerHTML]=citationText></div>
+        <div *ngIf="selectedStyle!='0'" id="citation" class="box-content uk-padding-small" [innerHTML]=citationText></div>
       </dd>
     </dl>
   </div>
@@ -23,7 +24,7 @@
 })
 export class CiteThisComponent {
   private sub:any;
-  public selectedStyle:string;
+  public selectedStyle:string="0";
   public citationText:string;
   public citation:Citation = new Citation();
   // public cite: any;
@@ -35,7 +36,7 @@
 
 
   constructor(private route: ActivatedRoute) {
-    this.selectedStyle = this.citation.templates[0];
+    // this.selectedStyle = this.citation.templates[0];
   }
 
   ngOnInit() {
@@ -138,7 +139,7 @@
        }
     };
 
-    var citeproc = new CSL.Engine(new Sys(this.citation.locale,  this.data ), this.citation[this.selectedStyle]);
+    var citeproc = new CSL.Engine(new Sys(this.citation.locale,  this.data ), this.citation[(this.selectedStyle == "0")?this.citation.templates[0]:this.selectedStyle]);
     citeproc.updateItems([this.data.id]);
     this.citationText = citeproc.makeBibliography();
     this.citationText = ((this.citationText != null) && (this.citationText.length > 1) && (this.citationText[1].length > 0)) ? this.citationText[1][0] : '';
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/utils/subscribe/subscribe.service.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/utils/subscribe/subscribe.service.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/utils/subscribe/subscribe.service.ts	(revision 53464)
@@ -19,6 +19,9 @@
                        .map(res =>  ((<any>res =="")?{}:<any> res.json()))
 
                        .map(res => {
+                         if(res.status && res.status != 200) {
+                           return null;
+                         }
                          if(res.subscribers && res.subscribers != null){
 
                            for(var i =0; i< res.subscribers.length; i++ ){
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/utils/number-utils.class.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/utils/number-utils.class.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/utils/number-utils.class.ts	(revision 53464)
@@ -6,21 +6,22 @@
   public static roundNumber(num: number):any {
       console.log("Trying to round number: "+ num);
       var roundNum = null;
+      var initialNum = num;
       if(num >= 1000000){
         num=num/1000000;
         num= Math.round(num);
-        roundNum =  { "number": num, "size": "mi" };
+        roundNum =  { "number": num, "size": "mi", count: initialNum};
       }else if( num >= 10000){
         num=num/1000;
         num= Math.round(num);
-        roundNum =  { "number": num, "size": "K" };
+        roundNum =  { "number": num, "size": "K", count: initialNum};
       }else if (num >= 100) {
         num=num/100;
         num= Math.round(num);
         num=num*100;
-        roundNum =  { "number": num, "size": "" };
+        roundNum =  { "number": num, "size": "" , count: initialNum};
       }else{
-        roundNum =  { "number": num, "size": "" };
+        roundNum =  { "number": num, "size": "" , count: initialNum};
       }
       console.log("Rounded number: "+ roundNum.number + " "+ roundNum.size);
       return roundNum;
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/utils/properties/errorCodes.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/utils/properties/errorCodes.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/utils/properties/errorCodes.ts	(revision 53464)
@@ -7,4 +7,5 @@
   public OUT_OF_BOUND = 5;
   public NOT_FOUND = 6;
   public NOT_SAVED = 7;
+  public FORBIDDEN = 8;
 }
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/utils/entities/dataProviderInfo.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/utils/entities/dataProviderInfo.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/utils/entities/dataProviderInfo.ts	(revision 53464)
@@ -10,16 +10,18 @@
     originalId: string;
     countries: string[];
 
-    aggregationStatus: {"fundedContent": string, "indexRecords": string}; //collected from datasource api
+    aggregationStatus: {"fundedContent": string, "indexRecords": string, "fulltexts": string}; //collected from datasource api
 
     tabs: {"name": string, "content": string}[];
     tabs2: string[] =[];
     tabsInTypes = {
         "publicationsTab": new Set<string>(
-                        [   "aggregator::pubsrepository::institutional",
+                        [   "aggregator::datarepository",
+                            "aggregator::pubsrepository::institutional",
                             "aggregator::pubsrepository::unknown",
                             "aggregator::pubsrepository::journals",
                             "crissystem",
+                            "datarepository::unknown",
                             "infospace",
                             "pubsrepository::institutional",
                             "pubsrepository::journal",
@@ -27,17 +29,15 @@
                             "scholarcomminfra",
                             "pubsrepository::thematic",
                             "pubscatalogue::unknown",
-
-                            "aggregator::datarepository",
-                            "crissystem",
-                            "datarepository::unknown",
                             "orprepository"
                         ]),
         "datasetsTab": new Set<string>(
-                        [   "aggregator::pubsrepository::institutional",
+                        [   "aggregator::datarepository",
+                            "aggregator::pubsrepository::institutional",
                             "aggregator::pubsrepository::unknown",
                             "aggregator::pubsrepository::journals",
                             "crissystem",
+                            "datarepository::unknown",
                             "infospace",
                             "pubsrepository::institutional",
                             "pubsrepository::journal",
@@ -44,11 +44,6 @@
                             "pubsrepository::unknown",
                             "scholarcomminfra",
                             "pubsrepository::thematic",
-                            "pubscatalogue::unknown",
-
-                            "aggregator::datarepository",
-                            "crissystem",
-                            "datarepository::unknown",
                             "orprepository"
                         ]),
         "statisticsTab": new Set<string>(
@@ -79,10 +74,12 @@
                         ]),
         "softwareTab": new Set<string>(
                         [
-                          /*  "aggregator::datarepository",
+                            "aggregator::datarepository",
                             "aggregator::pubsrepository::institutional",
                             "aggregator::pubsrepository::unknown",
                             "aggregator::pubsrepository::journals",
+                            "crissystem",
+                            "datarepository::unknown",
                             "infospace",
                             "pubsrepository::institutional",
                             "pubsrepository::journal",
@@ -91,14 +88,16 @@
                             "pubsrepository::thematic",
                             "softwarerepository",
                             "aggregator::softwarerepository",
-                            "orprepository"*/
+                            "orprepository"
                         ]),
           "orpsTab": new Set<string>(
                           [
-                          /*  "aggregator::datarepository",
+                            "aggregator::datarepository",
                             "aggregator::pubsrepository::institutional",
                             "aggregator::pubsrepository::unknown",
                             "aggregator::pubsrepository::journals",
+                            "crissystem",
+                            "datarepository::unknown",
                             "infospace",
                             "pubsrepository::institutional",
                             "pubsrepository::journal",
@@ -107,7 +106,7 @@
                             "pubsrepository::thematic",
                             "softwarerepository",
                             "aggregator::softwarerepository",
-                            "orprepository"*/
+                            "orprepository"
                           ])
         /*
         ,
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/deposit/datasets/depositBySubject.component.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/deposit/datasets/depositBySubject.component.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/deposit/datasets/depositBySubject.component.ts	(revision 53464)
@@ -14,12 +14,12 @@
     template: `
         <div class="uk-margin-large-top">
 
-                <h3>Or search for domain specific repositories</h3>
+                <h5>Or search for domain specific repositories</h5>
 
                 <form class= "uk-grid">
                     <input type="text"  [(ngModel)]="subjectKeyword"  class="uk-margin-medium-left uk-padding-remove-left  uk-input" name="subject" placeholder="Type keywords (e.g Biology, Natural sciences, Social Sciences, Engineering Sciences... )"  style="width: 580px;" />
 
-                    <button class=" uk-button uk-button-danger"  type="submit" (click)="search()" >
+                    <button class=" uk-button portal-button"  type="submit" (click)="search()" >
                         Search
                     </button>
                 </form>
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/utils/errorMessages.component.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/utils/errorMessages.component.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/utils/errorMessages.component.ts	(revision 53464)
@@ -5,7 +5,7 @@
     selector: 'errorMessages',
     template: `
       <div *ngIf="status.some(checkErroCode(errorCodes.LOADING))"
-            [class]="(tab_error_class ? '' : 'uk-animation-fade') + ' uk-margin-top  uk-width-1-1'" role="alert"><img class="loading-gif  uk-align-center" ></div>
+            [class]="(tab_error_class ? '' : 'uk-animation-fade') + ' uk-margin-top  uk-width-1-1'" role="alert"><span class="loading-gif  uk-align-center" ></span></div>
       <div *ngIf="status.every(checkErroCode(errorCodes.NONE))"
             [class]="(tab_error_class ? 'uk-margin-top' : 'uk-animation-fade') + ' uk-alert uk-alert-primary'" role="alert">No {{type}} available</div>
       <div *ngIf="status.every(checkErroCode(errorCodes.ERROR)) ||
@@ -29,6 +29,9 @@
       <div *ngIf="status.some(checkErroCode(errorCodes.NOT_SAVED))"
             [class]="(tab_error_class ? 'uk-margin-top' : 'uk-animation-fade') + ' uk-alert uk-alert-warning'" role="alert">Changes could not be saved
       </div>
+      <div *ngIf="status.some(checkErroCode(errorCodes.FORBIDDEN))"
+            [class]="(tab_error_class ? 'uk-margin-top' : 'uk-animation-fade') + 'uk-alert uk-alert-danger'" role="alert">You are not allowed to access this page
+      </div>
     `
   })
 
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/utils/properties/environment-specific.service.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/utils/properties/environment-specific.service.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/utils/properties/environment-specific.service.ts	(revision 53464)
@@ -20,7 +20,8 @@
 
   private serverUrl = "http://scoobydoo.di.uoa.gr:4000";
   // private serverUrl = "https://explore.openaire.eu";
-  // private serverUrl = "https://beta.connect.openaire.eu";
+  // private serverUrl = "https://connect.openaire.eu";
+  // private serverUrl = "https://test.explore.openaire.eu";
   constructor(private http: Http,  @Inject(PLATFORM_ID) private platformId: string) {
       this.testBrowser = isPlatformBrowser(platformId);
       if (this.testBrowser) {
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/deposit/deposit.component.html
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/deposit/deposit.component.html	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/deposit/deposit.component.html	(revision 53464)
@@ -26,7 +26,7 @@
               <a href="{{helpdesk}}" target="_blank">ask a question (<i class="custom-external"></i>)</a> to OpenAIRE’s national representative.
           </p>
         </div-->
-          <h3>See if your institution has a repository </h3>
+          <h5>See if your institution has a repository </h5>
 
           <form class= "uk-grid">
               <div class="uk-width-1-2 ">
@@ -35,7 +35,7 @@
                 (selectedValueChanged)="valueChanged($event)">
               </entities-autocomplete>
               </div>
-              <button class=" uk-margin-left uk-button uk-button-danger"  type="submit" (click)="organizationSelected(selectedId)" >
+              <button class=" uk-margin-left uk-button portal-button"  type="submit" (click)="organizationSelected(selectedId)" >
                   Locate
               </button>
               <div *ngIf="warningMessage.length > 0" class="uk-alert uk-alert-warning uk-animation-fade" role="alert">{{warningMessage}}</div>
@@ -44,7 +44,7 @@
             <deposit-by-subject></deposit-by-subject>
           </div>
           <div *ngIf="mapUrl"  class="uk-margin-large-top">
-            <h3>Or locate repository on map</h3>
+            <h5>Or locate repository on map</h5>
             <div   class="uk-margin-top">
               <i-frame [url]="mapUrl" width="100%" height="900"></i-frame>
             </div>
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/deposit/datasets/depositBySubjectResult.component.html
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/deposit/datasets/depositBySubjectResult.component.html	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/deposit/datasets/depositBySubjectResult.component.html	(revision 53464)
@@ -12,14 +12,18 @@
                       <form class= "uk-margin uk-text-center uk-margin-top">
                           <input type="text"  [(ngModel)]="newSubject"  class=" uk-input uk-width-1-2" name="subject" placeholder="Search for classifications..."   />
 
-                          <button class=" uk-button uk-button-danger"  type="submit" (click)="searchDataproviders()" >
+                          <button class=" uk-button portal-button"  type="submit" (click)="searchDataproviders()" >
                               Search
                           </button>
                       </form>
                       <div *ngIf="subject.length > 0" class=" uk-text-center ">
-                          <span>Keywords: {{subject}}<span><a class="uk-icon-button" (click) = "subject = ''"><span aria-hidden="true" class=" clickable "><span class="clickable uk-icon">
-<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="close" ratio="1"><path fill="none" stroke="#000" stroke-width="1.06" d="M16,16 L4,4"></path><path fill="none" stroke="#000" stroke-width="1.06" d="M16,4 L4,16"></path></svg>
-</span></span></a></span>
+                          <span>Keywords: {{subject}}<span>
+                            <a class=" " (click) = "subject = ''">  <span (click)="removeContext(context)" aria-hidden="true" class="uk-icon-button icon-button-small ">
+                                <svg width="16" height="16" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="close" ratio="0.8"><path fill="none" stroke="#000" stroke-width="1.06" d="M16,16 L4,4"></path><path fill="none" stroke="#000" stroke-width="1.06" d="M16,4 L4,16"></path></svg>
+                              </span>
+                             </a>
+
+                            </span>
                         </span>
                       </div>
                     </div>
@@ -30,7 +34,7 @@
             <helper position="left" styleName=" uk-width-1-5 uk-padding-left"></helper>
             <div class="uk-width-expand">
               <div *ngIf="fetchDataproviders.searchUtils.status == errorCodes.LOADING"
-                    class="uk-animation-fade uk-margin-top  uk-width-1-1" role="alert"><img class="loading-gif  uk-align-center" >
+                    class="uk-animation-fade uk-margin-top  uk-width-1-1" role="alert"><span class="loading-gif  uk-align-center" ></span>
               </div>
 
 
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/claims/claim-utils/claimResultSearchForm.component.html
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/claims/claim-utils/claimResultSearchForm.component.html	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/claims/claim-utils/claimResultSearchForm.component.html	(revision 53464)
@@ -31,7 +31,7 @@
         </div-->
         <input class=" uk-input uk-width-1-2 form-control" [(ngModel)]="keyword" name="keyword" placeholder="Title, doi, author, orcid..."/>
         <span class="input-group-btn">
-          <button (click)="search(false)"  type="submit" class=" uk-button uk-button-danger">Search</button>
+          <button (click)="search(false)"  type="submit" class=" uk-button portal-button">Search</button>
         </span>
       <!--/div-->
     </div>
@@ -40,18 +40,18 @@
 </form>
   <div *ngIf="showSearchResults" class="uk-margin-top uk-animation">
       <ul class="uk-tab" uk-tab="animation: uk-animation-fade">
-        <li *ngIf="searchSource == 'all' || searchSource == 'openaire'" (click)="clickTab('openairePub')" ><a>Publications <span  class="uk-badge uk-badge-notification">{{   (openairePubsNum)?(openairePubsNum | number):0 }}</span></a></li>
-        <li *ngIf="searchSource == 'all' || searchSource == 'openaire'" (click)="clickTab('openaireData')" ><a>Research Data <span  class="uk-badge uk-badge-notification">{{(openaireDataNum==null)?'0':(openaireDataNum | number)}}</span></a></li>
-        <li *ngIf="searchSource == 'all' || searchSource == 'openaire'" (click)="clickTab('openaireSoftware')" ><a>Software <span  class="uk-badge uk-badge-notification">{{(openaireSoftwareNum==null)?'0':(openaireSoftwareNum | number)}}</span></a></li>
-        <li *ngIf="searchSource == 'all' || searchSource == 'openaire'" (click)="clickTab('openaireORP')" ><a>Other research products <span  class="uk-badge uk-badge-notification">{{(openaireORPNum==null)?'0':(openaireORPNum | number)}}</span></a></li>
-        <li *ngIf="searchSource == 'all' || searchSource == 'crossref'" (click)="clickTab('crossref')" ><a>Crossref <span  class="uk-badge uk-badge-notification">{{(crossrefResultsNum)?(crossrefResultsNum | number):0}}</span></a></li>
-        <li *ngIf="searchSource == 'all' || searchSource == 'datacite'" (click)="clickTab('datacite')"><a>Datacite <span  class="uk-badge uk-badge-notification">{{(dataciteResultsNum==null)?'0':(dataciteResultsNum | number)}}</span></a></li>
-        <li *ngIf="searchSource == 'all' || searchSource == 'orcid'" (click)="clickTab('orcid')"><a>Orcid  <span  class="uk-badge uk-badge-notification">{{(orcidResultsNum)?(orcidResultsNum | number):0}}</span></a></li>
+        <li *ngIf="searchSource == 'all' || searchSource == 'openaire'" (click)="clickTab('openairePub')" ><a>Publications ({{   (openairePubsNum)?(openairePubsNum | number):0 }})</a></li>
+        <li *ngIf="searchSource == 'all' || searchSource == 'openaire'" (click)="clickTab('openaireData')" ><a>Research Data ({{(openaireDataNum==null)?'0':(openaireDataNum | number)}})</a></li>
+        <li *ngIf="searchSource == 'all' || searchSource == 'openaire'" (click)="clickTab('openaireSoftware')" ><a>Software ({{(openaireSoftwareNum==null)?'0':(openaireSoftwareNum | number)}})</a></li>
+        <li *ngIf="searchSource == 'all' || searchSource == 'openaire'" (click)="clickTab('openaireORP')" ><a>Other research products ({{(openaireORPNum==null)?'0':(openaireORPNum | number)}})</a></li>
+        <li *ngIf="searchSource == 'all' || searchSource == 'crossref'" (click)="clickTab('crossref')" ><a>Crossref ({{(crossrefResultsNum)?(crossrefResultsNum | number):0}})</a></li>
+        <li *ngIf="searchSource == 'all' || searchSource == 'datacite'" (click)="clickTab('datacite')"><a>Datacite ({{(dataciteResultsNum==null)?'0':(dataciteResultsNum | number)}})</a></li>
+        <li *ngIf="searchSource == 'all' || searchSource == 'orcid'" (click)="clickTab('orcid')"><a>Orcid  ({{(orcidResultsNum)?(orcidResultsNum | number):0}})</a></li>
       </ul>
 
         <div *ngIf="activeTab == 'crossref'" id="crossref" >
           <div  class="uk-margin-top" >
-            <div *ngIf="crossrefStatus == errorCodes.LOADING" class="uk-animation-fade uk-margin-top  uk-width-1-1" role="alert"><img class="loading-gif  uk-align-center" ></div>
+            <div *ngIf="crossrefStatus == errorCodes.LOADING" class="uk-animation-fade uk-margin-top  uk-width-1-1" role="alert">s</div>
             <div *ngIf="crossrefStatus != errorCodes.LOADING && crossrefResults.length == 0" class="uk-alert uk-alert-primary" role="alert">No Results found</div>
             <div *ngIf="crossrefStatus == errorCodes.ERROR" class="uk-alert uk-alert-warning" role="alert">An Error Occured</div>
             <div *ngIf="crossrefStatus == errorCodes.NOT_AVAILABLE" class="uk-alert uk-alert-danger" role="alert">Service not available</div>
@@ -68,7 +68,7 @@
         </div>
         <div   *ngIf="activeTab == 'openairePub'" id="openairePubs" class="uk-animation-fade" >
           <div class = "uk-margin-top">
-            <div *ngIf="openairePubsStatus == errorCodes.LOADING" class="uk-animation-fade uk-margin-top  uk-width-1-1" role="alert"><img class="loading-gif  uk-align-center" ></div>
+            <div *ngIf="openairePubsStatus == errorCodes.LOADING" class="uk-animation-fade uk-margin-top  uk-width-1-1" role="alert"><span class="loading-gif  uk-align-center" ></span></div>
             <div *ngIf="openairePubsStatus == errorCodes.NONE" class="uk-alert uk-alert-primary" role="alert">No Results found</div>
             <div *ngIf="openairePubsStatus == errorCodes.ERROR" class="uk-alert uk-alert-warning" role="alert">An Error Occured</div>
             <div *ngIf="openairePubsStatus == errorCodes.NOT_AVAILABLE" class="uk-alert uk-alert-danger" role="alert">Service not available</div>
@@ -84,7 +84,7 @@
        </div>
         <div  *ngIf="activeTab == 'orcid'" id="orcid" class="uk-animation-fade">
           <div class="uk-margin-top" >
-            <div *ngIf="orcidStatus == errorCodes.LOADING" class="uk-animation-fade uk-margin-top  uk-width-1-1" role="alert"><img class="loading-gif  uk-align-center" ></div>
+            <div *ngIf="orcidStatus == errorCodes.LOADING" class="uk-animation-fade uk-margin-top  uk-width-1-1" role="alert"><span class="loading-gif  uk-align-center" ></span></div>
             <div *ngIf="orcidStatus == errorCodes.ERROR" class="uk-alert uk-alert-warning" role="alert">An Error Occured</div>
             <div *ngIf="orcidStatus == errorCodes.NOT_AVAILABLE" class="uk-alert uk-alert-danger" role="alert">Service not available</div>
             <div *ngIf="orcidStatus == errorCodes.NONE && (!authorIds ||authorIds.length == 0)" class = "uk-alert uk-alert-primary " > No results found  </div>
@@ -118,7 +118,7 @@
            </div>
          </div>
          <div  *ngIf="activeTab == 'datacite'" id="datacite" class="uk-animation-fade">
-           <div *ngIf="dataciteStatus == errorCodes.LOADING" class="uk-animation-fade uk-margin-top  uk-width-1-1" role="alert"><img class="loading-gif  uk-align-center" ></div>
+           <div *ngIf="dataciteStatus == errorCodes.LOADING" class="uk-animation-fade uk-margin-top  uk-width-1-1" role="alert"><span class="loading-gif  uk-align-center" ></span></div>
            <div *ngIf="dataciteStatus == errorCodes.NONE" class="uk-alert uk-alert-primary" role="alert">No Results found</div>
            <div *ngIf="dataciteStatus == errorCodes.ERROR" class="uk-alert uk-alert-warning" role="alert">An Error Occured</div>
            <div *ngIf="dataciteStatus == errorCodes.NOT_AVAILABLE" class="uk-alert uk-alert-danger" role="alert">Service not available</div>
@@ -134,7 +134,7 @@
             </div>
           </div>
           <div  *ngIf="activeTab == 'openaireData'" id="openaireData" class="uk-animation-fade">
-            <div *ngIf="openaireDataStatus == errorCodes.LOADING" class="uk-animation-fade uk-margin-top  uk-width-1-1" role="alert"><img class="loading-gif  uk-align-center" ></div>
+            <div *ngIf="openaireDataStatus == errorCodes.LOADING" class="uk-animation-fade uk-margin-top  uk-width-1-1" role="alert"><span class="loading-gif  uk-align-center" ></span></div>
             <div *ngIf="openaireDataStatus == errorCodes.NONE" class="uk-alert uk-alert-primary" role="alert">No Results found</div>
             <div *ngIf="openaireDataStatus == errorCodes.ERROR" class="uk-alert uk-alert-warning" role="alert">An Error Occured</div>
             <div *ngIf="openaireDataStatus == errorCodes.NOT_AVAILABLE" class="uk-alert uk-alert-danger" role="alert">Service not available</div>
@@ -150,7 +150,7 @@
            </div>
       </div>
       <div  *ngIf="activeTab == 'openaireSoftware'" id="openaireSoftware" class="uk-animation-fade">
-        <div *ngIf="openaireSoftwareStatus == errorCodes.LOADING" class="uk-animation-fade uk-margin-top  uk-width-1-1" role="alert"><img class="loading-gif  uk-align-center" ></div>
+        <div *ngIf="openaireSoftwareStatus == errorCodes.LOADING" class="uk-animation-fade uk-margin-top  uk-width-1-1" role="alert"><span class="loading-gif  uk-align-center" ></span></div>
         <div *ngIf="openaireSoftwareStatus == errorCodes.NONE" class="uk-alert uk-alert-primary" role="alert">No Results found</div>
         <div *ngIf="openaireSoftwareStatus == errorCodes.ERROR" class="uk-alert uk-alert-warning" role="alert">An Error Occured</div>
         <div *ngIf="openaireSoftwareStatus == errorCodes.NOT_AVAILABLE" class="uk-alert uk-alert-danger" role="alert">Service not available</div>
@@ -166,7 +166,7 @@
          </div>
       </div>
       <div  *ngIf="activeTab == 'openaireORP'" id="openaireORP" class="uk-animation-fade">
-        <div *ngIf="openaireORPStatus == errorCodes.LOADING" class="uk-animation-fade uk-margin-top  uk-width-1-1" role="alert"><img class="loading-gif  uk-align-center" ></div>
+        <div *ngIf="openaireORPStatus == errorCodes.LOADING" class="uk-animation-fade uk-margin-top  uk-width-1-1" role="alert"><span class="loading-gif  uk-align-center" ></span></div>
         <div *ngIf="openaireORPStatus == errorCodes.NONE" class="uk-alert uk-alert-primary" role="alert">No Results found</div>
         <div *ngIf="openaireORPStatus == errorCodes.ERROR" class="uk-alert uk-alert-warning" role="alert">An Error Occured</div>
         <div *ngIf="openaireORPStatus == errorCodes.NOT_AVAILABLE" class="uk-alert uk-alert-danger" role="alert">Service not available</div>
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/deposit/publications/depositPublications.component.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/deposit/publications/depositPublications.component.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/deposit/publications/depositPublications.component.ts	(revision 53464)
@@ -8,7 +8,7 @@
        <div class="tm-main uk-width-1-1@s uk-width-1-1@m  uk-width-1-1@l uk-row-first ">
 
       <div class="uk-container">
-        <deposit [compatibility]="'openaire____::47ce9e9f4fad46e732cff06419ecaabb||OpenDOAR'" [requestFor]="'Publications'" [mapUrl]=mapUrl [piwikSiteId]=piwikSiteId></deposit>
+        <deposit [compatibility]="'openaire____::47ce9e9f4fad46e732cff06419ecaabb||OpenDOAR'" [requestFor]="'Publications'" [mapUrl]=mapUrl [piwikSiteId]=piwikSiteId></deposit>         
       </div>
       </div>
     </div>
@@ -17,6 +17,6 @@
 })
 
 export class DepositPublicationsComponent {
-  public mapUrl ="https://www.openaire.eu/stats/markers-demo.html";
+  public mapUrl ="https://beta.openaire.eu/stats/markers-demo.html";
   @Input() piwikSiteId = null;
 }
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/claims/claimsByToken/claimsByToken.service.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/claims/claimsByToken/claimsByToken.service.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/claims/claimsByToken/claimsByToken.service.ts	(revision 53464)
@@ -11,10 +11,11 @@
 
     constructor(private http: Http ) {}
 
-    getClaims(token: string,  apiURL:string):any {
+    getClaims(openaireId: string,  apiURL:string):any {
         console.info("getClaims in service");
 
-        let url = apiURL+"project/claims?projectToken="+token;
+        //let url = apiURL+"project/claims?projectToken="+token;
+        let url = apiURL+"projects/"+openaireId+"/all_claims";
 
         let key = url;
 
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/claims/claim-utils/displayClaims/displayClaims.component.html
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/claims/claim-utils/displayClaims/displayClaims.component.html	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/claims/claim-utils/displayClaims/displayClaims.component.html	(revision 53464)
@@ -83,7 +83,9 @@
       <div *ngIf="deleteMessage.length>0 "   [innerHTML]="deleteMessage">
 
       </div>
-       <button class=" uk-button uk-button-default"  (click)="confirmOpen()"> <span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="trash" ratio="1"><polyline fill="none" stroke="#000" points="6.5 3 6.5 1.5 13.5 1.5 13.5 3"></polyline><polyline fill="none" stroke="#000" points="4.5 4 4.5 18.5 15.5 18.5 15.5 4"></polyline><rect x="8" y="7" width="1" height="9"></rect><rect x="11" y="7" width="1" height="9"></rect><rect x="2" y="3" width="16" height="1"></rect></svg></span> Delete</button>
+
+
+       <!--button *ngIf="claims && claims.length > 0" class=" uk-button uk-button-default"  (click)="confirmOpen()"> <span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="trash" ratio="1"><polyline fill="none" stroke="#000" points="6.5 3 6.5 1.5 13.5 1.5 13.5 3"></polyline><polyline fill="none" stroke="#000" points="4.5 4 4.5 18.5 15.5 18.5 15.5 4"></polyline><rect x="8" y="7" width="1" height="9"></rect><rect x="11" y="7" width="1" height="9"></rect><rect x="2" y="3" width="16" height="1"></rect></svg></span> Delete</button-->
     </div>
     <br>
 
@@ -96,7 +98,14 @@
     <table *ngIf="claims && claims.length > 0" class="uk-table uk-table-small uk-table-striped">
       <thead>
          <tr>
-            <th *ngIf="enableDelete"><input id="checkAll" type="checkbox" (click)="selectAll($event)" [ngModel]="selected.length==claims.length" /></th>
+            <th *ngIf="enableDelete" class="uk-padding-remove-right" title="Select all">
+              <input id="checkAll" type="checkbox" (click)="selectAll($event)" [ngModel]="selected.length==claims.length" />
+            </th>
+            <th class="uk-padding-remove-right uk-padding-remove-left" title="Delete selected">
+              <a [class]=" 'uk-text-danger '+(selected.length > 0?'':'uk-disabled')"  (click)="confirmOpen()"  >
+                <span class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="trash" ratio="1"><polyline fill="none" stroke="#000" points="6.5 3 6.5 1.5 13.5 1.5 13.5 3"></polyline><polyline fill="none" stroke="#000" points="4.5 4 4.5 18.5 15.5 18.5 15.5 4"></polyline><rect x="8" y="7" width="1" height="9"></rect><rect x="11" y="7" width="1" height="9"></rect><rect x="2" y="3" width="16" height="1"></rect></svg></span>
+              </a>
+            </th>
             <!--<th>Id</th>
             <!--  <th>Target Type</th> -->
               <th><a (click)="changeOrderby('target')" >Research Result</a> </th>
@@ -110,7 +119,7 @@
       <tbody>
           <tr *ngFor="let claim of claims " >
            <td *ngIf="enableDelete"><input [id]="claim.id" type="checkbox" (click)="select(claim,$event)"  [ngModel]="isSelected(claim.id)"/></td>
-
+           <td></td>
             <td><claim-entity [entity]="claim.target" [type]="claim.targetType" [(properties)]=properties> </claim-entity></td>
              <td><claim-entity [entity]="claim.source" [type]="claim.sourceType" [(properties)]=properties> </claim-entity></td>
             <td *ngIf="showUserEmail">{{claim.userMail}}</td>
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/claims/linking/selected/selectedResults.component.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/claims/linking/selected/selectedResults.component.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/claims/linking/selected/selectedResults.component.ts	(revision 53464)
@@ -25,7 +25,7 @@
                  <tr  *ngFor="let pub of results" >
                      <td   >
                         <div>
-                          <span *ngIf="showAccessRights" (click)="removePublication(pub)" aria-hidden="true" class="uk-icon-button"><span class="uk-icon">
+                          <span *ngIf="showAccessRights" (click)="removePublication(pub)" aria-hidden="true" class="uk-icon-button icon-button-small"><span class="uk-icon">
 <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="close" ratio="1"><path fill="none" stroke="#000" stroke-width="1.06" d="M16,16 L4,4"></path><path fill="none" stroke="#000" stroke-width="1.06" d="M16,4 L4,16"></path></svg>
 </span></span>
                           <a *ngIf="pub.url" target="_blank" href="{{pub.url}}" > <span class="custom-external"></span> {{pub.title?pub.title:'[No title available]'}}</a>
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/claims/directLinking/directLinking.component.html
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/claims/directLinking/directLinking.component.html	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/claims/directLinking/directLinking.component.html	(revision 53464)
@@ -16,7 +16,7 @@
       <div *ngIf="validInput != null && validInput">
        <ul uk-accordion *ngIf=" ! (linkTo =='result' && show=='claim') " uk-accordion class="uk-padding-small uk-margin-remove-bottom basket-accordion">
          <li>
-            <h3 class=" uk-text-right uk-margin-remove-vertical uk-width-small uk-margin-auto-left uk-accordion-title basket-title uk-text-danger" uk-tooltip="title:Click to see your selections">
+            <h3 class=" uk-text-right uk-margin-remove-vertical uk-width-small uk-margin-auto-left uk-accordion-title basket-title portal-color" uk-tooltip="title:Click to see your selections">
              <span class="uk-icon"><svg xml:space="preserve" xmlns:xlink="http://www.w3.org/1999/xlink" height="28px" id="my-box" style="enable-background:new 0 0 512 512;" version="1.1" viewBox="0 0 512 512" width="28px" x="0px" xmlns="http://www.w3.org/2000/svg" y="0px"><g>	<path d="M480,320v128H32V320h78.859l64.016,96h162.25l64-96H480 M384,32H128L0,288v192h512V288L384,32L384,32z M35.781,288l112-224 h216.438l112,224H384l-64,96H192l-64.016-96H35.781L35.781,288z" fill="#b5b5b5"></path></g> </svg> </span>
              <span  class="uk-badge basket-badge ">{{(projects.length + contexts.length + results.length - ((type =="project")?1:0))  | number}}</span>
            </h3>
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/sharedComponents/navigationBar.component.html
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/sharedComponents/navigationBar.component.html	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/sharedComponents/navigationBar.component.html	(revision 53464)
@@ -24,6 +24,16 @@
             <div>
                <div  *ngIf= "isClient" class="uk-panel" id="module-0">
                   <ul class="uk-nav uk-nav-default">
+                    <li class="uk-nav-header uk-parent" >
+                      Dashboards
+                      <ul class="uk-nav-sub">
+                    		<li *ngIf="portal!='explore'"><a href="https://explore.openaire.eu" target="_blank" class="uk-heading-bullet explore-heading-bullet">EXPLORE</a></li>
+                    		<li *ngIf="portal!='provide'"><a href="https://provide.openaire.eu" target="_blank" class="uk-heading-bullet provide-heading-bullet">PROVIDE</a></li>
+                    		<li *ngIf="portal!='connect'"><a href="https://connect.openaire.eu" target="_blank" class="uk-heading-bullet connect-heading-bullet">CONNECT</a></li>
+                    		<li *ngIf="portal!='monitor'"><a href="https://monitor.openaire.eu" target="_blank" class="uk-heading-bullet monitor-heading-bullet">MONITOR</a></li>
+                    		<li *ngIf="portal!='develop'"><a href="https://develop.openaire.eu" target="_blank" class="uk-heading-bullet develop-heading-bullet">DEVELOP</a></li>
+                      </ul>
+                    </li>
                     <ng-container *ngIf="!onlyTop" >
                       <ng-container *ngFor="let menu of menuItems">
                       <li class="uk-nav-header uk-parent" *ngIf="isEnabled(menu.entitiesRequired,showEntity) && isEnabled(menu.routeRequired, showPage)">
@@ -83,7 +93,7 @@
 
 </div>
 <div class="tm-header uk-visible@m tm-header-transparent" uk-header="">
-   <div [class]="'uk-navbar-container uk-sticky uk-navbar-transparent uk-light '+portal+'-menu'" uk-sticky="" media="768" cls-active="uk-active uk-navbar-sticky" animation="uk-animation-slide-top" top=".tm-header + [class*=&quot;uk-section&quot;]" cls-inactive="uk-navbar-transparent uk-light" style="">
+   <div [class]="'uk-navbar-container uk-sticky uk-navbar-transparent '+portal+'-menu'" uk-sticky="" media="768" cls-active="uk-active uk-navbar-sticky" animation="uk-animation-slide-top" top=".tm-header + [class*=&quot;uk-section&quot;]" cls-inactive="uk-navbar-transparent" style="">
       <div class="uk-container uk-container-expand">
          <nav class="uk-navbar" uk-navbar="{&quot;align&quot;:&quot;left&quot;}">
             <div class="uk-navbar-left  uk-visible@l   uk-width-1-3">
@@ -101,7 +111,8 @@
                <div *ngIf="community" class="uk-margin-left uk-text-large"> {{community.name}} </div>
              </a>
             </div>
-            <div   *ngIf="!onlyTop" class="uk-navbar-center">
+            <!-- <div   *ngIf="!onlyTop" class="uk-navbar-center"> -->
+            <div   *ngIf="!onlyTop" class="uk-navbar-right">
                <ul *ngIf= "isClient" class="uk-navbar-nav">
                  <ng-container *ngFor="let menu of menuItems">
                    <li class="uk-parent" *ngIf="isEnabled(menu.entitiesRequired,showEntity) && isEnabled(menu.routeRequired, showPage)">
@@ -128,9 +139,10 @@
                   </ng-container>
 
                </ul>
-            </div>
-            <div  *ngIf="userMenu" class="uk-navbar-right">
-                  <user-mini [userMenuItems]=userMenuItems [logInUrl]=logInUrl [logOutUrl]=logOutUrl [cookieDomain]=cookieDomain></user-mini>
+            <!-- </div> -->
+            <!-- <div  *ngIf="userMenu" class="uk-navbar-right"> -->
+            <!-- <div  *ngIf="userMenu" class="uk-navbar-right"> -->
+                  <user-mini  *ngIf="userMenu"  [userMenuItems]=userMenuItems [logInUrl]=logInUrl [logOutUrl]=logOutUrl [cookieDomain]=cookieDomain></user-mini>
 
             </div>
          </nav>
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/sharedComponents/feedback/feedback.component.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/sharedComponents/feedback/feedback.component.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/sharedComponents/feedback/feedback.component.ts	(revision 53464)
@@ -6,8 +6,8 @@
 @Component({
   selector: 'feedback',
   template: `
-  <div id="feedback" class="uk-tooltip" (click) = "initialize()">
-  	<a [href]="'mailto:' + feedbackmail +'?Subject=' + subject + '&body=' + body" target="_top" type="button" class="btn btn-info btn-lg">
+  <div id="feedback" class="" (click) = "initialize()">
+  	<a [href]="'mailto:' + feedbackmail +'?Subject=' + subject + '&body=' + body" target="_top" type="button" class="">
   		<img src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDEuMS8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9HcmFwaGljcy9TVkcvMS4xL0RURC9zdmcxMS5kdGQiPjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0iTGF5ZXJfMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgeD0iMHB4IiB5PSIwcHgiIHdpZHRoPSI5LjI5OXB4IiBoZWlnaHQ9IjUwLjYyNXB4IiB2aWV3Qm94PSIwIDAgOS4yOTkgNTAuNjI1IiBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDAgMCA5LjI5OSA1MC42MjUiIHhtbDpzcGFjZT0icHJlc2VydmUiPjxnPjxwYXRoIGZpbGw9IiNGRkZGRkYiIGQ9Ik0zLjUxNiw0Ni44N3YxLjYzNWg1LjY2N3YwLjk3NEgzLjUxNnYxLjE0N2gtMC40NGwtMC4zNTItMS4xNDdIMi4zNjdDMC43ODksNDkuNDc4LDAsNDguNzg4LDAsNDcuNDA5YzAtMC4zNCwwLjA2OC0wLjczOCwwLjIwNS0xLjE5NWwwLjc3OSwwLjI1MmMtMC4xMjEsMC4zNzUtMC4xODIsMC42OTUtMC4xODIsMC45NjFjMCwwLjM2NywwLjEyMiwwLjY0LDAuMzY2LDAuODE0YzAuMjQ0LDAuMTc2LDAuNjM2LDAuMjY0LDEuMTc1LDAuMjY0SDIuNzZWNDYuODdIMy41MTZ6Ii8+PHBhdGggZmlsbD0iI0ZGRkZGRiIgZD0iTTkuMjk5LDQyLjk4NWMwLDAuOTQ5LTAuMjg5LDEuNjk3LTAuODY2LDIuMjQ2Yy0wLjU3OCwwLjU0OS0xLjM4MiwwLjgyNC0yLjQwOCwwLjgyNGMtMS4wMzYsMC0xLjg1Ny0wLjI1Ni0yLjQ2Ny0wLjc2NmMtMC42MS0wLjUxMS0wLjkxNC0xLjE5My0wLjkxNC0yLjA1NGMwLTAuODA1LDAuMjY1LTEuNDQsMC43OTQtMS45MDljMC41MjktMC40NywxLjIyOC0wLjcwMywyLjA5NS0wLjcwM2gwLjYxNXY0LjQyNGMwLjc1NC0wLjAyMSwxLjMyNi0wLjIxMSwxLjcxNy0wLjU3MlM4LjQ1LDQzLjYwNiw4LjQ1LDQyLjk1YzAtMC42OTEtMC4xNDUtMS4zNzUtMC40MzQtMi4wNTFoMC44NjZjMC4xNDgsMC4zNDQsMC4yNTUsMC42NjgsMC4zMTksMC45NzVDOS4yNjcsNDIuMTgxLDkuMjk5LDQyLjU1MSw5LjI5OSw0Mi45ODV6IE0zLjQ1Nyw0My4yNDljMCwwLjUxNywwLjE2OCwwLjkyNiwwLjUwNCwxLjIzMnMwLjgwMSwwLjQ4OCwxLjM5NiwwLjU0M3YtMy4zNTdjLTAuNjEzLDAtMS4wODMsMC4xMzgtMS40MSwwLjQxQzMuNjIxLDQyLjM1LDMuNDU3LDQyLjc0MSwzLjQ1Nyw0My4yNDl6Ii8+PHBhdGggZmlsbD0iI0ZGRkZGRiIgZD0iTTkuMjk5LDM2LjI1MmMwLDAuOTQ5LTAuMjg5LDEuNjk3LTAuODY2LDIuMjQ2Yy0wLjU3OCwwLjU0OS0xLjM4MiwwLjgyNC0yLjQwOCwwLjgyNGMtMS4wMzYsMC0xLjg1Ny0wLjI1Ni0yLjQ2Ny0wLjc2NmMtMC42MS0wLjUxLTAuOTE0LTEuMTkzLTAuOTE0LTIuMDUzYzAtMC44MDUsMC4yNjUtMS40NDEsMC43OTQtMS45MXMxLjIyOC0wLjcwMywyLjA5NS0wLjcwM2gwLjYxNXY0LjQyNGMwLjc1NC0wLjAyLDEuMzI2LTAuMjExLDEuNzE3LTAuNTcyczAuNTg2LTAuODY5LDAuNTg2LTEuNTI1YzAtMC42OTEtMC4xNDUtMS4zNzUtMC40MzQtMi4wNTFoMC44NjZjMC4xNDgsMC4zNDQsMC4yNTUsMC42NjgsMC4zMTksMC45NzZTOS4yOTksMzUuODE5LDkuMjk5LDM2LjI1MnogTTMuNDU3LDM2LjUxNmMwLDAuNTE2LDAuMTY4LDAuOTI2LDAuNTA0LDEuMjMyYzAuMzM2LDAuMzA4LDAuODAxLDAuNDg4LDEuMzk2LDAuNTQzdi0zLjM1N2MtMC42MTMsMC0xLjA4MywwLjEzNy0xLjQxLDAuNDFDMy42MjEsMzUuNjE4LDMuNDU3LDM2LjAwOCwzLjQ1NywzNi41MTZ6Ii8+PHBhdGggZmlsbD0iI0ZGRkZGRiIgZD0iTTguMzE5LDI3Ljg2MnYwLjA1M2MwLjY1MiwwLjQ0OSwwLjk3OSwxLjEyMSwwLjk3OSwyLjAxN2MwLDAuODQtMC4yODYsMS40OTMtMC44NiwxLjk2UzcuMDQ3LDMyLjU5LDUuOTg5LDMyLjU5Yy0xLjA1OCwwLTEuODgxLTAuMjMzLTIuNDY3LTAuNzAyYy0wLjU4Ni0wLjQ3LTAuODc5LTEuMTIxLTAuODc5LTEuOTU3YzAtMC44NzEsMC4zMTYtMS41MzksMC45NDktMi4wMDVWMjcuODVsLTAuNDYzLDAuMDQxbC0wLjQ1MSwwLjAyM0gwLjA2NHYtMC45NzRoOS4xMTd2MC43OTFMOC4zMTksMjcuODYyeiBNOC40ODMsMjkuODA3YzAtMC42NjQtMC4xOC0xLjE0Ni0wLjU0MS0xLjQ0NHMtMC45NDQtMC40NDgtMS43NS0wLjQ0OEg1Ljk4N2MtMC45MDksMC0xLjU1OSwwLjE1MS0xLjk0NywwLjQ1NWMtMC4zODgsMC4zMDMtMC41ODMsMC43ODUtMC41ODMsMS40NDljMCwwLjU3LDAuMjIyLDEuMDA4LDAuNjY1LDEuMzExUzUuMTksMzEuNTgzLDYsMzEuNTgzYzAuODE5LDAsMS40MzgtMC4xNDksMS44NTYtMC40NTFDOC4yNzQsMzAuODMxLDguNDgzLDMwLjM4OSw4LjQ4MywyOS44MDd6Ii8+PHBhdGggZmlsbD0iI0ZGRkZGRiIgZD0iTTIuNjU0LDIxLjg5MWMwLTAuODQ0LDAuMjg4LTEuNDk5LDAuODY0LTEuOTY2YzAuNTc2LTAuNDY3LDEuMzkyLTAuNywyLjQ0Ni0wLjdjMS4wNTUsMCwxLjg3NCwwLjIzNSwyLjQ1OCwwLjcwNmMwLjU4NCwwLjQ3MSwwLjg3NiwxLjEyNCwwLjg3NiwxLjk2YzAsMC40MTgtMC4wNzYsMC44LTAuMjMsMS4xNDZjLTAuMTU0LDAuMzQ2LTAuMzkzLDAuNjM2LTAuNzEzLDAuODd2MC4wN2wwLjgyNiwwLjIwNXYwLjY5N0gwLjA2NHYtMC45NzNoMi4yMTVjMC40OTYsMCwwLjk0MSwwLjAxNiwxLjMzNiwwLjA0N3YtMC4wNDdDMi45NzUsMjMuNDU0LDIuNjU0LDIyLjc4MiwyLjY1NCwyMS44OTF6IE0zLjQ2OSwyMi4wMzJjMCwwLjY2NCwwLjE5LDEuMTQzLDAuNTcxLDEuNDM2czEuMDIyLDAuNDM5LDEuOTI1LDAuNDM5YzAuOTAzLDAsMS41NDgtMC4xNSwxLjkzNy0wLjQ1MWMwLjM5LTAuMzAxLDAuNTg0LTAuNzgzLDAuNTg0LTEuNDQ3YzAtMC41OTgtMC4yMTktMS4wNDMtMC42NTMtMS4zMzZzLTEuMDYyLTAuNDM5LTEuODc4LTAuNDM5Yy0wLjgzNiwwLTEuNDU5LDAuMTQ2LTEuODY5LDAuNDM5UzMuNDY5LDIxLjQxOCwzLjQ2OSwyMi4wMzJ6Ii8+PHBhdGggZmlsbD0iI0ZGRkZGRiIgZD0iTTkuMTgzLDEzLjU3N0w4LjI2OSwxMy43N3YwLjA0N2MwLjQwMSwwLjMyLDAuNjc0LDAuNjQsMC44MTYsMC45NThzMC4yMTQsMC43MTYsMC4yMTQsMS4xOTJjMCwwLjYzNy0wLjE2NCwxLjEzNi0wLjQ5MSwxLjQ5N2MtMC4zMjgsMC4zNjEtMC43OTUsMC41NDItMS40LDAuNTQyYy0xLjI5NywwLTEuOTc3LTEuMDM3LTIuMDM5LTMuMTExbC0wLjAzNS0xLjA5SDQuOTM0Yy0wLjUwNCwwLTAuODc2LDAuMTA4LTEuMTE2LDAuMzI1Yy0wLjI0LDAuMjE3LTAuMzYsMC41NjMtMC4zNiwxLjA0YzAsMC41MzUsMC4xNjQsMS4xNDEsMC40OTIsMS44MTZsLTAuNzQ0LDAuMjk5Yy0wLjE3Mi0wLjMxNi0wLjMwNy0wLjY2My0wLjQwNC0xLjA0Yy0wLjA5Ny0wLjM3Ny0wLjE0Ni0wLjc1NS0wLjE0Ni0xLjEzNGMwLTAuNzY2LDAuMTctMS4zMzMsMC41MS0xLjcwMmMwLjM0LTAuMzY5LDAuODg1LTAuNTU0LDEuNjM1LTAuNTU0aDQuMzg0djAuNzIySDkuMTgzeiBNOC40OTYsMTUuNzc0YzAtMC42MDUtMC4xNjYtMS4wODEtMC40OTgtMS40MjdjLTAuMzMyLTAuMzQ2LTAuNzk3LTAuNTE5LTEuMzk2LTAuNTE5aC0wLjU4bDAuMDQxLDAuOTczYzAuMDI3LDAuNzczLDAuMTQ3LDEuMzMxLDAuMzYsMS42NzNjMC4yMTQsMC4zNDIsMC41NDQsMC41MTMsMC45OTMsMC41MTNjMC4zNTIsMCwwLjYxOS0wLjEwNiwwLjgwMy0wLjMxOVM4LjQ5NiwxNi4xNTcsOC40OTYsMTUuNzc0eiIvPjxwYXRoIGZpbGw9IiNGRkZGRkYiIGQ9Ik05LjI5OSw4LjI4NWMwLDAuOTMtMC4yODYsMS42NDktMC44NTgsMi4xNTljLTAuNTcxLDAuNTEtMS4zODEsMC43NjUtMi40MjgsMC43NjVjLTEuMDc1LDAtMS45MDUtMC4yNTktMi40OTEtMC43NzZTMi42NDMsOS4xNzgsMi42NDMsOC4yMjFjMC0wLjMwOSwwLjAzMy0wLjYxNywwLjEtMC45MjZDMi44MSw2Ljk4NiwyLjg4OCw2Ljc0NCwyLjk3Nyw2LjU2OGwwLjgyNiwwLjI5OUMzLjcxNyw3LjA4MiwzLjY0Niw3LjMxNiwzLjU4OSw3LjU3QzMuNTMyLDcuODI0LDMuNTA0LDguMDQ5LDMuNTA0LDguMjQ0YzAsMS4zMDUsMC44MzIsMS45NTcsMi40OTYsMS45NTdjMC43ODksMCwxLjM5Ni0wLjE1OSwxLjgxNS0wLjQ3OGMwLjQyMi0wLjMxOSwwLjYzNC0wLjc5LDAuNjM0LTEuNDE1YzAtMC41MzUtMC4xMTUtMS4wODQtMC4zNDctMS42NDZoMC44NjFDOS4xODgsNy4wOTIsOS4yOTksNy42MzMsOS4yOTksOC4yODV6Ii8+PHBhdGggZmlsbD0iI0ZGRkZGRiIgZD0iTTUuODk2LDQuMTc4QzUuNjU2LDQuMDEsNS4zNDQsMy43NTQsNC45NTcsMy40MUwyLjc2LDEuMzM2VjAuMTgybDIuNzM2LDIuNjAyTDkuMTgzLDB2MS4xNzhMNi4xNDYsMy40NDVsMC42MzMsMC43MzJoMi40MDJ2MC45NjFIMC4wNjR2LTAuOTZoNC44MzRjMC4yMTUsMCwwLjU0NiwwLjAxNiwwLjk5NiwwLjA0N1Y0LjE3OEg1Ljg5NnoiLz48L2c+PC9zdmc+" alt="Feedback" title="Feedback Button" height="70px">
   	</a>
   </div>
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/claims/claim-utils/startOver.component.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/claims/claim-utils/startOver.component.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/claims/claim-utils/startOver.component.ts	(revision 53464)
@@ -6,7 +6,7 @@
 @Component({
     selector: 'start-over',
     template: `
-    <!--button   (click)="confirmOpen()"  class="uk-button uk-button-danger uk-align-left"  >  <span  class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="refresh" ratio="1"><path fill="none" stroke="#000" stroke-width="1.1" d="M17.08,11.15 C17.09,11.31 17.1,11.47 17.1,11.64 C17.1,15.53 13.94,18.69 10.05,18.69 C6.16,18.68 3,15.53 3,11.63 C3,7.74 6.16,4.58 10.05,4.58 C10.9,4.58 11.71,4.73 12.46,5"></path><polyline fill="none" stroke="#000" points="9.9 2 12.79 4.89 9.79 7.9"></polyline></svg></span> Clear All</button-->
+    <!--button   (click)="confirmOpen()"  class="uk-button portal-button uk-align-left"  >  <span  class="uk-icon"><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="refresh" ratio="1"><path fill="none" stroke="#000" stroke-width="1.1" d="M17.08,11.15 C17.09,11.31 17.1,11.47 17.1,11.64 C17.1,15.53 13.94,18.69 10.05,18.69 C6.16,18.68 3,15.53 3,11.63 C3,7.74 6.16,4.58 10.05,4.58 C10.9,4.58 11.71,4.73 12.46,5"></path><polyline fill="none" stroke="#000" points="9.9 2 12.79 4.89 9.79 7.9"></polyline></svg></span> Clear All</button-->
     <span  (click)="confirmOpen()" uk-tooltip="title:Remove selected" aria-expanded="false" class="uk-text-danger uk-width-small" [style]="'cursor: '+ ((results.length + projects.length + contexts.length > 0)?'pointer;':'not-allowed;')" [style.cursor]="((results.length + projects.length + contexts.length > 0)?'pointer':'not-allowed')">
       <span class="uk-icon">
         <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"> <polyline fill="none" stroke="#000" points="6.5 3 6.5 1.5 13.5 1.5 13.5 3"></polyline> <polyline fill="none" stroke="#000" points="4.5 4 4.5 18.5 15.5 18.5 15.5 4"></polyline> <rect x="8" y="7" width="1" height="9"></rect> <rect x="11" y="7" width="1" height="9"></rect> <rect x="2" y="3" width="16" height="1"></rect></svg>
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/claims/claimsByToken/claimsByToken.component.html
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/claims/claimsByToken/claimsByToken.component.html	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/claims/claimsByToken/claimsByToken.component.html	(revision 53464)
@@ -12,7 +12,7 @@
   <div *ngIf="accessStatus=='valid'">
     <div class="uk-article-title custom-article-title">
         Claims Administrator
-        <a [queryParams]="routerHelper.createQueryParam('projectId',project['openaireId'])"
+        <a *ngIf="project" [queryParams]="routerHelper.createQueryParam('projectId',project['openaireId'])"
             routerLinkActive="router-link-active"
             routerLink="/search/project" >
               {{project['name']}} ({{project['funderName']}})
@@ -83,7 +83,7 @@
          <div *ngIf="(selectedWrong_PendingMode.size+selectedRight_PendingMode.size) > 0" class="uk-alert-primary" uk-alert>
              You have selected <span class="uk-badge">{{(selectedWrong_PendingMode.size+selectedRight_PendingMode.size)}}</span> claim(s) to curate
          </div>
-         <div class="uk-float-right">
+         <div *ngIf="totalPendingResults.count > 0" class="uk-float-right">
            <button (click)="clearCheckboxes()" [class]="((selectedWrong_PendingMode.size+selectedRight_PendingMode.size) == 0) ? 'uk-button uk-disabled' : 'uk-button'">Reset</button>
 
            <span title="Approve or dissaprove at least one claim"
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/claims/linking/bulkClaim/bulkClaim.component.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/claims/linking/bulkClaim/bulkClaim.component.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/claims/linking/bulkClaim/bulkClaim.component.ts	(revision 53464)
@@ -22,7 +22,7 @@
           <label for="exampleInputFile">Select a file: </label>
           <div class="js-upload" uk-form-custom>
             <input id="exampleInputFile" class="uk-width-medium" type="file"  (change)="fileChangeEvent($event)"/>
-            <button class="uk-button uk-button-default" type="button" tabindex="-1" [class.disabled]="!enableUpload" ><span class="uk-margin-small-right uk-icon"  >
+            <button class="uk-button  portal-button" type="button" tabindex="-1" [class.disabled]="!enableUpload" ><span class="uk-margin-small-right uk-icon"  >
             <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"> <polyline fill="none" stroke="#000" points="5 8 9.5 3.5 14 8 "></polyline> <rect x="3" y="17" width="13" height="1"></rect>
              <line fill="none" stroke="#000" x1="9.5" y1="15" x2="9.5" y2="4"></line></svg></span> Select</button>
             <!--button class="uk-button uk-button-small" [class.disabled]="!enableUpload" type="button" (click)="upload()">Upload</button-->
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/landingPages/software/software.component.html
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/landingPages/software/software.component.html	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/landingPages/software/software.component.html	(revision 53464)
@@ -6,7 +6,7 @@
 
     <div *ngIf="warningMessage.length > 0" class="uk-alert uk-alert-warning  uk-margin-large-top" role="alert">{{warningMessage}}</div>
     <div *ngIf="errorMessage.length > 0" class="uk-alert uk-alert-danger  uk-margin-large-top" role="alert">{{errorMessage}}</div>
-    <div [style.display]="showLoading ? 'inline' : 'none'" class="uk-animation-fade uk-margin-large-top  uk-width-1-1" role="alert"><img class="loading-gif  uk-align-center" ></div>
+    <div [style.display]="showLoading ? 'inline' : 'none'" class="uk-animation-fade uk-margin-large-top  uk-width-1-1" role="alert"><span class="loading-gif  uk-align-center" ></span></div>
 
     <div *ngIf="softwareInfo != null" uk-grid class="uk-grid-large">
         <div class="uk-width-expand@m uk-width-1-1@s">
@@ -51,7 +51,7 @@
                 </showSubjects>
                 </li>
             </ul>
-
+            <hr *ngIf="softwareInfo.description" >
             <div *ngIf="softwareInfo.description" class="uk-margin-bottom uk-text-justify descriptionText">
               {{softwareInfo.description}}
             </div>
@@ -81,7 +81,7 @@
                 </div>
             </div></div> -->
 
-            <ul class="custom-accordion" uk-accordion>
+            <ul class="custom-accordion " uk-accordion>
 
                <li *ngIf="softwareInfo.relatedResearchResults" (click)="activeTab='Related Research Results'">
                    <a class="uk-accordion-title" href="#">
@@ -90,9 +90,9 @@
                        <span *ngIf="softwareInfo.relatedResearchResults" class="uk-badge uk-badge-notification">
                            {{relatedResearchResultsNum | number}}
                        </span> -->
-                       <span class="uk-badge uk-badge-notification">
-                           {{relatedResearchResultsNum | number}}
-                       </span>
+                       <!-- <span class="uk-badge uk-badge-notification"> -->
+                           ({{relatedResearchResultsNum | number}})
+                       <!-- </span> -->
                    </a>
                    <div class="uk-accordion-content">
                      <!-- <div *ngIf="!softwareInfo.relatedResearchResults" class = "uk-alert  uk-alert-primary">
@@ -101,7 +101,7 @@
                      <div *ngIf="softwareInfo.relatedResearchResults"> -->
                      <div>
                          <div *ngFor="let provenanceaction of getKeys(softwareInfo.relatedResearchResults)">
-                             <div class="uk-text-large uk-margin-bottom">{{provenanceaction}}</div>
+                             <div class="uk-text-large">{{provenanceaction}}</div>
 
                              <tabTable [percentageName]="trust" [info]="softwareInfo.relatedResearchResults.get(provenanceaction)" [(properties)]=properties></tabTable>
                          </div>
@@ -116,9 +116,9 @@
                         <span *ngIf="softwareInfo.similarResearchResults" class="uk-badge uk-badge-notification">
                             {{softwareInfo.similarResearchResults.length | number}}
                         </span> -->
-                        <span class="uk-badge uk-badge-notification">
-                            {{softwareInfo.similarResearchResults.length | number}}
-                        </span>
+                        <!-- <span class="uk-badge uk-badge-notification"> -->
+                            ({{softwareInfo.similarResearchResults.length | number}})
+                        <!-- </span> -->
                     </a>
                     <div class="uk-accordion-content">
                       <!-- <div *ngIf="!softwareInfo.similarResearchResults" class = "uk-alert  uk-alert-primary" >
@@ -151,105 +151,6 @@
                   </li>
             </ul>
 
-            <!-- <ul class="uk-tab uk-visible@m" uk-tab="connect: #tab-content">
-                <li (click)="activeTab='Related Research Results'"
-                    [class]="activeTab == 'Related Research Results'?'uk-active':''">
-                     <a>
-                         Related Research Results
-                         <span class="uk-badge uk-badge-notification">
-                             {{relatedResearchResultsNum | number}}
-                         </span>
-                     </a>
-                 </li>
-
-                <li (click)="activeTab='Similar Research Results'"
-                    [class]="activeTab == 'Similar Research Results'?'uk-active':''">
-                    <a>
-                        Similar Research Results
-                        <span *ngIf="!softwareInfo.similarResearchResults" class="uk-badge uk-badge-notification">0</span>
-                        <span *ngIf="softwareInfo.similarResearchResults" class="uk-badge uk-badge-notification">
-                            {{softwareInfo.similarResearchResults.length | number}}
-                        </span>
-                    </a>
-                </li>
-
-                <li (click)="metricsClicked=true; activeTab='Metrics'"
-                    [class]="activeTab == 'Metrics'?'uk-active':''">
-                    <a>
-                        Metrics
-                    </a>
-                </li>
-            </ul> -->
-
-            <!-- <button class="uk-button uk-button-default uk-hidden@m" type="button">
-              <span uk-navbar-toggle-icon></span> <span class="uk-margin-small-left">{{activeTab}}</span>
-            </button>
-
-            <ul id="toggle-small-tabs" class="uk-subnav uk-subnav-pill uk-dropdown uk-hidden@m" uk-switcher="connect: #tab-content" uk-dropdown="mode: click" uk-toggle="target: #toggle-small-tabs">
-              <li (click)="activeTab='Related Research Results'"
-                  [class]="activeTab == 'Related Research Results'?'uk-active':''">
-                     <a>
-                         Related Research Results
-                         <span class="uk-badge uk-badge-notification">
-                             {{relatedResearchResultsNum | number}}
-                         </span>
-                     </a>
-                 </li>
-
-                <li (click)="activeTab='Similar Research Results'"
-                    [class]="activeTab == 'Similar Research Results'?'uk-active':''">
-                    <a>
-                        Similar Research Results
-                        <span *ngIf="!softwareInfo.similarResearchResults" class="uk-badge uk-badge-notification">0</span>
-                        <span *ngIf="softwareInfo.similarResearchResults" class="uk-badge uk-badge-notification">
-                            {{softwareInfo.similarResearchResults.length | number}}
-                        </span>
-                    </a>
-                </li>
-
-                <li (click)="metricsClicked=true; activeTab='Metrics'"
-                    [class]="activeTab == 'Metrics'?'uk-active':''">
-                    <a>
-                        Metrics
-                    </a>
-                </li>
-            </ul> -->
-
-            <!-- <div class="uk-margin custom-tab-content">
-                <div *ngIf="activeTab=='Related Research Results'" class="uk-animation-fade">
-                    <div *ngIf="!softwareInfo.relatedResearchResults" class = "uk-alert  uk-alert-primary" >
-                        No related research results available
-                    </div>
-                    <div *ngIf="softwareInfo.relatedResearchResults">
-                        <div *ngFor="let provenanceaction of getKeys(softwareInfo.relatedResearchResults)">
-                            <div class="uk-text-large">{{provenanceaction}}</div>
-
-                            <tabTable [percentageName]="trust" [info]="softwareInfo.relatedResearchResults.get(provenanceaction)" [(properties)]=properties></tabTable>
-                        </div>
-                    </div>
-                </div>
-
-                <div *ngIf="activeTab=='Similar Research Results'" class="uk-animation-fade">
-                    <div  *ngIf="!softwareInfo.similarResearchResults"  class = "uk-alert  uk-alert-primary" >
-                        No similar research results available
-                    </div>
-                    <div *ngIf="softwareInfo.similarResearchResults">
-                        <tabTable [percentageName]="similarity" [info]="softwareInfo.similarResearchResults"></tabTable>
-                    </div>
-                </div>
-                <div *ngIf="activeTab=='Metrics'" class="uk-animation-fade">
-                    <metrics [pageViews]="pageViews"
-                        [id]="softwareId" [entityType]="'results'" [entity]="'Software'"
-                        (metricsResults)="metricsResults($event)" [(properties)] = properties>
-                    </metrics>
-                    <i-frame *ngIf="metricsClicked && totalViews > 0"
-                        [url]=viewsFrameUrl width="100%" height="250">
-                    </i-frame>
-                    <i-frame *ngIf="metricsClicked && totalDownloads > 0"
-                        [url]=downloadsFrameUrl width="100%" height="250">
-                    </i-frame>
-                </div>
-          </div> -->
         </div>
 
         <div class="uk-width-large@m uk-width-1-1@s">
@@ -261,7 +162,7 @@
           <altmetrics *ngIf="softwareInfo.identifiers && softwareInfo.identifiers.get('doi')"
              id="{{softwareInfo.identifiers.get('doi')[0]}}" type="doi">
           </altmetrics >
-            <ul class="uk-list ">
+            <ul class="uk-list uk-margin-remove-bottom">
 
                 <li *ngIf="softwareInfo.hostedBy_collectedFrom && softwareInfo.hostedBy_collectedFrom.length > 0">
                     <availableOn [availableOn]="softwareInfo.hostedBy_collectedFrom"></availableOn>
@@ -298,18 +199,13 @@
                 </li-->
 
                 <li>
-                  <ul uk-accordion class="uk-padding-remove">
-                      <li>
-                        <div class=" sideInfoTitle uk-accordion-title cite-this-button uk-width-1-1" type="button">
-                          Cite this software
-                        </div>
-                          <div class="uk-accordion-content">
-                            <citeThis [result]="softwareInfo" [id]="softwareId" type="software"></citeThis>
-                          </div>
-                      </li>
-                  </ul>
 
-
+                    <div class=" sideInfoTitle  cite-this-button uk-width-1-1" type="button">
+                      Cite this software
+                    </div>
+                    <div class="">
+                      <citeThis [result]="softwareInfo" [id]="softwareId" type="software"></citeThis>
+                    </div>
                 </li>
                 <!--li>
                   <ul uk-accordion class="uk-padding-remove">
@@ -334,8 +230,36 @@
                 </li-->
 
             </ul>
+            <button   class="   uk-button portal-button uk-width-1-1 ">
+              <span class="uk-icon">
+                   <svg icon="link" ratio="1" xmlns="http://www.w3.org/2000/svg" width="25" viewBox="0 0 20 20" height="25"><path d="M10.625,12.375 L7.525,15.475 C6.825,16.175 5.925,16.175 5.225,15.475 L4.525,14.775 C3.825,14.074 3.825,13.175 4.525,12.475 L7.625,9.375" fill="none" stroke="#000" stroke-width="1.1"></path><path d="M9.325,7.375 L12.425,4.275 C13.125,3.575 14.025,3.575 14.724,4.275 L15.425,4.975 C16.125,5.675 16.125,6.575 15.425,7.275 L12.325,10.375" fill="none" stroke="#000" stroke-width="1.1"></path><path d="M7.925,11.875 L11.925,7.975" fill="none" stroke="#000" stroke-width="1.1"></path></svg>
+                 </span> Link this software to...
+            </button>
 
+          <div   uk-dropdown="pos: bottom-left; mode:click" style="background: transparent !important;box-shadow: none; max-width: 70px !important; min-width: 70px !important;">
+              <ul class="uk-iconnav uk-iconnav-vertical">
+                <li  uk-tooltip="pos:right;" title="<div class='tooltip-custom-font-size  '>Projects</div>">
+                  <a   class="   uk-icon-button portal-button  shadowBox"  style="padding: 6px;"  [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[softwareId,'software','project'])"   routerLinkActive="router-link-active" routerLink="/participate/direct-claim" >
+                    <span class="uk-icon" >
+                       <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="album" ratio="1"><rect x="5" y="2" width="10" height="1"></rect><rect x="3" y="4" width="14" height="1"></rect><rect fill="none" stroke="#000" x="1.5" y="6.5" width="17" height="11"></rect></svg></span>
+                  </a>
+                </li>
+                 <li  uk-tooltip="pos:right;" title="<div class='tooltip-custom-font-size  '>Communities</div>">
+                   <a   class="   uk-icon-button portal-button  shadowBox"  style="padding: 6px;" [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[softwareId,'software','context'])"   routerLinkActive="router-link-active" routerLink="/participate/direct-claim" >
+                     <span class="uk-icon"  >
+                          <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="users" ratio="1"><circle fill="none" stroke="#000" stroke-width="1.1" cx="7.7" cy="8.6" r="3.5"></circle><path fill="none" stroke="#000" stroke-width="1.1" d="M1,18.1 C1.7,14.6 4.4,12.1 7.6,12.1 C10.9,12.1 13.7,14.8 14.3,18.3"></path><path fill="none" stroke="#000" stroke-width="1.1" d="M11.4,4 C12.8,2.4 15.4,2.8 16.3,4.7 C17.2,6.6 15.7,8.9 13.6,8.9 C16.5,8.9 18.8,11.3 19.2,14.1"></path></svg></span>
+                   </a>
+                 </li>
+                 <li uk-tooltip="pos:right;" title="<div class='tooltip-custom-font-size  uk-margin-small'>Other research results</div>">
+                   <a   class="   uk-icon-button portal-button  shadowBox"  style="padding: 6px;"  [queryParams]="routerHelper.createQueryParams(['id','type','linkTo'],[softwareId,'software','result'])"   routerLinkActive="router-link-active" routerLink="/participate/direct-claim" >
+                     <span class="uk-icon" >
+                          <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="copy" ratio="1"><rect fill="none" stroke="#000" x="3.5" y="2.5" width="12" height="16"></rect><polyline fill="none" stroke="#000" points="5 0.5 17.5 0.5 17.5 17"></polyline></svg></span>
+                   </a>
+                 </li>
+
+             </ul>
           </div>
+          </div>
         </div>
     </div>
 <!-- Claiming FAB -->
@@ -346,7 +270,7 @@
                 <svg icon="link" ratio="1" xmlns="http://www.w3.org/2000/svg" width="40" viewBox="0 0 20 20" height="40"><path d="M10.625,12.375 L7.525,15.475 C6.825,16.175 5.925,16.175 5.225,15.475 L4.525,14.775 C3.825,14.074 3.825,13.175 4.525,12.475 L7.625,9.375" fill="none" stroke="#000" stroke-width="1.1"></path><path d="M9.325,7.375 L12.425,4.275 C13.125,3.575 14.025,3.575 14.724,4.275 L15.425,4.975 C16.125,5.675 16.125,6.575 15.425,7.275 L12.325,10.375" fill="none" stroke="#000" stroke-width="1.1"></path><path d="M7.925,11.875 L11.925,7.975" fill="none" stroke="#000" stroke-width="1.1"></path></svg>
               </span>
          </a-->
-         <button style=" box-shadow: 0 1px 10px #444444" class="   uk-button uk-button-danger  ">
+         <!-- <button   class="   uk-button uk-button-danger  ">
            <span class="uk-icon">
                 <svg icon="link" ratio="1" xmlns="http://www.w3.org/2000/svg" width="25" viewBox="0 0 20 20" height="25"><path d="M10.625,12.375 L7.525,15.475 C6.825,16.175 5.925,16.175 5.225,15.475 L4.525,14.775 C3.825,14.074 3.825,13.175 4.525,12.475 L7.625,9.375" fill="none" stroke="#000" stroke-width="1.1"></path><path d="M9.325,7.375 L12.425,4.275 C13.125,3.575 14.025,3.575 14.724,4.275 L15.425,4.975 C16.125,5.675 16.125,6.575 15.425,7.275 L12.325,10.375" fill="none" stroke="#000" stroke-width="1.1"></path><path d="M7.925,11.875 L11.925,7.975" fill="none" stroke="#000" stroke-width="1.1"></path></svg>
               </span> Link this software to
@@ -374,7 +298,8 @@
               </li>
 
           </ul>
-       </div>
+       </div> -->
+
       </div>
 
 </div>
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/utils/properties/env-properties.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/utils/properties/env-properties.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/utils/properties/env-properties.ts	(revision 53464)
@@ -70,7 +70,8 @@
 
 
   feedbackmail;
-
+  feedbackmailForMissingEntities;
+  
   helperPageUrl;
 
   cacheUrl;
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/sharedComponents/bottom.component.html
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/sharedComponents/bottom.component.html	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/sharedComponents/bottom.component.html	(revision 53464)
@@ -1,89 +1,337 @@
-<div class="custom-footer">
-<div class="uk-section-primary uk-section uk-section-small uk-padding-remove-bottom">
-  <div class="uk-container">
-     <div class="uk-grid-margin uk-grid" uk-grid="">
-        <div class="uk-width-expand@m uk-light uk-first-column">
-           <div *ngIf="showSocialButton" class="uk-margin">
 
+<!-- <div class="uk-section-primary uk-preserve-color uk-section uk-section-small uk-padding-remove-bottom">
+   <div class="uk-container uk-container-expand">
+      <div class="uk-grid-large uk-grid-margin-large uk-grid" uk-grid="">
+         <div *ngIf="showSocialButton" class="uk-width-auto@m uk-light uk-first-column">
+            <div id="footer#4" class="newsletter uk-margin uk-margin-remove-bottom uk-text-left uk-panel">
+               <h6 class="el-title uk-margin uk-h2">
+                  Newsletter
+               </h6>
+               <a target="_blank" href="https://www.openaire.eu/newsletter/view" class="el-link">
+                  <span   class="el-image uk-icon">
+                     <svg width="30" height="30" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+                        <circle cx="3.12" cy="16.8" r="1.85"></circle>
+                        <path fill="none" stroke="#000" stroke-width="1.1" d="M1.5,8.2 C1.78,8.18 2.06,8.16 2.35,8.16 C7.57,8.16 11.81,12.37 11.81,17.57 C11.81,17.89 11.79,18.19 11.76,18.5"></path>
+                        <path fill="none" stroke="#000" stroke-width="1.1" d="M1.5,2.52 C1.78,2.51 2.06,2.5 2.35,2.5 C10.72,2.5 17.5,9.24 17.5,17.57 C17.5,17.89 17.49,18.19 17.47,18.5"></path>
+                     </svg>
+                  </span>
+               </a>
+            </div>
+         </div>
+         <div *ngIf="showMenu" class="uk-width-expand@m uk-light">
+            <div id="footer#7" class="uk-text-right@m uk-text-center">
 
-           <div class="uk-child-width-auto uk-grid-small uk-grid" uk-grid="">
-             <div class="uk-first-column">
-                <a class="el-link uk-icon-link uk-icon" href="http://www.facebook.com/groups/openaire/" target="_blank" ><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="facebook" ratio="1"><path d="M11,10h2.6l0.4-3H11V5.3c0-0.9,0.2-1.5,1.5-1.5H14V1.1c-0.3,0-1-0.1-2.1-0.1C9.6,1,8,2.4,8,5v2H5.5v3H8v8h3V10z"></path></svg></a>
-             </div>
-             <div>
-                <a class="el-link uk-icon-link uk-icon" href="http://www.twitter.com/OpenAIRE_eu" target="_blank" ><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="twitter" ratio="1"><path d="M19,4.74 C18.339,5.029 17.626,5.229 16.881,5.32 C17.644,4.86 18.227,4.139 18.503,3.28 C17.79,3.7 17.001,4.009 16.159,4.17 C15.485,3.45 14.526,3 13.464,3 C11.423,3 9.771,4.66 9.771,6.7 C9.771,6.99 9.804,7.269 9.868,7.539 C6.795,7.38 4.076,5.919 2.254,3.679 C1.936,4.219 1.754,4.86 1.754,5.539 C1.754,6.82 2.405,7.95 3.397,8.61 C2.79,8.589 2.22,8.429 1.723,8.149 L1.723,8.189 C1.723,9.978 2.997,11.478 4.686,11.82 C4.376,11.899 4.049,11.939 3.713,11.939 C3.475,11.939 3.245,11.919 3.018,11.88 C3.49,13.349 4.852,14.419 6.469,14.449 C5.205,15.429 3.612,16.019 1.882,16.019 C1.583,16.019 1.29,16.009 1,15.969 C2.635,17.019 4.576,17.629 6.662,17.629 C13.454,17.629 17.17,12 17.17,7.129 C17.17,6.969 17.166,6.809 17.157,6.649 C17.879,6.129 18.504,5.478 19,4.74"></path></svg></a>
-             </div>
-             <div>
-                <a class="el-link uk-icon-link uk-icon" href="http://www.linkedin.com/groups/OpenAIRE-3893548" target="_blank"  ><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="linkedin" ratio="1"><path d="M5.77,17.89 L5.77,7.17 L2.21,7.17 L2.21,17.89 L5.77,17.89 L5.77,17.89 Z M3.99,5.71 C5.23,5.71 6.01,4.89 6.01,3.86 C5.99,2.8 5.24,2 4.02,2 C2.8,2 2,2.8 2,3.85 C2,4.88 2.77,5.7 3.97,5.7 L3.99,5.7 L3.99,5.71 L3.99,5.71 Z"></path><path d="M7.75,17.89 L11.31,17.89 L11.31,11.9 C11.31,11.58 11.33,11.26 11.43,11.03 C11.69,10.39 12.27,9.73 13.26,9.73 C14.55,9.73 15.06,10.71 15.06,12.15 L15.06,17.89 L18.62,17.89 L18.62,11.74 C18.62,8.45 16.86,6.92 14.52,6.92 C12.6,6.92 11.75,7.99 11.28,8.73 L11.3,8.73 L11.3,7.17 L7.75,7.17 C7.79,8.17 7.75,17.89 7.75,17.89 L7.75,17.89 L7.75,17.89 Z"></path></svg></a>
-             </div>
-             <div>
-                <a class="el-link uk-icon-link uk-icon" href="http://www.slideshare.net/OpenAIRE_eu" target="_blank"  ><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="social" ratio="1"><line fill="none" stroke="#000" stroke-width="1.1" x1="13.4" y1="14" x2="6.3" y2="10.7"></line><line fill="none" stroke="#000" stroke-width="1.1" x1="13.5" y1="5.5" x2="6.5" y2="8.8"></line><circle fill="none" stroke="#000" stroke-width="1.1" cx="15.5" cy="4.6" r="2.3"></circle><circle fill="none" stroke="#000" stroke-width="1.1" cx="15.5" cy="14.8" r="2.3"></circle><circle fill="none" stroke="#000" stroke-width="1.1" cx="4.5" cy="9.8" r="2.3"></circle></svg></a>
-             </div>
-             <div>
-                <a class="el-link uk-icon-link uk-icon" href="http://vimeo.com/openaire" target="_blank" ><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="vimeo" ratio="1"><path d="M2.065,7.59C1.84,7.367,1.654,7.082,1.468,6.838c-0.332-0.42-0.137-0.411,0.274-0.772c1.026-0.91,2.004-1.896,3.127-2.688 c1.017-0.713,2.365-1.173,3.286-0.039c0.849,1.045,0.869,2.629,1.084,3.891c0.215,1.309,0.421,2.648,0.88,3.901 c0.127,0.352,0.37,1.018,0.81,1.074c0.567,0.078,1.145-0.917,1.408-1.289c0.684-0.987,1.611-2.317,1.494-3.587 c-0.115-1.349-1.572-1.095-2.482-0.773c0.146-1.514,1.555-3.216,2.912-3.792c1.439-0.597,3.579-0.587,4.302,1.036 c0.772,1.759,0.078,3.802-0.763,5.396c-0.918,1.731-2.1,3.333-3.363,4.829c-1.114,1.329-2.432,2.787-4.093,3.422 c-1.897,0.723-3.021-0.686-3.667-2.318c-0.705-1.777-1.056-3.771-1.565-5.621C4.898,8.726,4.644,7.836,4.136,7.191 C3.473,6.358,2.72,7.141,2.065,7.59C1.977,7.502,2.115,7.551,2.065,7.59L2.065,7.59z"></path></svg></a>
-             </div>
-          </div>
+               <ul class="uk-subnav uk-margin-remove-bottom uk-subnav-divider uk-flex-right@m uk-flex-center" uk-margin="">
+                 <ng-container *ngFor="let submenu of menuItems">
+                   <li class="el-item"  *ngIf="isEnabled(submenu.routeRequired, showPage)">
+                     <a *ngIf="submenu.route.length > 0"  routerLink="{{submenu.route}}"  [queryParams]=submenu.params >{{submenu.title}}</a>
+                     <a *ngIf="submenu.route.length == 0 && submenu.url.length > 0"  href="{{submenu.url}}" target="_blank" >{{submenu.title}}</a>
+                   </li>
+                 </ng-container>
+               </ul>
 
-           </div>
-           <!--div class="uk-margin uk-margin-remove-top uk-margin-remove-bottom uk-text-left">
-              <img [src]="assetsPath + 'common/ec_logo_inv_small.png'" class="el-image" alt="European Commission">
-           </div-->
-        </div>
-        <div *ngIf="showMenu"  class="uk-width-expand@m uk-light">
+            </div>
+         </div>
+         <div class="uk-width-auto@m uk-grid-item-match">
+            <div class="uk-tile-primary uk-preserve-color uk-tile uk-padding-remove">
+               <div id="footer#9" class="uk-margin uk-text-right@m uk-text-center">
+                  <a class="el-content uk-button uk-button-default uk-button-small" target="_blank" href="https://www.openaire.eu/contact-us" target="_blank" style="border: 1px solid white; background: 0; color: white;">
+                  Contact us
+                  </a>
+               </div>
+            </div>
+         </div>
+      </div>
+   </div>
+</div>
+<div class="uk-section-primary uk-section uk-section-xsmall uk-padding-remove-bottom">
+   <div class="uk-container uk-container-expand">
+      <div *ngIf="showOpenaire"  class="uk-margin-small uk-grid uk-grid-stack" uk-grid="">
+         <div class="uk-width-1-1@m uk-first-column">
+            <div class="uk-margin-large uk-margin-remove-top uk-text-center@m uk-text-center">
+               <img   [src]="assetsPath + 'common/Logo_Horizontal_white_small.png'"  sizes="(min-width: 126px) 126px" data-width="126" data-height="30" class="el-image" alt="OpenAIRE">
+            </div>
+         </div>
+      </div>
+      <div class="uk-flex-middle uk-margin-remove-vertical uk-grid" uk-grid="">
+         <div class="uk-width-small@m uk-first-column">
+            <div id="footer#16" class="uk-margin-medium uk-text-left@m uk-text-center uk-margin-small-bottom">
+               <img [src]="assetsPath + 'commission.jpg'"  sizes="(min-width: 50px) 50px" data-width="427" data-height="285" class="el-image" alt="European Commission">
+            </div>
+         </div>
+         <div *ngIf="showDnet" class="uk-width-expand@m">
+            <div id="footer#18" class=" uk-text-small uk-margin uk-margin-remove-bottom uk-text-center uk-text-lead">
+               <a href="http://creativecommons.org/licenses/by/4.0/" rel="license">
+                  <img src="/images/Icons/cc.svg" uk-svg="" hidden="true">
+                  <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" width="24" height="24" class=" uk-svg">
+                     <title></title>
+                     <g data-name="Creative Commons" id="Creative_Commons">
+                        <circle cx="12" cy="12" r="11.5" style="fill:none;stroke:#ffffff;stroke-linecap:round;stroke-linejoin:round"></circle>
+                        <path d="M10.87,10a3.5,3.5,0,1,0,0,4" style="fill:none;stroke:#ffffff;stroke-linecap:round;stroke-linejoin:round"></path>
+                        <path d="M18.87,10a3.5,3.5,0,1,0,0,4" style="fill:none;stroke:#ffffff;stroke-linecap:round;stroke-linejoin:round"></path>
+                     </g>
+                  </svg>
+                  &nbsp;<img src="/images/Icons/cc-by.svg" uk-svg="" hidden="true">
+                  <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" width="24" height="24" class=" uk-svg">
+                     <title></title>
+                     <g id="Attribution">
+                        <g data-name="<Group>" id="_Group_">
+                           <circle cx="12" cy="5" data-name="<Path>" id="_Path_" r="1.5" style="fill:none;stroke:#ffffff;stroke-linecap:round;stroke-linejoin:round"></circle>
+                           <path d="M12,8a5,5,0,0,0-3.07.71,1,1,0,0,0-.43.83V15H10v5.5h4V15h1.5V9.54a1,1,0,0,0-.43-.83A5,5,0,0,0,12,8Z" data-name="<Path>" id="_Path_2" style="fill:none;stroke:#ffffff;stroke-linecap:round;stroke-linejoin:round"></path>
+                        </g>
+                        <circle cx="12" cy="12" r="11.5" style="fill:none;stroke:#ffffff;stroke-linecap:round;stroke-linejoin:round"></circle>
+                     </g>
+                  </svg>
+               </a>
+               &nbsp;Unless otherwise indicated, all materials created by OpenAIRE are licenced under&nbsp;<a href="http://creativecommons.org/licenses/by/4.0/" rel="license">CC ATTRIBUTION 4.0 INTERNATIONAL LICENSE</a>.
+            </div>
+         </div>
+         <div class="uk-width-small@m">
+            <div class="uk-margin uk-margin-remove-top uk-margin-remove-bottom uk-text-right@m uk-text-center">
+               <a href="#" uk-totop="" uk-scroll="" class="uk-totop uk-icon">
+               </a>
+            </div>
+         </div>
+      </div>
+   </div>
+</div>
+<div *ngIf="showSocialButton" id="footer#21" class="uk-section-primary uk-section uk-section-xsmall" style="background: #14134D;">
+   <div class="uk-container">
+      <div class="uk-grid-margin uk-grid uk-grid-stack" uk-grid="">
+         <div class="uk-width-expand@m uk-first-column">
+            <div id="footer#24" class="uk-margin uk-text-center">
+               <div class="uk-child-width-auto uk-grid-large uk-flex-center uk-grid" uk-grid="">
+                  <div class="uk-first-column">
+                     <a   href="http://www.facebook.com/groups/openaire/" target="_blank" class="el-link uk-icon-button uk-icon">
+                        <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+                           <path d="M11,10h2.6l0.4-3H11V5.3c0-0.9,0.2-1.5,1.5-1.5H14V1.1c-0.3,0-1-0.1-2.1-0.1C9.6,1,8,2.4,8,5v2H5.5v3H8v8h3V10z"></path>
+                        </svg>
+                     </a>
+                  </div>
+                  <div>
+                     <a   href="http://www.twitter.com/OpenAIRE_eu" target="_blank" class="el-link uk-icon-button uk-icon">
+                        <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+                           <path d="M19,4.74 C18.339,5.029 17.626,5.229 16.881,5.32 C17.644,4.86 18.227,4.139 18.503,3.28 C17.79,3.7 17.001,4.009 16.159,4.17 C15.485,3.45 14.526,3 13.464,3 C11.423,3 9.771,4.66 9.771,6.7 C9.771,6.99 9.804,7.269 9.868,7.539 C6.795,7.38 4.076,5.919 2.254,3.679 C1.936,4.219 1.754,4.86 1.754,5.539 C1.754,6.82 2.405,7.95 3.397,8.61 C2.79,8.589 2.22,8.429 1.723,8.149 L1.723,8.189 C1.723,9.978 2.997,11.478 4.686,11.82 C4.376,11.899 4.049,11.939 3.713,11.939 C3.475,11.939 3.245,11.919 3.018,11.88 C3.49,13.349 4.852,14.419 6.469,14.449 C5.205,15.429 3.612,16.019 1.882,16.019 C1.583,16.019 1.29,16.009 1,15.969 C2.635,17.019 4.576,17.629 6.662,17.629 C13.454,17.629 17.17,12 17.17,7.129 C17.17,6.969 17.166,6.809 17.157,6.649 C17.879,6.129 18.504,5.478 19,4.74"></path>
+                        </svg>
+                     </a>
+                  </div>
+                  <div>
+                     <a href="http://www.linkedin.com/groups/OpenAIRE-3893548" target="_blank" class="el-link uk-icon-button uk-icon">
+                        <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+                           <path d="M5.77,17.89 L5.77,7.17 L2.21,7.17 L2.21,17.89 L5.77,17.89 L5.77,17.89 Z M3.99,5.71 C5.23,5.71 6.01,4.89 6.01,3.86 C5.99,2.8 5.24,2 4.02,2 C2.8,2 2,2.8 2,3.85 C2,4.88 2.77,5.7 3.97,5.7 L3.99,5.7 L3.99,5.71 L3.99,5.71 Z"></path>
+                           <path d="M7.75,17.89 L11.31,17.89 L11.31,11.9 C11.31,11.58 11.33,11.26 11.43,11.03 C11.69,10.39 12.27,9.73 13.26,9.73 C14.55,9.73 15.06,10.71 15.06,12.15 L15.06,17.89 L18.62,17.89 L18.62,11.74 C18.62,8.45 16.86,6.92 14.52,6.92 C12.6,6.92 11.75,7.99 11.28,8.73 L11.3,8.73 L11.3,7.17 L7.75,7.17 C7.79,8.17 7.75,17.89 7.75,17.89 L7.75,17.89 L7.75,17.89 Z"></path>
+                        </svg>
+                     </a>
+                  </div>
+                  <div>
+                     <a   href="http://www.slideshare.net/OpenAIRE_eu" target="_blank" class="el-link uk-icon-button uk-icon">
+                        <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+                           <line fill="none" stroke="#000" stroke-width="1.1" x1="13.4" y1="14" x2="6.3" y2="10.7"></line>
+                           <line fill="none" stroke="#000" stroke-width="1.1" x1="13.5" y1="5.5" x2="6.5" y2="8.8"></line>
+                           <circle fill="none" stroke="#000" stroke-width="1.1" cx="15.5" cy="4.6" r="2.3"></circle>
+                           <circle fill="none" stroke="#000" stroke-width="1.1" cx="15.5" cy="14.8" r="2.3"></circle>
+                           <circle fill="none" stroke="#000" stroke-width="1.1" cx="4.5" cy="9.8" r="2.3"></circle>
+                        </svg>
+                     </a>
+                  </div>
+                  <div>
+                     <a   href="https://www.youtube.com/channel/UChFYqizc-S6asNjQSoWuwjw" target="_blank" class="el-link uk-icon-button uk-icon">
+                        <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+                           <path d="M15,4.1c1,0.1,2.3,0,3,0.8c0.8,0.8,0.9,2.1,0.9,3.1C19,9.2,19,10.9,19,12c-0.1,1.1,0,2.4-0.5,3.4c-0.5,1.1-1.4,1.5-2.5,1.6 c-1.2,0.1-8.6,0.1-11,0c-1.1-0.1-2.4-0.1-3.2-1c-0.7-0.8-0.7-2-0.8-3C1,11.8,1,10.1,1,8.9c0-1.1,0-2.4,0.5-3.4C2,4.5,3,4.3,4.1,4.2 C5.3,4.1,12.6,4,15,4.1z M8,7.5v6l5.5-3L8,7.5z"></path>
+                        </svg>
+                     </a>
+                  </div>
+               </div>
+            </div>
+         </div>
+      </div>
+   </div>
+</div> -->
 
-              <ul class="uk-subnav uk-margin-remove-bottom uk-subnav-divider uk-flex-center" uk-margin="" >
-                <ng-container *ngFor="let submenu of menuItems">
-                  <li class="el-item"  *ngIf="isEnabled(submenu.routeRequired, showPage)">
-                    <a *ngIf="submenu.route.length > 0"  routerLink="{{submenu.route}}"  [queryParams]=submenu.params >{{submenu.title}}</a>
-                    <a *ngIf="submenu.route.length == 0 && submenu.url.length > 0"  href="{{submenu.url}}" target="_blank" >{{submenu.title}}</a>
-                  </li>
-                </ng-container>
-              </ul>
-        </div>
-     </div>
-  </div>
+
+<!-- NEW -->
+
+<div   class="uk-section-primary uk-section uk-section-small uk-padding-remove-bottom">
+   <div class="uk-container uk-container-expand">
+      <div class="uk-container uk-container-expand uk-margin-small">
+         <div class="uk-grid-collapse uk-grid" uk-grid="">
+            <div id="footer#3" class="uk-width-expand@s uk-first-column">
+               <div *ngIf="showOpenaire" class="uk-margin-small uk-margin-remove-top uk-text-left@s uk-text-center">
+                  <img [src]="assetsPath + 'common/Logo_Horizontal_white_small.png'"   data-width="126" data-height="30" class="el-image" alt="OpenAIRE">
+               </div>
+               <div *ngIf="showDnet" id="footer#5" class="uk-margin uk-text-left@s uk-text-center">
+                  <img  [src]="assetsPath + 'common/commission.jpg'"   sizes="(min-width: 50px) 50px" data-width="427" data-height="285" class="el-image" alt="European Commission">
+               </div>
+               <div *ngIf="showSocialButton" id="footer#6" class="newsletter uk-margin uk-margin-remove-bottom uk-text-left@s uk-text-center uk-panel">
+                  <h5 class="el-title uk-margin uk-h5">
+                     Newsletter
+                  </h5>
+                  <a target="_blank" href="https://www.openaire.eu/newsletter/view" class="el-link">
+                     <span   class="el-image uk-icon">
+                        <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+                           <circle cx="3.12" cy="16.8" r="1.85"></circle>
+                           <path fill="none" stroke="#000" stroke-width="1.1" d="M1.5,8.2 C1.78,8.18 2.06,8.16 2.35,8.16 C7.57,8.16 11.81,12.37 11.81,17.57 C11.81,17.89 11.79,18.19 11.76,18.5"></path>
+                           <path fill="none" stroke="#000" stroke-width="1.1" d="M1.5,2.52 C1.78,2.51 2.06,2.5 2.35,2.5 C10.72,2.5 17.5,9.24 17.5,17.57 C17.5,17.89 17.49,18.19 17.47,18.5"></path>
+                        </svg>
+                     </span>
+                  </a>
+               </div>
+               <div *ngIf="showSocialButton" id="footer#7" class="newsletter uk-margin-small uk-margin-remove-top uk-text-left@s uk-text-center uk-panel">
+
+                  <div class="acymailing_module" id="acymailing_module_formAcymailing60611">
+                     <div class="" id="acymailing_toggle_formAcymailing60611">
+                        <p><a class="" id="acymailing_togglemodule_formAcymailing60611" target="_blank" href="https://www.openaire.eu/newsletter/view">Subscribe</a></p>
+
+                     </div>
+                  </div>
+               </div>
+               <div  *ngIf="showSocialButton"class="uk-margin-small uk-margin-remove-top uk-text-left@s uk-text-center">
+                  <div class="uk-child-width-auto uk-grid-small uk-flex-left@s uk-flex-center uk-grid" uk-grid="">
+                     <div class="uk-first-column">
+                        <a  href="http://www.facebook.com/groups/openaire/" target="_blank" class="el-link uk-icon-button uk-icon">
+                           <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+                              <path d="M11,10h2.6l0.4-3H11V5.3c0-0.9,0.2-1.5,1.5-1.5H14V1.1c-0.3,0-1-0.1-2.1-0.1C9.6,1,8,2.4,8,5v2H5.5v3H8v8h3V10z"></path>
+                           </svg>
+                        </a>
+                     </div>
+                     <div>
+                        <a  href="http://www.twitter.com/OpenAIRE_eu" target="_blank" class="el-link uk-icon-button uk-icon">
+                           <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+                              <path d="M19,4.74 C18.339,5.029 17.626,5.229 16.881,5.32 C17.644,4.86 18.227,4.139 18.503,3.28 C17.79,3.7 17.001,4.009 16.159,4.17 C15.485,3.45 14.526,3 13.464,3 C11.423,3 9.771,4.66 9.771,6.7 C9.771,6.99 9.804,7.269 9.868,7.539 C6.795,7.38 4.076,5.919 2.254,3.679 C1.936,4.219 1.754,4.86 1.754,5.539 C1.754,6.82 2.405,7.95 3.397,8.61 C2.79,8.589 2.22,8.429 1.723,8.149 L1.723,8.189 C1.723,9.978 2.997,11.478 4.686,11.82 C4.376,11.899 4.049,11.939 3.713,11.939 C3.475,11.939 3.245,11.919 3.018,11.88 C3.49,13.349 4.852,14.419 6.469,14.449 C5.205,15.429 3.612,16.019 1.882,16.019 C1.583,16.019 1.29,16.009 1,15.969 C2.635,17.019 4.576,17.629 6.662,17.629 C13.454,17.629 17.17,12 17.17,7.129 C17.17,6.969 17.166,6.809 17.157,6.649 C17.879,6.129 18.504,5.478 19,4.74"></path>
+                           </svg>
+                        </a>
+                     </div>
+                     <div>
+                        <a  href="http://www.linkedin.com/groups/OpenAIRE-3893548" target="_blank" class="el-link uk-icon-button uk-icon">
+                           <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+                              <path d="M5.77,17.89 L5.77,7.17 L2.21,7.17 L2.21,17.89 L5.77,17.89 L5.77,17.89 Z M3.99,5.71 C5.23,5.71 6.01,4.89 6.01,3.86 C5.99,2.8 5.24,2 4.02,2 C2.8,2 2,2.8 2,3.85 C2,4.88 2.77,5.7 3.97,5.7 L3.99,5.7 L3.99,5.71 L3.99,5.71 Z"></path>
+                              <path d="M7.75,17.89 L11.31,17.89 L11.31,11.9 C11.31,11.58 11.33,11.26 11.43,11.03 C11.69,10.39 12.27,9.73 13.26,9.73 C14.55,9.73 15.06,10.71 15.06,12.15 L15.06,17.89 L18.62,17.89 L18.62,11.74 C18.62,8.45 16.86,6.92 14.52,6.92 C12.6,6.92 11.75,7.99 11.28,8.73 L11.3,8.73 L11.3,7.17 L7.75,7.17 C7.79,8.17 7.75,17.89 7.75,17.89 L7.75,17.89 L7.75,17.89 Z"></path>
+                           </svg>
+                        </a>
+                     </div>
+                     <div>
+                        <a  href="http://www.slideshare.net/OpenAIRE_eu" target="_blank" class="el-link uk-icon-button uk-icon">
+                           <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+                              <line fill="none" stroke="#000" stroke-width="1.1" x1="13.4" y1="14" x2="6.3" y2="10.7"></line>
+                              <line fill="none" stroke="#000" stroke-width="1.1" x1="13.5" y1="5.5" x2="6.5" y2="8.8"></line>
+                              <circle fill="none" stroke="#000" stroke-width="1.1" cx="15.5" cy="4.6" r="2.3"></circle>
+                              <circle fill="none" stroke="#000" stroke-width="1.1" cx="15.5" cy="14.8" r="2.3"></circle>
+                              <circle fill="none" stroke="#000" stroke-width="1.1" cx="4.5" cy="9.8" r="2.3"></circle>
+                           </svg>
+                        </a>
+                     </div>
+                     <div>
+                        <a href="https://www.youtube.com/channel/UChFYqizc-S6asNjQSoWuwjw" target="_blank" class="el-link uk-icon-button uk-icon">
+                           <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+                              <path d="M15,4.1c1,0.1,2.3,0,3,0.8c0.8,0.8,0.9,2.1,0.9,3.1C19,9.2,19,10.9,19,12c-0.1,1.1,0,2.4-0.5,3.4c-0.5,1.1-1.4,1.5-2.5,1.6 c-1.2,0.1-8.6,0.1-11,0c-1.1-0.1-2.4-0.1-3.2-1c-0.7-0.8-0.7-2-0.8-3C1,11.8,1,10.1,1,8.9c0-1.1,0-2.4,0.5-3.4C2,4.5,3,4.3,4.1,4.2 C5.3,4.1,12.6,4,15,4.1z M8,7.5v6l5.5-3L8,7.5z"></path>
+                           </svg>
+                        </a>
+                     </div>
+                  </div>
+               </div>
+            </div>
+            <div *ngIf="!showMenu" class="uk-width-expand@m uk-light">
+               <div id="footer#7" class="uk-text-right@m uk-text-center">
+
+                  <ul class="uk-subnav uk-margin-remove-bottom uk-subnav-divider" uk-margin="">
+                    <ng-container *ngFor="let submenu of menuItems">
+                      <li class="el-item"  *ngIf="isEnabled(submenu.routeRequired, showPage)">
+                        <a *ngIf="submenu.route.length > 0"  routerLink="{{submenu.route}}"  [queryParams]=submenu.params >{{submenu.title}}</a>
+                        <a *ngIf="submenu.route.length == 0 && submenu.url.length > 0"  href="{{submenu.url}}" target="_blank" >{{submenu.title}}</a>
+                      </li>
+                    </ng-container>
+                  </ul>
+
+               </div>
+            </div>
+            <div *ngIf="showMenu" id="footer#9" class="uk-width-expand@s">
+               <div id="footer#10" class="uk-width-medium uk-text-left@s uk-text-center uk-panel">
+                  <h3 class="el-title uk-h6">Dashboards</h3>
+                  <ul class="uk-nav uk-nav-default uk-nav-parent-icon uk-nav-accordion" uk-nav="">
+                     <li><a href="https://explore.openaire.eu" target="_blank">Explore</a></li>
+                     <li><a href="https://provide.openaire.eu" target="_blank">Provide</a></li>
+                     <li><a href="https://connect.openaire.eu/" target="_blank">Connect</a></li>
+                     <li><a href="https://monitor.openaire.eu" target="_blank">Monitor</a></li>
+                     <li><a href="https://develop.openaire.eu" target="_blank">Develop</a></li>
+                  </ul>
+               </div>
+            </div>
+            <div *ngIf="showMenu" id="footer#11" class="uk-width-expand@s">
+               <div id="footer#12" class="uk-width-medium uk-text-left@s uk-text-center uk-panel">
+                  <h3 class="el-title uk-h6">Support</h3>
+                  <ul class="uk-nav uk-nav-default uk-nav-parent-icon uk-nav-accordion" uk-nav="">
+                     <li><a target="_blank" href="https://www.openaire.eu/guides">Guides</a></li>
+                     <li><a target="_blank" href="https://www.openaire.eu/faqs">FAQs</a></li>
+                     <li><a target="_blank" href="https://www.openaire.eu/frontpage/webinars">Webinars</a></li>
+                     <li><a target="_blank" href="https://www.openaire.eu/support/helpdesk">Ask a question</a></li>
+                  </ul>
+               </div>
+            </div>
+            <div *ngIf="showMenu" id="footer#13" class="uk-width-expand@s">
+               <div id="footer#14" class="uk-width-medium uk-text-left@s uk-text-center uk-panel">
+                  <h3 class="el-title uk-h6">Updates</h3>
+                  <ul class="uk-nav uk-nav-default uk-nav-parent-icon uk-nav-accordion" uk-nav="">
+                     <li><a target="_blank" href="https://www.openaire.eu/news/">News</a></li>
+                     <li><a target="_blank" href="https://www.openaire.eu/events">Events</a></li>
+                     <li><a target="_blank" href="https://www.openaire.eu/blogs/magazine">Blogs</a></li>
+                     <li><a target="_blank" href="https://www.openaire.eu/documents">Documents</a></li>
+                  </ul>
+               </div>
+            </div>
+         </div>
+      </div>
+   </div>
 </div>
-<div class="uk-section-primary uk-section uk-section-small">
-  <div class="uk-container">
-     <div class="uk-grid-margin uk-grid uk-grid-stack" uk-grid="">
-        <div class="uk-width-1-1@m uk-first-column">
-           <div *ngIf="showDnet" class="uk-margin uk-margin-remove-top uk-margin-remove-bottom uk-text-center">
-              <img [src]="assetsPath + 'common/Logo_Horizontal_white_small.png'" class="el-image" alt="OpenAIRE">
-           </div>
-           <!--div *ngIf="showDnet" class="footer-license uk-margin uk-margin-remove-bottom uk-text-center uk-text-lead">
-              <div><a href="http://creativecommons.org/licenses/by/4.0/" rel="license"><img [src]="assetsPath + 'common/80x15.png'" alt="Creative" style="height: auto; max-width: 100%; vertical-align: middle;"></a>&nbsp;UNLESS OTHERWISE INDICATED, ALL MATERIALS CREATED BY THE OPENAIRE CONSORTIUM ARE LICENSED UNDER A&nbsp;<a href="http://creativecommons.org/licenses/by/4.0/" rel="license">CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE</a>.</div>
-              <div>OPENAIRE IS POWERED BY&nbsp;<a href="http://www.d-net.research-infrastructures.eu/">D-NET</a>.</div>
-           </div-->
-           <div *ngIf="showOpenaire" class="footer-license uk-margin uk-margin-remove-bottom uk-text-center uk-text-lead">
-              <div>POWERED BY&nbsp;
-                <br>
-                <a href="https://www.openaire.eu/">
-                <img [src]="assetsPath + 'common/Logo_Horizontal_white_small.png'" class="el-image" alt="OpenAIRE"></a>
-              </div>
-           </div>
-           <div *ngIf="showDnet" class="uk-grid-large uk-flex-middle uk-margin-small uk-grid" uk-grid="">
-              <div class="uk-width-small@m uk-first-column">
-                 <div id="footer#15" class="uk-margin uk-margin-remove-bottom uk-text-center">
-                    <img [src]="assetsPath + 'ec_logo_inv_small-4aa7cf58.png'"  sizes="(min-width: 114px) 114px, 100vw" class="el-image" alt="European Commission" width="114">
-                 </div>
-              </div>
-              <div class="uk-width-expand@m">
-                 <div id="footer#17" class=" uk-text-small uk-margin uk-margin-remove-bottom uk-text-center uk-text-lead">
-                    <a href="http://creativecommons.org/licenses/by/4.0/" rel="license"><img src="https://i.creativecommons.org/l/by/3.0/80x15.png" alt="Creative" style="height: auto; max-width: 100%; vertical-align: middle;"></a>&nbsp;Unless otherwise indicated, all materials created by the OpenAIRE consortium are licenced under&nbsp;<a href="http://creativecommons.org/licenses/by/4.0/" rel="license">CC ATTRIBUTION 4.0 INTERNATIONAL LICENSE</a>.
-                 </div>
-              </div>
-              <div class="uk-width-small@m">
-                 <div class="uk-margin uk-margin-remove-top uk-margin-remove-bottom uk-text-right">
-                    <a href="#" uk-totop="" uk-scroll="" class="uk-totop uk-icon">
-                    </a>
-                 </div>
-              </div>
-           </div>
-           <!--div class="uk-margin uk-margin-remove-top uk-margin-remove-bottom uk-text-right">
-              <a href="#" uk-totop="" uk-scroll="" class="uk-totop uk-icon"></a>
-           </div-->
-        </div>
-     </div>
-  </div>
+
+
+
+<div class="uk-section-primary uk-section uk-section-xsmall">
+   <div class="uk-container">
+      <div class="uk-grid-margin uk-grid uk-grid-stack" uk-grid="">
+         <div class="uk-width-expand@m">
+         </div>
+      </div>
+   </div>
 </div>
+<div class="uk-section-primary uk-section uk-section-xsmall">
+   <div class="uk-container uk-container-expand">
+      <div class="uk-grid-margin uk-grid" uk-grid="">
+         <div class="uk-width-small@m uk-first-column">
+         </div>
+         <div class="uk-width-expand@m">
+            <div id="footer#22" class=" uk-text-small uk-margin uk-margin-remove-bottom uk-text-center@m uk-text-center uk-text-lead">
+               <a href="http://creativecommons.org/licenses/by/4.0/" rel="license">
+                  <img src="/images/Icons/cc.svg" uk-svg="" hidden="true">
+                  <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" width="24" height="24" class=" uk-svg">
+                     <title></title>
+                     <g data-name="Creative Commons" id="Creative_Commons">
+                        <circle cx="12" cy="12" r="11.5" style="fill:none;stroke:#ffffff;stroke-linecap:round;stroke-linejoin:round"></circle>
+                        <path d="M10.87,10a3.5,3.5,0,1,0,0,4" style="fill:none;stroke:#ffffff;stroke-linecap:round;stroke-linejoin:round"></path>
+                        <path d="M18.87,10a3.5,3.5,0,1,0,0,4" style="fill:none;stroke:#ffffff;stroke-linecap:round;stroke-linejoin:round"></path>
+                     </g>
+                  </svg>
+                  &nbsp;<img src="/images/Icons/cc-by.svg" uk-svg="" hidden="true">
+                  <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" width="24" height="24" class=" uk-svg">
+                     <title></title>
+                     <g id="Attribution">
+                        <g data-name="<Group>" id="_Group_">
+                           <circle cx="12" cy="5" data-name="<Path>" id="_Path_" r="1.5" style="fill:none;stroke:#ffffff;stroke-linecap:round;stroke-linejoin:round"></circle>
+                           <path d="M12,8a5,5,0,0,0-3.07.71,1,1,0,0,0-.43.83V15H10v5.5h4V15h1.5V9.54a1,1,0,0,0-.43-.83A5,5,0,0,0,12,8Z" data-name="<Path>" id="_Path_2" style="fill:none;stroke:#ffffff;stroke-linecap:round;stroke-linejoin:round"></path>
+                        </g>
+                        <circle cx="12" cy="12" r="11.5" style="fill:none;stroke:#ffffff;stroke-linecap:round;stroke-linejoin:round"></circle>
+                     </g>
+                  </svg>
+               </a>
+               &nbsp;Unless otherwise indicated, all materials created by OpenAIRE are licenced under&nbsp;<a href="http://creativecommons.org/licenses/by/4.0/" rel="license">CC ATTRIBUTION 4.0 INTERNATIONAL LICENSE</a>.
+            </div>
+         </div>
+         <div class="uk-width-small@m">
+            <div class="uk-margin uk-margin-remove-top uk-margin-remove-bottom uk-text-right@m uk-text-center">
+               <a href="#" uk-totop="" uk-scroll="" class="uk-totop uk-icon">
+
+               </a>
+            </div>
+         </div>
+      </div>
+   </div>
 </div>
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/app.component.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/app.component.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/app.component.ts	(revision 53464)
@@ -37,7 +37,7 @@
           <cookie-law *ngIf= "isClient" position="bottom">
               OpenAIRE uses cookies in order to function properly.<br>
               Cookies are small pieces of data that websites store in your browser to allow us to give you the best browsing experience possible.
-              By using the OpenAIRE portal you accept our use of cookies. <a href="//ec.europa.eu/ipg/basics/legal/cookies/index_en.htm" target="_blank"> Read more <span class="uk-icon">
+              By using the OpenAIRE portal you accept our use of cookies. <a href="http://ec.europa.eu/ipg/basics/legal/cookies/index_en.htm" target="_blank"> Read more <span class="uk-icon">
               <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="chevron-right" ratio="1"><polyline fill="none" stroke="#000" stroke-width="1.03" points="7 4 13 10 7 16"></polyline></svg>
               </span></a>
           </cookie-law>
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/deposit/depositResult.component.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/deposit/depositResult.component.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/deposit/depositResult.component.ts	(revision 53464)
@@ -29,7 +29,7 @@
               <helper position="left" styleName=" uk-width-1-5 uk-padding-left"></helper>
               <div class="uk-width-expand">
                 <div *ngIf="status == errorCodes.LOADING || (status == errorCodes.LOADING && fetchDataproviders.searchUtils.status == errorCodes.LOADING)"
-                      class="uk-animation-fade uk-margin-top  uk-width-1-1" role="alert"><img class="loading-gif  uk-align-center" >
+                      class="uk-animation-fade uk-margin-top  uk-width-1-1" role="alert"><span class="loading-gif  uk-align-center" ></span>
                 </div>
 
 
@@ -43,7 +43,7 @@
                         [title] = "'Organizations'"  [multipleSelections]=false (selectedValueChanged)="valueChanged($event)">
                       </entities-autocomplete>
                       </div>
-                      <button class=" uk-button uk-button-default"  type="submit" (click)="organizationSelected(selectedId)" >
+                      <button class=" uk-button portal-button"  type="submit" (click)="organizationSelected(selectedId)" >
                           Locate
                       </button>
                       <div *ngIf="warningMessage.length > 0" class="uk-alert uk-alert-warning uk-animation-fade" role="alert">{{warningMessage}}</div>
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/claims/claim-utils/claimContextSearchForm.component.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/claims/claim-utils/claimContextSearchForm.component.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/claims/claim-utils/claimContextSearchForm.component.ts	(revision 53464)
@@ -77,7 +77,7 @@
               <div *ngIf="error" class="uk-alert uk-alert-warning" role="alert">An error occured while loading communities...</div>
               <div class="uk-text-large  ">or</div>
               <div class=" uk-text-bold uk-margin-bottom uk-margin-left">browse through community categories:
-                <button  uk-toggle="target: #browse; animation:  uk-animation-fade" class="uk-button uk-button-default"> Browse </button>
+                <button  uk-toggle="target: #browse; animation:  uk-animation-fade" class="uk-button  portal-button"> Browse </button>
               </div>
               <div class="uk-margin-left">
 
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/claims/claimsByToken/claimsByToken.component.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/claims/claimsByToken/claimsByToken.component.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/claims/claimsByToken/claimsByToken.component.ts	(revision 53464)
@@ -34,7 +34,7 @@
 
 })
 export class ClaimsByTokenComponent {
-  public token: string = "";
+  public openaireId: string = "";
   public sub: any;
   public project: any;
   private claims:any = [];
@@ -97,7 +97,7 @@
       });
     this.sub =  this.route.queryParams.subscribe(params => {
         this.mode = "pending";
-        this.token = params['token'];
+        this.openaireId = params['openaireId'];
         this.selectedRight_PendingMode = new Set<string>();
         this.selectedWrong_PendingMode = new Set<string>();
         this.selectedRight_CuratedMode = new Set<string>();
@@ -253,7 +253,7 @@
 
   validateJWTandToken() {
 
-    if(this.token) {
+    if(this.openaireId) {
       this.pending_status = this.errorCodes.LOADING;
       this.curated_status = this.errorCodes.LOADING;
 
@@ -266,7 +266,7 @@
       this.activeCuratedPage.page = 1;
       this.totalCuratedResults.count = 0;
 
-      this.claimsByTokenService.getClaims(this.token,  this.properties.claimsAPIURL).subscribe(
+      this.claimsByTokenService.getClaims(this.openaireId,  this.properties.claimsAPIURL).subscribe(
           data => {
             //this.closeLoading();
             this.accessStatus = "valid";
@@ -288,7 +288,9 @@
               this.totalPendingResults.count = this.pending_claims.length;
               this.totalCuratedResults.count = this.curated_claims.length;
 
-              this.updateTitle("Claims For Project Managers - "+this.project.name);
+              if(this.project) {
+                this.updateTitle("Claims For Project Managers - "+this.project.name);
+              }
               this.showTables = true;
 
               if(!this.triggered) {
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/claims/linking/insertClaim/insertClaim.component.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/claims/linking/insertClaim/insertClaim.component.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/claims/linking/insertClaim/insertClaim.component.ts	(revision 53464)
@@ -28,7 +28,7 @@
         <div class="uk-alert uk-alert-warning  uk-margin-top" role="alert">{{warningMessage}}</div>
       </div>
     <div>
-    <button  *ngIf="!claiming  && showButton" (click)="validateInsertions()"  class="uk-button uk-button-danger uk-float-right"  >Finish</button>
+    <button  *ngIf="!claiming  && showButton" (click)="validateInsertions()"  class="uk-button portal-button uk-float-right"  >Finish</button>
   </div>
     `
 })
Index: modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/sharedComponents/bottom.component.ts
===================================================================
--- modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/sharedComponents/bottom.component.ts	(revision 53463)
+++ modules/uoa-services-library/trunk/ng-openaire-library-production/src/app/sharedComponents/bottom.component.ts	(revision 53464)
@@ -10,7 +10,7 @@
 export class BottomComponent {
 
 @Input() showSocialButton:boolean = true;
-@Input() showOpenaire:boolean = false;
+@Input() showOpenaire:boolean = true;
 @Input() showMenu:boolean = true;
 @Input() showDnet:boolean = true;
 @Input() assetsPath:string ='assets/common-assets/';
