diff --git a/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/ListDatasetGroupsComponent.tsx b/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/ListDatasetGroupsComponent.tsx
index 710cbb98e..f301a260d 100644
--- a/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/ListDatasetGroupsComponent.tsx
+++ b/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/ListDatasetGroupsComponent.tsx
@@ -54,7 +54,6 @@ export const ListDatasetGroupsComponent: React.FC<{
         showHeader={true}
         showSelectAll={false}
         rowClassName="pl-[30px]!"
-        columnRowVariant="default"
         emptyState={<EmptyStateList text="No dataset groups found" />}
       />
     </InfiniteListContainer>
diff --git a/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/ListPermissionGroupsComponent.tsx b/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/ListPermissionGroupsComponent.tsx
index e1abd92a1..3f4b53d1f 100644
--- a/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/ListPermissionGroupsComponent.tsx
+++ b/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/ListPermissionGroupsComponent.tsx
@@ -54,7 +54,6 @@ export const ListPermissionGroupsComponent: React.FC<{
         showHeader={true}
         showSelectAll={false}
         rowClassName="pl-[30px]!"
-        columnRowVariant="default"
         emptyState={<EmptyStateList text="No permission groups found" />}
       />
     </InfiniteListContainer>
diff --git a/web/src/app/app/(settings_layout)/settings/(permissions)/users/ListUsersComponent.tsx b/web/src/app/app/(settings_layout)/settings/(permissions)/users/ListUsersComponent.tsx
index 80f2c8652..3320ad5bc 100644
--- a/web/src/app/app/(settings_layout)/settings/(permissions)/users/ListUsersComponent.tsx
+++ b/web/src/app/app/(settings_layout)/settings/(permissions)/users/ListUsersComponent.tsx
@@ -102,7 +102,6 @@ export const ListUsersComponent: React.FC<{
         rowClassName="pl-[30px]!"
         // onSelectChange={setSelectedRowKeys}
         // selectedRowKeys={selectedRowKeys}
-        columnRowVariant="default"
         emptyState={<EmptyStateList text="No users found" variant="card" show={isFetched} />}
       />
     </InfiniteListContainer>
diff --git a/web/src/components/ui/context/ContextMenu.stories.tsx b/web/src/components/ui/context/ContextMenu.stories.tsx
index f8cde1f43..c666dfa2c 100644
--- a/web/src/components/ui/context/ContextMenu.stories.tsx
+++ b/web/src/components/ui/context/ContextMenu.stories.tsx
@@ -1,5 +1,5 @@
 import type { Meta, StoryObj } from '@storybook/react';
-import { ContextMenu, ContextProps } from './ContextMenu';
+import { ContextMenu } from './ContextMenu';
 import {
   Window,
   WindowSettings,
@@ -383,7 +383,9 @@ export const ContextMenuWithEverything: Story = {
         loading: false,
         icon: <Window />,
         items: [
-          <div className="flex min-h-10 min-w-10 items-center rounded bg-red-300 p-1 text-red-600">
+          <div
+            key="nested-item"
+            className="flex min-h-10 min-w-10 items-center rounded bg-red-300 p-1 text-red-600">
             This is a nested item
           </div>
         ]
diff --git a/web/src/components/ui/context/ContextMenu.tsx b/web/src/components/ui/context/ContextMenu.tsx
index 0f30f8361..02f42c3cd 100644
--- a/web/src/components/ui/context/ContextMenu.tsx
+++ b/web/src/components/ui/context/ContextMenu.tsx
@@ -72,6 +72,8 @@ export const ContextMenu: React.FC<ContextMenuProps> = React.memo(
   }
 );
 
+ContextMenu.displayName = 'ContextMenu';
+
 const ContextMenuItemSelector: React.FC<{
   item: ContextMenuItems[number];
   index: number;
diff --git a/web/src/components/ui/dropdown/Dropdown.stories.tsx b/web/src/components/ui/dropdown/Dropdown.stories.tsx
index 82abf85e1..be5966f3e 100644
--- a/web/src/components/ui/dropdown/Dropdown.stories.tsx
+++ b/web/src/components/ui/dropdown/Dropdown.stories.tsx
@@ -167,8 +167,6 @@ export const WithDisabledItems: Story = {
 export const CustomWidth: Story = {
   args: {
     menuHeader: 'Custom Width Menu',
-    minWidth: 300,
-    maxWidth: 400,
     items: [
       {
         value: '1',
diff --git a/web/src/components/ui/list/InfiniteListContainer/InfiniteListContainer.tsx b/web/src/components/ui/list/InfiniteListContainer/InfiniteListContainer.tsx
index ff9fb6253..b13776a4b 100644
--- a/web/src/components/ui/list/InfiniteListContainer/InfiniteListContainer.tsx
+++ b/web/src/components/ui/list/InfiniteListContainer/InfiniteListContainer.tsx
@@ -1,4 +1,4 @@
-import { createStyles } from 'antd-style';
+import { cn } from '@/lib/classMerge';
 import React from 'react';
 
 export const InfiniteListContainer: React.FC<{
@@ -6,15 +6,13 @@ export const InfiniteListContainer: React.FC<{
   popupNode?: React.ReactNode;
   showContainerBorder?: boolean;
 }> = React.memo(({ children, popupNode, showContainerBorder = true }) => {
-  const { styles, cx } = useStyles();
-
   return (
-    <div className={cx('overflow-hidden', showContainerBorder && styles.container)}>
+    <div className={cn('overflow-hidden', showContainerBorder && 'border-border rounded border')}>
       {children}
 
       {popupNode && (
-        <div className="fixed bottom-0 left-0 right-0 w-full">
-          <div className="relative ml-[220px] mr-[55px]">{popupNode}</div>
+        <div className="fixed right-0 bottom-0 left-0 w-full">
+          <div className="relative mr-[55px] ml-[220px]">{popupNode}</div>
         </div>
       )}
     </div>
@@ -22,10 +20,3 @@ export const InfiniteListContainer: React.FC<{
 });
 
 InfiniteListContainer.displayName = 'InfiniteListContainer';
-
-const useStyles = createStyles(({ css, token }) => ({
-  container: css`
-    border: 0.5px solid ${token.colorBorder};
-    border-radius: ${token.borderRadius}px;
-  `
-}));