diff --git a/claims/claim-utils/claimContextSearchForm.component.html b/claims/claim-utils/claimContextSearchForm.component.html
index 02e289b5..d74247f1 100644
--- a/claims/claim-utils/claimContextSearchForm.component.html
+++ b/claims/claim-utils/claimContextSearchForm.component.html
@@ -8,16 +8,16 @@
               </advanced-search-input>
           </div>
      
-        <div *ngIf="communities" class="uk-margin-right uk-padding uk-grid uk-child-width-1-3 uk-grid-small uk-grid-match"  
+        <div *ngIf="communities" class=" uk-padding uk-grid uk-child-width-1-3 uk-grid-small uk-grid-match"
         uk-grid >
           <ng-container *ngFor="let community of filter()">
-            <div class="uk-padding-small uk-link-reset community-card">
+            <div class="uk-padding-small uk-link-reset community-card " (click)="select(community.id, community.label)">
             <div [title]="(this.results.length>=basketLimit)?'Basket reached the size limit':''" 
                  class="uk-card uk-card-default uk-card-hover uk-padding-small uk-text-center " >
               <div class="uk-text-right" >
                 <a 
                   [class]="(this.results.length>=basketLimit)?'uk-icon-button uk-disabled disabled':'uk-icon-button enabled'" *ngIf="!isSelected(community.id)"
-                   (click)="select(community.id, community.label)">
+                   >
                         <span class="uk-icon">
                         <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="plus"
                              ratio="1"><rect x="9" y="1" width="1" height="17"></rect><rect x="1" y="9" width="17"
@@ -25,7 +25,7 @@
                      </span>
                 </a>
                 <a *ngIf="isSelected(community.id)" class="uk-icon-button selected " 
-                   (click)="remove(community)">
+                   (click)="openModal()">
                      <span class="uk-icon" >
                       <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="check" ratio="1"><polyline fill="none" stroke="#000" stroke-width="1.1" points="4,10 8,15 17,4"></polyline></svg>
                      </span>
diff --git a/claims/claim-utils/claimProjectSearchForm.component.html b/claims/claim-utils/claimProjectSearchForm.component.html
index 2bcb9e4d..ef01f55a 100644
--- a/claims/claim-utils/claimProjectSearchForm.component.html
+++ b/claims/claim-utils/claimProjectSearchForm.component.html
@@ -6,7 +6,7 @@
   </advanced-search-input>
 </div>
 <div *ngIf="!showResults">
-  <div class="uk-text-center uk-text-large uk-text-muted uk-margin-large-top">No {{openaireEntities.PROJECT.toLowerCase()}} results yet... <br>Start
+  <div class="uk-text-center uk-text-large uk-text-meta uk-margin-large-top">No {{openaireEntities.PROJECT.toLowerCase()}} results yet... <br>Start
     searching for {{openaireEntities.PROJECTS.toLowerCase()}} to add them in the Basket
   </div>
 </div>
diff --git a/claims/claim-utils/claimResultSearchForm.component.html b/claims/claim-utils/claimResultSearchForm.component.html
index e0901037..da948401 100644
--- a/claims/claim-utils/claimResultSearchForm.component.html
+++ b/claims/claim-utils/claimResultSearchForm.component.html
@@ -13,7 +13,7 @@
 </div>
 
 <div *ngIf="!showSearchResults">
-  <div class="uk-text-center uk-text-large uk-text-muted uk-margin-large-top">
+  <div class="uk-text-center uk-text-large uk-text-meta uk-margin-large-top">
     No {{showOptions?openaireEntities.RESULTS.toLowerCase() :'sources'}} yet...<br>Use the searchbar to find and link
     {{showOptions?openaireEntities.RESULTS.toLowerCase() :'sources'}}.
   </div>
diff --git a/claims/claim-utils/claimResults.component.ts b/claims/claim-utils/claimResults.component.ts
index eaec6530..267c4cb8 100644
--- a/claims/claim-utils/claimResults.component.ts
+++ b/claims/claim-utils/claimResults.component.ts
@@ -7,14 +7,14 @@ declare var UIkit: any;
   selector: 'claim-results',
   template: `
 
-    <div *ngIf="results.length > 0 "   class="uk-padding">
-      <div *ngFor=" let entity of results " [class]="(isSelected(entity))?'uk-block-muted':''" class=" uk-card uk-card-default uk-padding-small uk-margin-bottom claim-result-card">
+    <div *ngIf="results.length > 0 "   class="uk-margin-top">
+      <div *ngFor=" let entity of results " [class]="(isSelected(entity))?'uk-block-muted':''" class=" uk-card uk-card-default uk-padding uk-margin-bottom claim-result-card">
         <div>
           <div class="uk-text-small">
             {{(!entity.result) ? entity.type : ((entity.result && entity.result.source == 'openaire') ? entity.type : (entity.result && entity.result.source + ' result'))}}
           </div>
           <div class="uk-grid">
-            <div class="uk-width-expand">
+            <div class="uk-width-expand uk-margin-right">
               <claim-title [entity]="entity"></claim-title>
               <claim-result-metadata [entity]="entity"></claim-result-metadata>
               <claim-project-metadata [entity]="entity"></claim-project-metadata>
diff --git a/claims/linking/bulkClaim/bulkClaim.component.ts b/claims/linking/bulkClaim/bulkClaim.component.ts
index 38f2ccb6..fdce3997 100644
--- a/claims/linking/bulkClaim/bulkClaim.component.ts
+++ b/claims/linking/bulkClaim/bulkClaim.component.ts
@@ -21,15 +21,15 @@ declare var UIkit: any;
           <div>
             <!--div class="uk-text-lead">Upload a DOI csv file <helper  div="link-result-bulk" tooltip=true ></helper></div>
             <label for="exampleInputFile">Select a file: </label-->
-            <div class="js-upload" uk-form-custom>
+            <div class="js-upload uk-float-left" uk-form-custom>
               <input id="exampleInputFile" class="uk-width-medium" type="file" (change)="fileChangeEvent($event)"/>
               <span class="uk-link " style="text-decoration: underline;">Upload a DOI's CSV file </span>
               <!--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-->
               <!--helper  div="link-result-bulk" tooltip=true ></helper-->
+                <span class=" " title="{{tooltip}}" uk-tooltip><span class="uk-icon" uk-icon="icon: info; ratio: 0.8">&nbsp; </span> </span>
             </div>
-            <span class=" " title="{{tooltip}}" uk-tooltip><span class="uk-icon" uk-icon="icon: info; ratio: 0.8">&nbsp; </span> </span>
             <div *ngIf="showReport" uk-alert class="uk-alert-primary">
               <a class="uk-alert-close" uk-close></a>
               <div>Uploaded file contains <span
diff --git a/claims/linking/linkingGeneric.component.html b/claims/linking/linkingGeneric.component.html
index 0376e843..66a32137 100644
--- a/claims/linking/linkingGeneric.component.html
+++ b/claims/linking/linkingGeneric.component.html
@@ -1,4 +1,8 @@
-<breadcrumbs [breadcrumbs]="breadcrumbs"></breadcrumbs> 
+<div class="uk-container uk-container-large uk-section uk-section-small uk-padding-remove-bottom">
+  <div class="uk-padding-small">
+    <breadcrumbs [breadcrumbs]="breadcrumbs"></breadcrumbs>
+  </div>
+</div>
  <stepper>
    <step *ngIf="!inlineEntity" [status]="stepStatus('source')" stepId="source" stepNumber="1"
          [stepText]="'Find Sources'" (stepChanged)="stepHasChanged($event)"
@@ -90,7 +94,7 @@
                            </ul>
                         
             
-                          <div *ngIf="showOptions.basketShowSources">  
+                          <div *ngIf="showOptions.basketShowSources" class="uk-padding-small">
                           
                             <div  
                                class="  uk-margin-remove-top uk-height-medium  uk-overflow-auto ">
@@ -129,7 +133,7 @@
                               
                           </div>
                          
-                          <div *ngIf="showOptions.basketShowLinksTo">
+                          <div *ngIf="showOptions.basketShowLinksTo" class="uk-padding-small">
                             <div
                              class="uk-height-medium  uk-overflow-auto">
                           <div  *ngIf="  (results.length)> 0 || showOptions.show=='result'"