diff --git a/static/css/styles.css b/static/css/styles.css
index d7fc8ee..2f0e681 100644
--- a/static/css/styles.css
+++ b/static/css/styles.css
@@ -3,7 +3,7 @@ section {
     padding-top: 2rem !important;
 }
 
-nav, nav > div, nav form {
+nav, nav > div {
     display: flex;
     align-items: center;
 }
@@ -91,7 +91,6 @@ label.checkbox {
 }
 
 #quick_scroll {
-    float: right;
     margin-bottom: 1rem;
 }
 
@@ -100,7 +99,7 @@ label.checkbox {
 }
 
 @media screen and (min-width: 1088px) {
-    .tooltip:hover::before, .tooltip:hover::after {
+    [data-tooltip]:hover::before, [data-tooltip]:hover::after {
         display: none !important;
     }
 }
diff --git a/templates/admin/list.html b/templates/admin/list.html
index 25cd74c..9406f1a 100644
--- a/templates/admin/list.html
+++ b/templates/admin/list.html
@@ -1,19 +1,19 @@
 {% extends "layout.html" %}
 {% block title %}Admin List{% endblock %}
 {% block add_button %}
-    <a class="navbar-item tooltip has-tooltip-bottom" data-tooltip="Add entry" href="{{ url_for('admin_edit') }}">
+    <a class="navbar-item has-tooltip-bottom" data-tooltip="Add entry" href="{{ url_for('admin_edit') }}">
         <i class="fa fa-plus"></i><i>&nbsp;</i><span class="is-hidden-mobile">Add entry</span>
     </a>
 {% endblock %}
 {% block body %}
-    <p id="quick_scroll">
-        Quick Scroll :
+    <div id="quick_scroll" class="level-right">
+        <span class="level-item">Quick Scroll :</span>
         {% for folder in folders %}
             {% if loop.index0 %}
-                <a href="#{{ folder.name }}">{{ folder.name }}</a>
+                <a class="level-item" href="#{{ folder.name }}">{{ folder.name }}</a>
             {% endif %}
         {% endfor %}
-    </p>
+    </div>
 
     <table class="table is-bordered is-striped is-narrow is-fullwidth is-hoverable is-size-7">
         <thead>
diff --git a/templates/layout.html b/templates/layout.html
index 4a5feac..ad34bc2 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -16,28 +16,28 @@
 
 <nav class="navbar is-dark" role="navigation" aria-label="main navigation">
     <div class="navbar-start">
-        <a class="navbar-item tooltip has-tooltip-bottom" data-tooltip="Home" href="{{ url_for('home') }}">
+        <a class="navbar-item has-tooltip-bottom" data-tooltip="Home" href="{{ url_for('home') }}">
             𝛑 😼 た
         </a>
-        <a class="navbar-item tooltip has-tooltip-bottom" data-tooltip="Latest torrents" href="{{ url_for('latest') }}">
+        <a class="navbar-item has-tooltip-bottom" data-tooltip="Latest torrents" href="{{ url_for('latest') }}">
             <i class="fa fa-newspaper-o"></i><i>&nbsp;</i><span class="is-hidden-mobile">Latest torrents</span>
         </a>
-        <a class="navbar-item tooltip has-tooltip-bottom" data-tooltip="My seeded torrents"
+        <a class="navbar-item has-tooltip-bottom" data-tooltip="My seeded torrents"
            href="{{ url_for('list_animes') }}">
             <i class="fa fa-cloud-download"></i><i>&nbsp;</i><span class="is-hidden-mobile">My seeded torrents</span>
         </a>
         {% block add_button %}{% endblock %}
         {% if request.args.get('q') %}
-            <a class="navbar-item tooltip has-tooltip-bottom" data-tooltip="TVDB"
+            <a class="navbar-item has-tooltip-bottom" data-tooltip="TVDB"
                href="https://www.thetvdb.com/search?menu%5Btype%5D=TV&query={{ request.args.get('q') }}"
                target="_blank">
                 <i class="fa fa-television"></i><i>&nbsp;</i><span class="is-hidden-mobile">TVDB</span>
             </a>
-            <a class="navbar-item tooltip has-tooltip-bottom" data-tooltip="Nautiljon"
+            <a class="navbar-item has-tooltip-bottom" data-tooltip="Nautiljon"
                href="https://www.nautiljon.com/search.php?q={{ request.args.get('q') }}" target="_blank">
                 <i class="fa fa-rss"></i><i>&nbsp;</i><span class="is-hidden-mobile">Nautiljon</span>
             </a>
-            <a class="navbar-item tooltip has-tooltip-bottom" data-tooltip="Animes-Mangas-DDL"
+            <a class="navbar-item has-tooltip-bottom" data-tooltip="Animes-Mangas-DDL"
                href="https://animemangaddl.com/?s={{ request.args.get('q') }}" target="_blank">
                 <i class="fa fa-adn"></i><i>&nbsp;</i><span class="is-hidden-mobile">A-M-DDL</span>
             </a>
@@ -75,7 +75,7 @@
         {% endif %}
         {% if action_form.message %}
             <div class="notification is-success">
-                <button class="delete"></button>
+                <button class="delete" onclick="this.parentNode.style.display = 'none'"></button>
                 {{ action_form.message }}
             </div>
         {% endif %}