diff --git a/packages/core/src/components/CheckboxTree/CheckboxTree.stories.tsx b/packages/core/src/components/CheckboxTree/CheckboxTree.stories.tsx
index 12f19b17a1..d5a33f0f9b 100644
--- a/packages/core/src/components/CheckboxTree/CheckboxTree.stories.tsx
+++ b/packages/core/src/components/CheckboxTree/CheckboxTree.stories.tsx
@@ -60,7 +60,7 @@ const CHECKBOX_TREE_ITEMS = [
 ];
 
 export default {
-  title: 'CheckboxTree',
+  title: 'Inputs/CheckboxTree',
   component: CheckboxTree,
 };
 
diff --git a/packages/core/src/components/Select/Select.stories.tsx b/packages/core/src/components/Select/Select.stories.tsx
index feb5c1cffb..833f3bc5f4 100644
--- a/packages/core/src/components/Select/Select.stories.tsx
+++ b/packages/core/src/components/Select/Select.stories.tsx
@@ -18,7 +18,7 @@ import React from 'react';
 import { Select } from '.';
 
 export default {
-  title: 'Select',
+  title: 'Inputs/Select',
   component: Select,
 };
 
diff --git a/packages/core/src/layout/ItemCard/ItemCard.stories.tsx b/packages/core/src/layout/ItemCard/ItemCard.stories.tsx
index 998856e041..2b48cc4630 100644
--- a/packages/core/src/layout/ItemCard/ItemCard.stories.tsx
+++ b/packages/core/src/layout/ItemCard/ItemCard.stories.tsx
@@ -24,7 +24,7 @@ export default {
 
 export const Default = () => (
   <Grid container spacing={4}>
-    <Grid item xs={6} sm={4} md={2}>
+    <Grid item xs={3}>
       <ItemCard
         title="Item Card"
         description="This is the description of an Item Card"
@@ -33,7 +33,7 @@ export const Default = () => (
         onClick={() => {}}
       />
     </Grid>
-    <Grid item xs={6} sm={4} md={2}>
+    <Grid item xs={3}>
       <ItemCard
         title="Item Card"
         description="This is the description of an Item Card"
@@ -47,7 +47,7 @@ export const Default = () => (
 
 export const Tags = () => (
   <Grid container spacing={4}>
-    <Grid item xs={6} sm={4} md={2}>
+    <Grid item xs={3}>
       <ItemCard
         title="Item Card"
         description="This is a Item Card"
@@ -55,7 +55,7 @@ export const Tags = () => (
         label="Button"
       />
     </Grid>
-    <Grid item xs={6} sm={4} md={2}>
+    <Grid item xs={3}>
       <ItemCard
         title="Item Card"
         description="This is a Item Card"
diff --git a/packages/core/src/layout/Page/Page.stories.tsx b/packages/core/src/layout/Page/Page.stories.tsx
index 2a60f182a1..fd2ddf3153 100644
--- a/packages/core/src/layout/Page/Page.stories.tsx
+++ b/packages/core/src/layout/Page/Page.stories.tsx
@@ -36,7 +36,7 @@ import {
 import { Box, Typography, Link, Chip, Grid } from '@material-ui/core';
 
 export default {
-  title: 'Layout/Example Plugin',
+  title: 'Plugins/Examples',
   component: Page,
 };
 
diff --git a/packages/storybook/.storybook/preview.js b/packages/storybook/.storybook/preview.js
index f92e07b045..dd2d2e9cdd 100644
--- a/packages/storybook/.storybook/preview.js
+++ b/packages/storybook/.storybook/preview.js
@@ -28,18 +28,7 @@ addParameters({
 export const parameters = {
   options: {
     storySort: {
-      order: [
-        'Example Plugin',
-        'Header',
-        'Sidebar',
-        'Tabs',
-        'Information Card',
-        'Tabbed Card',
-        'Table',
-        'Status',
-        'Trendline',
-        'Progress Card',
-      ],
+      order: ['Plugins', 'Layout', 'Navigation'],
     },
   },
 };
diff --git a/plugins/user-settings/src/components/SidebarWithSettings.stories.tsx b/plugins/user-settings/src/components/SidebarWithSettings.stories.tsx
deleted file mode 100644
index fd3d6ce0f0..0000000000
--- a/plugins/user-settings/src/components/SidebarWithSettings.stories.tsx
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2020 Spotify AB
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import React from 'react';
-import {
-  ApiProvider,
-  ApiRegistry,
-  appThemeApiRef,
-  AppThemeSelector,
-  configApiRef,
-  ConfigReader,
-  FeatureFlags,
-  featureFlagsApiRef,
-  Sidebar,
-  SidebarDivider,
-  SidebarSpace,
-} from '@backstage/core';
-import { MemoryRouter } from 'react-router';
-import { Settings } from './Settings';
-import { SettingsPage } from './SettingsPage';
-
-export default {
-  title: 'Plugins/user-settings/Settings',
-  component: Settings,
-  decorators: [
-    (storyFn: () => JSX.Element) => (
-      <MemoryRouter initialEntries={['/']}>{storyFn()}</MemoryRouter>
-    ),
-  ],
-};
-
-export const SidebarItem = () => (
-  <Sidebar>
-    <SidebarSpace />
-    <SidebarDivider />
-    <Settings />
-  </Sidebar>
-);
-
-const createConfig = () =>
-  ConfigReader.fromConfigs([
-    {
-      context: '',
-      data: {
-        auth: {
-          providers: {},
-        },
-      },
-    },
-  ]);
-
-const config = createConfig();
-
-const apis = ApiRegistry.from([
-  [configApiRef, config],
-  [featureFlagsApiRef, new FeatureFlags()],
-  [appThemeApiRef, AppThemeSelector.createWithStorage([])],
-]);
-
-export const TheSettingsPage = () => (
-  <div style={{ border: '1px solid #ddd' }}>
-    <ApiProvider apis={apis}>
-      <SettingsPage />
-    </ApiProvider>
-  </div>
-);