diff --git a/landingPages/landing-utils/availableOn.component.ts b/landingPages/landing-utils/availableOn.component.ts
index a3b3ff8f..21d8bcc1 100644
--- a/landingPages/landing-utils/availableOn.component.ts
+++ b/landingPages/landing-utils/availableOn.component.ts
@@ -15,8 +15,8 @@ import {HostedByCollectedFrom} from "../../utils/result-preview/result-preview";
         </span>
         <div class="uk-width-expand uk-padding-small uk-padding-remove-left uk-padding-remove-vertical">
           <span *ngIf="available.downloadUrl.length > 1" class="title">
-            <span class="uk-text-bold">{{available.downloadName}}</span>
-            <a *ngFor="let url of available.downloadUrl; let i=index;">
+            <span>{{available.downloadName}}</span>
+            <a *ngFor="let url of available.downloadUrl; let i=index;"
                [href]="url" target="_blank">
                [{{(i + 1) | number}}]
             </a>
@@ -26,6 +26,9 @@ import {HostedByCollectedFrom} from "../../utils/result-preview/result-preview";
             {{available.downloadName}}
             <span class="custom-external custom-icon space"></span>
           </a>
+          <span *ngIf="!available.downloadUrl || available.downloadUrl.length === 0" class="title">
+            {{available.downloadName}}
+          </span>
           <div *ngIf="removeUnknown(available.type) || available.year">
             <span *ngIf="removeUnknown(available.type)" class="uk-text-capitalize">{{available.type}}</span>
             <span *ngIf="removeUnknown(available.type) && available.year"> . </span>
diff --git a/utils/result-preview/result-preview.component.html b/utils/result-preview/result-preview.component.html
index 87ba2f38..213db431 100644
--- a/utils/result-preview/result-preview.component.html
+++ b/utils/result-preview/result-preview.component.html
@@ -215,31 +215,41 @@
 <div *ngIf="result.hostedBy_collectedFrom && result.hostedBy_collectedFrom.length > 0"
      class="uk-margin-small-bottom download-from">
   <div *ngFor="let from of result.hostedBy_collectedFrom"
-       [title]="from.bestAccessMode ? from.bestAccessMode : 'Not available'">
+        [title]="from.bestAccessMode ? from.bestAccessMode : 'Not available'"
+        class="uk-flex">
     <span class="uk-margin-small-right">
       <img [src]="from.icon">
     </span>
-    <span class="uk-margin-right uk-display-inline-block">
-      <span class="uk-text-muted">Download from: </span>
-      <a *ngIf="from.downloadUrl && from.downloadUrl.length === 1"
-         [href]="from.downloadUrl[0]" target="_blank" class="title">
-        {{from.downloadName}}
-        <span class="custom-external space"></span>
-      </a>
-      <span *ngIf="!from.downloadUrl || from.downloadUrl.length === 0" class="title">
-        {{from.downloadName}}
+    <span class="uk-width-expand">
+      <span class="uk-margin-right uk-display-inline-block">
+        <span class="uk-text-muted">Download from: </span>
+        <span *ngIf="from.downloadUrl.length > 1" class="title">
+            <span>{{from.downloadName}}</span>
+            <a *ngFor="let url of from.downloadUrl; let i=index;"
+               [href]="url" target="_blank">
+               [{{(i + 1) | number}}]
+            </a>
+          </span>
+        <a *ngIf="from.downloadUrl && from.downloadUrl.length === 1"
+           [href]="from.downloadUrl[0]" target="_blank" class="title">
+          {{from.downloadName}}
+          <span class="custom-external space"></span>
+        </a>
+        <span *ngIf="!from.downloadUrl || from.downloadUrl.length === 0" class="title">
+          {{from.downloadName}}
+        </span>
       </span>
-    </span>
-    <span class="provider uk-display-inline-block">
-      <span class="uk-text-muted">Provider: </span>
-<!--      target="_blank"-->
-      <a *ngIf="from.collectedId" routerLink="/search/dataprovider" [queryParams]="{datasourceId: from.collectedId}"
-         [href]="from.downloadUrl[0]" (click)="onClick();">
-        {{from.collectedName}}
-<!--        <span class="custom-external space"></span>-->
-      </a>
-      <span *ngIf="!from.collectedId">
-        {{from.collectedName}}
+      <span class="provider uk-display-inline-block">
+        <span class="uk-text-muted">Provider: </span>
+  <!--      target="_blank"-->
+        <a *ngIf="from.collectedId" routerLink="/search/dataprovider" [queryParams]="{datasourceId: from.collectedId}"
+           [href]="from.downloadUrl[0]" (click)="onClick();">
+          {{from.collectedName}}
+  <!--        <span class="custom-external space"></span>-->
+        </a>
+        <span *ngIf="!from.collectedId">
+          {{from.collectedName}}
+        </span>
       </span>
     </span>
   </div>