diff --git a/cannamanage-frontend/src/app/(dashboard-layout)/settings/staff/page.tsx b/cannamanage-frontend/src/app/(dashboard-layout)/settings/staff/page.tsx
index dc7edc3..4fa096a 100644
--- a/cannamanage-frontend/src/app/(dashboard-layout)/settings/staff/page.tsx
+++ b/cannamanage-frontend/src/app/(dashboard-layout)/settings/staff/page.tsx
@@ -1,6 +1,6 @@
 "use client"
 
-import { useState } from "react"
+import { useEffect, useState } from "react"
 import {
   useInviteStaffMutation,
   useRevokeStaffMutation,
@@ -157,22 +157,24 @@ function PermissionCheckboxes({
   }
 
   return (
-    <div className="grid grid-cols-1 gap-3 sm:grid-cols-2">
-      {ALL_PERMISSIONS.map((perm) => (
-        <div key={perm} className="flex items-center space-x-2">
-          <Checkbox
-            id={`perm-${perm}`}
-            checked={selected.includes(perm)}
-            onCheckedChange={() => toggle(perm)}
-          />
-          <Label
-            htmlFor={`perm-${perm}`}
-            className="cursor-pointer text-sm font-normal"
-          >
-            {permLabels[perm]}
-          </Label>
-        </div>
-      ))}
+    <div className="grid grid-cols-1 gap-3">
+      {[...ALL_PERMISSIONS]
+        .sort((a, b) => permLabels[a].localeCompare(permLabels[b]))
+        .map((perm) => (
+          <div key={perm} className="flex items-center space-x-2">
+            <Checkbox
+              id={`perm-${perm}`}
+              checked={selected.includes(perm)}
+              onCheckedChange={() => toggle(perm)}
+            />
+            <Label
+              htmlFor={`perm-${perm}`}
+              className="cursor-pointer text-sm font-normal"
+            >
+              {permLabels[perm]}
+            </Label>
+          </div>
+        ))}
     </div>
   )
 }
@@ -311,11 +313,14 @@ function EditPermissionsDialog({
     staffMember?.id ?? ""
   )
 
-  // Sync permissions when staff member changes
-  const handleOpen = (isOpen: boolean) => {
-    if (isOpen && staffMember) {
+  // Sync permissions whenever the dialog opens or staff member changes
+  useEffect(() => {
+    if (open && staffMember) {
       setPermissions([...staffMember.permissions])
     }
+  }, [open, staffMember])
+
+  const handleOpen = (isOpen: boolean) => {
     onOpenChange(isOpen)
   }
 
diff --git a/cannamanage-frontend/src/components/layout/footer.tsx b/cannamanage-frontend/src/components/layout/footer.tsx
index 3ea0cca..4914b4a 100644
--- a/cannamanage-frontend/src/components/layout/footer.tsx
+++ b/cannamanage-frontend/src/components/layout/footer.tsx
@@ -1,36 +1,11 @@
-import { cn } from "@/lib/utils"
-
-import { buttonVariants } from "@/components/ui/button"
-
 export function Footer() {
   const currentYear = new Date().getFullYear()
 
   return (
     <footer className="bg-background border-t border-sidebar-border">
-      <div className="container flex justify-between items-center p-4 md:px-6">
+      <div className="container flex items-center p-4 md:px-6">
         <p className="text-xs text-muted-foreground md:text-sm">
-          © {currentYear}{" "}
-          <a
-            href="/"
-            target="_blank"
-            rel="noopener noreferrer"
-            className={cn(buttonVariants({ variant: "link" }), "inline p-0")}
-          >
-            Shadboard
-          </a>
-          .
-        </p>
-        <p className="text-xs text-muted-foreground md:text-sm">
-          Designed & Developed by{" "}
-          <a
-            href="https://github.com/Qualiora"
-            target="_blank"
-            rel="noopener noreferrer"
-            className={cn(buttonVariants({ variant: "link" }), "inline p-0")}
-          >
-            Qualiora
-          </a>
-          .
+          © {currentYear} CannaManage
         </p>
       </div>
     </footer>
diff --git a/cannamanage-frontend/src/components/layout/horizontal-layout/bottom-bar-header.tsx b/cannamanage-frontend/src/components/layout/horizontal-layout/bottom-bar-header.tsx
index 98c20d4..3ef4578 100644
--- a/cannamanage-frontend/src/components/layout/horizontal-layout/bottom-bar-header.tsx
+++ b/cannamanage-frontend/src/components/layout/horizontal-layout/bottom-bar-header.tsx
@@ -20,7 +20,7 @@ export function BottomBarHeader() {
           width={24}
           className="dark:invert"
         />
-        <span>Shadboard</span>
+        <span>CannaManage</span>
       </Link>
       <div className="flex gap-2">
         <FullscreenToggle />
diff --git a/cannamanage-frontend/src/components/layout/sidebar.tsx b/cannamanage-frontend/src/components/layout/sidebar.tsx
index f1fbf8b..f4d113b 100644
--- a/cannamanage-frontend/src/components/layout/sidebar.tsx
+++ b/cannamanage-frontend/src/components/layout/sidebar.tsx
@@ -116,7 +116,7 @@ export function Sidebar() {
             width={24}
             className="dark:invert"
           />
-          <span>Shadboard</span>
+          <span>CannaManage</span>
         </Link>
         <CommandMenu buttonClassName="max-w-full" />
       </SidebarHeader>