diff --git a/src/components/admin/ConfirmDialog.dynamic.stories.tsx b/src/components/admin/ConfirmDialog.dynamic.stories.tsx
new file mode 100644
index 0000000..9a710ac
--- /dev/null
+++ b/src/components/admin/ConfirmDialog.dynamic.stories.tsx
@@ -0,0 +1,43 @@
+import type { Meta, StoryObj } from '@storybook/react';
+import featuresConfig from '@/config/features.json';
+import ConfirmDialog from './ConfirmDialog';
+
+const meta = {
+  title: 'Admin/ConfirmDialog (From JSON)',
+  component: ConfirmDialog,
+  parameters: {
+    layout: 'centered',
+    docs: {
+      description: {
+        component: 'ConfirmDialog component with stories dynamically loaded from features.json',
+      },
+    },
+  },
+  tags: ['autodocs'],
+} satisfies Meta<typeof ConfirmDialog>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+// Dynamically generate stories from features.json
+const confirmDialogStories = featuresConfig.storybookStories.ConfirmDialog;
+
+// Default Story
+export const Default: Story = {
+  name: confirmDialogStories.default.name,
+  args: {
+    ...confirmDialogStories.default.args,
+    onConfirm: () => console.log('Confirmed'),
+    onCancel: () => console.log('Cancelled'),
+  },
+};
+
+// Delete Warning Story
+export const DeleteWarning: Story = {
+  name: confirmDialogStories.deleteWarning.name,
+  args: {
+    ...confirmDialogStories.deleteWarning.args,
+    onConfirm: () => console.log('Confirmed delete'),
+    onCancel: () => console.log('Cancelled delete'),
+  },
+};
diff --git a/src/components/admin/ConfirmDialog.stories.tsx b/src/components/admin/ConfirmDialog.stories.tsx
new file mode 100644
index 0000000..19267b0
--- /dev/null
+++ b/src/components/admin/ConfirmDialog.stories.tsx
@@ -0,0 +1,41 @@
+import type { Meta, StoryObj } from '@storybook/react';
+import ConfirmDialog from './ConfirmDialog';
+
+const meta = {
+  title: 'Admin/ConfirmDialog',
+  component: ConfirmDialog,
+  parameters: {
+    layout: 'centered',
+  },
+  tags: ['autodocs'],
+} satisfies Meta<typeof ConfirmDialog>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+// Stories based on features.json storybookStories.ConfirmDialog
+export const Default: Story = {
+  name: 'Default',
+  args: {
+    open: true,
+    title: 'Confirm Action',
+    message: 'Are you sure you want to proceed?',
+    confirmLabel: 'Confirm',
+    cancelLabel: 'Cancel',
+    onConfirm: () => console.log('Confirmed'),
+    onCancel: () => console.log('Cancelled'),
+  },
+};
+
+export const DeleteWarning: Story = {
+  name: 'Delete Warning',
+  args: {
+    open: true,
+    title: 'Delete Item',
+    message: 'This action cannot be undone. Are you sure you want to delete this item?',
+    confirmLabel: 'Delete',
+    cancelLabel: 'Cancel',
+    onConfirm: () => console.log('Confirmed delete'),
+    onCancel: () => console.log('Cancelled delete'),
+  },
+};
diff --git a/src/components/admin/ConfirmDialog.tsx b/src/components/admin/ConfirmDialog.tsx
index aab7bd7..d503469 100644
--- a/src/components/admin/ConfirmDialog.tsx
+++ b/src/components/admin/ConfirmDialog.tsx
@@ -1,13 +1,13 @@
 'use client';
 
 import {
-  Button,
   Dialog,
   DialogActions,
   DialogContent,
   DialogContentText,
   DialogTitle,
 } from '@mui/material';
+import Button from '../atoms/Button';
 
 type ConfirmDialogProps = {
   open: boolean;
@@ -35,10 +35,8 @@ export default function ConfirmDialog({
         <DialogContentText>{message}</DialogContentText>
       </DialogContent>
       <DialogActions>
-        <Button onClick={onCancel}>{cancelLabel}</Button>
-        <Button onClick={onConfirm} color="error" variant="contained">
-          {confirmLabel}
-        </Button>
+        <Button onClick={onCancel} text={cancelLabel} />
+        <Button onClick={onConfirm} color="error" variant="contained" text={confirmLabel} />
       </DialogActions>
     </Dialog>
   );
diff --git a/src/components/admin/DataGrid.dynamic.stories.tsx b/src/components/admin/DataGrid.dynamic.stories.tsx
new file mode 100644
index 0000000..f24e4c8
--- /dev/null
+++ b/src/components/admin/DataGrid.dynamic.stories.tsx
@@ -0,0 +1,45 @@
+import type { Meta, StoryObj } from '@storybook/react';
+import featuresConfig from '@/config/features.json';
+import DataGrid from './DataGrid';
+
+const meta = {
+  title: 'Admin/DataGrid (From JSON)',
+  component: DataGrid,
+  parameters: {
+    layout: 'padded',
+    docs: {
+      description: {
+        component: 'DataGrid component with stories dynamically loaded from features.json',
+      },
+    },
+  },
+  tags: ['autodocs'],
+} satisfies Meta<typeof DataGrid>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+// Dynamically generate stories from features.json
+const dataGridStories = featuresConfig.storybookStories.DataGrid;
+
+// Default Story
+export const Default: Story = {
+  name: dataGridStories.default.name,
+  args: dataGridStories.default.args,
+};
+
+// With Actions Story
+export const WithActions: Story = {
+  name: dataGridStories.withActions.name,
+  args: {
+    ...dataGridStories.withActions.args,
+    onEdit: () => console.log('Edit clicked'),
+    onDelete: () => console.log('Delete clicked'),
+  },
+};
+
+// Empty State
+export const Empty: Story = {
+  name: dataGridStories.empty.name,
+  args: dataGridStories.empty.args,
+};
diff --git a/src/components/admin/DataGrid.stories.tsx b/src/components/admin/DataGrid.stories.tsx
new file mode 100644
index 0000000..d6f845e
--- /dev/null
+++ b/src/components/admin/DataGrid.stories.tsx
@@ -0,0 +1,61 @@
+import type { Meta, StoryObj } from '@storybook/react';
+import DataGrid from './DataGrid';
+
+const meta = {
+  title: 'Admin/DataGrid',
+  component: DataGrid,
+  parameters: {
+    layout: 'padded',
+  },
+  tags: ['autodocs'],
+} satisfies Meta<typeof DataGrid>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+// Stories based on features.json storybookStories.DataGrid
+export const Default: Story = {
+  name: 'Default',
+  args: {
+    columns: [
+      { name: 'id', label: 'ID' },
+      { name: 'name', label: 'Name' },
+      { name: 'email', label: 'Email' },
+    ],
+    rows: [
+      { id: 1, name: 'John Doe', email: 'john@example.com' },
+      { id: 2, name: 'Jane Smith', email: 'jane@example.com' },
+      { id: 3, name: 'Bob Johnson', email: 'bob@example.com' },
+    ],
+    primaryKey: 'id',
+  },
+};
+
+export const WithActions: Story = {
+  name: 'With Edit/Delete Actions',
+  args: {
+    columns: [
+      { name: 'id', label: 'ID' },
+      { name: 'name', label: 'Name' },
+      { name: 'status', label: 'Status' },
+    ],
+    rows: [
+      { id: 1, name: 'Active User', status: 'active' },
+      { id: 2, name: 'Pending User', status: 'pending' },
+    ],
+    onEdit: () => console.log('Edit clicked'),
+    onDelete: () => console.log('Delete clicked'),
+    primaryKey: 'id',
+  },
+};
+
+export const Empty: Story = {
+  name: 'Empty State',
+  args: {
+    columns: [
+      { name: 'id', label: 'ID' },
+      { name: 'name', label: 'Name' },
+    ],
+    rows: [],
+  },
+};
diff --git a/src/components/admin/DataGrid.tsx b/src/components/admin/DataGrid.tsx
index 35d645c..edb7f03 100644
--- a/src/components/admin/DataGrid.tsx
+++ b/src/components/admin/DataGrid.tsx
@@ -1,9 +1,6 @@
 'use client';
 
-import DeleteIcon from '@mui/icons-material/Delete';
-import EditIcon from '@mui/icons-material/Edit';
 import {
-  IconButton,
   Paper,
   Table,
   TableBody,
@@ -13,6 +10,7 @@ import {
   TableRow,
   Tooltip,
 } from '@mui/material';
+import IconButton from '../atoms/IconButton';
 
 type DataGridProps = {
   columns: Array<{ name: string; label?: string }>;
@@ -54,16 +52,12 @@ export default function DataGrid({ columns, rows, onEdit, onDelete, primaryKey =
                 <TableCell>
                   {onEdit && (
                     <Tooltip title="Edit">
-                      <IconButton size="small" onClick={() => onEdit(row)}>
-                        <EditIcon fontSize="small" />
-                      </IconButton>
+                      <IconButton size="small" onClick={() => onEdit(row)} icon="Edit" />
                     </Tooltip>
                   )}
                   {onDelete && (
                     <Tooltip title="Delete">
-                      <IconButton size="small" color="error" onClick={() => onDelete(row)}>
-                        <DeleteIcon fontSize="small" />
-                      </IconButton>
+                      <IconButton size="small" color="error" onClick={() => onDelete(row)} icon="Delete" />
                     </Tooltip>
                   )}
                 </TableCell>
diff --git a/src/components/atoms/Button.dynamic.stories.tsx b/src/components/atoms/Button.dynamic.stories.tsx
new file mode 100644
index 0000000..f57b4b5
--- /dev/null
+++ b/src/components/atoms/Button.dynamic.stories.tsx
@@ -0,0 +1,47 @@
+import type { Meta, StoryObj } from '@storybook/react';
+import featuresConfig from '@/config/features.json';
+import Button, { type ButtonProps } from './Button';
+
+const meta = {
+  title: 'Atoms/Button (From JSON)',
+  component: Button,
+  parameters: {
+    layout: 'centered',
+    docs: {
+      description: {
+        component: 'Button component with stories dynamically loaded from features.json',
+      },
+    },
+  },
+  tags: ['autodocs'],
+} satisfies Meta<typeof Button>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+// Dynamically generate stories from features.json
+const buttonStories = featuresConfig.storybookStories.Button;
+
+// Primary Button
+export const Primary: Story = {
+  name: buttonStories.primary.name,
+  args: buttonStories.primary.args as Partial<ButtonProps>,
+};
+
+// Secondary Button
+export const Secondary: Story = {
+  name: buttonStories.secondary.name,
+  args: buttonStories.secondary.args as Partial<ButtonProps>,
+};
+
+// Button with Icon
+export const WithIcon: Story = {
+  name: buttonStories.withIcon.name,
+  args: buttonStories.withIcon.args as Partial<ButtonProps>,
+};
+
+// Loading State
+export const Loading: Story = {
+  name: buttonStories.loading.name,
+  args: buttonStories.loading.args as Partial<ButtonProps>,
+};
diff --git a/src/components/atoms/Button.stories.tsx b/src/components/atoms/Button.stories.tsx
new file mode 100644
index 0000000..e5383ec
--- /dev/null
+++ b/src/components/atoms/Button.stories.tsx
@@ -0,0 +1,65 @@
+import type { Meta, StoryObj } from '@storybook/react';
+import Button from './Button';
+
+const meta = {
+  title: 'Atoms/Button',
+  component: Button,
+  parameters: {
+    layout: 'centered',
+  },
+  tags: ['autodocs'],
+  argTypes: {
+    variant: {
+      control: 'select',
+      options: ['text', 'outlined', 'contained'],
+    },
+    color: {
+      control: 'select',
+      options: ['default', 'primary', 'secondary', 'error', 'warning', 'info', 'success'],
+    },
+    size: {
+      control: 'select',
+      options: ['small', 'medium', 'large'],
+    },
+  },
+} satisfies Meta<typeof Button>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+// Stories based on features.json storybookStories
+export const Primary: Story = {
+  name: 'Primary Button',
+  args: {
+    variant: 'contained',
+    color: 'primary',
+    text: 'Click Me',
+  },
+};
+
+export const Secondary: Story = {
+  name: 'Secondary Button',
+  args: {
+    variant: 'outlined',
+    color: 'secondary',
+    text: 'Cancel',
+  },
+};
+
+export const WithIcon: Story = {
+  name: 'With Icon',
+  args: {
+    variant: 'contained',
+    startIcon: 'Add',
+    text: 'Add Item',
+  },
+};
+
+export const Loading: Story = {
+  name: 'Loading State',
+  args: {
+    variant: 'contained',
+    disabled: true,
+    text: 'Loading...',
+  },
+};
diff --git a/src/components/atoms/Button.tsx b/src/components/atoms/Button.tsx
new file mode 100644
index 0000000..29ed14d
--- /dev/null
+++ b/src/components/atoms/Button.tsx
@@ -0,0 +1,35 @@
+'use client';
+
+import { Button as MuiButton, ButtonProps as MuiButtonProps } from '@mui/material';
+import * as Icons from '@mui/icons-material';
+
+export type ButtonProps = Omit<MuiButtonProps, 'startIcon' | 'endIcon'> & {
+  text?: string;
+  startIcon?: keyof typeof Icons;
+  endIcon?: keyof typeof Icons;
+};
+
+/**
+ * Atomic Button component
+ * Wraps Material-UI Button with icon support from features.json
+ */
+export default function Button({ 
+  text, 
+  children,
+  startIcon, 
+  endIcon,
+  ...props 
+}: ButtonProps) {
+  const StartIconComponent = startIcon ? Icons[startIcon] : null;
+  const EndIconComponent = endIcon ? Icons[endIcon] : null;
+
+  return (
+    <MuiButton
+      {...props}
+      startIcon={StartIconComponent ? <StartIconComponent /> : undefined}
+      endIcon={EndIconComponent ? <EndIconComponent /> : undefined}
+    >
+      {text || children}
+    </MuiButton>
+  );
+}
diff --git a/src/components/atoms/Icon.stories.tsx b/src/components/atoms/Icon.stories.tsx
new file mode 100644
index 0000000..ca9ebcb
--- /dev/null
+++ b/src/components/atoms/Icon.stories.tsx
@@ -0,0 +1,53 @@
+import type { Meta, StoryObj } from '@storybook/react';
+import Icon from './Icon';
+
+const meta = {
+  title: 'Atoms/Icon',
+  component: Icon,
+  parameters: {
+    layout: 'centered',
+  },
+  tags: ['autodocs'],
+  argTypes: {
+    color: {
+      control: 'select',
+      options: ['inherit', 'primary', 'secondary', 'action', 'disabled', 'error'],
+    },
+    fontSize: {
+      control: 'select',
+      options: ['small', 'medium', 'large', 'inherit'],
+    },
+  },
+} satisfies Meta<typeof Icon>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+export const Storage: Story = {
+  args: {
+    name: 'Storage',
+    color: 'primary',
+  },
+};
+
+export const Code: Story = {
+  args: {
+    name: 'Code',
+    fontSize: 'large',
+  },
+};
+
+export const AccountTree: Story = {
+  args: {
+    name: 'AccountTree',
+    color: 'secondary',
+  },
+};
+
+export const Speed: Story = {
+  args: {
+    name: 'Speed',
+    color: 'error',
+    fontSize: 'large',
+  },
+};
diff --git a/src/components/atoms/Icon.tsx b/src/components/atoms/Icon.tsx
new file mode 100644
index 0000000..5a0d497
--- /dev/null
+++ b/src/components/atoms/Icon.tsx
@@ -0,0 +1,23 @@
+'use client';
+
+import { SvgIconProps } from '@mui/material';
+import * as Icons from '@mui/icons-material';
+
+export type IconProps = SvgIconProps & {
+  name: keyof typeof Icons;
+};
+
+/**
+ * Atomic Icon component
+ * Renders Material-UI icons by name from features.json
+ */
+export default function Icon({ name, ...props }: IconProps) {
+  const IconComponent = Icons[name];
+
+  if (!IconComponent) {
+    console.warn(`Icon "${name}" not found in Material Icons`);
+    return null;
+  }
+
+  return <IconComponent {...props} />;
+}
diff --git a/src/components/atoms/IconButton.stories.tsx b/src/components/atoms/IconButton.stories.tsx
new file mode 100644
index 0000000..b054689
--- /dev/null
+++ b/src/components/atoms/IconButton.stories.tsx
@@ -0,0 +1,52 @@
+import type { Meta, StoryObj } from '@storybook/react';
+import IconButton from './IconButton';
+
+const meta = {
+  title: 'Atoms/IconButton',
+  component: IconButton,
+  parameters: {
+    layout: 'centered',
+  },
+  tags: ['autodocs'],
+  argTypes: {
+    color: {
+      control: 'select',
+      options: ['default', 'primary', 'secondary', 'error', 'warning', 'info', 'success'],
+    },
+    size: {
+      control: 'select',
+      options: ['small', 'medium', 'large'],
+    },
+  },
+} satisfies Meta<typeof IconButton>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+export const Edit: Story = {
+  args: {
+    icon: 'Edit',
+    color: 'primary',
+  },
+};
+
+export const Delete: Story = {
+  args: {
+    icon: 'Delete',
+    color: 'error',
+  },
+};
+
+export const Add: Story = {
+  args: {
+    icon: 'Add',
+    color: 'primary',
+  },
+};
+
+export const Settings: Story = {
+  args: {
+    icon: 'Settings',
+    size: 'large',
+  },
+};
diff --git a/src/components/atoms/IconButton.tsx b/src/components/atoms/IconButton.tsx
new file mode 100644
index 0000000..659210c
--- /dev/null
+++ b/src/components/atoms/IconButton.tsx
@@ -0,0 +1,27 @@
+'use client';
+
+import { IconButton as MuiIconButton, IconButtonProps as MuiIconButtonProps } from '@mui/material';
+import * as Icons from '@mui/icons-material';
+
+export type IconButtonProps = Omit<MuiIconButtonProps, 'children'> & {
+  icon: keyof typeof Icons;
+};
+
+/**
+ * Atomic IconButton component
+ * Wraps Material-UI IconButton with icon name from features.json
+ */
+export default function IconButton({ icon, ...props }: IconButtonProps) {
+  const IconComponent = Icons[icon];
+
+  if (!IconComponent) {
+    console.warn(`Icon "${icon}" not found in Material Icons`);
+    return null;
+  }
+
+  return (
+    <MuiIconButton {...props}>
+      <IconComponent />
+    </MuiIconButton>
+  );
+}
diff --git a/src/components/atoms/TextField.stories.tsx b/src/components/atoms/TextField.stories.tsx
new file mode 100644
index 0000000..a07a46e
--- /dev/null
+++ b/src/components/atoms/TextField.stories.tsx
@@ -0,0 +1,64 @@
+import type { Meta, StoryObj } from '@storybook/react';
+import TextField from './TextField';
+
+const meta = {
+  title: 'Atoms/TextField',
+  component: TextField,
+  parameters: {
+    layout: 'centered',
+  },
+  tags: ['autodocs'],
+  argTypes: {
+    variant: {
+      control: 'select',
+      options: ['standard', 'outlined', 'filled'],
+    },
+    type: {
+      control: 'select',
+      options: ['text', 'email', 'password', 'number', 'tel', 'url'],
+    },
+    size: {
+      control: 'select',
+      options: ['small', 'medium'],
+    },
+  },
+} satisfies Meta<typeof TextField>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {
+  args: {
+    label: 'Text Field',
+    placeholder: 'Enter text...',
+    variant: 'outlined',
+  },
+};
+
+export const Email: Story = {
+  args: {
+    label: 'Email',
+    type: 'email',
+    placeholder: 'user@example.com',
+    variant: 'outlined',
+  },
+};
+
+export const WithError: Story = {
+  args: {
+    label: 'Name',
+    error: true,
+    helperText: 'This field is required',
+    variant: 'outlined',
+  },
+};
+
+export const Multiline: Story = {
+  args: {
+    label: 'Description',
+    multiline: true,
+    rows: 4,
+    placeholder: 'Enter description...',
+    variant: 'outlined',
+  },
+};
diff --git a/src/components/atoms/TextField.tsx b/src/components/atoms/TextField.tsx
new file mode 100644
index 0000000..e2a7f9a
--- /dev/null
+++ b/src/components/atoms/TextField.tsx
@@ -0,0 +1,15 @@
+'use client';
+
+import { TextField as MuiTextField, TextFieldProps as MuiTextFieldProps } from '@mui/material';
+
+export type TextFieldProps = MuiTextFieldProps & {
+  // Additional props from features.json
+};
+
+/**
+ * Atomic TextField component
+ * Wraps Material-UI TextField with features.json configuration
+ */
+export default function TextField(props: TextFieldProps) {
+  return <MuiTextField {...props} />;
+}
diff --git a/src/components/atoms/Typography.stories.tsx b/src/components/atoms/Typography.stories.tsx
new file mode 100644
index 0000000..aafc749
--- /dev/null
+++ b/src/components/atoms/Typography.stories.tsx
@@ -0,0 +1,53 @@
+import type { Meta, StoryObj } from '@storybook/react';
+import Typography from './Typography';
+
+const meta = {
+  title: 'Atoms/Typography',
+  component: Typography,
+  parameters: {
+    layout: 'centered',
+  },
+  tags: ['autodocs'],
+  argTypes: {
+    variant: {
+      control: 'select',
+      options: ['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'subtitle1', 'subtitle2', 'body1', 'body2', 'caption', 'button', 'overline'],
+    },
+    align: {
+      control: 'select',
+      options: ['left', 'center', 'right', 'justify'],
+    },
+  },
+} satisfies Meta<typeof Typography>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+export const Heading1: Story = {
+  args: {
+    variant: 'h1',
+    text: 'Heading 1',
+  },
+};
+
+export const Heading4: Story = {
+  args: {
+    variant: 'h4',
+    text: 'Heading 4',
+  },
+};
+
+export const Body: Story = {
+  args: {
+    variant: 'body1',
+    text: 'This is body text with regular weight and size.',
+  },
+};
+
+export const Caption: Story = {
+  args: {
+    variant: 'caption',
+    color: 'text.secondary',
+    text: 'Caption text - smaller and secondary color',
+  },
+};
diff --git a/src/components/atoms/Typography.tsx b/src/components/atoms/Typography.tsx
new file mode 100644
index 0000000..eabf2b7
--- /dev/null
+++ b/src/components/atoms/Typography.tsx
@@ -0,0 +1,16 @@
+'use client';
+
+import { Typography as MuiTypography, TypographyProps as MuiTypographyProps } from '@mui/material';
+
+export type TypographyProps = Omit<MuiTypographyProps, 'children'> & {
+  text?: string;
+  children?: React.ReactNode;
+};
+
+/**
+ * Atomic Typography component
+ * Wraps Material-UI Typography with text prop from features.json
+ */
+export default function Typography({ text, children, ...props }: TypographyProps) {
+  return <MuiTypography {...props}>{text || children}</MuiTypography>;
+}
diff --git a/src/components/atoms/index.ts b/src/components/atoms/index.ts
new file mode 100644
index 0000000..939a569
--- /dev/null
+++ b/src/components/atoms/index.ts
@@ -0,0 +1,47 @@
+// Atomic component library - exported from features.json componentProps
+export { default as Button } from './Button';
+export { default as TextField } from './TextField';
+export { default as Typography } from './Typography';
+export { default as IconButton } from './IconButton';
+export { default as Icon } from './Icon';
+
+// Re-export commonly used Material-UI components for consistency
+export {
+  Box,
+  Grid,
+  Paper,
+  Card,
+  CardContent,
+  Dialog,
+  DialogTitle,
+  DialogContent,
+  DialogActions,
+  Select,
+  MenuItem,
+  FormControl,
+  InputLabel,
+  Checkbox,
+  FormControlLabel,
+  AppBar,
+  Toolbar,
+  Drawer,
+  Alert,
+  CircularProgress,
+  Pagination,
+  Tabs,
+  Tab,
+  Table,
+  TableBody,
+  TableCell,
+  TableContainer,
+  TableHead,
+  TableRow,
+  List,
+  ListItem,
+  ListItemText,
+  ListItemIcon,
+  Accordion,
+  AccordionSummary,
+  AccordionDetails,
+  Chip,
+} from '@mui/material';
diff --git a/src/config/features.json b/src/config/features.json
index e5c7c7f..4d1d1d4 100644
--- a/src/config/features.json
+++ b/src/config/features.json
@@ -2944,6 +2944,7 @@
         "type": "integer",
         "description": "Query result limit",
         "validation": "^[0-9]+$",
+        "sanitize": "integer",
         "min": 1,
         "max": 10000,
         "default": 100
diff --git a/src/utils/ComponentTreeRenderer.tsx b/src/utils/ComponentTreeRenderer.tsx
index 20cc8fc..f072376 100644
--- a/src/utils/ComponentTreeRenderer.tsx
+++ b/src/utils/ComponentTreeRenderer.tsx
@@ -236,7 +236,7 @@ function interpolateValue(value: any, data: Record<string, any>): any {
         const [, operation, argsStr] = mathOp;
         const safeOps = ['abs', 'ceil', 'floor', 'round', 'max', 'min'];
         
-        if (safeOps.includes(operation)) {
+        if (operation && argsStr && safeOps.includes(operation)) {
           try {
             // Parse arguments safely
             const args = argsStr.split(',').map(arg => {
@@ -258,11 +258,13 @@ function interpolateValue(value: any, data: Record<string, any>): any {
     const ternaryMatch = expression.match(/^(.+?)\s*\?\s*(.+?)\s*:\s*(.+)$/);
     if (ternaryMatch) {
       const [, condition, trueValue, falseValue] = ternaryMatch;
-      const conditionResult = evaluateCondition(condition.trim(), data);
-      const targetValue = conditionResult ? trueValue.trim() : falseValue.trim();
-      
-      // Recursively interpolate the result
-      return interpolateValue(`{{${targetValue}}}`, data);
+      if (condition && trueValue !== undefined && falseValue !== undefined) {
+        const conditionResult = evaluateCondition(condition.trim(), data);
+        const targetValue = conditionResult ? trueValue.trim() : falseValue.trim();
+        
+        // Recursively interpolate the result
+        return interpolateValue(`{{${targetValue}}}`, data);
+      }
     }
     
     // Simple property access