diff --git a/backend/app.js b/backend/app.js
index 2a98860..8e50264 100644
--- a/backend/app.js
+++ b/backend/app.js
@@ -186,6 +186,8 @@ function calculateSubcriptionRetrievalDelay(amount) {
 function watchSubscriptions() { 
     let subscriptions = subscriptions_api.getAllSubscriptions();
 
+    if (!subscriptions) return;
+
     let subscriptions_amount = subscriptions.length;
     let delay_interval = calculateSubcriptionRetrievalDelay(subscriptions_amount);
 
diff --git a/src/app/subscription/subscription-file-card/subscription-file-card.component.ts b/src/app/subscription/subscription-file-card/subscription-file-card.component.ts
index 732413d..820577b 100644
--- a/src/app/subscription/subscription-file-card/subscription-file-card.component.ts
+++ b/src/app/subscription/subscription-file-card/subscription-file-card.component.ts
@@ -52,7 +52,7 @@ export class SubscriptionFileCardComponent implements OnInit {
   }
 
   goToFile() {
-    this.goToFileEmit.emit(this.file.title);
+    this.goToFileEmit.emit(this.file.id);
   }
 
   deleteAndRedownload() {
diff --git a/src/app/subscription/subscription/subscription.component.html b/src/app/subscription/subscription/subscription.component.html
index d9ee614..bb4c5d5 100644
--- a/src/app/subscription/subscription/subscription.component.html
+++ b/src/app/subscription/subscription/subscription.component.html
@@ -23,7 +23,7 @@
     </div>
     <div class="container">
         <div class="row">
-            <div *ngFor="let file of filtered_files" class="col-6 col-lg-4 mb-4 sub-file-col">
+            <div *ngFor="let file of filtered_files" class="col-6 col-lg-4 mb-2 mt-2 sub-file-col">
                 <app-subscription-file-card (reloadSubscription)="getSubscription()" (goToFileEmit)="goToFile($event)" [file]="file" [sub]="subscription" [use_youtubedl_archive]="use_youtubedl_archive"></app-subscription-file-card>
             </div>
         </div>