diff --git a/messages/en-US.json b/messages/en-US.json
index a01d8b61..704ad880 100644
--- a/messages/en-US.json
+++ b/messages/en-US.json
@@ -1196,7 +1196,7 @@
     "sidebarUserDevices": "Users",
     "sidebarMachineClients": "Machines",
     "sidebarDomains": "Domains",
-    "sidebarGeneral": "General",
+    "sidebarGeneral": "Manage",
     "sidebarLogAndAnalytics": "Log & Analytics",
     "sidebarBluePrints": "Blueprints",
     "sidebarOrganization": "Organization",
@@ -2146,7 +2146,7 @@
     "unverified": "Unverified",
     "domainSetting": "Domain Settings",
     "domainSettingDescription": "Configure settings for the domain",
-    "preferWildcardCertDescription": "Attempt to generate a wildcard certificate (require a properly configured certificate resolver).",
+    "preferWildcardCertDescription": "Attempt to generate a wildcard certificate (requires a properly configured certificate resolver).",
     "recordName": "Record Name",
     "auto": "Auto",
     "TTL": "TTL",
diff --git a/src/app/[orgId]/settings/(private)/idp/create/page.tsx b/src/app/[orgId]/settings/(private)/idp/create/page.tsx
index 682b23f1..c8dba38c 100644
--- a/src/app/[orgId]/settings/(private)/idp/create/page.tsx
+++ b/src/app/[orgId]/settings/(private)/idp/create/page.tsx
@@ -700,29 +700,6 @@ export default function Page() {
                                         id="create-idp-form"
                                         onSubmit={form.handleSubmit(onSubmit)}
                                     >
-                                        <Alert variant="neutral">
-                                            <InfoIcon className="h-4 w-4" />
-                                            <AlertTitle className="font-semibold">
-                                                {t("idpJmespathAbout")}
-                                            </AlertTitle>
-                                            <AlertDescription>
-                                                {t(
-                                                    "idpJmespathAboutDescription"
-                                                )}{" "}
-                                                <a
-                                                    href="https://jmespath.org"
-                                                    target="_blank"
-                                                    rel="noopener noreferrer"
-                                                    className="text-primary hover:underline inline-flex items-center"
-                                                >
-                                                    {t(
-                                                        "idpJmespathAboutDescriptionLink"
-                                                    )}{" "}
-                                                    <ExternalLink className="ml-1 h-4 w-4" />
-                                                </a>
-                                            </AlertDescription>
-                                        </Alert>
-
                                         <FormField
                                             control={form.control}
                                             name="identifierPath"
diff --git a/src/app/[orgId]/settings/(private)/remote-exit-nodes/create/page.tsx b/src/app/[orgId]/settings/(private)/remote-exit-nodes/create/page.tsx
index 062b7e9a..0e68c379 100644
--- a/src/app/[orgId]/settings/(private)/remote-exit-nodes/create/page.tsx
+++ b/src/app/[orgId]/settings/(private)/remote-exit-nodes/create/page.tsx
@@ -319,19 +319,6 @@ export default function CreateRemoteExitNodePage() {
   id: "${defaults?.remoteExitNodeId}"
   secret: "${defaults?.secret}"`}
                                 />
-                                <Alert variant="neutral" className="mt-4">
-                                    <InfoIcon className="h-4 w-4" />
-                                    <AlertTitle className="font-semibold">
-                                        {t(
-                                            "remoteExitNodeCreate.generate.saveCredentialsTitle"
-                                        )}
-                                    </AlertTitle>
-                                    <AlertDescription>
-                                        {t(
-                                            "remoteExitNodeCreate.generate.saveCredentialsDescription"
-                                        )}
-                                    </AlertDescription>
-                                </Alert>
                             </SettingsSectionBody>
                         </SettingsSection>
                     )}
diff --git a/src/app/[orgId]/settings/clients/machine/create/page.tsx b/src/app/[orgId]/settings/clients/machine/create/page.tsx
index 05ace912..42dfe0d5 100644
--- a/src/app/[orgId]/settings/clients/machine/create/page.tsx
+++ b/src/app/[orgId]/settings/clients/machine/create/page.tsx
@@ -523,18 +523,6 @@ export default function Page() {
                                                 </InfoSectionContent>
                                             </InfoSection>
                                         </InfoSections>
-
-                                        <Alert variant="neutral" className="">
-                                            <InfoIcon className="h-4 w-4" />
-                                            <AlertTitle className="font-semibold">
-                                                {t("clientCredentialsSave")}
-                                            </AlertTitle>
-                                            <AlertDescription>
-                                                {t(
-                                                    "clientCredentialsSaveDescription"
-                                                )}
-                                            </AlertDescription>
-                                        </Alert>
                                     </SettingsSectionBody>
                                 </SettingsSection>
                                 <SettingsSection>
diff --git a/src/app/[orgId]/settings/sites/create/page.tsx b/src/app/[orgId]/settings/sites/create/page.tsx
index 6395c265..63c73b8c 100644
--- a/src/app/[orgId]/settings/sites/create/page.tsx
+++ b/src/app/[orgId]/settings/sites/create/page.tsx
@@ -820,18 +820,6 @@ WantedBy=default.target`
                                             </InfoSection>
                                         </InfoSections>
 
-                                        <Alert variant="neutral" className="">
-                                            <InfoIcon className="h-4 w-4" />
-                                            <AlertTitle className="font-semibold">
-                                                {t("siteCredentialsSave")}
-                                            </AlertTitle>
-                                            <AlertDescription>
-                                                {t(
-                                                    "siteCredentialsSaveDescription"
-                                                )}
-                                            </AlertDescription>
-                                        </Alert>
-
                                         {/* <Form {...form}> */}
                                         {/*     <form */}
                                         {/*         className="space-y-4" */}
@@ -1067,17 +1055,6 @@ WantedBy=default.target`
                                             </div>
                                         </div>
                                     </div>
-                                    <Alert variant="neutral">
-                                        <InfoIcon className="h-4 w-4" />
-                                        <AlertTitle className="font-semibold">
-                                            {t("siteCredentialsSave")}
-                                        </AlertTitle>
-                                        <AlertDescription>
-                                            {t(
-                                                "siteCredentialsSaveDescription"
-                                            )}
-                                        </AlertDescription>
-                                    </Alert>
                                 </SettingsSectionBody>
                             </SettingsSection>
                         )}
diff --git a/src/app/globals.css b/src/app/globals.css
index 10a9764e..bd5860a6 100644
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -40,7 +40,7 @@
 }
 
 .dark {
-    --background: oklch(0.17 0.006 285.885);
+    --background: oklch(0.19 0.006 285.885);
     --foreground: oklch(0.985 0 0);
     --card: oklch(0.21 0.006 285.885);
     --card-foreground: oklch(0.985 0 0);
@@ -56,7 +56,7 @@
     --accent-foreground: oklch(0.985 0 0);
     --destructive: oklch(0.5382 0.1949 22.216);
     --border: oklch(1 0 0 / 13%);
-    --input: oklch(1 0 0 / 15%);
+    --input: oklch(1 0 0 / 18%);
     --ring: oklch(0.646 0.222 41.116);
     --chart-1: oklch(0.488 0.243 264.376);
     --chart-2: oklch(0.696 0.17 162.48);
diff --git a/src/app/navigation.tsx b/src/app/navigation.tsx
index 80e13ff2..54576c0c 100644
--- a/src/app/navigation.tsx
+++ b/src/app/navigation.tsx
@@ -82,6 +82,11 @@ export const orgNavSections = (): SidebarNavSection[] => [
                     }
                 ]
             },
+            {
+                title: "sidebarDomains",
+                href: "/{orgId}/settings/domains",
+                icon: <Globe className="size-4 flex-none" />
+            },
             ...(build == "saas"
                 ? [
                       {
@@ -91,12 +96,7 @@ export const orgNavSections = (): SidebarNavSection[] => [
                           showEE: true
                       }
                   ]
-                : []),
-            {
-                title: "sidebarDomains",
-                href: "/{orgId}/settings/domains",
-                icon: <Globe className="size-4 flex-none" />
-            }
+                : [])
         ]
     },
     {
diff --git a/src/components/DNSRecordsDataTable.tsx b/src/components/DNSRecordsDataTable.tsx
index 786b2d71..0a9eaa7d 100644
--- a/src/components/DNSRecordsDataTable.tsx
+++ b/src/components/DNSRecordsDataTable.tsx
@@ -114,6 +114,7 @@ export function DNSRecordsDataTable<TData, TValue>({
                             href="https://docs.pangolin.net/manage/domains"
                             target="_blank"
                             rel="noopener noreferrer"
+                            className="hidden sm:block"
                         >
                             <Button variant="outline">
                                 <ExternalLink className="h-4 w-4 mr-1" />
diff --git a/src/components/HorizontalTabs.tsx b/src/components/HorizontalTabs.tsx
index ddcc2b08..72093e0d 100644
--- a/src/components/HorizontalTabs.tsx
+++ b/src/components/HorizontalTabs.tsx
@@ -44,7 +44,7 @@ export function HorizontalTabs({
     }
 
     return (
-        <div className="space-y-6">
+        <div className="space-y-3">
             <div className="relative">
                 <div className="overflow-x-auto scrollbar-hide">
                     <div className="flex space-x-4 border-b min-w-max">
@@ -66,9 +66,9 @@ export function HorizontalTabs({
                                     key={hydratedHref}
                                     href={isProfessional ? "#" : hydratedHref}
                                     className={cn(
-                                        "px-4 py-2 text-sm font-medium transition-colors whitespace-nowrap",
+                                        "px-4 py-2 text-sm font-medium transition-colors whitespace-nowrap relative",
                                         isActive
-                                            ? "border-b-2 border-primary text-primary"
+                                            ? "text-primary after:absolute after:bottom-0 after:left-0 after:right-0 after:h-0.75 after:bg-primary after:rounded-full"
                                             : "text-muted-foreground hover:text-foreground",
                                         isDisabled && "cursor-not-allowed"
                                     )}
diff --git a/src/components/ResourceInfoBox.tsx b/src/components/ResourceInfoBox.tsx
index e0b81f79..6ef7521f 100644
--- a/src/components/ResourceInfoBox.tsx
+++ b/src/components/ResourceInfoBox.tsx
@@ -32,6 +32,12 @@ export default function ResourceInfoBox({}: ResourceInfoBoxType) {
                 <InfoSections
                     cols={resource.http && env.flags.usePangolinDns ? 5 : 4}
                 >
+                    <InfoSection>
+                        <InfoSectionTitle>URL</InfoSectionTitle>
+                        <InfoSectionContent>
+                            <CopyToClipboard text={fullUrl} isLink={true} />
+                        </InfoSectionContent>
+                    </InfoSection>
                     <InfoSection>
                         <InfoSectionTitle>{t("identifier")}</InfoSectionTitle>
                         <InfoSectionContent>
@@ -62,15 +68,6 @@ export default function ResourceInfoBox({}: ResourceInfoBoxType) {
                                     )}
                                 </InfoSectionContent>
                             </InfoSection>
-                            <InfoSection>
-                                <InfoSectionTitle>URL</InfoSectionTitle>
-                                <InfoSectionContent>
-                                    <CopyToClipboard
-                                        text={fullUrl}
-                                        isLink={true}
-                                    />
-                                </InfoSectionContent>
-                            </InfoSection>
                             {/* {isEnabled && (
                                 <InfoSection>
                                     <InfoSectionTitle>Socket</InfoSectionTitle>
diff --git a/src/components/SettingsSectionTitle.tsx b/src/components/SettingsSectionTitle.tsx
index e7d9b7e9..8e507358 100644
--- a/src/components/SettingsSectionTitle.tsx
+++ b/src/components/SettingsSectionTitle.tsx
@@ -11,7 +11,7 @@ export default function SettingsSectionTitle({
 }: SettingsSectionTitleProps) {
     return (
         <div
-            className={`space-y-0.5 ${!size || size === "2xl" ? "mb-8 md:mb-8" : ""}`}
+            className={`space-y-0.5 ${!size || size === "2xl" ? "mb-6 md:mb-6" : ""}`}
         >
             <h2
                 className={`text-${
diff --git a/src/components/ShareLinksTable.tsx b/src/components/ShareLinksTable.tsx
index 6cf7c57a..efac77df 100644
--- a/src/components/ShareLinksTable.tsx
+++ b/src/components/ShareLinksTable.tsx
@@ -104,6 +104,23 @@ export default function ShareLinksTable({
     }
 
     const columns: ExtendedColumnDef<ShareLinkRow>[] = [
+        {
+            accessorKey: "title",
+            friendlyName: t("title"),
+            header: ({ column }) => {
+                return (
+                    <Button
+                        variant="ghost"
+                        onClick={() =>
+                            column.toggleSorting(column.getIsSorted() === "asc")
+                        }
+                    >
+                        {t("title")}
+                        <ArrowUpDown className="ml-2 h-4 w-4" />
+                    </Button>
+                );
+            }
+        },
         {
             accessorKey: "resourceName",
             enableHiding: false,
@@ -135,23 +152,6 @@ export default function ShareLinksTable({
                 );
             }
         },
-        {
-            accessorKey: "title",
-            friendlyName: t("title"),
-            header: ({ column }) => {
-                return (
-                    <Button
-                        variant="ghost"
-                        onClick={() =>
-                            column.toggleSorting(column.getIsSorted() === "asc")
-                        }
-                    >
-                        {t("title")}
-                        <ArrowUpDown className="ml-2 h-4 w-4" />
-                    </Button>
-                );
-            }
-        },
         // {
         //     accessorKey: "domain",
         //     header: "Link",