diff --git a/website/web/templates/historical_lookups.html b/website/web/templates/historical_lookups.html
index 283983d..76af463 100644
--- a/website/web/templates/historical_lookups.html
+++ b/website/web/templates/historical_lookups.html
@@ -1,7 +1,43 @@
 {% from "macros.html" import shorten_string %}
 
 <div>
-{% if riskiq %}
+{% if circl_pdns %}
+  <center>
+    <h1 class="display-4">CIRCL Passive DNS
+     <div class="help-tip" title="Click for more details"
+          onclick="location.href='https://www.circl.lu/services/passive-dns/';"
+          style="cursor: pointer;">
+     </div>
+    </h1>
+  {% for query, responses in circl_pdns.items() %}
+  <div>
+    <h3>{{query}}</h3>
+    <table class="table">
+      <thead>
+        <tr>
+          <th class="col-sm-2" scope="col">First seen</th>
+          <th class="col-sm-2" scope="col">Last seen</th>
+          <th class="col-sm-1" scope="col">RR Type</th>
+          <th class="col-sm-2" scope="col">R Data</th>
+          <th scope="col">RR Name</th>
+      </thead>
+      <tbody>
+        {%for response in responses %}
+        <tr>
+          <td>{{response.time_first_datetime}}</td>
+          <td>{{response.time_last_datetime}}</td>
+          <td>{{response.rrtype}}</td>
+          <td>{{response.rdata}}</td>
+          <td>{{response.rrname}}</td>
+        </tr>
+        {% endfor %}
+    </table>
+  </div>
+  {%endfor%}
+  </center>
+
+{% endif%}
+{% if riskiq and current_user.is_authenticated %}
   <hr>
   <center>
     <h1 class="display-4">RiskIQ</h1>
@@ -13,52 +49,20 @@
       <tr>
         <th class="col-sm-2" scope="col">First seen</th>
         <th class="col-sm-2" scope="col">Last seen</th>
-        <th scope="col">Resolve</th>
         <th class="col-sm-1" scope="col">Type</th>
+        <th scope="col">Resolve</th>
     </thead>
     <tbody>
       {% for entry in riskiq['results'] %}
       <tr>
         <td>{{entry['firstSeen']}}</td>
         <td>{{entry['lastSeen']}}</td>
-        <td>{{entry['resolve']}}</td>
         <td>{{entry['recordType']}}</td>
+        <td>{{entry['resolve']}}</td>
       </tr>
       {% endfor %}
   </table>
   </div>
   </center>
 {% endif%}
-{% if circl_pdns %}
-  <hr>
-  <center>
-    <h1 class="display-4">CIRCL Passve DNS</h1>
-  {% for query, responses in circl_pdns.items() %}
-  <div>
-    <h3>{{query}}</h3>
-    <table class="table">
-      <thead>
-        <tr>
-          <th class="col-sm-2" scope="col">First seen</th>
-          <th class="col-sm-2" scope="col">Last seen</th>
-          <th scope="col">R Data</th>
-          <th scope="col">RR Name</th>
-          <th class="col-sm-1" scope="col">RR Type</th>
-      </thead>
-      <tbody>
-        {%for response in responses %}
-        <tr>
-          <td>{{response.time_first_datetime}}</td>
-          <td>{{response.time_last_datetime}}</td>
-          <td>{{response.rdata}}</td>
-          <td>{{response.rrname}}</td>
-          <td>{{response.rrtype}}</td>
-        </tr>
-        {% endfor %}
-    </table>
-  </div>
-  {%endfor%}
-  </center>
-
-{% endif%}
 </div>
diff --git a/website/web/templates/tree.html b/website/web/templates/tree.html
index 54228f3..83a4006 100644
--- a/website/web/templates/tree.html
+++ b/website/web/templates/tree.html
@@ -207,6 +207,10 @@
         <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>
@@ -251,14 +255,14 @@
                 <a href="#screenshotModal" data-bs-toggle="modal"
                    data-bs-target="#screenshotModal" role="button">Page Screenshot</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="#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>
@@ -293,10 +297,6 @@
               <a href="#adminModal" data-bs-toggle="modal"
                  data-bs-target="#adminModal" role="button">Admin tasks</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>
             {% if misp_push%}
             <li class="list-group-item">
               <a href="#mispPushModal" data-remote="{{ url_for('web_misp_push_view', tree_uuid=tree_uuid) }}"