diff --git a/templates/base.html.twig b/templates/base.html.twig
index 7de785c..ba75956 100644
--- a/templates/base.html.twig
+++ b/templates/base.html.twig
@@ -10,9 +10,22 @@
 
         {% block javascripts %}
             {{ encore_entry_script_tags('app') }}
-            <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
-            <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>
-            <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
+
+            <!-- Matomo -->
+            <script type="text/javascript">
+              var _paq = window._paq = window._paq || [];
+              /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+              _paq.push(['trackPageView']);
+              _paq.push(['enableLinkTracking']);
+              (function() {
+                var u="//analytics.thisfro.ch/";
+                _paq.push(['setTrackerUrl', u+'matomo.php']);
+                _paq.push(['setSiteId', '14']);
+                var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+                g.type='text/javascript'; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+              })();
+            </script>
+            <!-- End Matomo Code -->
         {% endblock %}
 
         <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -30,11 +43,11 @@
                 <a class="nav-link" href=" {{ path('homepage') }} "><i class="fas fa-seedling"></i> Offers</a>
               </li>
               <li class="nav-item dropdown">
-                <a class="nav-link dropdown-toggle" data-toggle="dropdown" href="{{ path('user_page') }}" role="button" aria-haspopup="true" aria-expanded="false"><i class="fas fa-user"></i> User</a>
+                <a class="nav-link dropdown-toggle" data-toggle="dropdown"role="button" aria-haspopup="true" aria-expanded="false"><i class="fas fa-user"></i> User</a>
                 <div class="dropdown-menu">
-                  <a class="dropdown-item" href="#">Wishlist</a>
+                  <a class="dropdown-item" href="{{ path('wishlist') }}"><i class="fas fa-star"></i> Wishlist</a>
                   <div class="dropdown-divider"></div>
-                  <a class="dropdown-item" href="#">User settings</a>
+                  <a class="dropdown-item" href="{{ path('user_page') }}"><i class="fas fa-user"></i> User settings</a>
                 </div>
               </li>
               <li>