diff --git a/fittrackee_client/public/index.html b/fittrackee_client/public/index.html
index a4687ed6..8f2cc6d9 100644
--- a/fittrackee_client/public/index.html
+++ b/fittrackee_client/public/index.html
@@ -8,13 +8,14 @@
     <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
     <link
       rel="stylesheet"
-      href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/css/bootstrap.min.css"
-      integrity="sha384-WskhaSGFgHYWDcbwN70/dfYBj47jz9qbsMId/iRN3ewGhXQFZCSftd1LZCfmhktB"
-      crossorigin="anonymous">
+      href="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/css/bootstrap.min.css"
+      integrity="sha384-GJzZqFGwb1QTTN6wy59ffF1BuGJpLSa9DkKMp0DgiMDm4iYMj70gZWKYbI706tWS"
+      crossorigin="anonymous"
+    >
     <link
       rel="stylesheet"
-      href="https://cdn.jsdelivr.net/npm/fork-awesome@1.0.11/css/fork-awesome.min.css"
-      integrity="sha256-MGU/JUq/40CFrfxjXb5pZjpoZmxiP2KuICN5ElLFNd8="
+      href="https://cdn.jsdelivr.net/npm/fork-awesome@1.1.5/css/fork-awesome.min.css"
+      integrity="sha256-P64qV9gULPHiZTdrS1nM59toStkgjM0dsf5mK/UwBV4="
       crossorigin="anonymous"
     >
     <link
@@ -34,5 +35,20 @@
       You need to enable JavaScript to run this app.
     </noscript>
     <div id="root"></div>
+    <script
+      src="https://code.jquery.com/jquery-3.3.1.slim.min.js"
+      integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"
+      crossorigin="anonymous"
+    ></script>
+    <script
+      src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.6/umd/popper.min.js"
+      integrity="sha384-wHAiFfRlMFy6i5SRaxvfOCifBUQy1xHdJ/yoi7FRNXMRBu5WHdZYu1hA6ZOblgut"
+      crossorigin="anonymous"
+    ></script>
+    <script
+      src="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/js/bootstrap.min.js"
+      integrity="sha384-B0UglyR+jN6CkvvICOB2joaf5I4l3gm9GU6Hc1og6Ls7i6U/mkkaduKaBhlAXv9k"
+      crossorigin="anonymous"
+    ></script>
   </body>
 </html>
diff --git a/fittrackee_client/src/components/Activity/ActivityDisplay/index.jsx b/fittrackee_client/src/components/Activity/ActivityDisplay/index.jsx
index ad8d56fc..ffe5dc94 100644
--- a/fittrackee_client/src/components/Activity/ActivityDisplay/index.jsx
+++ b/fittrackee_client/src/components/Activity/ActivityDisplay/index.jsx
@@ -79,7 +79,7 @@ class ActivityDisplay extends React.Component {
                       </div>
                       <div className="card-body">
                         <div className="row">
-                          <div className="col-8">
+                          <div className="col-md-8">
                             {activity.with_gpx ? (
                               <ActivityMap activity={activity} />
                             ) : (
diff --git a/fittrackee_client/src/components/Dashboard/UserStatistics.jsx b/fittrackee_client/src/components/Dashboard/UserStatistics.jsx
index 7ea0d9d0..0d882648 100644
--- a/fittrackee_client/src/components/Dashboard/UserStatistics.jsx
+++ b/fittrackee_client/src/components/Dashboard/UserStatistics.jsx
@@ -12,7 +12,7 @@ export default function UserStatistics (props) {
   duration = `${duration.split(':')[0]}h ${duration.split(':')[1]}min`
   return (
     <div className="row">
-      <div className="col">
+      <div className="col-md-3">
         <div className="card activity-card">
           <div className="card-body row">
             <div className="col-3">
@@ -25,7 +25,7 @@ export default function UserStatistics (props) {
           </div>
         </div>
       </div>
-      <div className="col">
+      <div className="col-md-3">
         <div className="card activity-card">
           <div className="card-body row">
             <div className="col-3">
@@ -40,7 +40,7 @@ export default function UserStatistics (props) {
           </div>
         </div>
       </div>
-      <div className="col">
+      <div className="col-md-3">
         <div className="card activity-card">
           <div className="card-body row">
             <div className="col-3">
@@ -53,7 +53,7 @@ export default function UserStatistics (props) {
           </div>
         </div>
       </div>
-      <div className="col">
+      <div className="col-md-3">
         <div className="card activity-card">
           <div className="card-body row">
             <div className="col-3">