diff --git a/app/[locale]/dashboard/[entityType]/[entitySlug]/layout.tsx b/app/[locale]/dashboard/[entityType]/[entitySlug]/layout.tsx
index 0c935b73..785d72e3 100644
--- a/app/[locale]/dashboard/[entityType]/[entitySlug]/layout.tsx
+++ b/app/[locale]/dashboard/[entityType]/[entitySlug]/layout.tsx
@@ -50,6 +50,11 @@ export default function OrgDashboardLayout({ children }: DashboardLayoutProps) {
       href: `/dashboard/${params.entityType}/${params.entitySlug}/consumers`,
       icon: 'userList',
     },
+    {
+      title: 'UseCases',
+      href: `/dashboard/${params.entityType}/${params.entitySlug}/usecases`,
+      icon: 'userList',
+    }
   ];
 
   return (
diff --git a/app/[locale]/manage/usecases/edit/[id]/assign/page.tsx b/app/[locale]/dashboard/[entityType]/[entitySlug]/usecases/edit/[id]/assign/page.tsx
similarity index 100%
rename from app/[locale]/manage/usecases/edit/[id]/assign/page.tsx
rename to app/[locale]/dashboard/[entityType]/[entitySlug]/usecases/edit/[id]/assign/page.tsx
diff --git a/app/[locale]/manage/usecases/edit/[id]/details/page.tsx b/app/[locale]/dashboard/[entityType]/[entitySlug]/usecases/edit/[id]/details/page.tsx
similarity index 100%
rename from app/[locale]/manage/usecases/edit/[id]/details/page.tsx
rename to app/[locale]/dashboard/[entityType]/[entitySlug]/usecases/edit/[id]/details/page.tsx
diff --git a/app/[locale]/manage/usecases/edit/[id]/publish/page.tsx b/app/[locale]/dashboard/[entityType]/[entitySlug]/usecases/edit/[id]/publish/page.tsx
similarity index 100%
rename from app/[locale]/manage/usecases/edit/[id]/publish/page.tsx
rename to app/[locale]/dashboard/[entityType]/[entitySlug]/usecases/edit/[id]/publish/page.tsx
diff --git a/app/[locale]/manage/usecases/edit/layout.tsx b/app/[locale]/dashboard/[entityType]/[entitySlug]/usecases/edit/layout.tsx
similarity index 100%
rename from app/[locale]/manage/usecases/edit/layout.tsx
rename to app/[locale]/dashboard/[entityType]/[entitySlug]/usecases/edit/layout.tsx
diff --git a/app/[locale]/manage/usecases/page.tsx b/app/[locale]/dashboard/[entityType]/[entitySlug]/usecases/page.tsx
similarity index 96%
rename from app/[locale]/manage/usecases/page.tsx
rename to app/[locale]/dashboard/[entityType]/[entitySlug]/usecases/page.tsx
index ae08f54d..18ac551a 100644
--- a/app/[locale]/manage/usecases/page.tsx
+++ b/app/[locale]/dashboard/[entityType]/[entitySlug]/usecases/page.tsx
@@ -12,8 +12,9 @@ import { GraphQL } from '@/lib/api';
 import { Icons } from '@/components/icons';
 import { LinkButton } from '@/components/Link';
 import { Loading } from '@/components/loading';
-import { ActionBar } from '../../dashboard/[entityType]/[entitySlug]/dataset/components/action-bar';
-import { Navigation } from '../../dashboard/[entityType]/[entitySlug]/dataset/components/navigate-org-datasets';
+import { Navigation } from '../dataset/components/navigate-org-datasets';
+import { ActionBar } from '../dataset/components/action-bar';
+
 
 const allUseCases: any = graphql(`
   query UseCasesData($filters: UseCaseFilter, $order: UseCaseOrder) {
diff --git a/app/[locale]/dashboard/components/dashboard-nav.tsx b/app/[locale]/dashboard/components/dashboard-nav.tsx
index 570d7e45..2b57e505 100644
--- a/app/[locale]/dashboard/components/dashboard-nav.tsx
+++ b/app/[locale]/dashboard/components/dashboard-nav.tsx
@@ -80,7 +80,7 @@ export function DashboardNav({
               <Text variant="headingMd" fontWeight="medium" className="py-2">
                 {entityDetails?.name}
               </Text>
-              <Link href={'/dashboard'}>
+              <Link href={'/dashboard/organization'}>
                 <Text variant="headingXs" color="interactive">
                   {' '}
                   Go back to Dashboard{' '}