diff --git a/assets/javascripts/discourse/initializers/community-landing-admin-tabs.js b/assets/javascripts/discourse/initializers/community-landing-admin-tabs.js
index 26b142a..2598cc6 100644
--- a/assets/javascripts/discourse/initializers/community-landing-admin-tabs.js
+++ b/assets/javascripts/discourse/initializers/community-landing-admin-tabs.js
@@ -862,6 +862,8 @@ const CONDITIONAL_TOGGLES = [
 ];
 
 function applyConditionalVisibility(container) {
+  const tab = TABS.find((t) => t.id === currentTab);
+
   CONDITIONAL_TOGGLES.forEach((group) => {
     const toggleRow = container.querySelector(
       `.row.setting[data-setting="${group.toggle}"]`
@@ -873,12 +875,17 @@ function applyConditionalVisibility(container) {
 
     group.whenOff.forEach((name) => {
       const row = container.querySelector(`.row.setting[data-setting="${name}"]`);
-      if (row) row.classList.toggle("cl-tab-hidden", isOn);
+      if (!row) return;
+      // Only unhide if this setting belongs to the current tab
+      const inTab = tab && tab.settings.has(name);
+      row.classList.toggle("cl-tab-hidden", !inTab || isOn);
     });
 
     group.whenOn.forEach((name) => {
       const row = container.querySelector(`.row.setting[data-setting="${name}"]`);
-      if (row) row.classList.toggle("cl-tab-hidden", !isOn);
+      if (!row) return;
+      const inTab = tab && tab.settings.has(name);
+      row.classList.toggle("cl-tab-hidden", !inTab || !isOn);
     });
   });
 
diff --git a/assets/stylesheets/community_landing/landing.css b/assets/stylesheets/community_landing/landing.css
index 80487f2..55d51fe 100644
--- a/assets/stylesheets/community_landing/landing.css
+++ b/assets/stylesheets/community_landing/landing.css
@@ -128,7 +128,10 @@
 /* ── Smooth Scroll ── */
 html {
   scroll-behavior: smooth;
-  overflow-x: hidden;
+}
+
+html, .cl-body {
+  max-width: 100vw;
 }
 
 /* ── Focus-visible Accessibility ── */
@@ -543,13 +546,17 @@ html {
 .cl-navbar__mobile-menu {
   display: none;
   position: fixed;
-  inset: 0;
+  top: 0;
+  left: 0;
+  width: 100vw;
+  height: 100vh;
+  height: 100dvh;
   background: var(--cl-bg);
   flex-direction: column;
   align-items: center;
   justify-content: center;
   gap: 1.25rem;
-  z-index: 1000;
+  z-index: 999;
 }
 
 .cl-navbar__mobile-menu.open {
@@ -2143,6 +2150,10 @@ html {
    MOBILE — tighter padding, no horizontal overflow
    ═══════════════════════════════════════════════════════════════════ */
 @media (max-width: 767px) {
+  .cl-orb-container {
+    display: none;
+  }
+
   .cl-container {
     padding: 0 1rem;
   }
diff --git a/lib/community_landing/page_builder.rb b/lib/community_landing/page_builder.rb
index 6834eeb..82e8671 100644
--- a/lib/community_landing/page_builder.rb
+++ b/lib/community_landing/page_builder.rb
@@ -188,13 +188,13 @@ module CommunityLanding
       html << "</div>"
 
       html << "<button class=\"cl-navbar__hamburger\" id=\"cl-hamburger\" aria-label=\"Toggle menu\"><span></span><span></span><span></span></button>\n"
+      html << "</div></nav>\n"
       html << "<div class=\"cl-navbar__mobile-menu\" id=\"cl-nav-links\">\n"
       html << theme_toggle
       html << render_social_icons
       html << "<a href=\"#{login_url}\" class=\"cl-navbar__link cl-btn--ghost\">#{button_with_icon(signin_label)}</a>\n"
       html << "<a href=\"#{login_url}\" class=\"cl-navbar__link cl-btn--primary\">#{button_with_icon(join_label)}</a>\n"
-      html << "</div>"
-      html << "</div></nav>\n"
+      html << "</div>\n"
       html
     end