diff --git a/templates/blog/article_page.html b/templates/blog/article_page.html
index 818dfe3..013c89b 100644
--- a/templates/blog/article_page.html
+++ b/templates/blog/article_page.html
@@ -69,7 +69,7 @@
     <div class="sticky top-28">
 
       <!-- Share -->
-      <div class="mb-8">
+      <section aria-label="Share this article" class="mb-8">
         <h3 class="font-display font-bold text-lg mb-4 uppercase tracking-widest text-zinc-500 text-sm">Share Article</h3>
         <div class="flex gap-2">
           <a href="https://x.com/intent/post?url={{ request.build_absolute_uri|urlencode }}&text={{ page.title|urlencode }}" target="_blank" rel="noopener noreferrer"
@@ -85,7 +85,7 @@
             <svg class="w-4 h-4" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" d="M13.19 8.688a4.5 4.5 0 0 1 1.242 7.244l-4.5 4.5a4.5 4.5 0 0 1-6.364-6.364l1.757-1.757m13.35-.622 1.757-1.757a4.5 4.5 0 0 0-6.364-6.364l-4.5 4.5a4.5 4.5 0 0 0 1.242 7.244" /></svg>
           </button>
         </div>
-      </div>
+      </section>
 
       <!-- Newsletter -->
       <div class="bg-brand-dark text-brand-light dark:bg-brand-light dark:text-brand-dark p-6 border border-transparent dark:border-zinc-700 shadow-solid-dark dark:shadow-solid-light">
diff --git a/templates/components/nav.html b/templates/components/nav.html
index 4734bf4..ee9d8f0 100644
--- a/templates/components/nav.html
+++ b/templates/components/nav.html
@@ -14,16 +14,20 @@
       <a href="/" class="hover:text-brand-cyan transition-colors">Home</a>
       <a href="/articles/" class="hover:text-brand-cyan transition-colors">Articles</a>
       <a href="/about/" class="hover:text-brand-pink transition-colors">About</a>
-      <!-- Hidden newsletter form for subscribe functionality -->
-      <div class="hidden">
-        {% include 'components/newsletter_form.html' with source='nav' label='Get updates' %}
-      </div>
-      <a href="#newsletter" class="px-5 py-2.5 bg-brand-dark dark:bg-brand-light text-brand-light dark:text-brand-dark font-display font-bold hover:-translate-y-1 hover:shadow-solid-dark dark:hover:shadow-solid-light transition-all border border-transparent dark:border-zinc-700">Subscribe</a>
+      <form method="post" action="/newsletter/subscribe/" data-newsletter-form class="flex items-center gap-2" id="nav-newsletter">
+        {% csrf_token %}
+        <input type="hidden" name="source" value="nav" />
+        <input type="email" name="email" required placeholder="dev@example.com"
+          class="bg-transparent border border-zinc-300 dark:border-zinc-700 px-3 py-2 text-brand-dark dark:text-brand-light font-mono text-sm focus:outline-none focus:border-brand-pink transition-colors w-44" />
+        <input type="text" name="honeypot" style="display:none" />
+        <button type="submit" class="px-5 py-2.5 bg-brand-dark dark:bg-brand-light text-brand-light dark:text-brand-dark font-display font-bold hover:-translate-y-1 hover:shadow-solid-dark dark:hover:shadow-solid-light transition-all border border-transparent dark:border-zinc-700 whitespace-nowrap">Subscribe</button>
+        <p data-newsletter-message aria-live="polite" class="font-mono text-xs text-brand-cyan hidden"></p>
+      </form>
     </div>
 
     <!-- Theme Toggle -->
     <div class="flex items-center gap-4">
-      <button type="button" data-theme-toggle class="p-2 rounded-full hover:bg-zinc-200 dark:hover:bg-zinc-800 transition-colors" aria-label="Toggle Dark Mode">
+      <button type="button" data-theme-toggle class="p-2 rounded-full hover:bg-zinc-200 dark:hover:bg-zinc-800 transition-colors" aria-label="Toggle theme">
         <svg class="w-5 h-5 hidden dark:block text-yellow-400" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" d="M12 3v2.25m6.364.386-1.591 1.591M21 12h-2.25m-.386 6.364-1.591-1.591M12 18.75V21m-4.773-4.227-1.591 1.591M5.25 12H3m4.227-4.773L5.636 5.636M15.75 12a3.75 3.75 0 1 1-7.5 0 3.75 3.75 0 0 1 7.5 0Z" /></svg>
         <svg class="w-5 h-5 block dark:hidden text-zinc-700" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" d="M21.752 15.002A9.72 9.72 0 0 1 18 15.75c-5.385 0-9.75-4.365-9.75-9.75 0-1.33.266-2.597.748-3.752A9.753 9.753 0 0 0 3 11.25C3 16.635 7.365 21 12.75 21a9.753 9.753 0 0 0 9.002-5.998Z" /></svg>
       </button>