diff --git a/stories/dropdown.stories.tsx b/stories/dropdown.stories.tsx
index f5816c4d..a7811855 100644
--- a/stories/dropdown.stories.tsx
+++ b/stories/dropdown.stories.tsx
@@ -19,7 +19,7 @@ export const Menu = () => {
             </ul>
         </DropDown>
     );
-};
+}
 Menu.storyName = 'menu';
 
 export const MenuWrapper = () => {
@@ -29,5 +29,5 @@ export const MenuWrapper = () => {
             action: () => window.alert('Clicked!'),
         }]} />
     );
-};
+}
 MenuWrapper.storyName = 'menu wrapper';
diff --git a/stories/forms.stories.tsx b/stories/forms.stories.tsx
index 09cbe398..5084d1a1 100644
--- a/stories/forms.stories.tsx
+++ b/stories/forms.stories.tsx
@@ -25,5 +25,5 @@ export const Default = () => {
             )}
         </Form>
     );
-};
+}
 Default.storyName = 'default';
diff --git a/stories/notifications.stories.tsx b/stories/notifications.stories.tsx
index 204fb545..f0ce70b4 100644
--- a/stories/notifications.stories.tsx
+++ b/stories/notifications.stories.tsx
@@ -18,19 +18,21 @@ export default {
     title: 'Notifications',
 };
 
-export const Default = () => (
-    <App>
-        {(apis) => [
-            {type: NotificationType.Success, title: 'Success'},
-            {type: NotificationType.Warning, title: 'Warning'},
-            {type: NotificationType.Error, title: 'Error'},
-        ].map((item) => (
-            <button key={item.type} className='argo-button argo-button--base' onClick={() =>
-                apis.notifications.show({type: item.type, content: <div>{getMessage()}</div>})
-            }>
-                {item.title}
-            </button>
-        ))}
-    </App>
-);
+export const Default = () => {
+    return (
+        <App>
+            {(apis) => [
+                {type: NotificationType.Success, title: 'Success'},
+                {type: NotificationType.Warning, title: 'Warning'},
+                {type: NotificationType.Error, title: 'Error'},
+            ].map((item) => (
+                <button key={item.type} className='argo-button argo-button--base' onClick={() =>
+                    apis.notifications.show({type: item.type, content: <div>{getMessage()}</div>})
+                }>
+                    {item.title}
+                </button>
+            ))}
+        </App>
+    );
+}
 Default.storyName = 'default';
diff --git a/stories/page.stories.tsx b/stories/page.stories.tsx
index 02b74ece..5cf8c475 100644
--- a/stories/page.stories.tsx
+++ b/stories/page.stories.tsx
@@ -100,21 +100,23 @@ export const Default = () => {
 };
 Default.storyName = 'default';
 
-export const DynamicToolbar = () => (
-    <Router history={history}>
-        <Route path={location.pathname}>
-            <Layout navItems={navItems}>
-                <Page title='Hello world!' toolbar={timer(0, 1000).pipe(map(() => ({breadcrumbs: [
-                    { title: 'hello ' + new Date().toLocaleTimeString() },
-                ]})))}>
-                    <div style={{ padding: '1em' }}>
-                        <div className='white-box'>Hello world!</div>
-                    </div>
-                </Page>
-            </Layout>
-        </Route>
-    </Router>
-);
+export const DynamicToolbar = () => {
+    return (
+        <Router history={history}>
+            <Route path={location.pathname}>
+                <Layout navItems={navItems}>
+                    <Page title='Hello world!' toolbar={timer(0, 1000).pipe(map(() => ({breadcrumbs: [
+                        { title: 'hello ' + new Date().toLocaleTimeString() },
+                    ]})))}>
+                        <div style={{ padding: '1em' }}>
+                            <div className='white-box'>Hello world!</div>
+                        </div>
+                    </Page>
+                </Layout>
+            </Route>
+        </Router>
+    );
+}
 DynamicToolbar.storyName = 'dynamic toolbar';
 
 export const CompactNavBar = () => {
@@ -140,39 +142,43 @@ export const CompactNavBar = () => {
 };
 CompactNavBar.storyName = 'compact nav bar';
 
-export const CustomTopBarTitle = () => (
-    <Router history={history}>
-        <Route path={location.pathname}>
-            <Layout navItems={navItems}>
-                <Page title='helmet title' topBarTitle='Top Bar Title' toolbar={{breadcrumbs: [
-                    { title: 'Apps ', path: '/applications' },
-                    { title: 'app name' },
-                ]}}>
-                    <div style={{ padding: '1em' }}>
-                        <div className='white-box'>
-                            Test
+export const CustomTopBarTitle = () => {
+    return (
+        <Router history={history}>
+            <Route path={location.pathname}>
+                <Layout navItems={navItems}>
+                    <Page title='helmet title' topBarTitle='Top Bar Title' toolbar={{breadcrumbs: [
+                        { title: 'Apps ', path: '/applications' },
+                        { title: 'app name' },
+                    ]}}>
+                        <div style={{ padding: '1em' }}>
+                            <div className='white-box'>
+                                Test
+                            </div>
                         </div>
-                    </div>
-                </Page>
-            </Layout>
-        </Route>
-    </Router>
-);
+                    </Page>
+                </Layout>
+            </Route>
+        </Router>
+    );
+}
 CustomTopBarTitle.storyName = 'custom top bar title';
 
-export const BackgroundColor = () => (
-    <Router history={history}>
-        <Route path={location.pathname}>
-            <Layout navItems={navItems} navBarStyle={{ backgroundColor: 'red' }}>
-                <Page title='Hello world!'>
-                    <div style={{ padding: '1em' }}>
-                        <div className='white-box'>
-                            Hello world!
+export const BackgroundColor = () => {
+    return (
+        <Router history={history}>
+            <Route path={location.pathname}>
+                <Layout navItems={navItems} navBarStyle={{ backgroundColor: 'red' }}>
+                    <Page title='Hello world!'>
+                        <div style={{ padding: '1em' }}>
+                            <div className='white-box'>
+                                Hello world!
+                            </div>
                         </div>
-                    </div>
-                </Page>
-            </Layout>
-        </Route>
-    </Router>
-);
+                    </Page>
+                </Layout>
+            </Route>
+        </Router>
+    );
+}
 BackgroundColor.storyName = 'background color';