diff --git a/claims/claim-utils/claimResultSearchForm.component.html b/claims/claim-utils/claimResultSearchForm.component.html
index b2e66b11..fe0ab300 100644
--- a/claims/claim-utils/claimResultSearchForm.component.html
+++ b/claims/claim-utils/claimResultSearchForm.component.html
@@ -1,14 +1,16 @@
-<div *ngIf="showOptions && showOptions.linkToEntities.length > 0" class="uk-width-xlarge@l uk-width-large" [ngClass]="centerAlign ? 'uk-align-center':''">
-  <advanced-search-input (searchEmitter)="search(true)">
-    <div input type="select" [(value)]="showOptions.show" placeholder="Type" hint="Select..."
-         [options]="showOptions.selectOptions" class="uk-width-2-5"></div>
-    <div class="uk-width-expand" input type="text" [(value)]="keyword" [searchable]="true" placeholder="Entities to link"
-         [hint]="'Search for ' + openaireEntities.RESULTS.toLowerCase()  + '...'" tooltip="true"></div>
-  </advanced-search-input>
-</div>
-<div *ngIf="!showOptions"  class="uk-width-xlarge@l uk-width-large">
-  <div search-input [(value)]="keyword" [placeholder]="'Search for ' + openaireEntities.RESULTS.toLowerCase() + '...'"
-       [searchInputClass]="'inner background'" (searchEmitter)="search(true)"></div>
+<div class="uk-flex uk-flex-center uk-flex-left@m">
+  <div *ngIf="showOptions && showOptions.linkToEntities.length > 0" class="uk-width-xlarge@l uk-width-large" [ngClass]="centerAlign ? 'uk-align-center':''">
+    <advanced-search-input (searchEmitter)="search(true)">
+      <div input type="select" [(value)]="showOptions.show" placeholder="Type" hint="Select..."
+           [options]="showOptions.selectOptions" class="uk-width-2-5"></div>
+      <div class="uk-width-expand" input type="text" [(value)]="keyword" [searchable]="true" placeholder="Entities to link"
+           [hint]="'Search for ' + openaireEntities.RESULTS.toLowerCase()  + '...'" tooltip="true"></div>
+    </advanced-search-input>
+  </div>
+  <div *ngIf="!showOptions"  class="uk-width-xlarge@l uk-width-large">
+    <div search-input [(value)]="keyword" [placeholder]="'Search for ' + openaireEntities.RESULTS.toLowerCase() + '...'"
+         [searchInputClass]="'inner background'" (searchEmitter)="search(true)"></div>
+  </div>
 </div>
 <div *ngIf="!showSearchResults">
   <div class="uk-text-center uk-text-large uk-text-meta uk-margin-large-top">
diff --git a/claims/linking/linkingGeneric.component.html b/claims/linking/linkingGeneric.component.html
index 7f394dd2..16cb04bf 100644
--- a/claims/linking/linkingGeneric.component.html
+++ b/claims/linking/linkingGeneric.component.html
@@ -73,11 +73,11 @@
   <div id="tm-main" class="uk-section uk-padding-remove-top" *ngIf="showOptions.show != 'claim'">
     <div>
       <schema2jsonld *ngIf="url" [URL]="url" name="Link your {{openaireEntities.RESULTS}}" type="other"></schema2jsonld>
-      <div [class]="((showOptions.show == 'claim')?'':' uk-margin-top ')+' uk-container uk-container-large '">
+      <div class="uk-container uk-container-large">
         <div *ngIf="properties" class="uk-section uk-padding-remove-top">
-          <div [class]="((showOptions.show == 'claim')?'':' uk-margin-top ')+' uk-container uk-container-large '">
+          <div class="uk-container uk-container-large">
             <div class="uk-grid basketContainer" *ngIf="showOptions.show!='claim'" uk-grid>
-              <div class="uk-width-2-3 uk-position-z-index">
+              <div class="uk-width-2-3@m uk-position-z-index uk-flex-first@m uk-flex-last uk-margin-medium-top">
                 <h2 *ngIf="inlineEntity" class="uk-text-center">Link source to</h2>
                 <div *ngIf="showOptions.show=='source'">
                   <claim-result-search-form [selectedResults]="sources" [properties]=properties
@@ -109,11 +109,11 @@
                 </div>
               </div>
               <!-- Basket-->
-              <div *ngIf="showOptions.show != 'claim'" class="uk-width-1-3">
+              <div *ngIf="showOptions.show != 'claim'" class="uk-width-1-3@m uk-flex-last@m uk-flex-first uk-margin-medium-top">
                 <div id="basket" uk-sticky="offset: 220; end: !*; media: @m" style="z-index: 0!important;">
                   <div class="uk-card uk-card-default linkingBasket">
                     <div class="uk-card-body uk-padding-small">
-                      <div class="uk-margin-right">
+                      <div>
                         <ng-container *ngIf="inlineEntity">
                           <div class="uk-margin-small-bottom">
                             <div class="uk-text-emphasis uk-text-bolder">Source</div>
@@ -145,7 +145,7 @@
                             </li>
                           </ul>
                           <div *ngIf="showOptions.basketShowSources">
-                            <div class="uk-height-medium  uk-overflow-auto">
+                            <div class="uk-height-max-medium  uk-overflow-auto uk-padding uk-padding-remove-left uk-padding-remove-vertical">
                               <div *ngIf="showOptions.show == 'source'" class="uk-padding-small uk-padding-remove-horizontal" style="min-height:17px;">
                                 <start-over *ngIf="showOptions.show == 'source' && sources.length> 0"
                                             [results]="sources"
@@ -173,7 +173,7 @@
                             </div>
                           </div>
                           <div *ngIf="showOptions.basketShowLinksTo">
-                            <div class="uk-height-medium uk-overflow-auto">
+                            <div class="uk-height-max-medium uk-overflow-auto uk-padding uk-padding-remove-left uk-padding-remove-vertical">
                               <ng-container *ngTemplateOutlet="destinations_basket"></ng-container>
                             </div>
                           </div>