diff --git a/claims/linking/linkingGeneric.component.html b/claims/linking/linkingGeneric.component.html
index 66a32137..5b671a0a 100644
--- a/claims/linking/linkingGeneric.component.html
+++ b/claims/linking/linkingGeneric.component.html
@@ -3,6 +3,8 @@
     <breadcrumbs [breadcrumbs]="breadcrumbs"></breadcrumbs>
   </div>
 </div>
+<div uk-sticky=" offset: 65; top:#basketStickTop; bottom: #basketStickBottom; media: @m"
+     style="z-index: 100" class="uk-background-default uk-margin-small-top">
  <stepper>
    <step *ngIf="!inlineEntity" [status]="stepStatus('source')" stepId="source" stepNumber="1"
          [stepText]="'Find Sources'" (stepChanged)="stepHasChanged($event)"
@@ -17,6 +19,7 @@
          [showStepLine]="true"></step>
 
  </stepper>
+</div>
  
 <metadata-preview *ngIf="showOptions.show=='claim' && properties" class="uk-margin-top"
                   [results]="results" [sources]="sources"
@@ -72,7 +75,7 @@
                     <!-- Basket-->
                     <div *ngIf="showOptions.show != 'claim'" class="uk-width-1-3   uk-padding-remove-left "
                          style="" >
-                      <div id="basket" uk-sticky=" offset: 130; top:#basketStickTop; bottom: #basketStickBottom;"
+                      <div id="basket" uk-sticky=" offset: 180; top:#basketStickTop; bottom: #basketStickBottom; media: @m"
                            style="z-index: 0" class="uk-card uk-card-default linkingBasket">
                       <div class="linksbasket uk-inline uk-width-1-1" style="">
                         <div>
@@ -196,13 +199,14 @@
                     </div>
                   </div>
                    
-                  <div id="basketStickBottom"></div>
-                  <helper *ngIf="pageContents && pageContents['bottom'] && pageContents['bottom'].length > 0" [texts]="pageContents['bottom']"></helper>
+
                 </div>
 
 
 <!--                <helper position="right" styleName=" uk-width-1-5"></helper>-->
               </div>
+                  <div id="basketStickBottom"></div>
+                  <helper *ngIf="pageContents && pageContents['bottom'] && pageContents['bottom'].length > 0" [texts]="pageContents['bottom']"></helper>
 <!--              <helper position="bottom"></helper>-->
             </div>
 
diff --git a/claims/linking/selected/ClaimEntityTitle.component.ts b/claims/linking/selected/ClaimEntityTitle.component.ts
index 40c4c64f..c8074700 100644
--- a/claims/linking/selected/ClaimEntityTitle.component.ts
+++ b/claims/linking/selected/ClaimEntityTitle.component.ts
@@ -7,7 +7,7 @@ import {StringUtils} from "../../../utils/string-utils.class";
   template:
       `
   <div class="uk-grid uk-flex uk-flex-middle">
-    <div class="uk-width-expand" [class.uk-h6]="!shortVersion" [class.uk-text-bold]="shortVersion"  [class.uk-text-truncate]="shortVersion"  [class.uk-margin-bottom]="!shortVersion" [class.uk-margin-small-bottom]="shortVersion">
+    <div class="uk-width-expand " style="word-break: break-word;" [class.uk-h6]="!shortVersion" [class.uk-text-bold]="shortVersion"  [class.uk-text-truncate]="shortVersion"  [class.uk-margin-bottom]="!shortVersion" [class.uk-margin-small-bottom]="shortVersion">
         <a *ngIf="entity.result && entity.result.url" target="_blank" [href]="entity.result.url"
           class="uk-text-link">{{entity.title ? sliceString(entity.title) : '[No title available]'}}</a>
        <span
diff --git a/timeout-interceptor.service.ts b/timeout-interceptor.service.ts
index c1374c82..ca5b7c7a 100644
--- a/timeout-interceptor.service.ts
+++ b/timeout-interceptor.service.ts
@@ -20,7 +20,7 @@ export class TimeoutInterceptor implements HttpInterceptor {
       return next.handle(req);
     }
 
-    const timeoutValue = isPlatformServer(this.platformId)?3000:6000;//req.headers.get('timeout') || this.defaultTimeout;
+    const timeoutValue = isPlatformServer(this.platformId)?3000:16000;//req.headers.get('timeout') || this.defaultTimeout;
     const timeoutValueNumeric = Number(timeoutValue);
     return next.handle(req).pipe(timeout(timeoutValueNumeric));
   }