diff --git a/data/html/sections/payloads.html b/data/html/sections/payloads.html
index 6e9a73efff9..b97703ad18d 100644
--- a/data/html/sections/payloads.html
+++ b/data/html/sections/payloads.html
@@ -4,7 +4,7 @@ <h4>Payloads</h4>
     </div>
     {% if "CAPE" in results and results.CAPE.payloads %}
         <div id="accordionPayloads">
-        {% for file in results.CAPE.payloads %}
+        {% for file in results.CAPE.payloads|sort(attribute='size', reverse=True) %}
             <div class="card mt-2">
                 <div class="card-header" id="headingPayload{{loop.index}}">
                     <h5 class="mb-0">
diff --git a/web/templates/analysis/generic/_file_info.html b/web/templates/analysis/generic/_file_info.html
index 7bd5e102965..3d33da6e063 100644
--- a/web/templates/analysis/generic/_file_info.html
+++ b/web/templates/analysis/generic/_file_info.html
@@ -23,27 +23,27 @@ <h5 class="mb-0 text-white"><i class="fas fa-file-alt me-2 text-primary"></i> Fi
         <table class="table table-dark table-striped mb-0" style="table-layout: fixed;">
             {% if source_url %}
             <tr>
-                <th style="width: 15%;">Downloaded From</th>
+                <th class="text-end text-info" style="width: 15%;">Downloaded From</th>
                 <td class="text-break">{{source_url|escape}}</td>
             </tr>
             {% endif %}
 
             {% if file.note %}
             <tr>
-                <th style="width: 15%;">Note</th>
+                <th class="text-end text-info" style="width: 15%;">Note</th>
                 <td class="text-break"><strong>{{file.note}}</strong></td>
             </tr>
             {% endif %}
 
             {% if file.cape_type %}
             <tr>
-                <th style="width: 15%;">Type</th>
+                <th class="text-end text-info" style="width: 15%;">Type</th>
                 <td><strong>{{file.cape_type}}</strong></td>
             </tr>
             {% endif %}
 
             <tr>
-                <th style="width: 15%;">File Name</th>
+                <th class="text-end text-info" style="width: 15%;">File Name</th>
                 <td class="text-break">
                     {% for name in file.name|str2list %}
                         <div><strong>{{name|safe}}</strong></div>
@@ -53,14 +53,14 @@ <h5 class="mb-0 text-white"><i class="fas fa-file-alt me-2 text-primary"></i> Fi
 
             {% if file.type %}
             <tr>
-                <th style="width: 15%;">File Type</th>
+                <th class="text-end text-info" style="width: 15%;">File Type</th>
                 <td>{{file.type}}</td>
             </tr>
             {% endif %}
 
             {% if file.guest_paths and tab_name == "dropped" %}
             <tr>
-                <th style="width: 15%;">Associated Filenames</th>
+                <th class="text-end text-info" style="width: 15%;">Associated Filenames</th>
                 <td class="text-break">
                     {% for path in file.guest_paths|str2list %}
                         <div>{{path}}</div>
@@ -70,13 +70,13 @@ <h5 class="mb-0 text-white"><i class="fas fa-file-alt me-2 text-primary"></i> Fi
             {% endif %}
 
             <tr>
-                <th style="width: 15%;">File Size</th>
+                <th class="text-end text-info" style="width: 15%;">File Size</th>
                 <td>{{file.size}} bytes</td>
             </tr>
 
             {% if file.module_path and file.process_path != file.module_path %}
             <tr>
-                <th style="width: 15%;">Module Path</th>
+                <th class="text-end text-info" style="width: 15%;">Module Path</th>
                 <td class="text-break">{{file.module_path}}</td>
             </tr>
             {% endif %}
@@ -84,43 +84,43 @@ <h5 class="mb-0 text-white"><i class="fas fa-file-alt me-2 text-primary"></i> Fi
             <!-- Advanced Process Info -->
             {% if file.cape_type_code == 8 or file.cape_type_code == 9 %}
                 <tr>
-                    <th style="width: 15%;">Virtual Address</th>
+                    <th class="text-end text-info" style="width: 15%;">Virtual Address</th>
                     <td>{{file.virtual_address}}</td>
                 </tr>
             {% endif %}
             {% if file.cape_type_code == 5 %}
                 <tr>
-                    <th style="width: 15%;">Section Handle</th>
+                    <th class="text-end text-info" style="width: 15%;">Section Handle</th>
                     <td>{{file.section_handle}}</td>
                 </tr>
             {% endif %}
             {% if file.cape_type_code == 3 or file.cape_type_code == 4 %}
                 <tr>
-                    <th style="width: 15%;">Target Process</th>
+                    <th class="text-end text-info" style="width: 15%;">Target Process</th>
                     <td>{{file.target_process}} (PID: {{file.target_pid}})</td>
                 </tr>
                 <tr>
-                    <th style="width: 15%;">Target Path</th>
+                    <th class="text-end text-info" style="width: 15%;">Target Path</th>
                     <td class="text-break">{{file.target_path}}</td>
                 </tr>
                 <tr>
-                    <th style="width: 15%;">Injecting Process</th>
+                    <th class="text-end text-info" style="width: 15%;">Injecting Process</th>
                     <td>{{file.process_name}} (PID: {{file.pid}})</td>
                 </tr>
                 <tr>
-                    <th style="width: 15%;">Path</th>
+                    <th class="text-end text-info" style="width: 15%;">Path</th>
                     <td class="text-break">{{file.process_path}}</td>
                 </tr>
             {% else %}
                 {% if file.process_name %}
                 <tr>
-                    <th style="width: 15%;">Process</th>
+                    <th class="text-end text-info" style="width: 15%;">Process</th>
                     <td>{{file.process_name}} {% if file.pid %}(PID: {{file.pid}}){% endif %}</td>
                 </tr>
                 {% endif %}
                 {% if file.process_path %}
                 <tr>
-                    <th style="width: 15%;">Path</th>
+                    <th class="text-end text-info" style="width: 15%;">Path</th>
                     <td class="text-break">{{file.process_path}}</td>
                 </tr>
                 {% endif %}
@@ -128,15 +128,15 @@ <h5 class="mb-0 text-white"><i class="fas fa-file-alt me-2 text-primary"></i> Fi
 
             <!-- Hashes -->
             <tr>
-                <th style="width: 15%;">MD5</th>
+                <th class="text-end text-info" style="width: 15%;">MD5</th>
                 <td class="text-monospace">{{file.md5}}</td>
             </tr>
             <tr>
-                <th style="width: 15%;">SHA1</th>
+                <th class="text-end text-info" style="width: 15%;">SHA1</th>
                 <td class="text-monospace">{{file.sha1}}</td>
             </tr>
             <tr>
-                <th style="width: 15%;">SHA256</th>
+                <th class="text-end text-info" style="width: 15%;">SHA256</th>
                 <td class="text-monospace">
                     {{file.sha256}}
                     <span class="ms-2">
@@ -148,35 +148,35 @@ <h5 class="mb-0 text-white"><i class="fas fa-file-alt me-2 text-primary"></i> Fi
             </tr>
             {% if file.sha3_384 %}
             <tr>
-                <th>SHA3-384</th>
+                <th class="text-end text-info">SHA3-384</th>
                 <td class="text-monospace text-break">{{file.sha3_384}}</td>
             </tr>
             {% endif %}
             {% if file.rh_hash %}
             <tr>
-                <th>RichHeader Hash</th>
+                <th class="text-end text-info">RichHeader Hash</th>
                 <td class="text-monospace">{{file.rh_hash}}</td>
             </tr>
             {% endif %}
             <tr>
-                <th>CRC32</th>
+                <th class="text-end text-info">CRC32</th>
                 <td class="text-monospace">{{file.crc32}}</td>
             </tr>
             {% if file.tlsh %}
             <tr>
-                <th>TLSH</th>
+                <th class="text-end text-info">TLSH</th>
                 <td class="text-monospace text-break">{{file.tlsh}}</td>
             </tr>
             {% endif %}
             <tr>
-                <th>Ssdeep</th>
+                <th class="text-end text-info">Ssdeep</th>
                 <td class="text-monospace text-break">{{file.ssdeep}}</td>
             </tr>
 
             <!-- External Tools -->
             {% if file.clamav %}
             <tr>
-                <th style="width: 15%;">ClamAV</th>
+                <th class="text-end text-info" style="width: 15%;">ClamAV</th>
                 <td>
                     <ul class="list-unstyled mb-0">
                     {% for sign in file.clamav %}
@@ -189,7 +189,7 @@ <h5 class="mb-0 text-white"><i class="fas fa-file-alt me-2 text-primary"></i> Fi
 
             {% if file.yara %}
             <tr>
-                <th style="width: 15%;">
+                <th class="text-end text-info" style="width: 15%;">
                     {% if config.yara_detail %}
                         <a class="btn btn-sm btn-outline-light" data-bs-toggle="collapse" href="#yara_{{file.sha256}}" role="button"><i class="fas fa-file-code"></i> Yara</a>
                     {% else %}
@@ -212,7 +212,7 @@ <h5 class="mb-0 text-white"><i class="fas fa-file-alt me-2 text-primary"></i> Fi
 
             {% if file.cape_yara %}
             <tr>
-                <th style="width: 15%;">
+                <th class="text-end text-info" style="width: 15%;">
                     {% if config.yara_detail %}
                         <a class="btn btn-sm btn-outline-light" data-bs-toggle="collapse" href="#capeyara_{{file.sha256}}" role="button"><i class="fas fa-file-signature"></i> CAPE Yara</a>
                     {% else %}
@@ -234,7 +234,7 @@ <h5 class="mb-0 text-white"><i class="fas fa-file-alt me-2 text-primary"></i> Fi
 
             {% if file.trid %}
             <tr>
-                <th style="width: 15%;">TriD</th>
+                <th class="text-end text-info" style="width: 15%;">TriD</th>
                 <td>
                     <ul class="list-unstyled mb-0">
                         {% for str in file.trid %}<li>{{str}}</li>{% endfor %}
@@ -245,7 +245,7 @@ <h5 class="mb-0 text-white"><i class="fas fa-file-alt me-2 text-primary"></i> Fi
 
             {% if file.die %}
             <tr>
-                <th style="width: 15%;">Detect It Easy</th>
+                <th class="text-end text-info" style="width: 15%;">Detect It Easy</th>
                 <td>
                     <ul class="list-unstyled mb-0">
                         {% for str in file.die %}<li>{{str}}</li>{% endfor %}
diff --git a/web/templates/analysis/generic/_subfile_info.html b/web/templates/analysis/generic/_subfile_info.html
index ae638ab934a..031701607f9 100644
--- a/web/templates/analysis/generic/_subfile_info.html
+++ b/web/templates/analysis/generic/_subfile_info.html
@@ -32,20 +32,20 @@ <h5 class="mb-0 text-white"><i class="fas fa-file-invoice me-2 text-info"></i> S
         <table class="table table-dark table-striped mb-0" style="table-layout: fixed;">
             {% if sub_file.note %}
             <tr>
-                <th style="width: 15%;">Note</th>
+                <th class="text-end text-info" style="width: 15%;">Note</th>
                 <td class="text-break"><strong>{{sub_file.note}}</strong></td>
             </tr>
             {% endif %}
 
             {% if sub_file.cape_type %}
             <tr>
-                <th style="width: 15%;">Type</th>
+                <th class="text-end text-info" style="width: 15%;">Type</th>
                 <td><strong>{{sub_file.cape_type}}</strong></td>
             </tr>
             {% endif %}
 
             <tr>
-                <th style="width: 15%;">Filename</th>
+                <th class="text-end text-info" style="width: 15%;">Filename</th>
                 <td class="text-break">
                     {% for name in sub_file.name|str2list %}
                     <div><strong>{{name|safe}}</strong></div>
@@ -55,14 +55,14 @@ <h5 class="mb-0 text-white"><i class="fas fa-file-invoice me-2 text-info"></i> S
 
             {% if sub_file.type %}
             <tr>
-                <th style="width: 15%;">File Type</th>
+                <th class="text-end text-info" style="width: 15%;">File Type</th>
                 <td>{{sub_file.type}}</td>
             </tr>
             {% endif %}
 
             {% if sub_file.guest_paths %}
             <tr>
-                <th style="width: 15%;">Associated Filenames</th>
+                <th class="text-end text-info" style="width: 15%;">Associated Filenames</th>
                 <td class="text-break">
                     {% for path in sub_file.guest_paths|str2list %}
                         <div>{{path}}</div>
@@ -72,71 +72,71 @@ <h5 class="mb-0 text-white"><i class="fas fa-file-invoice me-2 text-info"></i> S
             {% endif %}
 
             <tr>
-                <th style="width: 15%;">File Size</th>
+                <th class="text-end text-info" style="width: 15%;">File Size</th>
                 <td>{{sub_file.size}} bytes</td>
             </tr>
 
             {% if sub_file.module_path and sub_file.process_path != sub_file.module_path %}
             <tr>
-                <th style="width: 15%;">Module Path</th>
+                <th class="text-end text-info" style="width: 15%;">Module Path</th>
                 <td class="text-break">{{sub_file.module_path}}</td>
             </tr>
             {% endif %}
 
             {% if sub_file.cape_type_code == 8 or sub_file.cape_type_code == 9 %}
                 <tr>
-                    <th style="width: 15%;">Virtual Address</th>
+                    <th class="text-end text-info" style="width: 15%;">Virtual Address</th>
                     <td>{{sub_file.virtual_address}}</td>
                 </tr>
             {% endif %}
             {% if sub_file.cape_type_code == 5 %}
                 <tr>
-                    <th style="width: 15%;">Section Handle</th>
+                    <th class="text-end text-info" style="width: 15%;">Section Handle</th>
                     <td>{{sub_file.section_handle}}</td>
                 </tr>
             {% endif %}
             {% if sub_file.cape_type_code == 3 or sub_file.cape_type_code == 4 %}
                 <tr>
-                    <th style="width: 15%;">Target Process</th>
+                    <th class="text-end text-info" style="width: 15%;">Target Process</th>
                     <td>{{sub_file.target_process}} (PID: {{sub_file.target_pid}})</td>
                 </tr>
                 <tr>
-                    <th style="width: 15%;">Target Path</th>
+                    <th class="text-end text-info" style="width: 15%;">Target Path</th>
                     <td class="text-break">{{sub_file.target_path}}</td>
                 </tr>
                 <tr>
-                    <th style="width: 15%;">Injecting Process</th>
+                    <th class="text-end text-info" style="width: 15%;">Injecting Process</th>
                     <td>{{sub_file.process_name}} (PID: {{sub_file.pid}})</td>
                 </tr>
                 <tr>
-                    <th style="width: 15%;">Path</th>
+                    <th class="text-end text-info" style="width: 15%;">Path</th>
                     <td class="text-break">{{sub_file.process_path}}</td>
                 </tr>
             {% else %}
                 {% if sub_file.process_name %}
                 <tr>
-                    <th style="width: 15%;">Process</th>
+                    <th class="text-end text-info" style="width: 15%;">Process</th>
                     <td>{{sub_file.process_name}} {% if sub_file.pid %}(PID: {{sub_file.pid}}){% endif %}</td>
                 </tr>
                 {% endif %}
                 {% if sub_file.process_path %}
                 <tr>
-                    <th style="width: 15%;">Path</th>
+                    <th class="text-end text-info" style="width: 15%;">Path</th>
                     <td class="text-break">{{sub_file.process_path}}</td>
                 </tr>
                 {% endif %}
             {% endif %}
 
             <tr>
-                <th style="width: 15%;">MD5</th>
+                <th class="text-end text-info" style="width: 15%;">MD5</th>
                 <td class="text-monospace">{{sub_file.md5}}</td>
             </tr>
             <tr>
-                <th style="width: 15%;">SHA1</th>
+                <th class="text-end text-info" style="width: 15%;">SHA1</th>
                 <td class="text-monospace">{{sub_file.sha1}}</td>
             </tr>
             <tr>
-                <th style="width: 15%;">SHA256</th>
+                <th class="text-end text-info" style="width: 15%;">SHA256</th>
                 <td class="text-monospace">
                     {{sub_file.sha256}}
                     <span class="ms-2">
@@ -148,34 +148,34 @@ <h5 class="mb-0 text-white"><i class="fas fa-file-invoice me-2 text-info"></i> S
             </tr>
             {% if sub_file.sha3_384 %}
             <tr>
-                <th style="width: 15%;">SHA3-384</th>
+                <th class="text-end text-info" style="width: 15%;">SHA3-384</th>
                 <td class="text-monospace text-break">{{sub_file.sha3_384}}</td>
             </tr>
             {% endif %}
             {% if sub_file.rh_hash %}
             <tr>
-                <th style="width: 15%;">RichHeader Hash</th>
+                <th class="text-end text-info" style="width: 15%;">RichHeader Hash</th>
                 <td class="text-monospace">{{sub_file.rh_hash}}</td>
             </tr>
             {% endif %}
             <tr>
-                <th style="width: 15%;">CRC32</th>
+                <th class="text-end text-info" style="width: 15%;">CRC32</th>
                 <td class="text-monospace">{{sub_file.crc32}}</td>
             </tr>
             {% if sub_file.tlsh %}
             <tr>
-                <th style="width: 15%;">TLSH</th>
+                <th class="text-end text-info" style="width: 15%;">TLSH</th>
                 <td class="text-monospace text-break">{{sub_file.tlsh}}</td>
             </tr>
             {% endif %}
             <tr>
-                <th style="width: 15%;">Ssdeep</th>
+                <th class="text-end text-info" style="width: 15%;">Ssdeep</th>
                 <td class="text-monospace text-break">{{sub_file.ssdeep}}</td>
             </tr>
 
             {% if sub_file.clamav %}
             <tr>
-                <th style="width: 15%;">ClamAV</th>
+                <th class="text-end text-info" style="width: 15%;">ClamAV</th>
                 <td>
                     <ul class="list-unstyled mb-0">
                     {% for sign in sub_file.clamav %}
@@ -188,7 +188,7 @@ <h5 class="mb-0 text-white"><i class="fas fa-file-invoice me-2 text-info"></i> S
 
             {% if sub_file.yara %}
             <tr>
-                <th style="width: 15%;">
+                <th class="text-end text-info" style="width: 15%;">
                     {% if config.yara_detail %}
                         <a class="btn btn-sm btn-outline-light" data-bs-toggle="collapse" href="#yara_{{sub_file.sha256}}" role="button"><i class="fas fa-file-code"></i> Yara</a>
                     {% else %}
@@ -211,7 +211,7 @@ <h5 class="mb-0 text-white"><i class="fas fa-file-invoice me-2 text-info"></i> S
 
             {% if sub_file.cape_yara %}
             <tr>
-                <th style="width: 15%;">
+                <th class="text-end text-info" style="width: 15%;">
                     {% if config.yara_detail %}
                         <a class="btn btn-sm btn-outline-light" data-bs-toggle="collapse" href="#capeyara_{{sub_file.sha256}}" role="button"><i class="fas fa-file-signature"></i> CAPE Yara</a>
                     {% else %}
@@ -233,7 +233,7 @@ <h5 class="mb-0 text-white"><i class="fas fa-file-invoice me-2 text-info"></i> S
 
             {% if sub_file.trid %}
             <tr>
-                <th style="width: 15%;">TriD</th>
+                <th class="text-end text-info" style="width: 15%;">TriD</th>
                 <td>
                     <ul class="list-unstyled mb-0">
                         {% for str in sub_file.trid %}<li>{{str}}</li>{% endfor %}
@@ -244,7 +244,7 @@ <h5 class="mb-0 text-white"><i class="fas fa-file-invoice me-2 text-info"></i> S
 
             {% if sub_file.die %}
             <tr>
-                <th style="width: 15%;">Detect It Easy</th>
+                <th class="text-end text-info" style="width: 15%;">Detect It Easy</th>
                 <td>
                     <ul class="list-unstyled mb-0">
                         {% for str in sub_file.die %}<li>{{str}}</li>{% endfor %}
diff --git a/web/templates/analysis/overview/_info.html b/web/templates/analysis/overview/_info.html
index bf72db209b5..dd29cff6873 100644
--- a/web/templates/analysis/overview/_info.html
+++ b/web/templates/analysis/overview/_info.html
@@ -63,7 +63,7 @@ <h5 class="mb-0 text-white"><i class="fas fa-info-circle me-2 text-primary"></i>
                         <td class="text-nowrap">{{analysis.info.ended}}</td>
                         <td>{{analysis.info.duration}}s</td>
                         {% if analysis.info.options %}
-                            <td><button class="btn btn-sm btn-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#options_collapse">View</button></td>
+                            <td><button class="btn btn-sm btn-info" type="button" data-bs-toggle="collapse" data-bs-target="#options_collapse">View</button></td>
                         {% endif %}
                         {% if user.is_staff and analysis.distributed %}
                             <td>{{analysis.distributed.name}} <small class="text-white-50">({{analysis.distributed.task_id}})</small></td>
@@ -72,10 +72,10 @@ <h5 class="mb-0 text-white"><i class="fas fa-info-circle me-2 text-primary"></i>
                         <td>
                             <div class="btn-group btn-group-sm">
                                 {% if analysis.debug.log %}
-                                <button class="btn btn-outline-light" type="button" data-bs-toggle="collapse" data-bs-target="#info-log">Analysis</button>
+                                <button class="btn btn-outline-info" type="button" data-bs-toggle="collapse" data-bs-target="#info-log">Analysis</button>
                                 {% endif %}
                                 {% if analysis.process_log %}
-                                <button class="btn btn-outline-light" type="button" data-bs-toggle="collapse" data-bs-target="#process-log">Process</button>
+                                <button class="btn btn-outline-info" type="button" data-bs-toggle="collapse" data-bs-target="#process-log">Process</button>
                                 {% endif %}
                             </div>
                         </td>