diff --git a/frontend/src/component/ui/Spinner.scss b/frontend/src/component/ui/Spinner.module.scss
similarity index 100%
rename from frontend/src/component/ui/Spinner.scss
rename to frontend/src/component/ui/Spinner.module.scss
diff --git a/frontend/src/component/ui/Spinner.tsx b/frontend/src/component/ui/Spinner.tsx
index 0f0372129..0212381f7 100644
--- a/frontend/src/component/ui/Spinner.tsx
+++ b/frontend/src/component/ui/Spinner.tsx
@@ -1,19 +1,19 @@
 import React, { Component } from 'react';
 
-import './Spinner.scss';
+import styles from './Spinner.module.scss';
 
 export class Spinner extends Component {
   render() {
     return (
-      <div className={'spinner'}>
-        <div className={'solar-system'}>
-          <div className={'earth-orbit orbit'}>
-            <div className={'planet earth'} />
-            <div className={'venus-orbit orbit'}>
-              <div className={'planet venus'} />
-              <div className={'mercury-orbit orbit'}>
-                <div className={'planet mercury'} />
-                <div className={'sun'} />
+      <div className={styles.spinner}>
+        <div className={styles['solar-system']}>
+          <div className={`${styles['earth-orbit']} ${styles['orbit']}`}>
+            <div className={`${styles['planet']} ${styles['earth']}`} />
+            <div className={`${styles['venus-orbit']} ${styles['orbit']}`}>
+              <div className={`${styles['planet']} ${styles['venus']}`} />
+              <div className={`${styles['mercury-orbit']} ${styles['orbit']}`}>
+                <div className={`${styles['planet']} ${styles['mercury']}`} />
+                <div className={styles['sun']} />
               </div>
             </div>
           </div>
diff --git a/story/src/4-Spinner.stories.tsx b/story/src/4-Spinner.stories.tsx
new file mode 100644
index 000000000..ef97ec7fd
--- /dev/null
+++ b/story/src/4-Spinner.stories.tsx
@@ -0,0 +1,19 @@
+import React from 'react';
+import { Spinner } from '../../frontend/src/component/ui/Spinner';
+
+export default {
+  title: 'UI/Spinner',
+  component: Spinner
+};
+
+export const spinner = () => {
+  return (
+    <div
+      style={{
+        backgroundColor: '#000'
+      }}
+    >
+      <Spinner />
+    </div>
+  );
+};