diff --git a/examples/cra-kitchen-sink/src/__snapshots__/storyshots.test.js.snap b/examples/cra-kitchen-sink/src/__snapshots__/storyshots.test.js.snap
index 4b9d5dd48368..950ae0406fcb 100644
--- a/examples/cra-kitchen-sink/src/__snapshots__/storyshots.test.js.snap
+++ b/examples/cra-kitchen-sink/src/__snapshots__/storyshots.test.js.snap
@@ -193,7 +193,7 @@ exports[`Storyshots Addon Info.Decorator Use Info as story decorator 1`] = `
             }
           }
         >
-          <p
+          <div
             style={
               Object {
                 "WebkitFontSmoothing": "antialiased",
@@ -204,7 +204,7 @@ exports[`Storyshots Addon Info.Decorator Use Info as story decorator 1`] = `
             }
           >
             Info could be used as a global or local decorator as well.
-          </p>
+          </div>
         </div>
         <div>
           <h1
@@ -590,7 +590,7 @@ exports[`Storyshots Addon Info.GitHub issues #1814 1`] = `
             }
           }
         >
-          <p
+          <div
             style={
               Object {
                 "WebkitFontSmoothing": "antialiased",
@@ -601,7 +601,7 @@ exports[`Storyshots Addon Info.GitHub issues #1814 1`] = `
             }
           >
             Allow Duplicate DisplayNames for HOC #1814
-          </p>
+          </div>
         </div>
         <div>
           <h1
@@ -946,7 +946,7 @@ exports[`Storyshots Addon Info.Markdown Displays Markdown in description 1`] = `
           >
             You can use markdown in your withInfo() description.
           </h4>
-          <p
+          <div
             style={
               Object {
                 "WebkitFontSmoothing": "antialiased",
@@ -957,7 +957,7 @@ exports[`Storyshots Addon Info.Markdown Displays Markdown in description 1`] = `
             }
           >
             Sometimes you might want to manually include some code examples:
-          </p>
+          </div>
           <pre>
             <code
               className="hljs js"
@@ -968,7 +968,7 @@ exports[`Storyshots Addon Info.Markdown Displays Markdown in description 1`] = `
               }
             />
           </pre>
-          <p
+          <div
             style={
               Object {
                 "WebkitFontSmoothing": "antialiased",
@@ -992,7 +992,7 @@ exports[`Storyshots Addon Info.Markdown Displays Markdown in description 1`] = `
               link
             </a>
              to your project as well.
-          </p>
+          </div>
         </div>
         <div>
           <h1
@@ -1374,7 +1374,7 @@ exports[`Storyshots Addon Info.Options.header Shows or hides Info Addon header 1
             }
           }
         >
-          <p
+          <div
             style={
               Object {
                 "WebkitFontSmoothing": "antialiased",
@@ -1385,7 +1385,7 @@ exports[`Storyshots Addon Info.Options.header Shows or hides Info Addon header 1
             }
           >
             The Info Addon header should be hidden
-          </p>
+          </div>
         </div>
         <div>
           <h1
@@ -1730,7 +1730,7 @@ exports[`Storyshots Addon Info.Options.inline Inlines component inside story 1`]
           }
         }
       >
-        <p
+        <div
           style={
             Object {
               "WebkitFontSmoothing": "antialiased",
@@ -1741,7 +1741,7 @@ exports[`Storyshots Addon Info.Options.inline Inlines component inside story 1`]
           }
         >
           Component should be inlined between description and PropType table
-        </p>
+        </div>
       </div>
       <div>
         <h1
@@ -2127,7 +2127,7 @@ exports[`Storyshots Addon Info.Options.propTables Shows additional component pro
             }
           }
         >
-          <p
+          <div
             style={
               Object {
                 "WebkitFontSmoothing": "antialiased",
@@ -2138,7 +2138,7 @@ exports[`Storyshots Addon Info.Options.propTables Shows additional component pro
             }
           >
             There should be a prop table added for a component not included in the story
-          </p>
+          </div>
         </div>
         <div>
           <h1
@@ -2623,7 +2623,7 @@ exports[`Storyshots Addon Info.Options.propTablesExclude Exclude component from
             }
           }
         >
-          <p
+          <div
             style={
               Object {
                 "WebkitFontSmoothing": "antialiased",
@@ -2634,7 +2634,7 @@ exports[`Storyshots Addon Info.Options.propTablesExclude Exclude component from
             }
           >
             This can exclude extraneous components from being displayed in prop tables.
-          </p>
+          </div>
         </div>
         <div>
           <h1
@@ -3130,7 +3130,7 @@ exports[`Storyshots Addon Info.Options.source Shows or hides Info Addon source 1
             }
           }
         >
-          <p
+          <div
             style={
               Object {
                 "WebkitFontSmoothing": "antialiased",
@@ -3141,7 +3141,7 @@ exports[`Storyshots Addon Info.Options.source Shows or hides Info Addon source 1
             }
           >
             The Info Addon source section should be hidden
-          </p>
+          </div>
         </div>
         <div>
           <h1
@@ -3821,7 +3821,7 @@ exports[`Storyshots Addon Info.React Docgen Comments from Flow declarations 1`]
             }
           }
         >
-          <p
+          <div
             style={
               Object {
                 "WebkitFontSmoothing": "antialiased",
@@ -3832,7 +3832,7 @@ exports[`Storyshots Addon Info.React Docgen Comments from Flow declarations 1`]
             }
           >
             Comments above the Flow declarations should be extracted from the React component file itself and rendered in the Info Addon prop table
-          </p>
+          </div>
         </div>
         <div>
           <h1
@@ -4195,7 +4195,7 @@ exports[`Storyshots Addon Info.React Docgen Comments from PropType declarations
             }
           }
         >
-          <p
+          <div
             style={
               Object {
                 "WebkitFontSmoothing": "antialiased",
@@ -4206,7 +4206,7 @@ exports[`Storyshots Addon Info.React Docgen Comments from PropType declarations
             }
           >
             Comments above the PropType declarations should be extracted from the React component file itself and rendered in the Info Addon prop table
-          </p>
+          </div>
         </div>
         <div>
           <h1
@@ -4668,7 +4668,7 @@ exports[`Storyshots Addon Info.React Docgen Comments from component declaration
             }
           }
         >
-          <p
+          <div
             style={
               Object {
                 "WebkitFontSmoothing": "antialiased",
@@ -4679,7 +4679,7 @@ exports[`Storyshots Addon Info.React Docgen Comments from component declaration
             }
           >
             Comments above the component declaration should be extracted from the React component file itself and rendered below the Info Addon heading
-          </p>
+          </div>
         </div>
         <div>
           <h1
@@ -5319,7 +5319,7 @@ exports[`Storyshots Button addons composition 1`] = `
             }
           }
         >
-          <p
+          <div
             style={
               Object {
                 "WebkitFontSmoothing": "antialiased",
@@ -5330,7 +5330,7 @@ exports[`Storyshots Button addons composition 1`] = `
             }
           >
             see Notes panel for composition info
-          </p>
+          </div>
         </div>
         <div>
           <h1
@@ -5731,7 +5731,7 @@ exports[`Storyshots Button with new info 1`] = `
             }
           }
         >
-          <p
+          <div
             style={
               Object {
                 "WebkitFontSmoothing": "antialiased",
@@ -5755,7 +5755,7 @@ exports[`Storyshots Button with new info 1`] = `
               info addon
             </a>
              with its new painless API.
-          </p>
+          </div>
         </div>
         <div>
           <h1
@@ -6303,7 +6303,7 @@ exports[`Storyshots Button with some info 1`] = `
             }
           }
         >
-          <p
+          <div
             style={
               Object {
                 "WebkitFontSmoothing": "antialiased",
@@ -6327,7 +6327,7 @@ exports[`Storyshots Button with some info 1`] = `
               info addon
             </a>
              with its painful API.
-          </p>
+          </div>
         </div>
         <div>
           <h1