diff --git a/src/modules/admin/config/library/lessons/columns.config.jsx b/src/modules/admin/config/library/lessons/columns.config.jsx
index 768f024..9194c50 100644
--- a/src/modules/admin/config/library/lessons/columns.config.jsx
+++ b/src/modules/admin/config/library/lessons/columns.config.jsx
@@ -2,7 +2,7 @@
 // Column definitions and pinning for the standalone Lesson Library table.
 
 import { Badge } from "@/components/ui/badge";
-import { Clock } from "lucide-react";
+import { Clock, Layers } from "lucide-react";
 import { buildColumns } from "@/utils/table.util";
 import { buildSelectionColumn } from "@/components/generic/Table/buildSelectionColumn";
 import { buildRowActionsColumn } from "@/components/generic/Table/buildRowActionsColumn";
@@ -13,13 +13,23 @@ export const columnPinning = {
   left: [],
 };
 
-const COURSE_STATUS_BADGE = {
-  published:  "default",
-  draft:      "secondary",
-  standalone: "outline",
-};
-
 const cellOverrides = {
+  title: (info) => {
+    const inUnit = parseInt(info.row.original.unit_count ?? 0, 10) > 0;
+    return (
+      <div className="flex items-center gap-1.5 min-w-0">
+        {inUnit && (
+          <Badge variant="secondary" className="gap-1 text-[10px] font-medium shrink-0">
+            <Layers className="h-3 w-3" />
+            Unit
+          </Badge>
+        )}
+        <span className="block truncate max-w-56 text-sm" title={info.getValue()}>
+          {info.getValue()}
+        </span>
+      </div>
+    );
+  },
   duration_seconds: (info) => {
     const seconds = parseInt(info.getValue() ?? 0, 10);
     return (
@@ -39,11 +49,6 @@ const cellOverrides = {
       </Badge>
     );
   },
-  course_status: (info) => (
-    <Badge variant={COURSE_STATUS_BADGE[info.getValue()] ?? "outline"} className="text-xs capitalize">
-      {info.getValue()}
-    </Badge>
-  ),
 };
 
 export function buildDataColumns(attributes, rowActions) {
diff --git a/src/modules/admin/config/library/units/columns.config.jsx b/src/modules/admin/config/library/units/columns.config.jsx
index b1e09be..09cd097 100644
--- a/src/modules/admin/config/library/units/columns.config.jsx
+++ b/src/modules/admin/config/library/units/columns.config.jsx
@@ -2,7 +2,7 @@
 // Column definitions and pinning for the standalone Unit Library table.
 
 import { Badge } from "@/components/ui/badge";
-import { Clock } from "lucide-react";
+import { Clock, GraduationCap } from "lucide-react";
 import { buildColumns } from "@/utils/table.util";
 import { buildSelectionColumn } from "@/components/generic/Table/buildSelectionColumn";
 import { buildRowActionsColumn } from "@/components/generic/Table/buildRowActionsColumn";
@@ -13,13 +13,23 @@ export const columnPinning = {
   left: [],
 };
 
-const COURSE_STATUS_BADGE = {
-  published:  "default",
-  draft:      "secondary",
-  standalone: "outline",
-};
-
 const cellOverrides = {
+  title: (info) => {
+    const inCourse = parseInt(info.row.original.course_count ?? 0, 10) > 0;
+    return (
+      <div className="flex items-center gap-1.5 min-w-0">
+        {inCourse && (
+          <Badge variant="secondary" className="gap-1 text-[10px] font-medium shrink-0">
+            <GraduationCap className="h-3 w-3" />
+            Course
+          </Badge>
+        )}
+        <span className="block truncate max-w-56 text-sm" title={info.getValue()}>
+          {info.getValue()}
+        </span>
+      </div>
+    );
+  },
   duration_seconds: (info) => {
     const seconds = parseInt(info.getValue() ?? 0, 10);
     return (
@@ -36,19 +46,6 @@ const cellOverrides = {
       {info.getValue() ?? 0} lesson{(info.getValue() ?? 0) === 1 ? "" : "s"}
     </Badge>
   ),
-  course_count: (info) => {
-    const n = parseInt(info.getValue() ?? 0, 10);
-    return (
-      <Badge variant="secondary" className="text-xs tabular-nums">
-        {n} course{n === 1 ? "" : "s"}
-      </Badge>
-    );
-  },
-  course_status: (info) => (
-    <Badge variant={COURSE_STATUS_BADGE[info.getValue()] ?? "outline"} className="text-xs capitalize">
-      {info.getValue()}
-    </Badge>
-  ),
 };
 
 export function buildDataColumns(attributes, rowActions) {
diff --git a/src/modules/admin/config/library/units/rowActions.config.jsx b/src/modules/admin/config/library/units/rowActions.config.jsx
index 0e3ead1..a1e2c3d 100644
--- a/src/modules/admin/config/library/units/rowActions.config.jsx
+++ b/src/modules/admin/config/library/units/rowActions.config.jsx
@@ -14,12 +14,6 @@ export function buildRowActions({ onView, onEdit, onManageLessons, onArchive, on
       icon: <Eye className="h-3.5 w-3.5" />,
       onClick: (row) => onView(row),
     },
-    {
-      key: "edit",
-      label: "Edit Unit",
-      icon: <Pencil className="h-3.5 w-3.5" />,
-      onClick: (row) => onEdit(row),
-    },
     {
       key: "manage_lessons",
       label: "Manage Lessons",
diff --git a/src/modules/admin/pages/assets/AddAsset.jsx b/src/modules/admin/pages/assets/AddAsset.jsx
index 4a26bec..2e40530 100644
--- a/src/modules/admin/pages/assets/AddAsset.jsx
+++ b/src/modules/admin/pages/assets/AddAsset.jsx
@@ -185,12 +185,6 @@ export default function AddAsset() {
             hasFileError = true;
         }
 
-        // Thumbnail is required for video, optional for audio
-        if (isVideo && !thumbnailRef.current) {
-            setError("_thumbnail", { message: "A thumbnail is required for video uploads." });
-            hasFileError = true;
-        }
-
         if (hasFileError) return;
 
         setProgress({ phase: "uploading", pct: 0 });
@@ -259,15 +253,14 @@ export default function AddAsset() {
                         </Link>
                     </div>
 
-                    {/* ── Thumbnail (video required / audio optional) ── */}
+                    {/* ── Thumbnail (optional for both video and audio) ── */}
                     {(isVideo || isAudio) && (
                         <div className="space-y-1.5">
                             <Label>
                                 Thumbnail{" "}
-                                {isVideo
-                                    ? <span className="text-destructive">*</span>
-                                    : <span className="text-muted-foreground text-xs">(optional — album / cover art)</span>
-                                }
+                                <span className="text-muted-foreground text-xs">
+                                    (optional — {isVideo ? "video preview" : "album / cover art"})
+                                </span>
                             </Label>
                             <DropZone
                                 key={thumbKey}
@@ -350,23 +343,15 @@ export default function AddAsset() {
                             />
                         </div>
 
-                        {/* Storage Provider */}
+                        {/* Storage Provider — TEMPORARY: locked to S3 (see zrok tunnel note above; revert after VPS migration) */}
                         <div className="space-y-1.5">
                             <Label>Storage</Label>
-                            <Controller
-                                name="storage_provider"
-                                control={control}
-                                render={({ field }) => (
-                                    <Select value={field.value} onValueChange={field.onChange}>
-                                        <SelectTrigger><SelectValue /></SelectTrigger>
-                                        <SelectContent>
-                                            <SelectItem value="chibisafe">Chibisafe</SelectItem>
-                                            <SelectItem value="local">Local</SelectItem>
-                                            <SelectItem value="s3">S3</SelectItem>
-                                        </SelectContent>
-                                    </Select>
-                                )}
-                            />
+                            <Select value="s3" disabled>
+                                <SelectTrigger className="disabled:opacity-60 disabled:cursor-not-allowed"><SelectValue /></SelectTrigger>
+                                <SelectContent>
+                                    <SelectItem value="s3">S3</SelectItem>
+                                </SelectContent>
+                            </Select>
                         </div>
 
                     </div>
diff --git a/src/modules/admin/pages/assets/AddAssetsBulk.jsx b/src/modules/admin/pages/assets/AddAssetsBulk.jsx
index f36ff1b..ab0f567 100644
--- a/src/modules/admin/pages/assets/AddAssetsBulk.jsx
+++ b/src/modules/admin/pages/assets/AddAssetsBulk.jsx
@@ -131,7 +131,8 @@ export default function AddAssetsBulk() {
     const { user } = useAuth();
 
     const [isPublic, setIsPublic] = useState("false");
-    const [storageProvider, setStorageProvider] = useState("s3");
+    // TEMPORARY: locked to S3 (see zrok tunnel note; revert after VPS migration)
+    const storageProvider = "s3";
 
     const total = jobs.length;
     const done = jobs.filter((j) => j.status === "uploaded").length;
@@ -177,11 +178,10 @@ export default function AddAssetsBulk() {
                 </div>
                 <div className="flex-1 space-y-1.5">
                     <label className="text-sm font-medium">Storage</label>
-                    <Select value={storageProvider} onValueChange={setStorageProvider}>
-                        <SelectTrigger><SelectValue /></SelectTrigger>
+                    {/* TEMPORARY: locked to S3 (see zrok tunnel note; revert after VPS migration) */}
+                    <Select value={storageProvider} disabled>
+                        <SelectTrigger className="disabled:opacity-60 disabled:cursor-not-allowed"><SelectValue /></SelectTrigger>
                         <SelectContent>
-                            <SelectItem value="chibisafe">Chibisafe</SelectItem>
-                            <SelectItem value="local">Local</SelectItem>
                             <SelectItem value="s3">S3</SelectItem>
                         </SelectContent>
                     </Select>
diff --git a/src/modules/admin/pages/user_groups/ViewGroup.jsx b/src/modules/admin/pages/user_groups/ViewGroup.jsx
index 20d0480..65e2679 100644
--- a/src/modules/admin/pages/user_groups/ViewGroup.jsx
+++ b/src/modules/admin/pages/user_groups/ViewGroup.jsx
@@ -113,7 +113,7 @@ function InviteLinkDialog({ open, onOpenChange, group }) {
           {/* Invite link */}
           <div className="w-full flex flex-col gap-2">
             <div className="flex items-center gap-2 rounded-lg border bg-muted px-3 py-2 min-w-0">
-              <p className="font-mono text-xs text-muted-foreground truncate flex-1">
+              <p className="font-mono text-xs text-muted-foreground truncate w-64">
                 {inviteUrl}
               </p>
             </div>
diff --git a/src/modules/client/layout/ClientLayout.jsx b/src/modules/client/layout/ClientLayout.jsx
index dfd041e..ed3fe40 100644
--- a/src/modules/client/layout/ClientLayout.jsx
+++ b/src/modules/client/layout/ClientLayout.jsx
@@ -62,9 +62,9 @@ function ReferDialog({ open, onOpenChange }) {
     const handleDownload = () => {
         const canvas = document.querySelector("[data-qr='refer-invite']")
         if (!canvas) return
-        const url  = canvas.toDataURL("image/png")
+        const url = canvas.toDataURL("image/png")
         const link = document.createElement("a")
-        link.href     = url
+        link.href = url
         link.download = `QR_${group.group_code}.png`
         link.click()
     }
@@ -112,7 +112,7 @@ function ReferDialog({ open, onOpenChange }) {
                         {/* Invite link */}
                         <div className="w-full flex flex-col gap-2">
                             <div className="flex items-center gap-2 rounded-lg border bg-muted px-3 py-2 min-w-0">
-                                <p className="font-mono text-xs text-muted-foreground truncate flex-1">
+                                <p className="font-mono text-xs text-muted-foreground truncate w-64">
                                     {inviteUrl}
                                 </p>
                             </div>
@@ -175,10 +175,10 @@ function ClientNav() {
 
     // Derive primitive deps — effect only fires when the actual asset changes,
     // not on every tierMap/tierSlug reference churn.
-    const badgeAsset    = tierMap[tierSlug]?.badgeAsset ?? null
-    const badgeAssetId  = badgeAsset?.asset_id ?? null
+    const badgeAsset = tierMap[tierSlug]?.badgeAsset ?? null
+    const badgeAssetId = badgeAsset?.asset_id ?? null
     const badgeProvider = badgeAsset?.storage_provider ?? null
-    const badgeFileUrl  = badgeAsset?.file_url ?? null
+    const badgeFileUrl = badgeAsset?.file_url ?? null
 
     useEffect(() => {
         if (!badgeAssetId) { setBadgeImgUrl(null); return }
@@ -220,83 +220,83 @@ function ClientNav() {
 
     return (
         <>
-      <nav className="bg-card w-full border-b border-default">
-            <div className="flex flex-wrap items-center justify-between mx-auto py-3 px-6">
+            <nav className="bg-card w-full border-b border-default">
+                <div className="flex flex-wrap items-center justify-between mx-auto py-3 px-6">
 
-                {/* Logo */}
-                <div className="flex gap-4 items-center">
-                    <div className="w-40 cursor-pointer" onClick={() => navigate("/")}>
-                        <img src="/philpro-white.png" alt="Philproperties" className="object-cover dark:hidden" />
-                        <img src="/philpro-dark.png" alt="Philproperties" className="object-cover hidden dark:block" />
-                    </div>
-                    <div>
-                        <svg
-                            data-testid="geist-icon"
-                            height="16"
-                            width="16"
-                            viewBox="0 0 16 16"
-                            strokeLinejoin="round"
-                            className="xs:hidden sm:block fill-slate-300"
-                            xmlns="http://www.w3.org/2000/svg"
-                        >
-                            <path
-                                fillRule="evenodd"
-                                clipRule="evenodd"
-                                d="M4.01526 15.3939L4.3107 14.7046L10.3107 0.704556L10.6061 0.0151978L11.9849 0.606077L11.6894 1.29544L5.68942 15.2954L5.39398 15.9848L4.01526 15.3939Z"
-                            />
-                        </svg>
-                    </div>
-                    <div id="name" className="lg:-ml-1 font-medium text-sm flex items-center gap-2">
-                        {tierBadge && (
-                            <div className={`xs:hidden md:inline-flex items-center gap-1 px-2.5 py-0.5 rounded-full text-xs font-semibold ${tierBadge.cls}`}>
-                                {badgeImgUrl
-                                    ? <img src={badgeImgUrl} className="size-3.5 rounded-full object-cover" />
-                                    : TierIcon && <TierIcon className="size-3" />
-                                }
-                                {tierBadge.label}
-                            </div>
-                        )}
-                    </div>
-                </div>
-
-                {/* Right — bell + user menu */}
-                <div className="flex items-center gap-3">
-                    <ClientNotificationBell />
-                    <DropdownMenu>
-                        <DropdownMenuTrigger asChild>
-                            <Avatar className="cursor-pointer">
-                                <AvatarImage src={avatarUrl} />
-                                <AvatarFallback className={`text-sm font-semibold ${avatarColor}`}>
-                                    {initials || "PH"}
-                                </AvatarFallback>
-                            </Avatar>
-                        </DropdownMenuTrigger>
-
-                        <DropdownMenuContent align="end" className="w-64">
-
-                            {/* User info */}
-                            <DropdownMenuGroup className="p-1.5">
-                                <div className="w-full truncate text-start text-sm font-medium">
-                                    {fullName || "—"}
+                    {/* Logo */}
+                    <div className="flex gap-4 items-center">
+                        <div className="w-40 cursor-pointer" onClick={() => navigate("/")}>
+                            <img src="/philpro-white.png" alt="Philproperties" className="object-cover dark:hidden" />
+                            <img src="/philpro-dark.png" alt="Philproperties" className="object-cover hidden dark:block" />
+                        </div>
+                        <div>
+                            <svg
+                                data-testid="geist-icon"
+                                height="16"
+                                width="16"
+                                viewBox="0 0 16 16"
+                                strokeLinejoin="round"
+                                className="xs:hidden sm:block fill-slate-300"
+                                xmlns="http://www.w3.org/2000/svg"
+                            >
+                                <path
+                                    fillRule="evenodd"
+                                    clipRule="evenodd"
+                                    d="M4.01526 15.3939L4.3107 14.7046L10.3107 0.704556L10.6061 0.0151978L11.9849 0.606077L11.6894 1.29544L5.68942 15.2954L5.39398 15.9848L4.01526 15.3939Z"
+                                />
+                            </svg>
+                        </div>
+                        <div id="name" className="lg:-ml-1 font-medium text-sm flex items-center gap-2">
+                            {tierBadge && (
+                                <div className={`xs:hidden md:inline-flex items-center gap-1 px-2.5 py-0.5 rounded-full text-xs font-semibold ${tierBadge.cls}`}>
+                                    {badgeImgUrl
+                                        ? <img src={badgeImgUrl} className="size-3.5 rounded-full object-cover" />
+                                        : TierIcon && <TierIcon className="size-3" />
+                                    }
+                                    {tierBadge.label}
                                 </div>
-                                <div className="w-full truncate text-start text-[13px] font-medium text-muted-foreground">
-                                    {email}
-                                </div>
-                            </DropdownMenuGroup>
+                            )}
+                        </div>
+                    </div>
 
-                            <DropdownMenuSeparator />
+                    {/* Right — bell + user menu */}
+                    <div className="flex items-center gap-3">
+                        <ClientNotificationBell />
+                        <DropdownMenu>
+                            <DropdownMenuTrigger asChild>
+                                <Avatar className="cursor-pointer">
+                                    <AvatarImage src={avatarUrl} />
+                                    <AvatarFallback className={`text-sm font-semibold ${avatarColor}`}>
+                                        {initials || "PH"}
+                                    </AvatarFallback>
+                                </Avatar>
+                            </DropdownMenuTrigger>
 
-                            <DropdownMenuGroup>
-                                <DropdownMenuItem className="bg-gradient-to-r from-[#0e7490] via-[#3b82f6] to-[#4f46e5] text-white" onClick={() => navigate("/plans")}>
-                                    <Zap /> Plans
-                                </DropdownMenuItem>
-                                <DropdownMenuItem onClick={() => navigate("/profile")}>
-                                    <User /> Profile
-                                </DropdownMenuItem>
-                                <DropdownMenuItem onClick={() => navigate("/settings")}>
-                                    <Settings /> Account Settings
-                                </DropdownMenuItem>
-                                {/* <DropdownMenuItem>
+                            <DropdownMenuContent align="end" className="w-64">
+
+                                {/* User info */}
+                                <DropdownMenuGroup className="p-1.5">
+                                    <div className="w-full truncate text-start text-sm font-medium">
+                                        {fullName || "—"}
+                                    </div>
+                                    <div className="w-full truncate text-start text-[13px] font-medium text-muted-foreground">
+                                        {email}
+                                    </div>
+                                </DropdownMenuGroup>
+
+                                <DropdownMenuSeparator />
+
+                                <DropdownMenuGroup>
+                                    <DropdownMenuItem className="bg-gradient-to-r from-[#0e7490] via-[#3b82f6] to-[#4f46e5] text-white" onClick={() => navigate("/plans")}>
+                                        <Zap /> Plans
+                                    </DropdownMenuItem>
+                                    <DropdownMenuItem onClick={() => navigate("/profile")}>
+                                        <User /> Profile
+                                    </DropdownMenuItem>
+                                    <DropdownMenuItem onClick={() => navigate("/settings")}>
+                                        <Settings /> Account Settings
+                                    </DropdownMenuItem>
+                                    {/* <DropdownMenuItem>
                                     <TableOfContents /> Documentation
                                     <DropdownMenuShortcut>
                                         <SquareArrowOutUpRight />
@@ -308,29 +308,29 @@ function ClientNav() {
                                 <DropdownMenuItem onSelect={() => setReferOpen(true)}>
                                     <Gift /> Refer
                                 </DropdownMenuItem> */}
-                                <DropdownMenuItem onSelect={(e) => e.preventDefault()}>
-                                    Theme
-                                    <DropdownMenuShortcut>
-                                        <ThemeSwitcher />
-                                    </DropdownMenuShortcut>
-                                </DropdownMenuItem>
-                            </DropdownMenuGroup>
+                                    <DropdownMenuItem onSelect={(e) => e.preventDefault()}>
+                                        Theme
+                                        <DropdownMenuShortcut>
+                                            <ThemeSwitcher />
+                                        </DropdownMenuShortcut>
+                                    </DropdownMenuItem>
+                                </DropdownMenuGroup>
 
-                            <DropdownMenuSeparator />
+                                <DropdownMenuSeparator />
 
-                            <DropdownMenuGroup>
-                                <DropdownMenuItem variant="destructive" onClick={handleLogout}>
-                                    <LogOut /> Log out
-                                </DropdownMenuItem>
-                            </DropdownMenuGroup>
+                                <DropdownMenuGroup>
+                                    <DropdownMenuItem variant="destructive" onClick={handleLogout}>
+                                        <LogOut /> Log out
+                                    </DropdownMenuItem>
+                                </DropdownMenuGroup>
 
-                        </DropdownMenuContent>
-                    </DropdownMenu>
+                            </DropdownMenuContent>
+                        </DropdownMenu>
+                    </div>
                 </div>
-            </div>
-        </nav>
+            </nav>
 
-        <ReferDialog open={referOpen} onOpenChange={setReferOpen} />
+            <ReferDialog open={referOpen} onOpenChange={setReferOpen} />
         </>
     )
 }
diff --git a/src/utils/table.util.jsx b/src/utils/table.util.jsx
index 894a857..4707fd1 100644
--- a/src/utils/table.util.jsx
+++ b/src/utils/table.util.jsx
@@ -129,7 +129,7 @@ function renderCell(attr, value) {
     }
     case "date": return <span className="text-xs text-muted-foreground">{formatDate(value)}</span>;
     case "number": return <span className="font-mono text-xs font-semibold text-muted-foreground">{value}</span>;
-    default: return <span className="text-sm">{value}</span>;
+    default: return <span className="block truncate max-w-56 text-sm" title={String(value)}>{value}</span>;
   }
 }