From 1c3b2f8a9dedb03698c6089ec9e9c9d1ff24953f Mon Sep 17 00:00:00 2001
From: AntoniaBK <antonia@cookfirst.de>
Date: Mon, 22 Apr 2024 15:43:15 +0200
Subject: [PATCH 1/2] chg: dropdown menu

---
 website/web/static/tree.css     |  94 +++++++-
 website/web/templates/tree.html | 402 ++++++++++++++------------------
 2 files changed, 269 insertions(+), 227 deletions(-)

diff --git a/website/web/static/tree.css b/website/web/static/tree.css
index feea838..be89934 100644
--- a/website/web/static/tree.css
+++ b/website/web/static/tree.css
@@ -28,6 +28,23 @@
   scroll-margin: 50px;
 }
 
+#help {
+  text-align: center;
+  border-style: solid;
+  border-color: blue;
+  border-radius: 25px;
+  text-decoration: none;
+  height: 50px;
+  width: 50px;
+  background-color: blue;
+  color: white;
+}
+
+#help:hover {
+  background-color: white;
+  color: blue;
+}
+
 /* Generic parts of menus */
 hr {
   display: block;
@@ -88,9 +105,7 @@ hr {
   top: 5px;
   background: white;
   border: 2px solid;
-  padding-top: 5px;
-  padding-right: 5px;
-  padding-left: 5px;
+  padding: 5px;
 }
 
 #menu_container_horizontal {
@@ -98,9 +113,7 @@ hr {
   top: 5px;
   left: 5px;
   left: 217px;
-  padding-top: 5px;
-  padding-right: 5px;
-  padding-left: 5px;
+  padding: 5px;
 }
 
 #menu_container_horizontal .container {
@@ -121,6 +134,75 @@ hr {
     background: #fff;
 }
 
+
+/* NEW: Dropdown Menu */
+/* Dropdown Button */
+.dropbtn {
+  background-color: #3498db;
+  color: white;
+  font-size: 16px;
+  border: none;
+  cursor: pointer;
+  width: 180px;
+  text-align: center;
+}
+
+/* Dropdown button on hover & focus */
+.dropbtn:hover, .dropbtn:focus {
+  background-color: #2980b9;
+}
+
+/* The container <div> - needed to position the dropdown content */
+.dropdown {
+  position: relative;
+  display: inline-block;
+}
+
+/* Dropdown Content (Hidden by Default) */
+.dropdown-content {
+  display: none;
+  position: absolute;
+  background-color: #f9f9f9;
+  width: 180px;
+  box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
+  z-index: 1;
+}
+
+/* Links inside the dropdown */
+.dropdown-content a {
+  color: black;
+  padding: 12px 16px;
+  text-decoration: none;
+  display: block;
+}
+
+.dropdown-content.show {
+  display: block;
+}
+
+/* Change color of dropdown links on hover */
+.dropdown-content a:hover {background-color: #f1f1f1;}
+
+/* Show the dropdown menu on hover */
+#capture-menu:hover #capture-menu-content {
+  display: block;
+}
+#actions-menu:hover #actions-menu-content {
+  display: block;
+}
+#tools-menu:hover #tools-menu-content {
+  display: block;
+}
+#admin-menu:hover #admin-menu-content {
+  display: block;
+}
+
+/* Change the background color of the dropdown button when the dropdown content is shown */
+.dropdown:hover .dropbtn {
+  background-color: #2980b9;
+}
+
+
 /* legend */
 #legend_container {
   position: fixed;
diff --git a/website/web/templates/tree.html b/website/web/templates/tree.html
index 52e4919..d66323e 100644
--- a/website/web/templates/tree.html
+++ b/website/web/templates/tree.html
@@ -258,35 +258,99 @@
           </span>
       </button>
     </div>
-    <hr/>
-    <div id=menu_vertical_content class="collapse show">
-      <ul class="list-group list-group-flush">
-        <li class="list-group-item">
-          <a href="#detailsModal" data-bs-toggle="modal" data-bs-target="#detailsModal" role="button">Capture Details</a>
-        </li>
-        <li class="list-group-item">
-          <a href="#statsModal" data-remote="{{ url_for('stats', tree_uuid=tree_uuid) }}"
-             data-bs-toggle="modal" data-bs-target="#statsModal" role="button">Statistics</a>
-        </li>
-        <li class="list-group-item">
-          <a href="https://www.lookyloo.eu/docs/main/usage.html#_investigate_a_capture" role="button">Lookyloo Manual</a>
-        </li>
-        <li class="list-group-item">
-          <a href="{{ url_for('index') }}" role="button">Homepage</a>
-        </li>
-        {% if enable_monitoring %}
-        <hr/>
-        <li class="list-group-item">
-          <a href="#monitoringModal" data-bs-toggle="modal" data-bs-target="#monitoringModal" role="button" class="btn btn-outline-info">Monitor capture</a>
-        </li>
-        {% endif %}
-        {% if enable_mail_notification %}
-        <hr/>
-        <li class="list-group-item">
-          <a href="#emailModal" data-bs-toggle="modal" data-bs-target="#emailModal" role="button" class="btn btn-outline-danger">Report suspicious</br>capture</a>
-        </li>
-        {% endif %}
-      </ul>
+    <div id="legend_container" class="tree-panel-container">
+      <div id=legend class="collapse show">
+        <center>
+          <div style="display: inline">
+            <b>Legend</b>
+          </div>
+          <div style="display: inline;">
+            <button type="button" class="btn btn-link" data-bs-toggle="collapse" data-bs-target="#legend">
+                <img src="{{ url_for('static', filename='down.jpg') }}" alt="Minimize legend" height="25" width="25" title="Collapse">
+            </button>
+          </div>
+        </center>
+      <hr/>
+      <div title="The node contains at least one insecure (not HTTPS) request">
+        <img src="{{ url_for('static', filename='insecure.svg') }}" alt="Insecure requests"
+             height="20" width="20"> Unencrypted requests
+      </div>
+    
+      <div title="This node contains only empty responses">
+        <img src="{{ url_for('static', filename='empty.svg') }}" alt="Empty responses"
+             height="20" width="20"> Empty responses
+      </div>
+    
+      <div title="Number of cookies received in the responses of this node">
+        <img src="{{ url_for('static', filename='cookie_received.png') }}" alt="Cookie received"
+             height="20" width="20"> Cookie received
+      </div>
+    
+      <div title="Number of cookies sent in the requests of this node">
+        <img src="{{ url_for('static', filename='cookie_read.png') }}" alt="Cookie read"
+             height="20" width="20"> Cookie read
+      </div>
+    
+      <div title="Number of redirects initiated by the responses of this node">
+        <img src="{{ url_for('static', filename='redirect.png') }}" alt="Redirect"
+             height="20" width="20"> Redirect
+      </div>
+    
+      <div title="Number of resources loaded from iFrames in the responses in this node">
+        <img src="{{ url_for('static', filename='ifr.png') }}" alt="iFrame"
+            height="20" width="20"> iFrame
+      </div>
+    
+      <div title="Number of JavaScript in the responses in this node">
+        <img src="{{ url_for('static', filename='javascript.png') }}" alt="JavaScript"
+             height="20" width="20"> Javascript
+      </div>
+    
+      <div title="Number of fonts in the responses in this node">
+        <img src="{{ url_for('static', filename='font.png') }}" alt="Font"
+             height="20" width="20"> Font
+      </div>
+    
+      <div title="Number of HTML in the responses in this node">
+        <img src="{{ url_for('static', filename='html.png') }}" alt="HTML"
+             height="20" width="20"> HTML
+      </div>
+    
+      <div title="Number of JSON in the responses in this node">
+        <img src="{{ url_for('static', filename='json.png') }}" alt="JSON"
+             height="20" width="20"> JSON
+      </div>
+    
+      <div title="Number of CSS in the responses in this node">
+        <img src="{{ url_for('static', filename='css.png') }}" alt="CSS"
+             height="20" width="20"> CSS
+      </div>
+    
+      <div title="Number of executables in the responses in this node">
+        <img src="{{ url_for('static', filename='exe.png') }}" alt="EXE"
+            height="20" width="20"> EXE
+      </div>
+    
+      <div title="Number of images in the responses in this node">
+        <img src="{{ url_for('static', filename='img.png') }}" alt="Image"
+            height="20" width="20"> Image
+      </div>
+    
+      <div title="Number of videos in the responses in this node">
+        <img src="{{ url_for('static', filename='video.png') }}" alt="Video"
+            height="20" width="20"> Video
+      </div>
+    
+      <div title="Number of unknown resources in the responses in this node">
+        <img src="{{ url_for('static', filename='wtf.png') }}" alt="Content type not set/unknown"
+            height="20" width="20"> Unknown content
+        </div>
+    
+      <div title="The node contains a downloaded file">
+        <img src="{{ url_for('static', filename='download.png') }}" alt="Contains a downloaded file"
+            height="20" width="20"> Downloaded file
+        </div>
+      </div>
     </div>
   </div>
 </div>
@@ -306,212 +370,108 @@
     <div id="menu_horizontal_content" class="collapse show flex-grow-1 ms-3 container">
         <div class="hstack gap-3">
           <div class="vr"></div>
-          <div class="col-md">
-            <ul class="list-group list-group-flush">
-              <li class="list-group-item">
+          <div id="capture-menu" class="dropdown">
+              <button class="dropbtn">Capture</button>
+              <div id="capture-menu-content" class="dropdown-content">
+                <a href="#detailsModal" data-bs-toggle="modal" data-bs-target="#detailsModal" role="button">Capture Details</a>
+                <a href="#statsModal" data-remote="{{ url_for('stats', tree_uuid=tree_uuid) }}"
+                       data-bs-toggle="modal" data-bs-target="#statsModal" role="button">Statistics</a>
                 <a href="#screenshotModal" data-bs-toggle="modal"
-                   data-bs-target="#screenshotModal" role="button">Page Screenshot</a>
-              </li>
-              <li class="list-group-item">
-                <a href="#modulesModal" data-remote="{{ url_for('trigger_modules', tree_uuid=tree_uuid, force=False) }}"
-                   data-bs-toggle="modal" data-bs-target="#modulesModal" role="button">Third Party Reports</a>
-              </li>
-              <li class="list-group-item">
-                <a href="#historyModal" data-remote="{{ url_for('historical_lookups', tree_uuid=tree_uuid, force=False) }}"
-                   data-bs-toggle="modal" data-bs-target="#historyModal" role="button">Historical lookups</a>
-              </li>
-              <li class="list-group-item">
-                <a href="#hashlookupModal" data-remote="{{ url_for('hashlookup', tree_uuid=tree_uuid) }}"
-                   data-bs-toggle="modal" data-bs-target="#hashlookupModal" role="button">Hashlookup hits</a>
-              </li>
-            </ul>
+                       data-bs-target="#screenshotModal" role="button">Page Screenshot</a>
+              </div>
           </div>
-        <div class="vr"></div>
-        <div class="col-md">
-          <ul class="list-group list-group-flush">
-            <li class="list-group-item">
-              <a href="#urlsInPageModal" data-remote="{{ url_for('urls_rendered_page', tree_uuid=tree_uuid) }}"
-                 data-bs-toggle="modal" data-bs-target="#urlsInPageModal" role="button">Subsequent Captures</a>
-            </li>
-            <li class="list-group-item">
-              <a href="{{ url_for('recapture', tree_uuid=tree_uuid) }}" role="button">Re-Capture</a>
-            </li>
-            <li class="list-group-item">
-              <a href="#downloadModal" data-bs-toggle="modal"
-                 data-bs-target="#downloadModal" role="button">Download elements</a>
-            </li>
-            <li class="list-group-item">
+          <div class="vr"></div>
+          <div id="tools-menu" class="dropdown">
+            <button class="dropbtn">Analytical Tools</button>
+            <div id="tools-menu-content" class="dropdown-content">
+              <a href="#modulesModal" data-remote="{{ url_for('trigger_modules', tree_uuid=tree_uuid, force=False) }}"
+                    data-bs-toggle="modal" data-bs-target="#modulesModal" role="button">Third Party Reports</a>
+              <a href="#historyModal" data-remote="{{ url_for('historical_lookups', tree_uuid=tree_uuid, force=False) }}"
+                    data-bs-toggle="modal" data-bs-target="#historyModal" role="button">Historical lookups</a>
+              <a href="#hashlookupModal" data-remote="{{ url_for('hashlookup', tree_uuid=tree_uuid) }}"
+                    data-bs-toggle="modal" data-bs-target="#hashlookupModal" role="button">Hashlookup hits</a>
               <a href="#bodyHashesModal" data-remote="{{ url_for('tree_body_hashes', tree_uuid=tree_uuid) }}"
-                 data-bs-toggle="modal" data-bs-target="#bodyHashesModal" role="button">Ressources Capture</a>
-            </li>
-            <li class="list-group-item">
+                  data-bs-toggle="modal" data-bs-target="#bodyHashesModal" role="button">Ressources Capture</a>
               <a href="#faviconsModal" data-remote="{{ url_for('tree_favicons', tree_uuid=tree_uuid) }}"
-                 data-bs-toggle="modal" data-bs-target="#faviconsModal" role="button">Favicons Capture</a>
-            </li>
-            <li class="list-group-item">
+                  data-bs-toggle="modal" data-bs-target="#faviconsModal" role="button">Favicons Capture</a>
               <a href="#captureHashesTypesModal" data-remote="{{ url_for('tree_capture_hashes_types', tree_uuid=tree_uuid) }}"
                  data-bs-toggle="modal" data-bs-target="#captureHashesTypesModal" role="button">Capture hashes types</a>
-            </li>
-            <li class="list-group-item">
               <a href="#identifiersModal" data-remote="{{ url_for('tree_identifiers', tree_uuid=tree_uuid) }}"
                  data-bs-toggle="modal" data-bs-target="#identifiersModal" role="button">Identifiers Capture</a>
-            </li>
-          </ul>
-        </div>
-        {% if current_user.is_authenticated %}
-        <div class="vr"></div>
-        <div class="col-md">
-          <ul class="list-group list-group-flush">
-            <li class="list-group-item">
-              <a href="#adminModal" data-bs-toggle="modal"
-                 data-bs-target="#adminModal" role="button">Admin tasks</a>
-            </li>
-            {% if misp_push%}
-            <li class="list-group-item">
-              <a href="#mispPushModal" data-remote="{{ url_for('web_misp_push_view', tree_uuid=tree_uuid) }}"
-                 data-bs-toggle="modal" data-bs-target="#mispPushModal" role="button">Prepare push to MISP</a>
-            </li>
-            {% endif %}
-            {% if misp_lookup%}
-            <li class="list-group-item">
-              <a href="#mispLookupModal" data-remote="{{ url_for('web_misp_lookup_view', tree_uuid=tree_uuid) }}"
-                 data-bs-toggle="modal" data-bs-target="#mispLookupModal" role="button">Search events on MISP</a>
-            </li>
-            {% endif %}
-          </ul>
-        </div>
-        {% endif %}
-        {%if enable_categorization or enable_bookmark or enable_context_by_users %}
-        <div class="vr"></div>
-        <div class="col-md">
-          <ul class="list-group list-group-flush">
-            {% if enable_categorization %}
-            <li class="list-group-item">
-              <a href="#categoriesModal" data-remote="{{ url_for('categories_capture', tree_uuid=tree_uuid) }}"
-                 data-bs-toggle="modal" data-bs-target="#categoriesModal" role="button">Manage categories</a>
-            </li>
-            {% endif %}
-            {% if enable_bookmark %}
-            <li class="list-group-item">
-              <a href="#/" role="button" onclick="UnbookmarkAllNodes();">Unbookmark all nodes</a>
-            </li>
-            {% endif %}
-            {% if enable_context_by_users %}
-            <li class="list-group-item">
-              <a href="#/" role="button" onclick="MarkAsKnown('{{ tree_uuid }}');">Mark all the captures' entries as known</a>
-            </li>
-            {% endif %}
-          </ul>
-        </div>
-        {% endif %}
+            </div>
+          </div>
+          <div class="vr"></div>
+          <div id="actions-menu" class="dropdown">
+            <button class="dropbtn">Actions</button>
+            <div id="actions-menu-content" class="dropdown-content">
+              <a href="#urlsInPageModal" data-remote="{{ url_for('urls_rendered_page', tree_uuid=tree_uuid) }}"
+                  data-bs-toggle="modal" data-bs-target="#urlsInPageModal" role="button">Subsequent Captures</a>
+              <a href="{{ url_for('recapture', tree_uuid=tree_uuid) }}" role="button">Re-Capture</a>
+                <a href="#downloadModal" data-bs-toggle="modal"
+                  data-bs-target="#downloadModal" role="button">Download elements</a>
+            </div>
+          </div>
+          {% if current_user.is_authenticated %}
+            <div class="vr"></div>
+            <div id="admin-menu" class="dropdown">
+              <button id="admin-menu-content" class="dropbtn">Admin Rights</button>
+              <div class="dropdown-content">
+                <a href="#adminModal" data-bs-toggle="modal"
+                    data-bs-target="#adminModal" role="button">Admin tasks</a>
+                {% if misp_push%}
+                  <a href="#mispPushModal" data-remote="{{ url_for('web_misp_push_view', tree_uuid=tree_uuid) }}"
+                    data-bs-toggle="modal" data-bs-target="#mispPushModal" role="button">Prepare push to MISP</a>
+                {% endif %}
+                {% if misp_lookup%}
+                  <a href="#mispLookupModal" data-remote="{{ url_for('web_misp_lookup_view', tree_uuid=tree_uuid) }}"
+                    data-bs-toggle="modal" data-bs-target="#mispLookupModal" role="button">Search events on MISP</a>
+                {% endif %}
+              </div>
+            </div>
+          {% endif %}
+        
+          {%if enable_categorization or enable_bookmark or enable_context_by_users %}
+          <div class="vr"></div>
+          <div class="col-md">
+            <ul class="list-group list-group-flush">
+              {% if enable_categorization %}
+              <li class="list-group-item">
+                <a href="#categoriesModal" data-remote="{{ url_for('categories_capture', tree_uuid=tree_uuid) }}"
+                  data-bs-toggle="modal" data-bs-target="#categoriesModal" role="button">Manage categories</a>
+              </li>
+              {% endif %}
+              {% if enable_bookmark %}
+              <li class="list-group-item">
+                <a href="#/" role="button" onclick="UnbookmarkAllNodes();">Unbookmark all nodes</a>
+              </li>
+              {% endif %}
+              {% if enable_context_by_users %}
+              <li class="list-group-item">
+                <a href="#/" role="button" onclick="MarkAsKnown('{{ tree_uuid }}');">Mark all the captures' entries as known</a>
+              </li>
+              {% endif %}
+            </ul>
+          </div>
+          {% endif %}
+
+          
+          {% if enable_monitoring %}
+          <a href="#monitoringModal" data-bs-toggle="modal" data-bs-target="#monitoringModal" role="button" class="btn btn-outline-info" title="Take regularily captures of the URL">Monitor capture</a>
+          {% endif %}
+
+          {% if enable_mail_notification %}
+          <a href="#emailModal" data-bs-toggle="modal" data-bs-target="#emailModal" role="button" class="btn btn-outline-danger">Report suspicious</br>capture</a>
+          {% endif %}
+
+          <a id="help" href="https://www.lookyloo.eu/docs/main/usage.html#_investigate_a_capture" role="button" title="Lookyloo Manual">?</a>
+          
+          
       </div>
     </div>
   </div>
 </div>
 
-<div id="legend_container" class="tree-panel-container">
-  <div id=legend class="collapse show">
-    <center>
-      <div style="display: inline">
-        <b>Legend</b>
-      </div>
-      <div style="display: inline;">
-        <button type="button" class="btn btn-link" data-bs-toggle="collapse" data-bs-target="#legend">
-            <img src="{{ url_for('static', filename='down.jpg') }}" alt="Minimize legend" height="25" width="25" title="Collapse">
-        </button>
-      </div>
-    </center>
-  <hr/>
-  <div title="The node contains at least one insecure (not HTTPS) request">
-    <img src="{{ url_for('static', filename='insecure.svg') }}" alt="Insecure requests"
-         height="20" width="20"> Unencrypted requests
-  </div>
 
-  <div title="This node contains only empty responses">
-    <img src="{{ url_for('static', filename='empty.svg') }}" alt="Empty responses"
-         height="20" width="20"> Empty responses
-  </div>
-
-  <div title="Number of cookies received in the responses of this node">
-    <img src="{{ url_for('static', filename='cookie_received.png') }}" alt="Cookie received"
-         height="20" width="20"> Cookie received
-  </div>
-
-  <div title="Number of cookies sent in the requests of this node">
-    <img src="{{ url_for('static', filename='cookie_read.png') }}" alt="Cookie read"
-         height="20" width="20"> Cookie read
-  </div>
-
-  <div title="Number of redirects initiated by the responses of this node">
-    <img src="{{ url_for('static', filename='redirect.png') }}" alt="Redirect"
-         height="20" width="20"> Redirect
-  </div>
-
-  <div title="Number of resources loaded from iFrames in the responses in this node">
-    <img src="{{ url_for('static', filename='ifr.png') }}" alt="iFrame"
-        height="20" width="20"> iFrame
-  </div>
-
-  <div title="Number of JavaScript in the responses in this node">
-    <img src="{{ url_for('static', filename='javascript.png') }}" alt="JavaScript"
-         height="20" width="20"> Javascript
-  </div>
-
-  <div title="Number of fonts in the responses in this node">
-    <img src="{{ url_for('static', filename='font.png') }}" alt="Font"
-         height="20" width="20"> Font
-  </div>
-
-  <div title="Number of HTML in the responses in this node">
-    <img src="{{ url_for('static', filename='html.png') }}" alt="HTML"
-         height="20" width="20"> HTML
-  </div>
-
-  <div title="Number of JSON in the responses in this node">
-    <img src="{{ url_for('static', filename='json.png') }}" alt="JSON"
-         height="20" width="20"> JSON
-  </div>
-
-  <div title="Number of CSS in the responses in this node">
-    <img src="{{ url_for('static', filename='css.png') }}" alt="CSS"
-         height="20" width="20"> CSS
-  </div>
-
-  <div title="Number of executables in the responses in this node">
-    <img src="{{ url_for('static', filename='exe.png') }}" alt="EXE"
-        height="20" width="20"> EXE
-  </div>
-
-  <div title="Number of images in the responses in this node">
-    <img src="{{ url_for('static', filename='img.png') }}" alt="Image"
-        height="20" width="20"> Image
-  </div>
-
-  <div title="Number of videos in the responses in this node">
-    <img src="{{ url_for('static', filename='video.png') }}" alt="Video"
-        height="20" width="20"> Video
-  </div>
-
-  <div title="Number of unknown resources in the responses in this node">
-    <img src="{{ url_for('static', filename='wtf.png') }}" alt="Content type not set/unknown"
-        height="20" width="20"> Unknown content
-    </div>
-
-  <div title="The node contains a downloaded file">
-    <img src="{{ url_for('static', filename='download.png') }}" alt="Contains a downloaded file"
-        height="20" width="20"> Downloaded file
-    </div>
-  </div>
-
-  <div style="width: 70px; float: right;">
-    <center>
-    <button type="button" class="btn btn-link" data-bs-toggle="collapse" data-bs-target="#legend">
-      <img src="{{ url_for('static', filename='up.jpg') }}" alt="Maximize legend" height="40" width="40" title="Expand">
-      <b>Legend</b>
-    </button>
-    </center>
-  </div>
-</div>
 
 <!-- Modals -->
 

From e9b36433718a72cfa1b35a5448f618fa3e79d9d3 Mon Sep 17 00:00:00 2001
From: AntoniaBK <antonia@cookfirst.de>
Date: Mon, 22 Apr 2024 16:21:59 +0200
Subject: [PATCH 2/2] chg: Refactor admin only menu

---
 website/web/templates/tree.html | 43 +++++----------------------------
 1 file changed, 6 insertions(+), 37 deletions(-)

diff --git a/website/web/templates/tree.html b/website/web/templates/tree.html
index d66323e..33d9583 100644
--- a/website/web/templates/tree.html
+++ b/website/web/templates/tree.html
@@ -414,10 +414,11 @@
           {% if current_user.is_authenticated %}
             <div class="vr"></div>
             <div id="admin-menu" class="dropdown">
-              <button id="admin-menu-content" class="dropbtn">Admin Rights</button>
-              <div class="dropdown-content">
-                <a href="#adminModal" data-bs-toggle="modal"
-                    data-bs-target="#adminModal" role="button">Admin tasks</a>
+              <button class="dropbtn">Admin only</button>
+              <div id="admin-menu-content" class="dropdown-content">
+                <a href="{{ url_for('rebuild_tree', tree_uuid=tree_uuid) }}" role="button">Rebuild capture</a>
+                <a href="{{ url_for('hide_capture', tree_uuid=tree_uuid) }}" role="button">Hide capture</a>
+                <a href="{{ url_for('remove_capture', tree_uuid=tree_uuid) }}" role="button">Remove capture</a>
                 {% if misp_push%}
                   <a href="#mispPushModal" data-remote="{{ url_for('web_misp_push_view', tree_uuid=tree_uuid) }}"
                     data-bs-toggle="modal" data-bs-target="#mispPushModal" role="button">Prepare push to MISP</a>
@@ -426,6 +427,7 @@
                   <a href="#mispLookupModal" data-remote="{{ url_for('web_misp_lookup_view', tree_uuid=tree_uuid) }}"
                     data-bs-toggle="modal" data-bs-target="#mispLookupModal" role="button">Search events on MISP</a>
                 {% endif %}
+                <a href="{{ url_for('logout') }}" role="button" style="color: red">Logout</a>
               </div>
             </div>
           {% endif %}
@@ -862,39 +864,6 @@
   </div>
 </div>
 
-<div class="modal fade" id="adminModal" tabindex="-1" role="dialog">
-  <div class="modal-dialog modal-xl" role="document">
-      <div class="modal-content">
-          <div class="modal-header">
-              <h4 class="modal-title" id="adminModalLabel">
-                  RUn admin only tasks on the capture
-              </h4>
-              </br>
-              <button type="button" class="btn btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-          </div>
-          </br>
-          <div class="modal-body">
-          <ul>
-            <li>
-              <a href="{{ url_for('rebuild_tree', tree_uuid=tree_uuid) }}" role="button">Rebuild capture</a>
-            </li>
-            <li>
-              <a href="{{ url_for('hide_capture', tree_uuid=tree_uuid) }}" role="button">Hide capture</a>
-            </li>
-            <li>
-              <a href="{{ url_for('remove_capture', tree_uuid=tree_uuid) }}" role="button">Remove capture</a>
-            </li>
-            <li>
-              <a href="{{ url_for('logout') }}" role="button">Logout</a>
-            </li>
-          </ul>
-          </div>
-          <div class="modal-footer">
-              <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-          </div>
-      </div>
-  </div>
-</div>
 <div class="modal fade" id="hashlookupModal" tabindex="-1" role="dialog">
   <div class="modal-dialog modal-xl" role="document">
       <div class="modal-content">