diff --git a/v2/lib/theme/Loading.js b/v2/lib/theme/Loading/index.js
similarity index 60%
rename from v2/lib/theme/Loading.js
rename to v2/lib/theme/Loading/index.js
index d7438f21c7..f63bce8148 100644
--- a/v2/lib/theme/Loading.js
+++ b/v2/lib/theme/Loading/index.js
@@ -7,12 +7,20 @@
 
 import React from 'react';
 
+import styles from './styles.module.css';
+
 export default props => {
   if (props.error) {
+    console.log(props.error);
     return <div align="center">Error</div>;
   }
   if (props.pastDelay) {
-    return <div align="center">Loading...</div>;
+    return (
+      <div className={styles.loader}>
+        <p>Please wait a moment</p>
+        <div className={styles.loaderSpinning} />
+      </div>
+    );
   }
   return null;
 };
diff --git a/v2/lib/theme/Loading/styles.module.css b/v2/lib/theme/Loading/styles.module.css
new file mode 100644
index 0000000000..c783a0a18a
--- /dev/null
+++ b/v2/lib/theme/Loading/styles.module.css
@@ -0,0 +1,22 @@
+.loader {
+  width: 100%;
+  height: 49px;
+  position: fixed;
+  text-align: center;
+  top: 35%;
+}
+
+.loaderSpinning {
+  width: 49px;
+  height: 49px;
+  margin: 0 auto;
+  border: 5px solid #cccccc;
+  border-radius: 50%;
+  border-top: 5px solid #1d4d8b;
+  animation: loader-spin infinite 1s linear;
+}
+
+@keyframes loader-spin {
+  from { transform: rotate(0deg); }
+  to { transform: rotate(360deg); }
+}
\ No newline at end of file