diff --git a/messages/en-US.json b/messages/en-US.json
index 83ad9a06..79939254 100644
--- a/messages/en-US.json
+++ b/messages/en-US.json
@@ -1230,7 +1230,7 @@
     "refreshError": "Failed to refresh data",
     "verified": "Verified",
     "pending": "Pending",
-    "sidebarBilling": "Payment & Billing",
+    "sidebarBilling": "Billing",
     "billing": "Billing",
     "orgBillingDescription": "Manage your billing information and subscriptions",
     "github": "GitHub",
@@ -1765,7 +1765,7 @@
     "licenseTableValidUntil": "Valid Until",
     "saasLicenseKeysSettingsTitle": "Enterprise Licenses",
     "saasLicenseKeysSettingsDescription": "Generate and manage Enterprise license keys for self-hosted Pangolin instances",
-    "sidebarEnterpriseLicenses": "Enterprise Licenses",
+    "sidebarEnterpriseLicenses": "Licenses",
     "generateLicenseKey": "Generate License Key",
     "generateLicenseKeyForm": {
         "validation": {
diff --git a/src/app/navigation.tsx b/src/app/navigation.tsx
index a3311b68..2d6aaec8 100644
--- a/src/app/navigation.tsx
+++ b/src/app/navigation.tsx
@@ -15,7 +15,8 @@ import {
     Globe, // Added from 'dev' branch
     MonitorUp, // Added from 'dev' branch
     Server,
-    Zap
+    Zap,
+    CreditCard
 } from "lucide-react";
 
 export type SidebarNavSection = {
@@ -119,6 +120,24 @@ export const orgNavSections = (
                 href: "/{orgId}/settings/api-keys",
                 icon: <KeyRound className="h-4 w-4" />
             },
+            ...(build == "saas"
+                ? [
+                      {
+                          title: "sidebarBilling",
+                          href: "/{orgId}/settings/billing",
+                          icon: <CreditCard className="h-4 w-4" />
+                      }
+                  ]
+                : []),
+            ...(build == "saas"
+                ? [
+                      {
+                          title: "sidebarEnterpriseLicenses",
+                          href: "/{orgId}/settings/license",
+                          icon: <TicketCheck className="h-4 w-4" />
+                      }
+                  ]
+                : []),
             {
                 title: "sidebarSettings",
                 href: "/{orgId}/settings/general",
diff --git a/src/components/GenerateLicenseKeysTable.tsx b/src/components/GenerateLicenseKeysTable.tsx
index 275a4068..580fdba4 100644
--- a/src/components/GenerateLicenseKeysTable.tsx
+++ b/src/components/GenerateLicenseKeysTable.tsx
@@ -105,6 +105,9 @@ export default function GenerateLicenseKeysTable({
                         <ArrowUpDown className="ml-2 h-4 w-4" />
                     </Button>
                 );
+            },
+            cell: ({ row }) => {
+                return row.original.instanceName || "-";
             }
         },
         {
diff --git a/src/components/LayoutSidebar.tsx b/src/components/LayoutSidebar.tsx
index 04cee5c8..a40c2017 100644
--- a/src/components/LayoutSidebar.tsx
+++ b/src/components/LayoutSidebar.tsx
@@ -130,64 +130,6 @@ export function LayoutSidebar({
             </div>
 
             <div className="p-4 space-y-4 shrink-0">
-                {build === "saas" && (
-                    <div className="mb-3 pt-4">
-                        <div className="space-y-1">
-                            <Link
-                                href={`/${orgId}/settings/billing`}
-                                className={cn(
-                                    "flex items-center rounded transition-colors text-muted-foreground hover:text-foreground text-sm w-full hover:bg-secondary/50 dark:hover:bg-secondary/20 rounded-md",
-                                    isSidebarCollapsed
-                                        ? "px-2 py-2 justify-center"
-                                        : "px-3 py-1.5"
-                                )}
-                                title={
-                                    isSidebarCollapsed
-                                        ? t("sidebarBilling")
-                                        : undefined
-                                }
-                            >
-                                <span
-                                    className={cn(
-                                        "flex-shrink-0",
-                                        !isSidebarCollapsed && "mr-2"
-                                    )}
-                                >
-                                    <CreditCard className="h-4 w-4" />
-                                </span>
-                                {!isSidebarCollapsed && (
-                                    <span>{t("sidebarBilling")}</span>
-                                )}
-                            </Link>
-                            <Link
-                                href={`/${orgId}/settings/license`}
-                                className={cn(
-                                    "flex items-center rounded transition-colors text-muted-foreground hover:text-foreground text-sm w-full hover:bg-secondary/50 dark:hover:bg-secondary/20 rounded-md",
-                                    isSidebarCollapsed
-                                        ? "px-2 py-2 justify-center"
-                                        : "px-3 py-1.5"
-                                )}
-                                title={
-                                    isSidebarCollapsed
-                                        ? t("sidebarEnterpriseLicenses")
-                                        : undefined
-                                }
-                            >
-                                <span
-                                    className={cn(
-                                        "flex-shrink-0",
-                                        !isSidebarCollapsed && "mr-2"
-                                    )}
-                                >
-                                    <TicketCheck className="h-4 w-4" />
-                                </span>
-                                {!isSidebarCollapsed && (
-                                    <span>{t("sidebarEnterpriseLicenses")}</span>
-                                )}
-                            </Link>
-                        </div>
-                    </div>
-                )}
                 {build === "enterprise" && (
                     <div className="mb-3">
                         <SidebarLicenseButton