diff --git a/packages/grafana-ui/src/components/Badge/Badge.story.tsx b/packages/grafana-ui/src/components/Badge/Badge.story.tsx
index e76f72e5cb1..5c2e1f15e94 100644
--- a/packages/grafana-ui/src/components/Badge/Badge.story.tsx
+++ b/packages/grafana-ui/src/components/Badge/Badge.story.tsx
@@ -3,7 +3,7 @@ import { boolean, text, select } from '@storybook/addon-knobs';
 import { Badge, BadgeColor } from './Badge';
 
 export default {
-  title: 'Other/Badge',
+  title: 'Data Display/Badge',
   component: Badge,
   decorators: [],
   parameters: {
diff --git a/packages/grafana-ui/src/components/StatsPicker/StatsPicker.story.tsx b/packages/grafana-ui/src/components/StatsPicker/StatsPicker.story.tsx
index 77258c6c043..e50f3546f5c 100644
--- a/packages/grafana-ui/src/components/StatsPicker/StatsPicker.story.tsx
+++ b/packages/grafana-ui/src/components/StatsPicker/StatsPicker.story.tsx
@@ -18,7 +18,7 @@ interface State {
   stats: string[];
 }
 
-export class WrapperWithState extends PureComponent<any, State> {
+class WrapperWithState extends PureComponent<any, State> {
   constructor(props: any) {
     super(props);
     this.state = {