diff --git a/build/ui-bundle.zip b/build/ui-bundle.zip
index 57bfa9d..0b4442f 100644
Binary files a/build/ui-bundle.zip and b/build/ui-bundle.zip differ
diff --git a/src/partials/article-404.hbs b/src/partials/article-404.hbs
index 436b280..200a263 100644
--- a/src/partials/article-404.hbs
+++ b/src/partials/article-404.hbs
@@ -1,10 +1,37 @@
-<article class="doc">
-<h1 class="page">{{{or page.title 'Page Not Found'}}}</h1>
-<div class="paragraph">
-<p>The page you&#8217;re looking for does not exist. It may have been moved. You can{{#with site.homeUrl}} return to the <a href="{{{this}}}">start page</a>, or{{/with}} follow one of the links in the navigation to the left.</p>
-</div>
-<div class="paragraph">
-<p>If you arrived on this page by clicking on a link, please notify the owner of the site that the link is broken.
-If you typed the URL of this page manually, please double check that you entered the address correctly.</p>
-</div>
+<pre>{{log page}}</pre>
+<article
+    class="doc" 
+    style="
+        text-align: center;
+        height: 75vh;
+        display: grid;
+        place-items: center;
+        place-content: center;
+    "
+>
+    <h1 class="page">
+        Page Not Found
+    </h1>
+    <div class="paragraph">
+        <p>
+            The page you are looking for no longer exists.
+        </p>
+    </div>
+    <div class="paragraph">
+        <p>
+            If you believe this is a mistake, please help by
+            <a
+                style="cursor:pointer;text-decoration:none;"
+                target="_blank"
+                onclick="this.href=`https://github.com/starknet-io/starknet-docs/issues/new?assignees=landauraz&title=${encodeURIComponent(window.location.href)} is broken`"
+            >submitting an issue</a>.
+        </p>
+    </div>
+    <div class="paragraph">
+        <a href="{{{site.homeUrl}}}" style="text-decoration:none;">
+            <h1 style="font-size:1.1rem;">
+                Click here to go to the docs homepage
+            </h1>
+        </a>
+    </div>
 </article>
diff --git a/src/partials/body.hbs b/src/partials/body.hbs
index 4a0ac25..3f134da 100644
--- a/src/partials/body.hbs
+++ b/src/partials/body.hbs
@@ -1,4 +1,6 @@
 <div class="body">
-{{> nav}}
+{{#unless (eq page.layout '404')}}
+    {{> nav}}
+{{/unless}}
 {{> main}}
 </div>
diff --git a/src/partials/footer-scripts.hbs b/src/partials/footer-scripts.hbs
index 57fadf5..3dbd845 100644
--- a/src/partials/footer-scripts.hbs
+++ b/src/partials/footer-scripts.hbs
@@ -3,7 +3,7 @@
 <script async src="{{{uiRootPath}}}/js/vendor/tabs-block-behaviour.js?new"></script>
 <script async src="{{{uiRootPath}}}/js/vendor/swagger-ui.js?new"></script>
 <script async src="{{{uiRootPath}}}/js/vendor/component-versions.js?new"></script>
-<script src="https://chatwith.tools/chatbot/04f9f1da-f9bd-46c1-a74d-b72cec2014ea.js" async=""></script>
 <script src="{{uiRootPath}}/js/vendor/custom.js?new"></script>
 <script async src="{{{uiRootPath}}}/js/vendor/tabs.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
+{{#if page.component}}<script src="https://chatwith.tools/chatbot/04f9f1da-f9bd-46c1-a74d-b72cec2014ea.js" async=""></script>{{/if}}
\ No newline at end of file