diff --git a/_includes/footer.html b/_includes/footer.html
index 850d8f5a..fed4c960 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -19,12 +19,12 @@
   <div class="container-fluid py-4 mt-4 border-top">
     <div class="row">
       <div class="col-12 text-center">
-        <p class="small">
+        {% if site.org %}<p class="small">
           Built with
           <i class="fa-solid fa-heart" aria-label="Heart"></i>
           by
           <a href="{{ site['org-url'] }}">{{ site.org }}</a>
-        </p>
+        </p>{% endif %}
       </div>
     </div>
   </div>
diff --git a/_includes/header.html b/_includes/header.html
index 45625463..2bb08420 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -17,12 +17,12 @@
     <link rel="alternate" hreflang="en" href="{{ site.url }}{{ page.url }}">
     <link rel="alternate" hreflang="x-default" href="{{ site.url }}{{ page.url }}">
     <!-- Title -->
-    <title>{{ title }} - {{ site.title }}</title>
+    <title>{% if title %}{{ title }} - {% endif %}{{ site.title }}</title>
     <!-- Open Graph -->
     <meta property="og:site_name" content="{{ site.title }}">
     <meta property="og:type" content="website">
-    <meta property="og:title" content="{{ title }}">
-    <meta property="og:description" content="{{ description }}">
+    {% if title %}<meta property="og:title" content="{{ title }}">{% endif %}
+    {% if description %}<meta property="og:description" content="{{ description }}">{% endif %}
     <meta property="og:url" content="{{ site.url }}{{ page.url }}">
     {% if ogImage %}
     <meta property="og:image" content="{{ site.url }}/assets/img/{{ ogImage }}">
@@ -67,7 +67,7 @@
     </script>
 </head>
 
-<body class="{{ layout }}" data-bs-theme="dark">
+<body{% if layout %} class="{{ layout }}"{% endif %} data-bs-theme="dark">
     <a class="visually-hidden visually-hidden-focusable skip-link" href="#main-content">
         Skip to main content
     </a>
diff --git a/_includes/js.html b/_includes/js.html
index c2cef6f7..9f24f98d 100644
--- a/_includes/js.html
+++ b/_includes/js.html
@@ -10,9 +10,12 @@
   darkQuery.addEventListener('change', e => setTheme(e.matches));
 </script>
 <script>
-  document.querySelector('button.navbar-toggler').addEventListener('click', function(e) {
-    document.querySelector(this.dataset.target).classList.toggle('show');
-  });
+  const toggler = document.querySelector('button.navbar-toggler');
+  if (toggler) {
+    toggler.addEventListener('click', function(e) {
+      document.querySelector(this.dataset.target).classList.toggle('show');
+    });
+  }
   if (document.getElementById('dropdownMenuButton')) {
     document.getElementById('dropdownMenuButton').addEventListener('click', function(e) {
       document.querySelector('[aria-labelledby="' + this.id + '"]').classList.toggle('show');
