diff --git a/src/components/QueueSelector/QueueSelector.stories.mdx b/src/components/QueueSelector/QueueSelector.stories.mdx
index bbe3554..d64a04d 100644
--- a/src/components/QueueSelector/QueueSelector.stories.mdx
+++ b/src/components/QueueSelector/QueueSelector.stories.mdx
@@ -1,67 +1,31 @@
-import { Meta, Story, Canvas } from '@storybook/addon-docs/blocks';
+import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs/blocks';
 import QueueSelector from "./QueueSelector";
 import { Box } from '@material-ui/core';
 
+<Meta
+    title="Components/QueueSelector"
+    component={QueueSelector}
+    
+/>
 
 Allows the selection, removal and viewing of active queues. Its extends the [MUI Autocomplete component](https://material-ui.com/components/autocomplete/).
 
-<Meta title="Components/QueueSelector"
-decorators={[  (Story) => (
-      <Box m={4} p={4}>
-            <Story/>
-      </Box>
-    ),]}
- component={QueueSelector}/>
-
-# QueueSelector Default
-
-<Canvas>
-  <Story name="Closed" args={{
-      open:false,
-      setOpen:() => null,
-      value: [
-    {
-        'name': 'bidc',
-        'number_of_items': 5
-    },
-    {
-        'name': 'epics',
-        'number_of_items': 6
-    },
-    {
-        'name': 'wang',
-        'number_of_items': 13
-    }
-    ],
-      setValue:() => null
-  }}>
-     {args => <QueueSelector {...args} />}
-    </Story>
-</Canvas>
-
-# QueueSelector Open
-
 <Canvas>
-  <Story name="Open" args={{
-      open:true,
-      setOpen:() => null,
-      value: [
-    {
-        'name': 'bidc',
-        'number_of_items': 5
-    },
-    {
-        'name': 'epics',
-        'number_of_items': 6
-    },
-    {
-        'name': 'wang',
-        'number_of_items': 13
-    }
-    ],
-      setValue:() => null
-  }}>
-     {args => <QueueSelector {...args} />}
+    <Story 
+        name="Default" 
+        args={{
+            open:false,
+            setOpen:() => null,
+            value: [
+                { 'name': 'bidc', 'number_of_items': 5 },
+                { 'name': 'epics', 'number_of_items': 6 },
+                { 'name': 'wang', 'number_of_items': 13 }
+            ],
+            setValue:() => null
+        }}
+    >
+        { args => <QueueSelector {...args} /> }
     </Story>
 </Canvas>
 
+<ArgsTable of={QueueSelector} />
\ No newline at end of file