diff --git a/packages/builder/src/App.svelte b/packages/builder/src/App.svelte
index 4d193df104..04846e01bf 100644
--- a/packages/builder/src/App.svelte
+++ b/packages/builder/src/App.svelte
@@ -11,11 +11,8 @@
 
 <div class="banner-container" />
 <BannerDisplay />
-
 <NotificationDisplay />
-
 <LicensingOverlays />
-
 <Router {routes} config={{ queryHandler }} />
 <div class="modal-container" />
 <HelpIcon />
diff --git a/packages/builder/src/components/backend/TableNavigator/TableDataImport.svelte b/packages/builder/src/components/backend/TableNavigator/TableDataImport.svelte
index ea0ce59169..4aebd140e9 100644
--- a/packages/builder/src/components/backend/TableNavigator/TableDataImport.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/TableDataImport.svelte
@@ -218,7 +218,6 @@
   }
 
   label {
-    font-family: var(--font-sans);
     cursor: pointer;
     font-weight: 600;
     box-sizing: border-box;
diff --git a/packages/builder/src/components/common/TemplateDisplay.svelte b/packages/builder/src/components/common/TemplateDisplay.svelte
index 66da437118..4699b2492c 100644
--- a/packages/builder/src/components/common/TemplateDisplay.svelte
+++ b/packages/builder/src/components/common/TemplateDisplay.svelte
@@ -50,7 +50,7 @@
 
 <Content>
   <div slot="side-nav">
-    <SideNav title="Templates">
+    <SideNav>
       <SideNavItem
         on:click={() => (selectedCategory = null)}
         text="All"
diff --git a/packages/builder/src/pages/builder/portal/plugins/index.svelte b/packages/builder/src/pages/builder/portal/plugins/index.svelte
index a76c6502e4..f5924ef486 100644
--- a/packages/builder/src/pages/builder/portal/plugins/index.svelte
+++ b/packages/builder/src/pages/builder/portal/plugins/index.svelte
@@ -47,7 +47,7 @@
   <Layout noPadding>
     <Layout gap="XS" noPadding>
       <Heading size="M">Plugins</Heading>
-      <Body>Add your own custom datasources and components.</Body>
+      <Body>Add your own custom datasources and components</Body>
     </Layout>
     <Divider />
     <Layout noPadding>
diff --git a/packages/builder/src/pages/builder/portal/settings/_layout.svelte b/packages/builder/src/pages/builder/portal/settings/_layout.svelte
index c1103bdaa7..dde65aac85 100644
--- a/packages/builder/src/pages/builder/portal/settings/_layout.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/_layout.svelte
@@ -7,7 +7,7 @@
 <Page narrow>
   <Content>
     <div slot="side-nav">
-      <SideNav title="Settings">
+      <SideNav>
         <SideNavItem
           text="API Key"
           url={$url("./api")}
diff --git a/packages/builder/src/pages/builder/portal/settings/auth/index.svelte b/packages/builder/src/pages/builder/portal/settings/auth/index.svelte
index 4a51d84bc1..300562bdfe 100644
--- a/packages/builder/src/pages/builder/portal/settings/auth/index.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/auth/index.svelte
@@ -316,11 +316,7 @@
 <Layout noPadding>
   <Layout gap="XS" noPadding>
     <Heading size="M">Authentication</Heading>
-    <Body>
-      Every budibase app comes with basic authentication (email/password)
-      included. You can add additional authentication methods from the options
-      below.
-    </Body>
+    <Body>Add additional authentication methods from the options below</Body>
   </Layout>
   {#if providers.google}
     <Divider />
diff --git a/packages/builder/src/pages/builder/portal/usage/index.svelte b/packages/builder/src/pages/builder/portal/usage/index.svelte
index 893da14160..12e3a56d31 100644
--- a/packages/builder/src/pages/builder/portal/usage/index.svelte
+++ b/packages/builder/src/pages/builder/portal/usage/index.svelte
@@ -182,18 +182,14 @@
       <Layout noPadding gap="XS">
         <Heading>Usage</Heading>
         <Body>
-          <div>Get information about your current usage within Budibase.</div>
-          {#if accountPortalAccess}
-            <div>
-              To upgrade your plan and usage limits visit your <Link
-                on:click={goToAccountPortal}
-                size="L">Account</Link
-              >
-            </div>
-          {/if}
+          <div>Get information about your current usage within Budibase</div>
         </Body>
       </Layout>
       <Divider />
+      <Body>
+        To upgrade your plan and usage limits visit your
+        <Link size="L" on:click={goToAccountPortal}>account</Link>.
+      </Body>
       <DashCard
         description="YOUR CURRENT PLAN"
         title={planTitle()}
diff --git a/packages/builder/src/pages/builder/portal/users/_layout.svelte b/packages/builder/src/pages/builder/portal/users/_layout.svelte
index 23e7aab9db..6507241ea6 100644
--- a/packages/builder/src/pages/builder/portal/users/_layout.svelte
+++ b/packages/builder/src/pages/builder/portal/users/_layout.svelte
@@ -10,7 +10,7 @@
 <Page>
   <Content {narrow}>
     <div slot="side-nav">
-      <SideNav title="Users">
+      <SideNav>
         <SideNavItem
           text="Users"
           url={$url("./users")}
diff --git a/packages/builder/src/pages/builder/portal/users/groups/index.svelte b/packages/builder/src/pages/builder/portal/users/groups/index.svelte
index d01c7effc0..c37ea1c039 100644
--- a/packages/builder/src/pages/builder/portal/users/groups/index.svelte
+++ b/packages/builder/src/pages/builder/portal/users/groups/index.svelte
@@ -98,14 +98,12 @@
         </Tags>
       {/if}
     </div>
-    <Body>
-      Easily assign and manage your users' access with groups.
-      {#if !$auth.accountPortalAccess && !$licensing.groupsEnabled && $admin.cloud}
-        Contact your account holder to upgrade your plan.
-      {/if}
-    </Body>
+    <Body>Easily assign and manage your users' access with groups</Body>
   </Layout>
   <Divider />
+  {#if !$auth.accountPortalAccess && !$licensing.groupsEnabled && $admin.cloud}
+    <Body>Contact your account holder to upgrade your plan.</Body>
+  {/if}
   <div class="controls">
     <ButtonGroup>
       {#if $licensing.groupsEnabled}
diff --git a/packages/builder/src/pages/builder/portal/users/users/_components/ImportUsersModal.svelte b/packages/builder/src/pages/builder/portal/users/users/_components/ImportUsersModal.svelte
index 293e3bc242..9c8ed07b82 100644
--- a/packages/builder/src/pages/builder/portal/users/users/_components/ImportUsersModal.svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/_components/ImportUsersModal.svelte
@@ -117,7 +117,6 @@
   }
 
   label {
-    font-family: var(--font-sans);
     font-weight: 600;
     box-sizing: border-box;
     overflow: hidden;
diff --git a/packages/builder/src/pages/builder/portal/users/users/index.svelte b/packages/builder/src/pages/builder/portal/users/users/index.svelte
index 7e3366a3f4..5fa1b65240 100644
--- a/packages/builder/src/pages/builder/portal/users/users/index.svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/index.svelte
@@ -214,7 +214,7 @@
   <Layout noPadding gap="M">
     <Layout gap="XS" noPadding>
       <Heading>Users</Heading>
-      <Body>Add users and control who gets access to your published apps.</Body>
+      <Body>Add users and control who gets access to your published apps</Body>
     </Layout>
     <Divider />
     <div class="controls">
