diff --git a/frontend/common/hooks/useOverflowVisibleCount.ts b/frontend/common/hooks/useOverflowVisibleCount.ts
index 171d8a4d14d1..faadeb0fb24c 100644
--- a/frontend/common/hooks/useOverflowVisibleCount.ts
+++ b/frontend/common/hooks/useOverflowVisibleCount.ts
@@ -68,7 +68,14 @@ export const useOverflowVisibleCount = ({
         return totalWidths + totalGaps
       }
 
-      const containerWidth = outerCont.clientWidth
+      // clientWidth includes the container's horizontal padding, which the items
+      // can't actually occupy. Subtract it so padded navbars don't over-estimate
+      // the available width and let items clip off-screen.
+      const outerStyle = getComputedStyle(outerCont)
+      const containerWidth =
+        outerCont.clientWidth -
+        (parseFloat(outerStyle.paddingLeft) || 0) -
+        (parseFloat(outerStyle.paddingRight) || 0)
       // All items fit
       if (sumWidths(widths.length) <= containerWidth) {
         setVisibleCount(widths.length)
diff --git a/frontend/web/components/navigation/OverflowNav.tsx b/frontend/web/components/navigation/OverflowNav.tsx
index 944fb7a6831a..cd3112c0bf38 100644
--- a/frontend/web/components/navigation/OverflowNav.tsx
+++ b/frontend/web/components/navigation/OverflowNav.tsx
@@ -71,8 +71,15 @@ const OverflowNav: FC<OverflowNavProps> = ({
           'd-flex align-items-center',
         )}
       >
+        {/* Wrappers keep DOM children 1:1 with items so measured widths align,
+            even when an item renders nothing or multiple elements */}
         {(isMeasuring ? items : visible).map((child, idx) => (
-          <React.Fragment key={idx}>{child}</React.Fragment>
+          <div
+            key={idx}
+            className={`d-flex align-items-center gap-${gap} flex-shrink-0`}
+          >
+            {child}
+          </div>
         ))}
       </div>
 
diff --git a/frontend/web/components/navigation/navbars/OrganisationNavbar.tsx b/frontend/web/components/navigation/navbars/OrganisationNavbar.tsx
index 2ba0d7a92f4f..09d630b89570 100644
--- a/frontend/web/components/navigation/navbars/OrganisationNavbar.tsx
+++ b/frontend/web/components/navigation/navbars/OrganisationNavbar.tsx
@@ -42,28 +42,27 @@ const OrganisationNavbar: FC<OrganisationNavType> = ({}) => {
           Usage
         </NavSubLink>
       )}
-      {AccountStore.isAdmin() && (
-        <>
-          {Utils.getFlagsmithHasFeature('organisation_integrations') && (
-            <NavSubLink
-              icon={<Icon name='layers' />}
-              id='integrations-link'
-              to={`/organisation/${
-                AccountStore.getOrganisation().id
-              }/integrations`}
-            >
-              Organisation Integrations
-            </NavSubLink>
-          )}
+      {AccountStore.isAdmin() &&
+        Utils.getFlagsmithHasFeature('organisation_integrations') && (
           <NavSubLink
-            icon={<Icon name='setting' width={24} />}
-            id='org-settings-link'
-            data-test='org-settings-link'
-            to={`/organisation/${AccountStore.getOrganisation().id}/settings`}
+            icon={<Icon name='layers' />}
+            id='integrations-link'
+            to={`/organisation/${
+              AccountStore.getOrganisation().id
+            }/integrations`}
           >
-            Organisation Settings
+            Organisation Integrations
           </NavSubLink>
-        </>
+        )}
+      {AccountStore.isAdmin() && (
+        <NavSubLink
+          icon={<Icon name='setting' width={24} />}
+          id='org-settings-link'
+          data-test='org-settings-link'
+          to={`/organisation/${AccountStore.getOrganisation().id}/settings`}
+        >
+          Organisation Settings
+        </NavSubLink>
       )}
     </OverflowNav>
   )
diff --git a/frontend/web/components/navigation/navbars/ProjectNavbar.tsx b/frontend/web/components/navigation/navbars/ProjectNavbar.tsx
index 3c66eb25e0cd..d0e7f4d7ba7e 100644
--- a/frontend/web/components/navigation/navbars/ProjectNavbar.tsx
+++ b/frontend/web/components/navigation/navbars/ProjectNavbar.tsx
@@ -60,7 +60,7 @@ const ProjectNavbar: FC<ProjectNavType> = ({ environmentId, projectId }) => {
             location.pathname.startsWith(`/project/${projectId}/lifecycle`)
           }
         >
-          Feature Lifecycle
+          Lifecycle
         </NavSubLink>
       )}
       <Permission
@@ -114,25 +114,23 @@ const ProjectNavbar: FC<ProjectNavType> = ({ environmentId, projectId }) => {
       >
         Compare
       </NavSubLink>
+      {projectAdmin && Utils.getFlagsmithHasFeature('release_pipelines') && (
+        <NavSubLink
+          icon={<Icon name='flash' />}
+          id='release-pipelines-link'
+          to={`/project/${projectId}/release-pipelines`}
+        >
+          Pipelines
+        </NavSubLink>
+      )}
       {projectAdmin && (
-        <>
-          {Utils.getFlagsmithHasFeature('release_pipelines') && (
-            <NavSubLink
-              icon={<Icon name='flash' />}
-              id='release-pipelines-link'
-              to={`/project/${projectId}/release-pipelines`}
-            >
-              Release Pipelines
-            </NavSubLink>
-          )}
-          <NavSubLink
-            icon={<Icon name='setting' width={24} />}
-            id='project-settings-link'
-            to={`/project/${projectId}/settings`}
-          >
-            Project Settings
-          </NavSubLink>
-        </>
+        <NavSubLink
+          icon={<Icon name='setting' width={24} />}
+          id='project-settings-link'
+          to={`/project/${projectId}/settings`}
+        >
+          Project Settings
+        </NavSubLink>
       )}
     </OverflowNav>
   )