diff --git a/components/BallsFeed.vue b/components/firebase/feeds.vue
similarity index 70%
rename from components/BallsFeed.vue
rename to components/firebase/feeds.vue
index 8e01e2a77..693eaad85 100644
--- a/components/BallsFeed.vue
+++ b/components/firebase/feeds.vue
@@ -1,14 +1,14 @@
 <template>
   <div>
     <p v-for="ball in store.ballsInFeed" :key="ball.id">
-      <span>{{ ball.author_name }}:</span>
+      <span> {{ ball.author_name }}:</span>
       {{ ball.message }}
     </p>
   </div>
 </template>
 
 <script>
-import { store } from "../functions/store";
+import { store } from "../../functions/store";
 
 export default {
   data() {
diff --git a/components/InputForm.vue b/components/firebase/inputform.vue
similarity index 76%
rename from components/InputForm.vue
rename to components/firebase/inputform.vue
index 25c655e3c..5f5e040ab 100644
--- a/components/InputForm.vue
+++ b/components/firebase/inputform.vue
@@ -1,12 +1,12 @@
 <template>
   <form @submit.prevent="formPost">
     <input type="text" autofocus ref="inputMessage" v-model="message" />
-    <input type="submit" value="DUNK!" />
+    <input :disabled="!this.message" type="submit" value="DUNK!" />
   </form>
 </template>
 
 <script>
-import { store } from "../functions/store";
+import { store } from "../../functions/store";
 
 export default {
   data() {
diff --git a/components/Login.vue b/components/firebase/login.vue
similarity index 79%
rename from components/Login.vue
rename to components/firebase/login.vue
index e05d4dc77..7b0198437 100644
--- a/components/Login.vue
+++ b/components/firebase/login.vue
@@ -7,19 +7,18 @@
 
 <script>
 import firebase from "firebase/app";
-import "firebase/auth";
 
 export default {
   methods: {
     signInWithGoogle() {
-      var provider = new firebase.auth.GoogleAuthProvider();
+      const provider = new firebase.auth.GoogleAuthProvider();
       firebase
         .auth()
         .signInWithPopup(provider)
         .catch(err => alert(err.message || err));
     },
     signInWithGithub() {
-      var provider = new firebase.auth.GithubAuthProvider();
+      const provider = new firebase.auth.GithubAuthProvider();
       firebase
         .auth()
         .signInWithPopup(provider)
diff --git a/functions/store.js b/functions/store.js
index 918a9a0c4..de02e6fce 100644
--- a/functions/store.js
+++ b/functions/store.js
@@ -4,7 +4,7 @@ import "firebase/firestore";
 import "firebase/auth";
 
 // Initialize Firebase, copied from cloud console
-var config = {
+const firebaseConfig = {
   apiKey: "AIzaSyCMsFreESs58-hRxTtiqQrIcimh4i1wbsM",
   authDomain: "postwoman-api.firebaseapp.com",
   databaseURL: "https://postwoman-api.firebaseio.com",
@@ -14,7 +14,7 @@ var config = {
   appId: "1:421993993223:web:ec0baa8ee8c02ffa1fc6a2",
   measurementId: "G-ERJ6025CEB"
 };
-firebase.initializeApp(config);
+firebase.initializeApp(firebaseConfig);
 
 // a reference to the Balls collection
 const ballsCollection = firebase.firestore().collection("balls");
diff --git a/layouts/default.vue b/layouts/default.vue
index 6991ce845..e2088b376 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -346,16 +346,12 @@
                 </v-popover>
               </span>
 
-
-
-    <Login v-if="!store.currentUser" />
-    <div v-else>
-      <button @click="logout">Log out</button>
-      <InputForm />
-      <BallsFeed />
-    </div>
-
-
+              <login v-if="!store.currentUser" />
+              <div v-else>
+                <button @click="logout">Log out</button>
+                <inputform />
+                <ballsfeed />
+              </div>
             </div>
           </header>
           <nuxt />
@@ -645,8 +641,9 @@ export default {
   components: {
     logo: () => import("../components/logo"),
     modal: () => import("../components/modal"),
-
-    Login, InputForm, BallsFeed
+    login: () => import("../components/firebase/login"),
+    inputform: () => import("../components/firebase/inputform"),
+    ballsfeed: () => import("../components/firebase/feeds")
   },
 
   methods: {
@@ -657,11 +654,12 @@ export default {
       };
     },
 
-
     logout() {
-      firebase.auth().signOut()
-        .catch((err) => alert(err.message || err));
-    },
+      firebase
+        .auth()
+        .signOut()
+        .catch(err => alert(err.message || err));
+    }
   },
 
   data() {