diff --git a/apps/client/public/locales/en-US/translation.json b/apps/client/public/locales/en-US/translation.json
index d1f8a5d3..5160356a 100644
--- a/apps/client/public/locales/en-US/translation.json
+++ b/apps/client/public/locales/en-US/translation.json
@@ -116,6 +116,7 @@
   "No group found": "No group found",
   "No page history saved yet.": "No page history saved yet.",
   "No pages yet": "No pages yet",
+  "No shared pages": "No shared pages",
   "No results found...": "No results found...",
   "No user found": "No user found",
   "Overview": "Overview",
diff --git a/apps/client/src/ee/licence/components/oss-details.tsx b/apps/client/src/ee/licence/components/oss-details.tsx
index 3f31e1a4..9950bcbf 100644
--- a/apps/client/src/ee/licence/components/oss-details.tsx
+++ b/apps/client/src/ee/licence/components/oss-details.tsx
@@ -1,39 +1,76 @@
-import { Group, Table, ThemeIcon } from "@mantine/core";
+import { Group, List, Stack, Table, Text, ThemeIcon } from "@mantine/core";
 import { IconCheck } from "@tabler/icons-react";
 
+const enterpriseFeatures = [
+  "SSO (SAML, OIDC, LDAP)",
+  "Multi-factor Authentication",
+  "Page-level Permissions",
+  "Audit Logs",
+  "API Keys",
+  "AI Integration",
+  "MCP Support",
+  "Advanced Search Engine Support",
+  "Full-text Search in Attachments (PDF, DOCX)",
+  "Resolve Comments",
+  "Confluence Import",
+  "DOCX Import",
+];
+
 export default function OssDetails() {
   return (
-    <Table.ScrollContainer minWidth={500} py="md">
-      <Table
-        variant="vertical"
-        verticalSpacing="sm"
-        layout="fixed"
-        withTableBorder
-      >
-        <Table.Caption>
-          To unlock enterprise features like SSO, AI, Page-level permissions, SSO, MFA, Resolve comments, contact sales@docmost.com.
-        </Table.Caption>
-        <Table.Tbody>
-          <Table.Tr>
-            <Table.Th w={160}>Edition</Table.Th>
-            <Table.Td>
-              <Group wrap="nowrap">
-                Open Source
-                <div>
-                  <ThemeIcon
-                    color="green"
-                    variant="light"
-                    size={24}
-                    radius="xl"
-                  >
-                    <IconCheck size={16} />
-                  </ThemeIcon>
-                </div>
-              </Group>
-            </Table.Td>
-          </Table.Tr>
-        </Table.Tbody>
-      </Table>
-    </Table.ScrollContainer>
+    <Stack gap="lg">
+      <Table.ScrollContainer minWidth={500} py="md">
+        <Table
+          variant="vertical"
+          verticalSpacing="sm"
+          layout="fixed"
+          withTableBorder
+        >
+          <Table.Tbody>
+            <Table.Tr>
+              <Table.Th w={160}>Edition</Table.Th>
+              <Table.Td>
+                <Group wrap="nowrap">
+                  Open Source
+                  <div>
+                    <ThemeIcon
+                      color="green"
+                      variant="light"
+                      size={24}
+                      radius="xl"
+                    >
+                      <IconCheck size={16} />
+                    </ThemeIcon>
+                  </div>
+                </Group>
+              </Table.Td>
+            </Table.Tr>
+          </Table.Tbody>
+        </Table>
+      </Table.ScrollContainer>
+
+      <Stack gap="md">
+        <Text fw={500}>Upgrade to the Enterprise Edition to unlock:</Text>
+
+        <List
+          spacing={4}
+          size="sm"
+          icon={
+            <ThemeIcon size={20} color={"gray"} radius="xl">
+              <IconCheck size={14} />
+            </ThemeIcon>
+          }
+        >
+          {enterpriseFeatures.map((feature) => (
+            <List.Item key={feature}>{feature}</List.Item>
+          ))}
+        </List>
+
+        <Text size="sm" c="dimmed">
+          Contact <a href="mailto:sales@docmost.com">sales@docmost.com </a> for
+          enquiries.
+        </Text>
+      </Stack>
+    </Stack>
   );
 }
diff --git a/apps/client/src/features/comment/components/comment-list-with-tabs.tsx b/apps/client/src/features/comment/components/comment-list-with-tabs.tsx
index 92413b75..82dd4494 100644
--- a/apps/client/src/features/comment/components/comment-list-with-tabs.tsx
+++ b/apps/client/src/features/comment/components/comment-list-with-tabs.tsx
@@ -25,7 +25,6 @@ import { usePageQuery } from "@/features/page/queries/page-query.ts";
 import { IPagination } from "@/lib/types.ts";
 import { extractPageSlugId } from "@/lib";
 import { useTranslation } from "react-i18next";
-import { useIsCloudEE } from "@/hooks/use-is-cloud-ee";
 import { useGetSpaceBySlugQuery } from "@/features/space/queries/space-query.ts";
 import { IconArrowUp, IconMessageOff } from "@tabler/icons-react";
 
diff --git a/apps/client/src/features/share/components/share-list.tsx b/apps/client/src/features/share/components/share-list.tsx
index bf99f4ab..147c8bb9 100644
--- a/apps/client/src/features/share/components/share-list.tsx
+++ b/apps/client/src/features/share/components/share-list.tsx
@@ -2,6 +2,7 @@ import { Table, Group, Text, Anchor } from "@mantine/core";
 import React from "react";
 import { Link } from "react-router-dom";
 import { useTranslation } from "react-i18next";
+import { IconWorld } from "@tabler/icons-react";
 import Paginate from "@/components/common/paginate.tsx";
 import { useCursorPaginate } from "@/hooks/use-cursor-paginate";
 import { useGetSharesQuery } from "@/features/share/queries/share-query.ts";
@@ -11,6 +12,7 @@ import ShareActionMenu from "@/features/share/components/share-action-menu.tsx";
 import { buildSharedPageUrl } from "@/features/page/page.utils.ts";
 import { getPageIcon } from "@/lib";
 import { CustomAvatar } from "@/components/ui/custom-avatar.tsx";
+import { EmptyState } from "@/components/ui/empty-state.tsx";
 import classes from "./share.module.css";
 
 export default function ShareList() {
@@ -18,6 +20,10 @@ export default function ShareList() {
   const { cursor, goNext, goPrev } = useCursorPaginate();
   const { data, isLoading } = useGetSharesQuery({ cursor });
 
+  if (!isLoading && data?.items.length === 0) {
+    return <EmptyState icon={IconWorld} title={t("No shared pages")} />;
+  }
+
   return (
     <>
       <Table.ScrollContainer minWidth={500}>
diff --git a/apps/client/src/features/workspace/components/members/components/workspace-members-table.tsx b/apps/client/src/features/workspace/components/members/components/workspace-members-table.tsx
index c2ccce41..f302fc48 100644
--- a/apps/client/src/features/workspace/components/members/components/workspace-members-table.tsx
+++ b/apps/client/src/features/workspace/components/members/components/workspace-members-table.tsx
@@ -94,14 +94,17 @@ export default function WorkspaceMembersTable() {
                     )}
                   </Table.Td>
                   <Table.Td>
-                    <RoleSelectMenu
-                      roles={assignableUserRoles}
-                      roleName={getUserRoleLabel(user.role)}
-                      onChange={(newRole) =>
-                        handleRoleChange(user.id, user.role, newRole)
-                      }
-                      disabled={!isAdmin}
-                    />
+                    {isAdmin ? (
+                      <RoleSelectMenu
+                        roles={assignableUserRoles}
+                        roleName={getUserRoleLabel(user.role)}
+                        onChange={(newRole) =>
+                          handleRoleChange(user.id, user.role, newRole)
+                        }
+                      />
+                    ) : (
+                      <Text fz="sm">{t(getUserRoleLabel(user.role))}</Text>
+                    )}
                   </Table.Td>
                   <Table.Td>
                     {isAdmin && (