diff --git a/Kyoo/ClientApp/package-lock.json b/Kyoo/ClientApp/package-lock.json
index 7930e31b..4d474975 100644
--- a/Kyoo/ClientApp/package-lock.json
+++ b/Kyoo/ClientApp/package-lock.json
@@ -1243,6 +1243,16 @@
         "semver-intersect": "1.4.0"
       }
     },
+    "@types/bootstrap": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/@types/bootstrap/-/bootstrap-4.3.1.tgz",
+      "integrity": "sha512-n7Zv7Y+C98Yv4oqbyqGn3alCvNRCya2xMYzOdVEnmnFlu04MXQk1ntVrBhXzDkiwhZZYNkNfBZn2yhTnEh/mHQ==",
+      "dev": true,
+      "requires": {
+        "@types/jquery": "*",
+        "popper.js": "^1.14.1"
+      }
+    },
     "@types/events": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz",
@@ -1279,6 +1289,7 @@
       "version": "3.3.31",
       "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.31.tgz",
       "integrity": "sha512-Lz4BAJihoFw5nRzKvg4nawXPzutkv7wmfQ5121avptaSIXlDNJCUuxZxX/G+9EVidZGuO0UBlk+YjKbwRKJigg==",
+      "dev": true,
       "requires": {
         "@types/sizzle": "*"
       }
@@ -1310,7 +1321,8 @@
     "@types/sizzle": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.2.tgz",
-      "integrity": "sha512-7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg=="
+      "integrity": "sha512-7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg==",
+      "dev": true
     },
     "@types/source-list-map": {
       "version": "0.1.2",
diff --git a/Kyoo/ClientApp/package.json b/Kyoo/ClientApp/package.json
index c541a2f7..3cd80f47 100644
--- a/Kyoo/ClientApp/package.json
+++ b/Kyoo/ClientApp/package.json
@@ -21,7 +21,6 @@
     "@angular/platform-browser": "~8.2.0",
     "@angular/platform-browser-dynamic": "~8.2.0",
     "@angular/router": "~8.2.0",
-    "@types/jquery": "^3.3.31",
     "bootstrap": "^4.3.1",
     "jquery": "^3.4.1",
     "popper.js": "^1.15.0",
@@ -34,9 +33,11 @@
     "@angular/cli": "~8.2.1",
     "@angular/compiler-cli": "~8.2.0",
     "@angular/language-service": "~8.2.0",
-    "@types/node": "~8.9.4",
+    "@types/bootstrap": "^4.3.1",
     "@types/jasmine": "~3.3.8",
     "@types/jasminewd2": "~2.0.3",
+    "@types/jquery": "^3.3.31",
+    "@types/node": "~8.9.4",
     "codelyzer": "^5.0.0",
     "jasmine-core": "~3.4.0",
     "jasmine-spec-reporter": "~4.2.1",
diff --git a/Kyoo/ClientApp/src/app/app.component.ts b/Kyoo/ClientApp/src/app/app.component.ts
index 1b818bed..2f23840f 100644
--- a/Kyoo/ClientApp/src/app/app.component.ts
+++ b/Kyoo/ClientApp/src/app/app.component.ts
@@ -1,6 +1,8 @@
 import { Component } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { Event, Router, NavigationStart, NavigationEnd, NavigationCancel, NavigationError } from '@angular/router';
+import * as $ from "jquery";
+import "bootstrap";
 
 @Component({
   selector: 'app-root',
@@ -24,29 +26,30 @@ export class AppComponent
       switch (true)
       {
         case event instanceof NavigationStart:
-          {
-            this.isLoading = true;
-            break;
-          }
+        {
+          this.isLoading = true;
+          break;
+        }
 
         case event instanceof NavigationEnd:
         case event instanceof NavigationCancel:
         case event instanceof NavigationError:
-          {
-            this.isLoading = false;
-            break;
-          }
+        {
+          this.isLoading = false;
+          break;
+        }
         default:
-          {
-            break;
-          }
+        {
+          this.isLoading = false;
+          break;
+        }
       }
     });
+  }
 
-    $(document).ready(function ()
-    {
-      $('[data-toggle="tooltip"]').tooltip();
-    });
+  ngAfterViewInit()
+  {
+    $('[data-toggle="tooltip"]').tooltip();
   }
 }
 
diff --git a/Kyoo/ClientApp/src/app/browse/browse.component.ts b/Kyoo/ClientApp/src/app/browse/browse.component.ts
index a11f3ec3..06390f16 100644
--- a/Kyoo/ClientApp/src/app/browse/browse.component.ts
+++ b/Kyoo/ClientApp/src/app/browse/browse.component.ts
@@ -21,11 +21,11 @@ export class BrowseComponent implements OnInit
   ngOnInit()
   {
     this.shows = this.route.snapshot.data.shows;
+  }
 
-    $(document).ready(function ()
-    {
-      $('[data-toggle="tooltip"]').tooltip();
-    });
+  ngAfterViewInit()
+  {
+    $('[data-toggle="tooltip"]').tooltip();
   }
 
   getThumb(slug: string)
diff --git a/Kyoo/ClientApp/src/app/show-details/show-details.component.ts b/Kyoo/ClientApp/src/app/show-details/show-details.component.ts
index 899f0b9a..e83ac73f 100644
--- a/Kyoo/ClientApp/src/app/show-details/show-details.component.ts
+++ b/Kyoo/ClientApp/src/app/show-details/show-details.component.ts
@@ -44,11 +44,11 @@ export class ShowDetailsComponent implements OnInit
     this.toolbar.setAttribute("style", `background-color: rgba(0, 0, 0, 0) !important`);
 
     this.getEpisodes();
+  }
 
-    $(document).ready(function ()
-    {
-      $('[data-toggle="tooltip"]').tooltip();
-    });
+  ngAfterViewInit()
+  {
+    $('[data-toggle="tooltip"]').tooltip();
   }
 
   ngOnDestroy()
diff --git a/Kyoo/ClientApp/tsconfig.json b/Kyoo/ClientApp/tsconfig.json
index 30956ae7..89ef17ca 100644
--- a/Kyoo/ClientApp/tsconfig.json
+++ b/Kyoo/ClientApp/tsconfig.json
@@ -11,6 +11,7 @@
     "moduleResolution": "node",
     "importHelpers": true,
     "target": "es2015",
+    "types": [ "jquery" ],
     "typeRoots": [
       "node_modules/@types"
     ],