diff --git a/src/components/MessageView/MessageView.stories.mdx b/src/components/MessageView/MessageView.stories.mdx
index e2710c9..d2b62ee 100644
--- a/src/components/MessageView/MessageView.stories.mdx
+++ b/src/components/MessageView/MessageView.stories.mdx
@@ -1,45 +1,51 @@
-import { Meta, Story, Canvas } from '@storybook/addon-docs/blocks';
+import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs/blocks';
 import MessageView from "./MessageView";
 
-The MessageView displays an [EmailHeader](/?path=/docs/components-emailheader--default-without-props) and the content of a message.
+<Meta
+    title="Components/MessageView"
+    component={MessageView}
+/>
 
-<Meta title="Components/MessageView" component={MessageView}/>
+Displays an [EmailHeader](/?path=/docs/components-emailheader) and the content of a message.
 
 # Default
 
 <Canvas>
-  <Story name="Default">
-     {args => <MessageView {...args} />}
+    <Story 
+        name="Default"
+    >
+        {args => <MessageView {...args} />}
     </Story>
 </Canvas>
 
-# With Message Data
+# With Data
 
 <Canvas>
-  <Story name="With Data" args={{
-      datetime: "2020-04-15T15:45:45+0000",
-      from_name:"Ricksy, Jennifer R",
-      from_email:"jricksy@purdue.edu",
-      to:[
-    {
-        "name": "csite@ecn.purdue.edu",
-        "email": "csite@ecn.purdue.edu"
-    }
-    ],
-      cc:[],
-      content: [
-        "I still can't get this to work.  And now the \"trial\" version that I was\n",
-        "using has expired so I can't do anything with a pdf.\n",
-        "\n",
-        "Jenny\n",
-        "\n",
-        "Jenny Ricksy\n",
-        "Burke Graduate Program Administrator\n",
-        "Lyles School of Civil Engineering\n",
-        "Ph: 765-494-2436    Fax: 765-494-0395\n",
-        "HAMP 1141G\n"
-    ],
-  }}>
-     {args => <MessageView {...args} />}
+    <Story 
+        name="With Data" 
+        args={{
+            datetime: "2020-04-15T15:45:45+0000",
+            from_name:"Ricksy, Jennifer R",
+            from_email:"jricksy@purdue.edu",
+            to:[
+                { "name": "csite@ecn.purdue.edu", "email": "csite@ecn.purdue.edu" }
+            ],
+            content: [
+                "I still can't get this to work.  And now the \"trial\" version that I was\n",
+                "using has expired so I can't do anything with a pdf.\n",
+                "\n",
+                "Jenny\n",
+                "\n",
+                "Jenny Ricksy\n",
+                "Burke Graduate Program Administrator\n",
+                "Lyles School of Civil Engineering\n",
+                "Ph: 765-494-2436    Fax: 765-494-0395\n",
+                "HAMP 1141G\n"
+            ],
+        }}
+    >
+        {args => <MessageView {...args} />}
     </Story>
-</Canvas>
\ No newline at end of file
+</Canvas>
+
+<ArgsTable of={MessageView} />
\ No newline at end of file