diff --git a/ui/src/routes/_layout/index.tsx b/ui/src/routes/_layout/index.tsx
index 4157ba5c9..5deea9a62 100644
--- a/ui/src/routes/_layout/index.tsx
+++ b/ui/src/routes/_layout/index.tsx
@@ -59,23 +59,21 @@ export const IndexPage = () => {
         <CardHeader>
           <CardTitle>Organizations</CardTitle>
           <CardDescription>
-            <div className='flex flex-col'>
-              <div>Browse your organizations or create a new one</div>
-            </div>
-            <div className='py-2'>
-              <Tooltip>
-                <TooltipTrigger asChild>
-                  <Button asChild size='sm' className='ml-auto gap-1'>
-                    <Link to='/create-organization'>
-                      New organization
-                      <PlusIcon className='h-4 w-4' />
-                    </Link>
-                  </Button>
-                </TooltipTrigger>
-                <TooltipContent>Create a new organization</TooltipContent>
-              </Tooltip>
-            </div>
+            Browse your organizations or create a new one
           </CardDescription>
+          <div className='py-2'>
+            <Tooltip>
+              <TooltipTrigger asChild>
+                <Button asChild size='sm' className='ml-auto gap-1'>
+                  <Link to='/create-organization'>
+                    New organization
+                    <PlusIcon className='h-4 w-4' />
+                  </Link>
+                </Button>
+              </TooltipTrigger>
+              <TooltipContent>Create a new organization</TooltipContent>
+            </Tooltip>
+          </div>
         </CardHeader>
         <CardContent>
           <Table>
diff --git a/ui/src/routes/_layout/organizations/$orgId/index.tsx b/ui/src/routes/_layout/organizations/$orgId/index.tsx
index e515a1aab..7cc717d1f 100644
--- a/ui/src/routes/_layout/organizations/$orgId/index.tsx
+++ b/ui/src/routes/_layout/organizations/$orgId/index.tsx
@@ -174,29 +174,25 @@ const OrganizationComponent = () => {
               </AlertDialogContent>
             </AlertDialog>
           </CardTitle>
-          <CardDescription>
-            <div className='flex flex-col'>
-              <div>{organization.description}</div>
-              <div className='py-2'>
-                <Tooltip>
-                  <TooltipTrigger asChild>
-                    <Button asChild size='sm' className='ml-auto gap-1'>
-                      <Link
-                        to='/organizations/$orgId/create-product'
-                        params={{ orgId: organization.id.toString() }}
-                      >
-                        New product
-                        <PlusIcon className='h-4 w-4' />
-                      </Link>
-                    </Button>
-                  </TooltipTrigger>
-                  <TooltipContent>
-                    Create a new product for this organization
-                  </TooltipContent>
-                </Tooltip>
-              </div>
-            </div>
-          </CardDescription>
+          <CardDescription>{organization.description}</CardDescription>
+          <div className='py-2'>
+            <Tooltip>
+              <TooltipTrigger asChild>
+                <Button asChild size='sm' className='ml-auto gap-1'>
+                  <Link
+                    to='/organizations/$orgId/create-product'
+                    params={{ orgId: organization.id.toString() }}
+                  >
+                    New product
+                    <PlusIcon className='h-4 w-4' />
+                  </Link>
+                </Button>
+              </TooltipTrigger>
+              <TooltipContent>
+                Create a new product for this organization
+              </TooltipContent>
+            </Tooltip>
+          </div>
         </CardHeader>
         <CardContent>
           <Table>
diff --git a/ui/src/routes/_layout/organizations/$orgId/products/$productId/index.tsx b/ui/src/routes/_layout/organizations/$orgId/products/$productId/index.tsx
index c99e6133d..87817b35e 100644
--- a/ui/src/routes/_layout/organizations/$orgId/products/$productId/index.tsx
+++ b/ui/src/routes/_layout/organizations/$orgId/products/$productId/index.tsx
@@ -176,32 +176,28 @@ const ProductComponent = () => {
               </AlertDialogContent>
             </AlertDialog>
           </CardTitle>
-          <CardDescription>
-            <div className='flex flex-col'>
-              <div>{product.description}</div>
-              <div className='py-2'>
-                <Tooltip>
-                  <TooltipTrigger asChild>
-                    <Button asChild size='sm' className='ml-auto gap-1'>
-                      <Link
-                        to='/organizations/$orgId/products/$productId/create-repository'
-                        params={{
-                          orgId: params.orgId,
-                          productId: params.productId,
-                        }}
-                      >
-                        New repository
-                        <PlusIcon className='h-4 w-4' />
-                      </Link>
-                    </Button>
-                  </TooltipTrigger>
-                  <TooltipContent>
-                    Add a new repository for this product
-                  </TooltipContent>
-                </Tooltip>
-              </div>
-            </div>
-          </CardDescription>
+          <CardDescription>{product.description}</CardDescription>
+          <div className='py-2'>
+            <Tooltip>
+              <TooltipTrigger asChild>
+                <Button asChild size='sm' className='ml-auto gap-1'>
+                  <Link
+                    to='/organizations/$orgId/products/$productId/create-repository'
+                    params={{
+                      orgId: params.orgId,
+                      productId: params.productId,
+                    }}
+                  >
+                    New repository
+                    <PlusIcon className='h-4 w-4' />
+                  </Link>
+                </Button>
+              </TooltipTrigger>
+              <TooltipContent>
+                Add a new repository for this product
+              </TooltipContent>
+            </Tooltip>
+          </div>
         </CardHeader>
         <CardContent>
           <Table>
diff --git a/ui/src/routes/_layout/organizations/$orgId/products/$productId/repositories/$repoId/index.tsx b/ui/src/routes/_layout/organizations/$orgId/products/$productId/repositories/$repoId/index.tsx
index 764af3984..b8943a9e3 100644
--- a/ui/src/routes/_layout/organizations/$orgId/products/$productId/repositories/$repoId/index.tsx
+++ b/ui/src/routes/_layout/organizations/$orgId/products/$productId/repositories/$repoId/index.tsx
@@ -190,33 +190,29 @@ const RepoComponent = () => {
               </AlertDialogContent>
             </AlertDialog>
           </CardTitle>
-          <CardDescription>
-            <div className='flex flex-col'>
-              <div>{repo.type}</div>
-              <div className='py-2'>
-                <Tooltip>
-                  <TooltipTrigger asChild>
-                    <Button asChild size='sm' className='ml-auto gap-1'>
-                      <Link
-                        to='/organizations/$orgId/products/$productId/repositories/$repoId/create-run'
-                        params={{
-                          orgId: params.orgId,
-                          productId: params.productId,
-                          repoId: params.repoId,
-                        }}
-                      >
-                        New run
-                        <PlusIcon className='h-4 w-4' />
-                      </Link>
-                    </Button>
-                  </TooltipTrigger>
-                  <TooltipContent>
-                    Create a new ORT run for this repository
-                  </TooltipContent>
-                </Tooltip>
-              </div>
-            </div>
-          </CardDescription>
+          <CardDescription>{repo.type}</CardDescription>
+          <div className='py-2'>
+            <Tooltip>
+              <TooltipTrigger asChild>
+                <Button asChild size='sm' className='ml-auto gap-1'>
+                  <Link
+                    to='/organizations/$orgId/products/$productId/repositories/$repoId/create-run'
+                    params={{
+                      orgId: params.orgId,
+                      productId: params.productId,
+                      repoId: params.repoId,
+                    }}
+                  >
+                    New run
+                    <PlusIcon className='h-4 w-4' />
+                  </Link>
+                </Button>
+              </TooltipTrigger>
+              <TooltipContent>
+                Create a new ORT run for this repository
+              </TooltipContent>
+            </Tooltip>
+          </div>
         </CardHeader>
         <CardContent>
           <Table>