diff --git a/src/client/components/StorybookProvider.js b/src/client/components/StorybookProvider.js
deleted file mode 100644
index 4e26f8d4972858d329badf211ea4458d4ec2a0ca..0000000000000000000000000000000000000000
--- a/src/client/components/StorybookProvider.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import React from 'react'
-import { Router } from 'react-router'
-import { Provider } from 'react-redux'
-
-const StorybookProvider = ({ children, store }) => (
-  <Provider store={store}>
-    <Router>
-      {children}
-    </Router>
-  </Provider>
-)
-
-export default StorybookProvider
diff --git a/src/client/components/facet_bar/FacetBar.js b/src/client/components/facet_bar/FacetBar.js
index f4843fdcb44d0a6ce490f553ba4a9aa072df2744..eeb967c81f2df81882bf7cb33b0b93bbd0f61a1b 100644
--- a/src/client/components/facet_bar/FacetBar.js
+++ b/src/client/components/facet_bar/FacetBar.js
@@ -61,6 +61,9 @@ const styles = theme => ({
   }
 })
 
+/**
+ * A component for rendering a preconfigured set of facets and related information.
+ */
 class FacetBar extends React.Component {
   constructor (props) {
     super(props)
@@ -351,11 +354,12 @@ FacetBar.propTypes = {
   clientFSClearResults: PropTypes.func,
   clientFSUpdateQuery: PropTypes.func,
   clientFSUpdateFacet: PropTypes.func,
-  map: PropTypes.object,
   defaultActiveFacets: PropTypes.instanceOf(Set).isRequired,
   leafletMap: PropTypes.object,
   showError: PropTypes.func,
   rootUrl: PropTypes.string.isRequired
 }
 
+export const FacetBarComponent = FacetBar
+
 export default withStyles(styles)(FacetBar)
diff --git a/src/client/components/facet_bar/FacetBar.stories.js b/src/client/components/facet_bar/FacetBar.stories.js
new file mode 100644
index 0000000000000000000000000000000000000000..9e863f1c7f64228cf471551145db90893679bc3f
--- /dev/null
+++ b/src/client/components/facet_bar/FacetBar.stories.js
@@ -0,0 +1,33 @@
+import React from 'react'
+import FacetBar, { FacetBarComponent } from './FacetBar'
+import { useSelector } from 'react-redux'
+import { perspectiveConfig } from '../../configs/sampo/PerspectiveConfig'
+
+export default {
+  component: FacetBarComponent,
+  title: 'Sampo-UI/facet_bar/FacetBar'
+}
+
+export const basic = props => {
+  const perspective = perspectiveConfig[0]
+  const facetResults = useSelector(state => state.perspective1)
+  const perspective1Facets = useSelector(state => state.perspective1Facets)
+  const perspective1FacetsConstrainSelf = useSelector(state => state.perspective1FacetsConstrainSelf)
+  return (
+    <FacetBar
+      facetedSearchMode='serverFS'
+      facetData={perspective1Facets}
+      facetDataConstrainSelf={perspective1FacetsConstrainSelf}
+      facetClass={perspective.id}
+      resultClass={perspective.id}
+      fetchingResultCount={facetResults.fetchingResultCount}
+      resultCount={facetResults.resultCount}
+      fetchFacet={() => null}
+      fetchFacetConstrainSelf={() => null}
+      fetchResultCount={() => null}
+      updateFacetOption={() => null}
+      defaultActiveFacets={perspective.defaultActiveFacets}
+      rootUrl=''
+    />
+  )
+}
diff --git a/src/client/components/facet_results/ObjectListItemEvent.stories.js b/src/client/components/facet_results/ObjectListItemEvent.stories.js
index b96b0aa0def6d5697bf0e6a12f72a35ebfd4e7bb..3196703d5d6147052a95deb0abe5f55db03bed06 100644
--- a/src/client/components/facet_results/ObjectListItemEvent.stories.js
+++ b/src/client/components/facet_results/ObjectListItemEvent.stories.js
@@ -3,7 +3,7 @@ import ObjectListItemEvent, { ObjectListItemEventComponent } from './ObjectListI
 
 export default {
   component: ObjectListItemEventComponent,
-  title: 'ObjectListItemEvent'
+  title: 'Sampo-UI/facet_results/ObjectListItemEvent'
 }
 
 export const basic = () =>
diff --git a/src/client/components/main_layout/TextPage.stories.js b/src/client/components/main_layout/TextPage.stories.js
index 7d6445bca05408024b524463020b6e0400be0b92..f4d561fc0ff403cdcf108f1b0235a3da50064b8a 100644
--- a/src/client/components/main_layout/TextPage.stories.js
+++ b/src/client/components/main_layout/TextPage.stories.js
@@ -3,7 +3,7 @@ import TextPage from './TextPage'
 
 export default {
   component: TextPage,
-  title: 'TextPage'
+  title: 'Sampo-UI/main_layout/TextPage'
 }
 
 export const basic = () => <TextPage>Some content</TextPage>
diff --git a/src/client/components/main_layout/TopBar.stories.js b/src/client/components/main_layout/TopBar.stories.js
index c8a7ff4edad74c1ab7daa64df24d42ddee56ccaa..2f246581e2285490e3ea530953f135eecce58a7a 100644
--- a/src/client/components/main_layout/TopBar.stories.js
+++ b/src/client/components/main_layout/TopBar.stories.js
@@ -6,7 +6,7 @@ import { perspectiveConfig } from '../../configs/sampo/PerspectiveConfig'
 
 export default {
   component: TopBar,
-  title: 'TopBar'
+  title: 'Sampo-UI/main_layout/TopBar'
 }
 
 export const basic = props => {