diff --git a/SKILLS.md b/SKILLS.md
index 917316c680a..523a68de4ce 100644
--- a/SKILLS.md
+++ b/SKILLS.md
@@ -68,7 +68,7 @@ CAPE (Config And Payload Extraction) is a malware analysis sandbox derived from
 
 ### Coding Standards (PEP 8+)
 *   **Imports:** Explicit imports only (`from lib import a, b`). No `from lib import *`. Group standard library, 3rd party, and local imports.
-*   **Strings:** Use double quotes (`"`) for strings. (This line was corrected from the original prompt to reflect the actual change needed for the example.)
+*   **Strings:** Use double quotes (`"`) for strings.
 *   **Logging:** Use `import logging; log = logging.getLogger(__name__)`. Do not use `print()`.
 *   **Exceptions:** Use custom exceptions from `lib/cuckoo/common/exceptions.py` (e.g., `CuckooOperationalError`).
 
diff --git a/conf/default/auxiliary.conf.default b/conf/default/auxiliary.conf.default
index 21018cdb1db..306cb2b226e 100644
--- a/conf/default/auxiliary.conf.default
+++ b/conf/default/auxiliary.conf.default
@@ -10,6 +10,9 @@ windows_static_route_gateway = 192.168.1.1
 evtx = no
 human_windows = yes
 human_linux = no
+# If enabling procmon:
+# You must download Procmon.exe from https://learn.microsoft.com/en-us/sysinternals/downloads/procmon
+# And place it to: analyzer/windows/bin/Procmon.exe
 procmon = no
 recentfiles = no
 screenshots_windows = yes
diff --git a/conf/default/cuckoo.conf.default b/conf/default/cuckoo.conf.default
index 539dacf009c..9eea7a3e188 100644
--- a/conf/default/cuckoo.conf.default
+++ b/conf/default/cuckoo.conf.default
@@ -246,6 +246,8 @@ analysis = 0
 mongo = no
 # Clean orphan files in mongodb
 unused_files_in_mongodb = no
+# Deduplicated files
+files = no
 
 [central_mode]
 # Central control-plane mode (off = current single-node behavior; analyses stay on the local
diff --git a/installer/cape2.sh b/installer/cape2.sh
index 11d3f2cea30..7cbde057b98 100755
--- a/installer/cape2.sh
+++ b/installer/cape2.sh
@@ -561,17 +561,17 @@ server {
     }
     # SSL configuration
     listen 443 ssl http2;
-    //listen [::]:443 ssl http2;
-    //listen 443 http3 reuseport;  # UDP listener for QUIC+HTTP/3
-    ssl        on;
-    //ssl_protocols       TLSv1.3; # QUIC requires TLS 1.3
+    #listen [::]:443 ssl http2;
+    listen 443 http3 reuseport;  # UDP listener for QUIC+HTTP/3
+    #ssl        on; # Obsolete in Nginx > 1.25.1
+    ssl_protocols       TLSv1.2 TLSv1.3; # QUIC requires TLS 1.3
     ssl_certificate         /etc/letsencrypt/live/$1/fullchain.pem;
     ssl_certificate_key     /etc/letsencrypt/live/$1/privkey.pem;
     ssl_client_certificate /etc/ssl/certs/cloudflare.crt;
     ssl_verify_client on;
 
-    //add_header Alt-Svc 'quic=":443"'; # Advertise that QUIC is available
-    //add_header QUIC-Status $quic;     # Sent when QUIC was used
+    add_header Alt-Svc 'h3=":443"; ma=86400'; # Advertise that QUIC is available
+    add_header QUIC-Status $quic;     # Sent when QUIC was used
 
     server_name $1 www.$1;
     location / {
diff --git a/web/analysis/views.py b/web/analysis/views.py
index 18ba39da562..a0b29ac94c4 100644
--- a/web/analysis/views.py
+++ b/web/analysis/views.py
@@ -45,7 +45,7 @@
 from lib.cuckoo.common.config import Config
 from lib.cuckoo.common.constants import ANALYSIS_BASE_PATH, CUCKOO_ROOT
 from lib.cuckoo.common.path_utils import path_exists, path_get_size, path_mkdir, path_read_file, path_safe
-from lib.cuckoo.common.utils import delete_folder, yara_detected
+from lib.cuckoo.common.utils import delete_folder, get_files_storage_path, yara_detected
 from lib.cuckoo.common.web_utils import category_all_files, my_rate_minutes, my_rate_seconds, perform_search, rateblock, statistics
 from lib.cuckoo.core.database import Database, TasksMixIn
 from lib.cuckoo.core.data.task import TASK_PENDING, Task
@@ -3582,6 +3582,10 @@ def file(request, category, task_id, dlfile):
         # Self Extracted support folder
         if not path_exists(path):
             path = os.path.join(CUCKOO_ROOT, "storage", "analyses", str(task_id), "selfextracted", file_name)
+
+        if not path_exists(path) and len(file_name) == 64:
+            path = get_files_storage_path(file_name)
+
     elif category in ("droppedzipall", "procdumpzipall", "CAPEzipall"):
         if web_cfg.zipped_download.download_all:
             sub_cat = category.replace("zipall", "")
@@ -3601,6 +3605,10 @@ def file(request, category, task_id, dlfile):
             path = buf
             if not path_exists(path):
                 path = os.path.join(CUCKOO_ROOT, "storage", "analyses", str(task_id), "selfextracted", file_name)
+
+            if not path_exists(path) and len(file_name) == 64:
+                path = get_files_storage_path(file_name)
+
     elif category == "networkzip":
         buf = os.path.join(CUCKOO_ROOT, "storage", "analyses", task_id, "network", file_name)
         path = buf
diff --git a/web/static/css/style.css b/web/static/css/style.css
index aadb771bd2f..fc8b123ecdb 100644
--- a/web/static/css/style.css
+++ b/web/static/css/style.css
@@ -563,8 +563,8 @@ pre {
 .table tbody tr.system > th,
 .table tbody tr.windows > td,
 .table tbody tr.windows > th {
-    background-color: inherit; /* inherit the TR background-color */
-    color: inherit; /* inherit the TR text color */
+  background-color: inherit; /* inherit the TR background-color */
+  color: inherit;            /* inherit the TR text color */
 }
 
 /* Hover/focus states */
diff --git a/web/static/js/hexdump.js b/web/static/js/hexdump.js
deleted file mode 100644
index 6d2ac9f077b..00000000000
--- a/web/static/js/hexdump.js
+++ /dev/null
@@ -1,239 +0,0 @@
-
-/*
- * hexy js - https://github.com/a2800276/hexy.js
- *  modified for cuckoo/web
-*/
-
-var hexy = function (buffer, config) {
-  var h = new Hexy(buffer, config)
-  return h.toString()
-}
-
-var Hexy = function (buffer, config) {
-  var self = this
-
-  config = config || {}
-
-  self.buffer    = buffer // magic string conversion here?
-  self.width     = config.width || 16
-  self.numbering = config.numbering == "none"  ? "none" : "hex_bytes"
-
-  switch (config.format) {
-    case "none":
-    case "twos":
-      self.format = config.format
-      break
-    default:
-      self.format = "fours"
-  }
-
-  self.caps        = config.caps        == "upper" ? "upper" : "lower"
-  self.annotate    = config.annotate    == "none"  ? "none"  : "ascii"
-  self.prefix      = config.prefix      || ""
-  self.indent      = config.indent      || 0
-  self.html        = config.html        || false
-  self.offset      = config.offset      || 0
-  self.length      = config.length      || -1
-
-  self.display_offset = config.display_offset || 0
-
-  if (self.offset) {
-    if (self.offset < self.buffer.length) {
-      self.buffer = self.buffer.slice(self.offset)
-    }
-  }
-
-  if (self.length !== -1) {
-    if (self.length <= self.buffer.length) {
-      self.buffer = self.buffer.slice(0,self.length)
-    }
-  }
-
-  for (var i = 0; i!=self.indent; ++i) {
-    self.prefix = " "+self.prefix
-  }
-
-  var pos = 0
-
-  this.toString = function () {
-    var str = ""
-
-    if (self.html) { str += "<div class='hexy'>\n"}
-    //split up into line of max `self.width`
-    var line_arr = lines()
-
-    //lines().forEach(function(hex_raw, i)
-    for (var i = 0; i!= line_arr.length; ++i) {
-      var hex_raw = line_arr[i],
-          hex = hex_raw[0],
-          raw = hex_raw[1]
-      //insert spaces every `self.format.twos` or fours
-      var howMany = hex.length
-      if (self.format === "fours") {
-        howMany = 4
-      } else if (self.format === "twos") {
-        howMany = 2
-      }
-
-      var hex_formatted = ""
-
-
-      for (var j =0; j< hex.length; j+=howMany) {
-        var s = hex.substr(j, howMany)
-        hex_formatted += s + " "
-      }
-
-      var addr = (i*self.width)+self.offset+self.display_offset;
-      if (self.html) {
-        odd = i%2 == 0 ? " even" : "  odd"
-        str += "<div class='"+pad(addr, 8)+odd+"'>"
-      }
-      str += self.prefix
-
-      if (self.numbering === "hex_bytes") {
-        str += pad(addr, 8) // padding...
-        str += ": "
-      }
-
-      var padlen = 0
-      switch(self.format) {
-        case "fours":
-          padlen = self.width*2 + self.width/2
-          break
-        case "twos":
-          padlen = self.width*3 + 2
-          break
-        default:
-          padlen = self.width * 2 + 1
-      }
-
-      str += rpad(hex_formatted, padlen)
-      if (self.annotate === "ascii") {
-        str+=" "
-        var ascii = raw.replace(/[\000-\040\177-\377]/g, ".")
-        str += escape(ascii)
-      }
-      if (self.html) {
-        str += "</div>\n"
-      } else {
-      str += "\n"
-      }
-    }
-    if (self.html) { str += "</div>\n"}
-    return str
-  }
-
-  var lines = function() {
-    var hex_raw = []
-    for (var i = 0; i<self.buffer.length ; i+=self.width) {
-      var begin = i,
-          end   = i+self.width >= self.buffer.length ? self.buffer.length : i+self.width,
-          slice = self.buffer.slice(begin, end),
-          hex   = self.caps === "upper" ? hexu(slice) : hexl(slice),
-          raw   = slice.toString('ascii')
-
-      hex_raw.push([hex,raw])
-    }
-    return hex_raw
-
-  }
-
-  var hexl = function (buffer) {
-    var str = ""
-    for (var i=0; i!=buffer.length; ++i) {
-      if (buffer.constructor == String) {
-        str += pad(buffer.charCodeAt(i), 2)
-      } else {
-        str += pad(buffer[i], 2)
-      }
-    }
-    return str
-  }
-  var hexu = function (buffer) {
-    return hexl(buffer).toUpperCase()
-  }
-
-  var pad = function(b, len) {
-    var s = b.toString(16)
-
-    while (s.length < len) {
-      s = "0" + s
-    }
-    return s
-  }
-  var rpad = function(s, len) {
-    for (var n = len - s.length; n!=0; --n) {
-      if (self.html) {
-        s += "&nbsp;"
-      } else {
-        s += " "
-      }
-
-    }
-    return s
-  }
-
-  var escape = function (str) {
-    str = str.split("&").join("&amp;")
-    str = str.split("<").join("&lt;")
-    str = str.split(">").join("&gt;")
-    return str
-  }
-
-
-}
-
-/**
- * the following code is hacked up from the jquery base64 codec plugin
- *  removed 80% of its guts though...
- * jQuery Plugin - base64 codec
- * @lisence MIT License https://github.com/yatt/jquery.base64/blob/master/license.txt
- * @author yatt/brainfs http://d.hatena.ne.jp/yatt http://twitter.com/brainfs
- * @version 0.0.1
- * @info
- */
-
-var base64 = new function()
-//
-{
-    var utfLibName  = "utf";
-    var b64char     = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-    var b64encTable = b64char.split("");
-    var b64decTable = [];
-    for (var i=0; i<b64char.length; i++) b64decTable[b64char.charAt(i)] = i;
-
-    this.decode = function(_b64, _strMode)
-    {
-        var tmp = decoder( _b64 );
-        var i, str = "";
-        for (i in tmp) str += String.fromCharCode(tmp[i]);
-        return str;
-    }
-
-    var decoder = function(_b64)
-    {
-        _b64    = _b64.replace(/[^A-Za-z0-9\+\/]/g, "");
-        var md  = _b64.length % 4;
-        var j, i, tmp;
-        var dat = [];
-
-        // replace 時 = も削っている。その = の代わりに 0x0 を補間
-        if (md) for (i=0; i<4-md; i++) _b64 += "A";
-
-        for (j=i=0; i<_b64.length; i+=4, j+=3)
-        {
-            tmp = (b64decTable[_b64.charAt( i )] <<18)
-                | (b64decTable[_b64.charAt(i+1)] <<12)
-                | (b64decTable[_b64.charAt(i+2)] << 6)
-                |  b64decTable[_b64.charAt(i+3)];
-            dat[ j ]    = tmp >>> 16;
-            dat[j+1]    = (tmp >>> 8) & 0xff;
-            dat[j+2]    = tmp & 0xff;
-        }
-        // 補完された 0x0 分削る
-        if (md) dat.length -= [0,0,2,1][md];
-
-        return dat;
-    }
-
-}
diff --git a/web/templates/analysis/generic/_file_info.html b/web/templates/analysis/generic/_file_info.html
index fdff27ff6d0..5dc25d1e7d9 100644
--- a/web/templates/analysis/generic/_file_info.html
+++ b/web/templates/analysis/generic/_file_info.html
@@ -407,7 +407,7 @@ <h5 class="mb-0 text-white"><i class="fas fa-file-alt me-2 text-info"></i> File
                 <div class="card bg-dark border-secondary text-white">
                     <div class="card-header"><h6 class="mb-0 text-white-50">Strings</h6></div>
                     <div class="card-body" style="max-height: 400px; overflow-y: auto;">
-                        <pre class="mb-0 text-light small">{% for string in file.strings %}{{string}}<br>{% endfor %}</pre>
+                        <pre class="mb-0 small">{% for string in file.strings %}{{string}}<br>{% endfor %}</pre>
                     </div>
                 </div>
             </div>
@@ -418,7 +418,7 @@ <h5 class="mb-0 text-white"><i class="fas fa-file-alt me-2 text-info"></i> File
                 <div class="card bg-dark text-white">
                     <div class="card-header"><h6 class="mb-0">.NET Strings</h6></div>
                     <div class="card-body" style="max-height: 400px; overflow-y: auto;">
-                        <pre class="mb-0 text-light small">{% for string in file.dotnet_strings %}{{string}}<br>{% endfor %}</pre>
+                        <pre class="mb-0 small">{% for string in file.dotnet_strings %}{{string}}<br>{% endfor %}</pre>
                     </div>
                 </div>
             </div>
@@ -429,7 +429,7 @@ <h5 class="mb-0 text-white"><i class="fas fa-file-alt me-2 text-info"></i> File
                 <div class="card bg-dark text-white">
                     <div class="card-header"><h6 class="mb-0">Extracted Text</h6></div>
                     <div class="card-body">
-                        <pre class="mb-0 text-light small">{{file.data|escape}}</pre>
+                        <pre class="mb-0 small">{{file.data|escape}}</pre>
                     </div>
                 </div>
             </div>
@@ -440,7 +440,7 @@ <h5 class="mb-0 text-white"><i class="fas fa-file-alt me-2 text-info"></i> File
                 <div class="card bg-dark text-white">
                     <div class="card-header"><h6 class="mb-0">Decoded File Content</h6></div>
                     <div class="card-body">
-                        <pre class="mb-0 text-light small">{{file.decoded_files|escape}}</pre>
+                        <pre class="mb-0 small">{{file.decoded_files|escape}}</pre>
                     </div>
                 </div>
             </div>
diff --git a/web/templates/analysis/generic/_floss.html b/web/templates/analysis/generic/_floss.html
index da479839592..074d8f13771 100644
--- a/web/templates/analysis/generic/_floss.html
+++ b/web/templates/analysis/generic/_floss.html
@@ -10,7 +10,7 @@ <h5 class="mb-0 text-white"><i class="fas fa-search-plus me-2 text-info"></i> FL
                 <h6 class="text-white border-bottom pb-2">Decoded Strings</h6>
                 <div class="card bg-dark text-white border-0">
                     <div class="card-body p-2" style="max-height: 200px; overflow-y: auto;">
-                        <pre class="mb-0 text-light small">{% for string in file.floss.decoded_strings %}{{string}}<br>{% endfor %}</pre>
+                        <pre class="mb-0 small">{% for string in file.floss.decoded_strings %}{{string}}<br>{% endfor %}</pre>
                     </div>
                 </div>
             </div>
@@ -21,7 +21,7 @@ <h6 class="text-white border-bottom pb-2">Decoded Strings</h6>
                 <h6 class="text-white border-bottom pb-2">Stack Strings</h6>
                 <div class="card bg-dark text-white border-0">
                     <div class="card-body p-2" style="max-height: 200px; overflow-y: auto;">
-                        <pre class="mb-0 text-light small">{% for string in file.floss.stack_strings %}{{string}}<br>{% endfor %}</pre>
+                        <pre class="mb-0 small">{% for string in file.floss.stack_strings %}{{string}}<br>{% endfor %}</pre>
                     </div>
                 </div>
             </div>
@@ -32,7 +32,7 @@ <h6 class="text-white border-bottom pb-2">Stack Strings</h6>
                 <h6 class="text-white border-bottom pb-2">Tight Strings</h6>
                 <div class="card bg-dark text-white border-0">
                     <div class="card-body p-2" style="max-height: 200px; overflow-y: auto;">
-                        <pre class="mb-0 text-light small">{% for string in file.floss.tight_strings %}{{string}}<br>{% endfor %}</pre>
+                        <pre class="mb-0 small">{% for string in file.floss.tight_strings %}{{string}}<br>{% endfor %}</pre>
                     </div>
                 </div>
             </div>
@@ -43,7 +43,7 @@ <h6 class="text-white border-bottom pb-2">Tight Strings</h6>
                 <h6 class="text-white border-bottom pb-2">Static Strings</h6>
                 <div class="card bg-dark text-white border-0">
                     <div class="card-body p-2" style="max-height: 200px; overflow-y: auto;">
-                        <pre class="mb-0 text-light small">{% for string in file.floss.static_strings %}{{string}}<br>{% endfor %}</pre>
+                        <pre class="mb-0 small">{% for string in file.floss.static_strings %}{{string}}<br>{% endfor %}</pre>
                     </div>
                 </div>
             </div>
diff --git a/web/templates/analysis/generic/_java.html b/web/templates/analysis/generic/_java.html
index a5dd91f3f8e..e23a7d8c355 100644
--- a/web/templates/analysis/generic/_java.html
+++ b/web/templates/analysis/generic/_java.html
@@ -7,7 +7,7 @@ <h5 class="mb-0 text-white"><i class="fab fa-java me-2 text-warning"></i> Java D
             {% if file.java and file.java.decompiled %}
                 <div class="card bg-dark text-white border-0">
                     <div class="card-body p-2" style="max-height: 500px; overflow-y: auto;">
-                        <pre class="mb-0 text-light small">{{file.java.decompiled}}</pre>
+                        <pre class="mb-0 small">{{file.java.decompiled}}</pre>
                     </div>
                 </div>
             {% else %}
diff --git a/web/templates/analysis/generic/_office.html b/web/templates/analysis/generic/_office.html
index e914afbe30d..0b99b388d0d 100644
--- a/web/templates/analysis/generic/_office.html
+++ b/web/templates/analysis/generic/_office.html
@@ -123,7 +123,7 @@ <h2 class="mb-0">
                             </div>
                             <div id="macro_code_{{forloop.parentloop.counter0}}_{{forloop.counter0}}" class="collapse" data-bs-parent="#macroCodeAccordion">
                                 <div class="card-body bg-dark text-white">
-                                    <pre class="mb-0 text-light small" style="max-height: 400px; overflow-y: auto;">{{code}}</pre>
+                                    <pre class="mb-0 small" style="max-height: 400px; overflow-y: auto;">{{code}}</pre>
                                 </div>
                             </div>
                         </div>
diff --git a/web/templates/analysis/generic/_pdf.html b/web/templates/analysis/generic/_pdf.html
index cecf97dc2fa..52d7ab1fd84 100644
--- a/web/templates/analysis/generic/_pdf.html
+++ b/web/templates/analysis/generic/_pdf.html
@@ -132,7 +132,7 @@ <h2 class="mb-0">
                             <div class="card-body bg-dark text-white">
                                 <p class="mb-1"><strong>Size:</strong> {{obj.Size}} bytes</p>
                                 <p class="mb-2"><strong>Offset:</strong> {{obj.Offset}}</p>
-                                <pre class="mb-0 text-light small border p-2 rounded bg-dark">{{obj.Data|linebreaksbr}}</pre>
+                                <pre class="mb-0 small border p-2 rounded bg-dark">{{obj.Data|linebreaksbr}}</pre>
                             </div>
                         </div>
                     </div>
diff --git a/web/templates/analysis/generic/_xlmmacro.html b/web/templates/analysis/generic/_xlmmacro.html
index 0127e2b4144..96914e013a5 100644
--- a/web/templates/analysis/generic/_xlmmacro.html
+++ b/web/templates/analysis/generic/_xlmmacro.html
@@ -6,7 +6,7 @@ <h5 class="mb-0 text-white"><i class="fas fa-file-excel me-2 text-success"></i>
         <div class="card-body">
             <div class="card bg-dark text-white border-0">
                 <div class="card-body p-2" style="max-height: 500px; overflow-y: auto;">
-                    <pre class="mb-0 text-light small">{% for line in file.office.XLMMacroDeobfuscator.Code %}{{line}}<br>{% endfor %}</pre>
+                    <pre class="mb-0 small">{% for line in file.office.XLMMacroDeobfuscator.Code %}{{line}}<br>{% endfor %}</pre>
                 </div>
             </div>
         </div>
diff --git a/web/templates/analysis/network/_cif.html b/web/templates/analysis/network/_cif.html
index 00e8f6f18c5..878e7889caf 100644
--- a/web/templates/analysis/network/_cif.html
+++ b/web/templates/analysis/network/_cif.html
@@ -30,10 +30,6 @@ <h5 class="mb-0 text-white"><i class="fas fa-shield-alt me-2 text-info"></i>CIF
                     {% endfor %}
                 </table>
             </div>
-        {% else %}
-            <div class="card-body">
-                <div class="alert alert-info">No CIF Results</div>
-            </div>
         {% endif %}
     </div>
 </section>
diff --git a/web/templates/analysis/network/_dns.html b/web/templates/analysis/network/_dns.html
index 0a6b0521b68..9ae02d903b5 100644
--- a/web/templates/analysis/network/_dns.html
+++ b/web/templates/analysis/network/_dns.html
@@ -82,7 +82,9 @@ <h5 class="mb-0 text-white"><i class="fas fa-globe me-2 text-info"></i>DNS Reque
             </div>
         {% else %}
             <div class="card-body">
-                <div class="alert alert-info">No domains contacted.</div>
+                <div class="alert alert-info text-center shadow-sm">
+                    <i class="fas fa-info-circle me-2"></i>No DNS requests recorded.
+                </div>
             </div>
         {% endif %}
     </div>
diff --git a/web/templates/analysis/network/_hosts.html b/web/templates/analysis/network/_hosts.html
index 4326aca1a53..9c82abbf46e 100644
--- a/web/templates/analysis/network/_hosts.html
+++ b/web/templates/analysis/network/_hosts.html
@@ -70,7 +70,9 @@ <h5 class="mb-0 text-white"><i class="fas fa-server me-2 text-info"></i>Hosts</h
             </div>
         {% else %}
             <div class="card-body">
-                <div class="alert alert-info">No hosts contacted.</div>
+                <div class="alert alert-info text-center shadow-sm">
+                    <i class="fas fa-info-circle me-2"></i>No host connections recorded.
+                </div>
             </div>
         {% endif %}
     </div>
diff --git a/web/templates/analysis/network/_http.html b/web/templates/analysis/network/_http.html
index af715355e64..898662ca1fd 100644
--- a/web/templates/analysis/network/_http.html
+++ b/web/templates/analysis/network/_http.html
@@ -22,6 +22,8 @@ <h5 class="mb-0 text-white"><i class="fas fa-sitemap me-2 text-info"></i>HTTP Re
                     {% else %}
                         Request:
                     {% endif %}
+                    <a href="javascript:void(0);" class="btn btn-secondary btn-sm btn-hexdump" data-raw="{{ http.request }}">Hexdump</a>
+                    <div class="hexdump-viewport" style="display:none;"></div>
                     {% for value in http.request|network_rn %}
                         <li>{{value}}</li>
                     {% endfor %}
@@ -34,6 +36,8 @@ <h5 class="mb-0 text-white"><i class="fas fa-sitemap me-2 text-info"></i>HTTP Re
                 {% else %}
                     Response:
                 {% endif %}
+                <a href="javascript:void(0);" class="btn btn-secondary btn-sm btn-hexdump" data-raw="{{ http.response }}">Hexdump</a>
+                <div class="hexdump-viewport" style="display:none;"></div>
                 {% for value in http.response|network_rn %}
                     <li>{{value}}</li>
                 {% endfor %}
@@ -73,23 +77,46 @@ <h5 class="mb-0 text-white"><i class="fas fa-sitemap me-2 text-info"></i>HTTP Re
         {% for request in network.http %}
             <tr>
                 <td style="word-wrap: break-word;">{{request.uri}} {% if request.source == "behavior" %}<span class="badge bg-primary">behavior</span>{% endif %}</td>
-                <td style="word-wrap: break-word;"><pre>{{request.data}}</pre></td>
-                {% if settings.NETWORK_PROC_MAP %}
-                    <td style="width: 160px; white-space: nowrap;">
-                        {% if request.process_name %}
-                            {{ request.process_name }}{% if request.process_id %} ({{ request.process_id }}){% endif %}
-                        {% else %}
-                            -
-                        {% endif %}
-                    </td>
-                {% endif %}
+                <td style="word-wrap: break-word;">
+                    <a href="javascript:void(0);" class="btn btn-secondary btn-sm btn-hexdump" data-raw="{{ request.data }}">Hexdump</a>
+                    <div class="hexdump-viewport" style="display:none;"></div><pre>{{request.data}}</pre>
+                    {% if settings.NETWORK_PROC_MAP %}
+                        <td style="width: 160px; white-space: nowrap;">
+                            {% if request.process_name %}
+                                {{ request.process_name }}{% if request.process_id %} ({{ request.process_id }}){% endif %}
+                            {% else %}
+                                -
+                            {% endif %}
+                        </td>
+                    {% endif %}
+                </td>
             </tr>
         {% endfor %}
     </table>
     </div>
-{% else %}
-    <div class="card-body">
-    <div class="alert alert-info">No HTTP(s) requests performed.</div>
-    </div>
 {% endif %}
 </div>
+
+<script type="text/javascript">
+$(function () {
+    $(".btn-hexdump").on('click', function() {
+        var $viewport = $(this).next('.hexdump-viewport');
+        if ($viewport.is(':visible')) {
+            $viewport.hide();
+        } else {
+            var raw = $(this).attr('data-raw');
+            if (raw) {
+                try {
+                    var result = renderHex(raw, 16, false);
+                    var $pre = $("<pre class='hexdump-container'></pre>").text(result);
+                    $viewport.empty().append($pre).show();
+                } catch (e) {
+                    $viewport.html("<div class='alert alert-danger'>Error decoding base64 data</div>").show();
+                }
+            } else {
+                $viewport.html("<div class='alert alert-warning'>No data available</div>").show();
+            }
+        }
+    });
+});
+</script>
diff --git a/web/templates/analysis/network/_icmp.html b/web/templates/analysis/network/_icmp.html
index 526cf7db7af..dd1b54a7c72 100644
--- a/web/templates/analysis/network/_icmp.html
+++ b/web/templates/analysis/network/_icmp.html
@@ -33,7 +33,9 @@ <h5 class="mb-0 text-white"><i class="fas fa-stream me-2 text-info"></i>ICMP Tra
 </div>
 {% else %}
 <div class="card-body">
-<div class="alert alert-info">No ICMP traffic performed.</div>
+    <div class="alert alert-info text-center shadow-sm">
+        <i class="fas fa-info-circle me-2"></i>No ICMP Traffic recorded.
+    </div>
 </div>
 {% endif %}
 </div>
diff --git a/web/templates/analysis/network/_irc.html b/web/templates/analysis/network/_irc.html
index e6d2961f209..3bb52b5a3bc 100644
--- a/web/templates/analysis/network/_irc.html
+++ b/web/templates/analysis/network/_irc.html
@@ -31,7 +31,9 @@ <h5 class="mb-0 text-white"><i class="fas fa-comments me-2 text-info"></i>IRC Tr
 </div>
 {% else %}
 <div class="card-body">
-<div class="alert alert-info">No IRC requests performed.</div>
+    <div class="alert alert-info text-center shadow-sm">
+        <i class="fas fa-info-circle me-2"></i>No IRC Traffic recorded.
+    </div>
 </div>
 {% endif %}
 </div>
diff --git a/web/templates/analysis/network/_smtp.html b/web/templates/analysis/network/_smtp.html
index a0971a15ee4..c391f430e93 100644
--- a/web/templates/analysis/network/_smtp.html
+++ b/web/templates/analysis/network/_smtp.html
@@ -83,7 +83,9 @@ <h5 class="mb-0 text-white"><i class="fas fa-envelope me-2 text-info"></i>SMTP T
 </div>
 {% else %}
 <div class="card-body">
-<div class="alert alert-info">No SMTP traffic performed.</div>
+    <div class="alert alert-info text-center shadow-sm">
+        <i class="fas fa-info-circle me-2"></i>No SMTP Traffic recorded.
+    </div>
 </div>
 {% endif %}
 </div>
diff --git a/web/templates/analysis/network/_suricata_alerts.html b/web/templates/analysis/network/_suricata_alerts.html
index d1cf77ab04c..30bd9be0e31 100644
--- a/web/templates/analysis/network/_suricata_alerts.html
+++ b/web/templates/analysis/network/_suricata_alerts.html
@@ -84,7 +84,9 @@ <h5 class="mb-0 text-white"><i class="fas fa-exclamation-triangle me-2 text-dang
             </div>
         {% else %}
             <div class="card-body">
-                <div class="alert alert-info">No Suricata Alerts</div>
+                <div class="alert alert-info text-center shadow-sm">
+                    <i class="fas fa-info-circle me-2"></i>No Suricata Alerts recorded.
+                </div>
             </div>
         {% endif %}
     </div>
diff --git a/web/templates/analysis/network/_suricata_files.html b/web/templates/analysis/network/_suricata_files.html
index 425160afbdb..10845e40516 100644
--- a/web/templates/analysis/network/_suricata_files.html
+++ b/web/templates/analysis/network/_suricata_files.html
@@ -135,5 +135,8 @@
         </div>
     {% endfor %}
 {% else %}
-    <div class="alert alert-primary"><b>Sorry!</b> No Suricata Extracted files.</div>
+    <div class="alert alert-info text-center shadow-sm mb-4">
+        <i class="fas fa-info-circle fa-2x mb-3 text-info"></i>
+        <p class="mb-0">No Suricata extracted files found.</p>
+    </div>
 {% endif %}
diff --git a/web/templates/analysis/network/_suricata_http.html b/web/templates/analysis/network/_suricata_http.html
index a90a4d91f1e..7b352c9f31f 100644
--- a/web/templates/analysis/network/_suricata_http.html
+++ b/web/templates/analysis/network/_suricata_http.html
@@ -97,7 +97,9 @@ <h5 class="mb-0 text-white"><i class="fas fa-globe me-2 text-info"></i>Suricata
             </div>
         {% else %}
             <div class="card-body">
-                <div class="alert alert-info">No Suricata HTTP</div>
+                <div class="alert alert-info text-center shadow-sm">
+                    <i class="fas fa-info-circle me-2"></i>No Suricata HTTP requests recorded.
+                </div>
             </div>
         {% endif %}
     </div>
diff --git a/web/templates/analysis/network/_suricata_tls.html b/web/templates/analysis/network/_suricata_tls.html
index dbd0d2bf1f9..7ef1bd74981 100644
--- a/web/templates/analysis/network/_suricata_tls.html
+++ b/web/templates/analysis/network/_suricata_tls.html
@@ -73,7 +73,9 @@ <h5 class="mb-0 text-white"><i class="fas fa-lock me-2 text-info"></i>Suricata T
             </div>
         {% else %}
             <div class="card-body">
-                <div class="alert alert-info">No Suricata TLS</div>
+                <div class="alert alert-info text-center shadow-sm">
+                    <i class="fas fa-info-circle me-2"></i>No Suricata TLS records found.
+                </div>
             </div>
         {% endif %}
     </div>
diff --git a/web/templates/analysis/network/_tcp.html b/web/templates/analysis/network/_tcp.html
index 54f03cf8832..356270bcc9a 100644
--- a/web/templates/analysis/network/_tcp.html
+++ b/web/templates/analysis/network/_tcp.html
@@ -1,14 +1,9 @@
-<script src="{{ STATIC_URL }}js/hexdump.js"></script>
 <section id="tcp" class="tcpudp">
-    <div class="card bg-dark border-secondary">
-        <div class="card-header border-secondary">
-            <h5 class="mb-0 text-white"><i class="fas fa-network-wired me-2 text-info"></i>TCP Connections</h5>
-        </div>
         {% if network.tcp %}
-            <div class="card-body">
+            <h4>TCP</h4>
                 <div class="row">
                     <div class="col-md-6">
-                        <table class="table table-dark table-striped table-bordered" style="width: 100%;margin-left: auto;margin-right: auto;">
+                        <table class="table table-dark table-striped table-bordered table-sm w-auto">
                             <tr>
                                 <th>Source</th>
                                 <th>Source Port</th>
@@ -41,13 +36,7 @@ <h5 class="mb-0 text-white"><i class="fas fa-network-wired me-2 text-info"></i>T
                     </div>
                     <div class="stream col-md-6"></div>
                 </div>
-            </div>
-        {% else %}
-            <div class="card-body">
-                <div class="alert alert-info">No TCP connections recorded.</div>
-            </div>
         {% endif %}
-    </div>
 </section>
 <script type='text/javascript'>
 $(function () {
diff --git a/web/templates/analysis/network/_udp.html b/web/templates/analysis/network/_udp.html
index 1824f182956..860f9ebd119 100644
--- a/web/templates/analysis/network/_udp.html
+++ b/web/templates/analysis/network/_udp.html
@@ -1,4 +1,3 @@
-<script src="{{ STATIC_URL }}js/hexdump.js"></script>
 <section id="udp" class="tcpudp">
     <div class="card bg-dark border-secondary">
         <div class="card-header border-secondary">
@@ -8,7 +7,7 @@ <h5 class="mb-0 text-white"><i class="fas fa-network-wired me-2 text-info"></i>U
             <div class="card-body">
                 <div class="row">
                     <div class="col-md-6">
-                        <table class="table table-dark table-striped table-bordered">
+                        <table class="table table-dark table-striped table-bordered table-sm w-auto">
                             <tr>
                                 <th>Source</th>
                                 <th>Source Port</th>
@@ -44,7 +43,9 @@ <h5 class="mb-0 text-white"><i class="fas fa-network-wired me-2 text-info"></i>U
             </div>
         {% else %}
             <div class="card-body">
-                <div class="alert alert-info">No UDP connections recorded.</div>
+                <div class="alert alert-info text-center shadow-sm">
+                    <i class="fas fa-info-circle me-2"></i>No UDP connections recorded.
+                </div>
             </div>
         {% endif %}
     </div>
diff --git a/web/templates/analysis/network/index.html b/web/templates/analysis/network/index.html
index c8dd65abad5..f64b353534a 100644
--- a/web/templates/analysis/network/index.html
+++ b/web/templates/analysis/network/index.html
@@ -32,11 +32,7 @@
             </a>
         </li>
         {% if network.tcp %}
-        <li class="nav-item">
-            <a class="nav-link" id="network_tcp-tab" href="#network_tcp_tab" data-bs-toggle="tab" role="tab" aria-controls="network_tcp_tab" aria-selected="false">
-                <i class="fas fa-exchange-alt me-2"></i>TCP ({{ network.tcp|length }})
-            </a>
-        </li>
+            <li class="nav-item"><a class="nav-link" id="network_tcp-tab" href="#network_tcp_tab" data-bs-toggle="tab" role="tab" aria-controls="network_tcp_tab" aria-selected="false"><i class="fas fa-exchange-alt me-2"></i>TCP ({{ network.tcp|length }})</a></li>
         {% endif %}
         {% if network.udp %}
         <li class="nav-item">
diff --git a/web/templates/analysis/overview/_info.html b/web/templates/analysis/overview/_info.html
index 969ae5cfd75..f7b4f26c54c 100644
--- a/web/templates/analysis/overview/_info.html
+++ b/web/templates/analysis/overview/_info.html
@@ -168,7 +168,7 @@ <h6 class="alert-heading font-weight-bold">Analysis Errors/Warnings:</h6>
         <div id="options_collapse" class="collapse mb-3">
             <div class="card card-body bg-dark text-white border-secondary">
                 <h6 class="card-title text-white-50">Options</h6>
-                <pre class="mb-0 text-light small">{% for key, val in analysis.info.options.items %}{{ key }}={{ val }}<br>{% endfor %}</pre>
+                <pre class="mb-0 small">{% for key, val in analysis.info.options.items %}{{ key }}={{ val }}<br>{% endfor %}</pre>
             </div>
         </div>
     {% endif %}
diff --git a/web/templates/analysis/overview/_statistics.html b/web/templates/analysis/overview/_statistics.html
index 15bf0a1b245..82181e526b8 100644
--- a/web/templates/analysis/overview/_statistics.html
+++ b/web/templates/analysis/overview/_statistics.html
@@ -3,14 +3,23 @@
     <div class="card bg-dark border-secondary mb-3">
         <div class="card-header border-secondary text-center" id="headingStatistics">
             <h5 class="mb-0">
-                <button class="btn btn-link btn-block text-center text-white text-decoration-none collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#statistics" aria-expanded="false" aria-controls="statistics">
-                    <i class="fas fa-stopwatch me-2 text-info"></i> Statistics {% if stats_total.total %}<span class="badge bg-dark ms-2">{{stats_total.total}}s</span>{% endif %}
+                <button class="btn btn-link btn-block text-center text-white text-decoration-none collapsed"
+                        type="button"
+                        data-bs-toggle="collapse"
+                        data-bs-target="#statistics"
+                        aria-expanded="false"
+                        aria-controls="statistics">
+                    <i class="fas fa-stopwatch me-2 text-info"></i>
+                    Statistics
+                    {% if stats_total.total %}
+                        <span class="badge bg-secondary ms-2">{{ stats_total.total }}s</span>
+                    {% endif %}
                 </button>
             </h5>
         </div>
         <div id="statistics" class="collapse" aria-labelledby="headingStatistics">
             <div class="card-body">
-                {% if analysis.info.category != "pcap" and analysis.info.category != "static"  %}
+                {% if analysis.info.category != "pcap" and analysis.info.category != "static" %}
                     {% if config.usage %}
                         <div class="mb-4 text-center">
                             {% include "analysis/overview/_usage.html" %}
@@ -18,19 +27,20 @@ <h5 class="mb-0">
                         <hr class="border-secondary">
                     {% endif %}
                 {% endif %}
-
-                <div class="row justify-content-center">
+                <div class="row g-3 justify-content-center">
                     {% if analysis.statistics.processing %}
-                    <div class="col-lg-2 mb-3" style="min-width: 250px;">
-                        <div class="card bg-dark h-100">
-                            <div class="card-header border-dark font-weight-bold">
-                                Processing <span class="badge text-white bg-dark float-end">{{ stats_total.processing }}s</span>
+                    <div class="col-12 col-md-6 col-lg-4" style="min-width: 300px;">
+                        <div class="card h-100">
+                            <div class="card-header border-dark fw-bold">
+                                Processing
+                                <span class="badge text-white float-end">{{ stats_total.processing }}s</span>
                             </div>
-                            <ul class="list-group list-group-flush text-dark">
+                            <ul class="list-group list-group-flush">
                                 {% for stat in analysis.statistics.processing|dictsortreversed:"time" %}
                                     {% if stat.time %}
                                     <li class="list-group-item bg-dark text-white border-secondary py-1 small">
-                                        <span class="text-info fw-bold me-2">{{stat.time}}s</span> {{stat.name}}
+                                        <span class="text-info fw-bold me-2">{{ stat.time }}s</span>
+                                        {{ stat.name }}
                                     </li>
                                     {% endif %}
                                 {% endfor %}
@@ -38,18 +48,19 @@ <h5 class="mb-0">
                         </div>
                     </div>
                     {% endif %}
-
                     {% if analysis.statistics.signatures %}
-                    <div class="col-lg-2 mb-3" style="min-width: 250px;">
-                        <div class="card bg-dark h-100">
-                            <div class="card-header border-dark font-weight-bold">
-                                Signatures <span class="badge text-white bg-dark float-end">{{ stats_total.signatures }}s</span>
+                    <div class="col-12 col-md-6 col-lg-4" style="min-width: 300px;">
+                        <div class="card h-100">
+                            <div class="card-header border-dark fw-bold">
+                                Signatures
+                                <span class="badge text-white float-end">{{ stats_total.signatures }}s</span>
                             </div>
-                            <ul class="list-group list-group-flush text-dark">
+                            <ul class="list-group list-group-flush">
                                 {% for stat in analysis.statistics.signatures|dictsortreversed:"time" %}
                                     {% if stat.time %}
                                     <li class="list-group-item bg-dark text-white border-secondary py-1 small">
-                                        <span class="text-warning fw-bold me-2">{{stat.time}}s</span> {{stat.name}}
+                                        <span class="text-warning fw-bold me-2">{{ stat.time }}s</span>
+                                        {{ stat.name }}
                                     </li>
                                     {% endif %}
                                 {% endfor %}
@@ -57,18 +68,19 @@ <h5 class="mb-0">
                         </div>
                     </div>
                     {% endif %}
-
                     {% if analysis.statistics.reporting %}
-                    <div class="col-lg-2 mb-3" style="min-width: 250px;">
-                        <div class="card bg-dark h-100">
-                            <div class="card-header border-dark font-weight-bold">
-                                Reporting <span class="badge text-white bg-dark float-end">{{ stats_total.reporting }}s</span>
+                    <div class="col-12 col-md-6 col-lg-4" style="min-width: 300px;">
+                        <div class="card h-100">
+                            <div class="card-header border-dark fw-bold">
+                                Reporting
+                                <span class="badge text-white float-end">{{ stats_total.reporting }}s</span>
                             </div>
-                            <ul class="list-group list-group-flush text-dark">
+                            <ul class="list-group list-group-flush">
                                 {% for stat in analysis.statistics.reporting|dictsortreversed:"time" %}
                                     {% if stat.time %}
                                     <li class="list-group-item bg-dark text-white border-secondary py-1 small">
-                                        <span class="text-success fw-bold me-2">{{stat.time}}s</span> {{stat.name}}
+                                        <span class="text-success fw-bold me-2">{{ stat.time }}s</span>
+                                        {{ stat.name }}
                                     </li>
                                     {% endif %}
                                 {% endfor %}
diff --git a/web/templates/analysis/overview/_summary.html b/web/templates/analysis/overview/_summary.html
index c8511a3f960..317961430a1 100644
--- a/web/templates/analysis/overview/_summary.html
+++ b/web/templates/analysis/overview/_summary.html
@@ -7,8 +7,8 @@ <h5 class="mb-0 text-white"><i class="fas fa-list-alt me-2 text-info"></i> Summa
         <div class="card-body">
             <div class="row">
                 <div class="col-md-3 mb-3">
-                    <div class="nav flex-column nav-pills" id="summaryTabs" role="tablist" aria-orientation="vertical">
-                        {% if analysis.behavior.summary.files %}<a class="nav-link active" id="v-pills-files-tab" data-bs-toggle="pill" href="#summary_files" role="tab" aria-controls="summary_files" aria-selected="true"><i class="fas fa-file me-2"></i> Accessed Files</a>{% endif %}
+                    <div class="nav flex-column nav-pills p-4" id="summaryTabs" role="tablist" aria-orientation="vertical">
+                        {% if analysis.behavior.summary.files %}<a class="nav-link" id="v-pills-files-tab" data-bs-toggle="pill" href="#summary_files" role="tab" aria-controls="summary_files" aria-selected="true"><i class="fas fa-file me-2"></i> Accessed Files</a>{% endif %}
                         {% if analysis.behavior.summary.read_files %}<a class="nav-link" id="v-pills-read-files-tab" data-bs-toggle="pill" href="#summary_read_files" role="tab" aria-controls="summary_read_files" aria-selected="false"><i class="fas fa-file-alt me-2"></i> Read Files</a>{% endif %}
                         {% if analysis.behavior.summary.write_files %}<a class="nav-link" id="v-pills-write-files-tab" data-bs-toggle="pill" href="#summary_write_files" role="tab" aria-controls="summary_write_files" aria-selected="false"><i class="fas fa-file-signature me-2"></i> Modified Files</a>{% endif %}
                         {% if analysis.behavior.summary.delete_files %}<a class="nav-link" id="v-pills-delete-files-tab" data-bs-toggle="pill" href="#summary_delete_files" role="tab" aria-controls="summary_delete_files" aria-selected="false"><i class="fas fa-trash-alt me-2"></i> Deleted Files</a>{% endif %}
@@ -26,7 +26,7 @@ <h5 class="mb-0 text-white"><i class="fas fa-list-alt me-2 text-info"></i> Summa
                 </div>
                 <div class="col-md-9">
                     <div class="tab-content" id="v-pills-tabContent">
-                        <div class="tab-pane fade show active" id="summary_files" role="tabpanel" aria-labelledby="v-pills-files-tab">
+                        <div class="tab-pane fade" id="summary_files" role="tabpanel" aria-labelledby="v-pills-files-tab">
                             <div class="card card-body bg-dark border-secondary text-white" style="max-height: 500px; overflow-y: auto;">
                                 {% if analysis.behavior.summary.files %}
                                     <ul class="list-unstyled mb-0">
@@ -210,3 +210,20 @@ <h5 class="mb-0 text-white"><i class="fas fa-list-alt me-2 text-info"></i> Summa
     </div>
 </section>
 {% endif %}
+
+<script>
+document.addEventListener("DOMContentLoaded", function () {
+  const container = document.getElementById("summaryTabs");
+  if (!container) return;
+
+  // If something is already active, don’t touch it.
+  if (container.querySelector(".nav-link.active")) return;
+
+  const firstLink = container.querySelector('a.nav-link[data-bs-toggle="pill"]');
+  if (!firstLink) return;
+
+  // Bootstrap 5 Tab API
+  const tab = bootstrap.Tab.getOrCreateInstance(firstLink);
+  tab.show();
+});
+</script>
\ No newline at end of file
diff --git a/web/templates/analysis/procdump/index.html b/web/templates/analysis/procdump/index.html
index 5c8c7ba8bc1..e91285a14eb 100644
--- a/web/templates/analysis/procdump/index.html
+++ b/web/templates/analysis/procdump/index.html
@@ -1,4 +1,3 @@
-<script src="{{ STATIC_URL }}js/hexdump.js"></script>
 <div class="dynamic-layout-target layout-centered">
 {% if procdump|length > 0 %}
     {% if settings.ZIPPED_DOWNLOAD_ALL and tab_name in 'dropped,procdump,CAPE' %}
diff --git a/web/templates/analysis/report.html b/web/templates/analysis/report.html
index 72314f69a16..17cacd558e3 100644
--- a/web/templates/analysis/report.html
+++ b/web/templates/analysis/report.html
@@ -32,20 +32,14 @@
 </script>
 {% endif %}
 <script>
-$(function() {
-  //Apply only when we reload the same page
-  if (document.referrer === document.URL){
-    //for bootstrap 3 use 'shown.bs.tab' instead of 'shown' in the next line
-    $('a[data-bs-toggle="tab"]').on('click', function (e) {
-      localStorage.setItem('lastAnalysisTab', $(e.target).attr('href'));
-    });
+    document.addEventListener('DOMContentLoaded', function () {
 
-    var lastAnalysisTab = localStorage.getItem('lastAnalysisTab');
+        // --- 1. Tab Persistence Logic ---
 
     if (lastAnalysisTab) {
         $('a[href="'+lastAnalysisTab+'"]').click();
     }
-  }
+  },
   // ajax req for some tabs
   $('[data-bs-toggle="tabajax"]').click(function(e) {
     var $this = $(this),
@@ -76,9 +70,9 @@
     }
     return false;
     });
-    //end
-});
 </script>
+
+
 <style type="text/css">
 .alert-tlp_green {
   background-color: black;
@@ -115,7 +109,6 @@
   {% endif %}
   </div>
 {% endif %}
-
 <ul class="nav nav-pills nav-fill bg-dark rounded shadow-sm p-1 mb-3" id="reportTabs" role="tablist">
     <li class="nav-item">
         <a class="nav-link active" id="overview-tab" href="#overview" data-bs-toggle="tab" role="tab" aria-controls="overview" aria-selected="true">
@@ -252,7 +245,7 @@
             </a>
         </li>
     {% endif %}
-    {% if settings.ADMIN or user.is_staff %}
+    {% if settings.ADMIN and user.is_staff %}
         <li class="nav-item">
             <a class="nav-link" id="admin-tab" href="#admin" data-bs-toggle="tab" role="tab" aria-controls="admin" aria-selected="false">
                 <i class="fas fa-user-shield me-2"></i>Admin
@@ -298,16 +291,16 @@
     </div>
     {% endif %}
     {% if analysis.memory %}
-        <div class="tab-pane fade" id="memory">
-            {% include "analysis/memory/index.html" %}
-        </div>
+    <div class="tab-pane fade" id="memory">
+        {% include "analysis/memory/index.html" %}
+    </div>
     {% endif %}
     {% if config.malheur %}
-        {% if analysis.info.category == "file" or analysis.info.category == "url" %}
-        <div class="tab-pane fade" id="similar">
-            {% include "analysis/similar/index.html" %}
-        </div>
-        {% endif %}
+    {% if analysis.info.category == "file" or analysis.info.category == "url" %}
+    <div class="tab-pane fade" id="similar">
+        {% include "analysis/similar/index.html" %}
+    </div>
+    {% endif %}
     {% endif %}
     {% if settings.COMMENTS %}
     <div class="tab-pane fade" id="comments">
@@ -320,9 +313,9 @@
     </div>
     {% endif %}
     {% if analysis.debugger_logs %}
-        <div class="tab-pane fade" id="debugger">
-            {% include "analysis/debugger/index.html" %}
-        </div>
+    <div class="tab-pane fade" id="debugger">
+        {% include "analysis/debugger/index.html" %}
+    </div>
     {% endif %}
     {% if analysis.sigma or analysis.sysmon or analysis.has_evtx %}
         <div class="tab-pane fade" id="eventlogs">
diff --git a/web/templates/submission/index.html b/web/templates/submission/index.html
index c208669fa4b..d8a4f5899ed 100644
--- a/web/templates/submission/index.html
+++ b/web/templates/submission/index.html
@@ -2,7 +2,7 @@
 {% block content %}
 <div class="row justify-content-center">
     <div class="col-lg-8">
-        <div class="card bg-dark shadow-sm border-secondary">
+        <div class="card shadow-sm border-secondary">
             <div class="card-header border-secondary bg-transparent">
                 <h4 class="mb-0 text-white"><i class="fas fa-upload me-2 text-primary"></i>Submit for Analysis</h4>
             </div>