diff --git a/_includes/faqs.html b/_includes/faqs.html
index befd428..02f0559 100644
--- a/_includes/faqs.html
+++ b/_includes/faqs.html
@@ -1,10 +1,12 @@
 {%- assign faqs = include.faqs | default: page.faqs -%}
 {%- if faqs.size > 0 %}
-{% if include.heading %}<h2>{{ include.heading | markdownify }}</h2>{% endif %}
+    {%- if include.heading %}
+        <h2>{{ include.heading | markdownify }}</h2>
+    {%- endif %}
 <dl>
-{% for faq in faqs %}
-<dt>{{ faq.question | markdownify }}</dt>
-<dd>{{ faq.answer | markdownify }}</dd>
-{% endfor %}
+    {%- for faq in faqs %}
+    <dt>{{ faq.question | markdownify | strip }}</dt>
+    <dd>{{ faq.answer | markdownify | strip }}</dd>
+    {%- endfor %}
 </dl>
-{% endif %}
+{%- endif %}
diff --git a/_includes/header.html b/_includes/header.html
index a29efba..89ab61f 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -1,5 +1,7 @@
 <h4><a class="brand" href="{{ site.baseurl }}/">{{ site.title }}</a>
-    {% if site.subtitle %}<small>{{ site.subtitle }}</small>{% endif %}
+{%- if site.subtitle %}
+    <small>{{ site.subtitle }}</small>
+{%- endif %}
 </h4>
 
 <p><a href="https://www.bleachbit.org">Main site</a>
@@ -7,6 +9,3 @@ <h4><a class="brand" href="{{ site.baseurl }}/">{{ site.title }}</a>
  | <a href="https://www.bleachbit.org/help">Get Help</a>
  | <a href="https://github.com/bleachbit/docs">Edit this documentation</a>
  </p>
-
-
-
diff --git a/_includes/navigation.html b/_includes/navigation.html
index 8b36c60..b138d25 100644
--- a/_includes/navigation.html
+++ b/_includes/navigation.html
@@ -1,16 +1,18 @@
 <ul class="nav-list">
     <li><a href="{{ site.baseurl }}/">Home</a></li>
-    {% for section in site.sections %}
-        {% assign attr = section[0] %}
-        {% assign label = section[1] %}
-
-        {% for page in site.categories[attr] %}
-            {% if forloop.first %}
-                <li class="nav-header">{{ label }}</li>
-            {% endif %}
-            <li data-order="{{ page.order }}"><a href="{{ site.baseurl }}{{ page.url }}">{{ page.nav_title | default: page.title }}</a></li>
-        {% endfor %}
-    {% endfor %}
-<!-- List additional links. It is recommended to add a divider
-    e.g. <li class="divider"></li> first to break up the content. -->
+    {%- for section in site.sections %}
+        {%- assign attr = section[0] %}
+        {%- assign label = section[1] %}
+        {%- if site.categories[attr] %}
+            {%- assign pages = site.categories[attr] | sort: 'order' %}
+            <li class="nav-header">{{ label }}</li>
+            {%- for page in pages %}
+                <li><a href="{{ site.baseurl }}{{ page.url }}">{{ page.nav_title | default: page.title }}</a></li>
+            {%- endfor %}
+        {%- endif %}
+    {%- endfor %}
+    {%- comment %}
+    List additional links here. It is recommended to add a divider
+    e.g. <li class="divider"></li> first to break up the content.
+    {%- endcomment %}
 </ul>
diff --git a/_layouts/default.html b/_layouts/default.html
index 1b783a8..1379a57 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -3,9 +3,9 @@
     <head>
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        {% if site.subtitle %}<meta name="description" content="{{ site.subtitle }}">{% endif %}
-
+        {%- if site.subtitle %}
+        <meta name="description" content="{{ site.subtitle }}">
+        {%- endif %}
         <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.8/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-sRIl4kxILFvY47J16cr9ZwB07vP4J8+LH7qKQnuqkuIAvNWLzeN8tE5YBujZqJLB" crossorigin="anonymous">
         <link rel="stylesheet" href="{{ site.baseurl }}/css/main.css">
         <link rel="icon" href="{{ site.baseurl }}/images/logo-square.svg" type="image/svg+xml">
@@ -21,8 +21,8 @@
             </div>
 
             <div class="row">
-                {% assign post_count = site.posts|size %}
-                {% if site.navigation != 0 and site.navigation == 1 or post_count > 0 %}
+                {%- assign post_count = site.posts|size %}
+                {%- if site.navigation != 0 and site.navigation == 1 or post_count > 0 %}
                     <div id="navigation" class="col-sm-2">
                         {% include navigation.html %}
                     </div>
@@ -30,27 +30,27 @@
                     <div id="content" class="col-sm-10">
                         {{ content }}
                     </div>
-                {% else %}
+                {%- else %}
                     <div id="content" class="col-sm-12">
                         {{ content }}
                     </div>
-                {% endif %}
+                {%- endif %}
             </div>
 
-            {% if page.disqus == 1 %}
+            {%- if page.disqus == 1 %}
             <div class="row">
-              {% if site.navigation == 1 or post_count > 0 %}
+                {%- if site.navigation == 1 or post_count > 0 %}
                 <div id="navigation" class="col-sm-2"></div>
                 <div id="disqus" class="col-sm-10">
                     {% include disqus.html %}
                 </div>
-              {% else %}
+                {%- else %}
                 <div id="disqus" class="col-sm-12">
                     {% include disqus.html %}
                 </div>
-              {% endif %}
+                {%- endif %}
             </div>
-            {% endif %}
+            {%- endif %}
 
             <div class="row">
                 <div id="footer" class="col-sm-12">
@@ -61,54 +61,6 @@
 
         <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.8/dist/js/bootstrap.bundle.min.js" integrity="sha384-FKyoEForCGlyvwx9Hj09JcYn3nv7wiPVlz7YYwJrWVcXK/BmnVDxM+D2scQbITxI" crossorigin="anonymous"></script>
         <script>
-            function orderNav() {
-                var list,
-                    section,
-                    header,
-                    sections = [],
-                    lists = {},
-                    headers = {};
-
-                var navUl = document.querySelectorAll('#navigation ul')[0],
-                    navLis = document.querySelectorAll('#navigation ul li');
-
-                if (!navUl) return;
-
-                for (var i = 0; i < navLis.length; i++) {
-                    var order, li = navLis[i];
-
-                    if (li.classList.contains('nav-header')) {
-                        section = li.textContent || li.innerText;
-                        sections.push(section);
-                        headers[section] = li;
-                        continue;
-                    }
-
-                    if (!lists[section]) {
-                        lists[section] = [];
-                    }
-
-                    order = parseFloat(li.getAttribute('data-order'))
-                    lists[section].push([order, li]);
-                }
-
-                for (var i = 0; i < sections.length; i++) {
-                    section = sections[i];
-                    list = lists[section].sort(function(a, b) {
-                        return a[0] - b[0];
-                    });
-
-                    if (header = headers[section]) {
-                        navUl.appendChild(header);
-                    }
-                    for (var j = 0; j < list.length; j++) {
-                        navUl.appendChild(list[j][1]);
-                    }
-                }
-            }
-
-            if (document.querySelectorAll) orderNav();
-
             // Add copy buttons to code blocks
             var codeBlocks = document.querySelectorAll('div.highlighter-rouge');
             codeBlocks.forEach(function(codeBlock) {
@@ -116,14 +68,15 @@
                 button.className = 'copy-button';
                 button.type = 'button';
                 button.ariaLabel = 'Copy code to clipboard';
-                button.innerText = 'Copy';
+                button.textContent = 'Copy';
 
                 button.addEventListener('click', function() {
-                    var code = codeBlock.querySelector('code').innerText;
+                    // Rouge always ends the block with a newline
+                    var code = codeBlock.querySelector('code').textContent.replace(/\n+$/, '');
                     navigator.clipboard.writeText(code).then(function() {
-                        button.innerText = 'Copied!';
+                        button.textContent = 'Copied!';
                         setTimeout(function() {
-                            button.innerText = 'Copy';
+                            button.textContent = 'Copy';
                         }, 2000);
                     }).catch(function(err) {
                         console.error('Failed to copy: ', err);
@@ -134,8 +87,8 @@
                 codeBlock.appendChild(button);
             });
         </script>
-        {% if site.google_analytics_id != "" %}
+        {%- if site.google_analytics_id != "" %}
         {% include google_analytics.html %}
-        {% endif %}
+        {%- endif %}
     </body>
 </html>
diff --git a/_layouts/page.html b/_layouts/page.html
index 6d5fdc1..ed2f340 100644
--- a/_layouts/page.html
+++ b/_layouts/page.html
@@ -5,7 +5,9 @@
 <div class="page-header">
     {% include ad.html %}
     <h1>{{ page.title }}</h1>
-    {% if page.subtitle %}<p class="subtitle">{{ page.subtitle }}</p>{% endif %}
+    {%- if page.subtitle %}
+    <p class="subtitle">{{ page.subtitle }}</p>
+    {%- endif %}
 </div>
 
 {{ content }}
diff --git a/_posts/2015-09-25-command-line-interface.md b/_posts/2015-09-25-command-line-interface.md
index 8e34343..fa383bc 100644
--- a/_posts/2015-09-25-command-line-interface.md
+++ b/_posts/2015-09-25-command-line-interface.md
@@ -5,7 +5,7 @@ subtitle: "Usage and options"
 nav_title: "CLI"
 category: doc
 date: 2015-09-25 23:27:26
-order: 4
+order: 7
 ---
 
 Most anything you can do with the graphical user interface, you can do with BleachBit's command line interface which serves two needs:
diff --git a/_posts/2015-09-25-frequently-asked-questions.md b/_posts/2015-09-25-frequently-asked-questions.md
index 839b487..2bab555 100644
--- a/_posts/2015-09-25-frequently-asked-questions.md
+++ b/_posts/2015-09-25-frequently-asked-questions.md
@@ -4,15 +4,15 @@ title: "Frequently asked questions"
 nav_title: "FAQ"
 category: doc
 date: 2015-09-25 23:30:16
-order: 5
+order: 8
 ---
 
-{% assign main_faqs = site.data.faqs.main %}
+{%- assign main_faqs = site.data.faqs.main -%}
 {% include faqs.html faqs=main_faqs heading=false %}
 
 ## Things to know
 
 While these may not be asked, they are not common knowledge:
 
-{% assign extra_faqs = site.data.faqs.things_to_know %}
+{%- assign extra_faqs = site.data.faqs.things_to_know -%}
 {% include faqs.html faqs=extra_faqs %}
diff --git a/_posts/2015-09-25-general-usage.md b/_posts/2015-09-25-general-usage.md
index 2b385b0..4189331 100644
--- a/_posts/2015-09-25-general-usage.md
+++ b/_posts/2015-09-25-general-usage.md
@@ -5,7 +5,7 @@ subtitle: "Getting started"
 nav_title: "Usage"
 category: doc
 date: 2015-09-25 23:25:52
-order: 3
+order: 6
 ---
 
 The general usage is as follows:
diff --git a/_posts/2015-09-25-preferences.md b/_posts/2015-09-25-preferences.md
index 5006eb2..50a57b7 100644
--- a/_posts/2015-09-25-preferences.md
+++ b/_posts/2015-09-25-preferences.md
@@ -5,7 +5,7 @@ subtitle: "Settings and configuration"
 nav_title: "Preferences"
 category: doc
 date: 2015-09-25 23:17:25
-order: 2
+order: 3
 ---
 
 BleachBit provides preferences (also called options or settings) which change how it works. To edit the preferences, click **Edit** - **Preferences**.
diff --git a/_posts/2015-09-25-running-from-source-code.md b/_posts/2015-09-25-running-from-source-code.md
index 415c27a..ed03100 100644
--- a/_posts/2015-09-25-running-from-source-code.md
+++ b/_posts/2015-09-25-running-from-source-code.md
@@ -5,6 +5,7 @@ subtitle: "Developer setup guide"
 nav_title: "Source Code"
 category: dev
 date: 2015-09-25 23:40:58
+order: 3
 ---
 
 Running BleachBit from source code is intended for developers and testers: other users should install [the prepared packages](https://www.bleachbit.org/download). Running BleachBit from source code is relatively easy because there is nothing to compile and installing BleachBit is not required.
diff --git a/_posts/2015-09-25-shred-files-and-wipe-disks.md b/_posts/2015-09-25-shred-files-and-wipe-disks.md
index 6d4df78..208113f 100644
--- a/_posts/2015-09-25-shred-files-and-wipe-disks.md
+++ b/_posts/2015-09-25-shred-files-and-wipe-disks.md
@@ -4,7 +4,7 @@ title: "How to shred files and wipe disks"
 nav_title: "Shred Files"
 category: doc
 date: 2015-09-25 23:33:58
-order: 6
+order: 9
 ---
 
 When software deletes a file, it typically erases only the file's metadata,
diff --git a/_posts/2015-09-25-winapp2ini.md b/_posts/2015-09-25-winapp2ini.md
index 6efe554..32ce3f0 100644
--- a/_posts/2015-09-25-winapp2ini.md
+++ b/_posts/2015-09-25-winapp2ini.md
@@ -5,7 +5,7 @@ subtitle: "Extend BleachBit cleaning on Windows"
 nav_title: "Winapp2.ini"
 category: doc
 date: 2015-09-25 23:38:45
-order: 8
+order: 10
 ---
 
 BleachBit imports cleaning rules from `winapp2.ini` files, giving Windows users
diff --git a/_posts/2015-09-30-install-on-linux.md b/_posts/2015-09-30-install-on-linux.md
index 9738c9d..8282ae2 100644
--- a/_posts/2015-09-30-install-on-linux.md
+++ b/_posts/2015-09-30-install-on-linux.md
@@ -5,7 +5,7 @@ subtitle: "Step-by-step guide"
 nav_title: "Linux Install"
 category: doc
 date: 2015-09-30 20:37:20
-order: 1
+order: 2
 ---
 
 This article covers
diff --git a/_posts/2018-03-14-troubleshooting.md b/_posts/2018-03-14-troubleshooting.md
index e912e19..c43d4c0 100644
--- a/_posts/2018-03-14-troubleshooting.md
+++ b/_posts/2018-03-14-troubleshooting.md
@@ -5,7 +5,7 @@ subtitle: "Fix common errors and problems"
 nav_title: "Troubleshooting"
 category: doc
 date: 2018-03-14 21:36:58
-order: 10
+order: 12
 ---
 
 When something goes wrong, these steps will help you gather information to ask for help or to file a bug report.
diff --git a/_posts/2018-05-12-audit.md b/_posts/2018-05-12-audit.md
index c522fce..035a397 100644
--- a/_posts/2018-05-12-audit.md
+++ b/_posts/2018-05-12-audit.md
@@ -5,6 +5,7 @@ subtitle: "Cleaning developer reference"
 nav_title: "Audit"
 category: dev
 date: 2018-05-12 15:38:24
+order: 2
 ---
 
 This is one procedure to audit the BleachBit's effectiveness.
diff --git a/_posts/2019-08-14-chaff.md b/_posts/2019-08-14-chaff.md
index cce27c6..4da65bc 100644
--- a/_posts/2019-08-14-chaff.md
+++ b/_posts/2019-08-14-chaff.md
@@ -5,7 +5,7 @@ subtitle: "Hide private files using decoy data"
 nav_title: "Chaff"
 category: doc
 date: 2019-08-14 20:45:26
-order: 9
+order: 11
 ---
 When you delete a file, traces can remain on your storage drive, and
 digital forensics tools are designed to find them. BleachBit's **Chaff**
diff --git a/_posts/2021-04-17-testing.md b/_posts/2021-04-17-testing.md
index 7f87bf8..fe3b851 100644
--- a/_posts/2021-04-17-testing.md
+++ b/_posts/2021-04-17-testing.md
@@ -5,6 +5,7 @@ subtitle: "A guide for developers and QA testers"
 nav_title: "Testing"
 category: dev
 date: 2021-04-17 17:30:57
+order: 1
 ---
 
 Interested in testing BleachBit to ensure high-quality releases?
diff --git a/_posts/2026-03-18-cookie-manager.md b/_posts/2026-03-18-cookie-manager.md
index 5627418..ecd74b8 100644
--- a/_posts/2026-03-18-cookie-manager.md
+++ b/_posts/2026-03-18-cookie-manager.md
@@ -5,7 +5,7 @@ subtitle: "Browser cookie management guide"
 nav_title: "Cookie Manager"
 category: doc
 date: 2026-03-18 09:47:00
-order: 3
+order: 5
 faqs:
   - question: How do cookies show in BleachBit's preview and cleaning log?
     answer: Instead of showing "Delete" in the log, you will see "Clean cookies" followed by the filename containing cookies. There will be one entry for each supported browser. The log will not list individual cookies.
diff --git a/_posts/2026-04-29-expert-mode.md b/_posts/2026-04-29-expert-mode.md
index 443ce74..b314457 100644
--- a/_posts/2026-04-29-expert-mode.md
+++ b/_posts/2026-04-29-expert-mode.md
@@ -5,7 +5,7 @@ subtitle: "Safety guardrails and advanced features"
 nav_title: "Expert mode"
 category: doc
 date: 2026-04-29 12:01:00
-order: 3
+order: 4
 
 ---
 
