diff --git a/client/.storybook/preview.js b/client/.storybook/preview.js
index 00a21d01f4..05544d95d5 100644
--- a/client/.storybook/preview.js
+++ b/client/.storybook/preview.js
@@ -2,5 +2,12 @@ import "bootstrap/dist/css/bootstrap.css"
 import "index.css"
 
 export const parameters = {
-  actions: { argTypesRegex: "^on[A-Z].*" }
+  actions: { argTypesRegex: "^on[A-Z].*" },
+  options: {
+    // Sort stories alphabetically
+    storySort: (a, b) =>
+      a[1].kind === b[1].kind
+        ? 0
+        : a[1].id.localeCompare(b[1].id, undefined, { numeric: true })
+  }
 }
diff --git a/client/stories/Button.stories.js b/client/stories/Button.stories.js
index 2854110cae..c871c58ee9 100644
--- a/client/stories/Button.stories.js
+++ b/client/stories/Button.stories.js
@@ -1,9 +1,8 @@
 import React from "react"
-
 import { Button } from "./Button"
 
 export default {
-  title: "Example/Button",
+  title: "Storybook/Examples/Button",
   component: Button,
   argTypes: {
     backgroundColor: { control: "color" }
diff --git a/client/stories/Header.stories.js b/client/stories/Header.stories.js
index 37c563fc2b..06bcb1fc0f 100644
--- a/client/stories/Header.stories.js
+++ b/client/stories/Header.stories.js
@@ -1,9 +1,8 @@
 import React from "react"
-
 import { Header } from "./Header"
 
 export default {
-  title: "Example/Header",
+  title: "Storybook/Examples/Header",
   component: Header
 }
 
diff --git a/client/stories/HeatMap.stories.js b/client/stories/HeatMap.stories.js
index 627115dfcc..323eff4abe 100644
--- a/client/stories/HeatMap.stories.js
+++ b/client/stories/HeatMap.stories.js
@@ -6,6 +6,8 @@ import HeatMap from "../src/components/HeatMap"
 import * as layouts from "../src/layouts"
 
 const containerStyle = {
+  float: "right",
+  overflow: "hidden",
   width: "100%",
   minWidth: "700px", // week 7days, at least 100px width for a day
   height: "350px", // week 7days, at least 50px height for a day,
diff --git a/client/stories/Introduction.stories.mdx b/client/stories/Introduction.stories.mdx
index cdf16c59c7..ee02199888 100644
--- a/client/stories/Introduction.stories.mdx
+++ b/client/stories/Introduction.stories.mdx
@@ -8,7 +8,7 @@ import Plugin from './assets/plugin.svg';
 import Repo from './assets/repo.svg';
 import StackAlt from './assets/stackalt.svg';
 
-<Meta title="Example/Introduction" />
+<Meta title="Storybook/Introduction" />
 
 <style>{`
   .subheading {
@@ -73,7 +73,7 @@ import StackAlt from './assets/stackalt.svg';
     display: block;
     margin-bottom: 2px;
   }
-  
+
   .link-item img {
     height: 40px;
     width: 40px;
@@ -111,7 +111,7 @@ import StackAlt from './assets/stackalt.svg';
     display: inline-block;
   }
 
-  
+
 `}</style>
 
 # Welcome to Storybook
diff --git a/client/stories/Page.stories.js b/client/stories/Page.stories.js
index 4952a48c19..8caf526c4d 100644
--- a/client/stories/Page.stories.js
+++ b/client/stories/Page.stories.js
@@ -1,10 +1,9 @@
 import React from "react"
-
-import { Page } from "./Page"
 import * as HeaderStories from "./Header.stories"
+import { Page } from "./Page"
 
 export default {
-  title: "Example/Page",
+  title: "Storybook/Examples/Page",
   component: Page
 }