diff --git a/.gitignore b/.gitignore
index 6571d85..92b8fe5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 node_modules/.bin/acorn
 node_modules/
-build/
\ No newline at end of file
+build/
+.DS_Store
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f17369..89e2ffe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [1.0.1] - 2018-01-18
+### Fixed
+- You now stay logged in when you refresh the app after logging in
+
 ## [0.0.7] - 2018-01-18
 ### Added
 - Map to measurement page.
diff --git a/firebase.json b/firebase.json
index d4ab75f..7af1794 100644
--- a/firebase.json
+++ b/firebase.json
@@ -42,7 +42,7 @@
       "headers": [
         {
           "key": "Link",
-          "value": "</bundle.80def.js>; rel=preload; as=script, </style.a240d.css>; rel=preload; as=style"
+          "value": "</bundle.f7598.js>; rel=preload; as=script, </style.02afd.css>; rel=preload; as=style"
         }
       ]
     },
@@ -51,61 +51,61 @@
       "headers": [
         {
           "key": "Link",
-          "value": "</bundle.80def.js>; rel=preload; as=script, </style.a240d.css>; rel=preload; as=style, </route-account.chunk.14754.js>; rel=preload; as=script"
+          "value": "</bundle.f7598.js>; rel=preload; as=script, </style.02afd.css>; rel=preload; as=style, </route-account.chunk.f77b6.js>; rel=preload; as=script"
         }
       ]
     },
     {
-      "source": "/addMedia",
+      "source": "/measurement",
       "headers": [
         {
           "key": "Link",
-          "value": "</bundle.80def.js>; rel=preload; as=script, </style.a240d.css>; rel=preload; as=style, </route-addMedia.chunk.0993d.js>; rel=preload; as=script"
+          "value": "</bundle.f7598.js>; rel=preload; as=script, </style.02afd.css>; rel=preload; as=style, </route-measurement.chunk.d31ca.js>; rel=preload; as=script"
         }
       ]
     },
     {
-      "source": "/overview",
+      "source": "/addMedia",
       "headers": [
         {
           "key": "Link",
-          "value": "</bundle.80def.js>; rel=preload; as=script, </style.a240d.css>; rel=preload; as=style, </route-overview.chunk.ac036.js>; rel=preload; as=script"
+          "value": "</bundle.f7598.js>; rel=preload; as=script, </style.02afd.css>; rel=preload; as=style, </route-addMedia.chunk.0993d.js>; rel=preload; as=script"
         }
       ]
     },
     {
-      "source": "/login",
+      "source": "/overview",
       "headers": [
         {
           "key": "Link",
-          "value": "</bundle.80def.js>; rel=preload; as=script, </style.a240d.css>; rel=preload; as=style, </route-login.chunk.b8935.js>; rel=preload; as=script"
+          "value": "</bundle.f7598.js>; rel=preload; as=script, </style.02afd.css>; rel=preload; as=style, </route-overview.chunk.ac036.js>; rel=preload; as=script"
         }
       ]
     },
     {
-      "source": "/add",
+      "source": "/Media",
       "headers": [
         {
           "key": "Link",
-          "value": "</bundle.80def.js>; rel=preload; as=script, </style.a240d.css>; rel=preload; as=style, </route-add.chunk.d9d39.js>; rel=preload; as=script"
+          "value": "</bundle.f7598.js>; rel=preload; as=script, </style.02afd.css>; rel=preload; as=style, </route-Media.chunk.fcf75.js>; rel=preload; as=script"
         }
       ]
     },
     {
-      "source": "/measurement",
+      "source": "/login",
       "headers": [
         {
           "key": "Link",
-          "value": "</bundle.80def.js>; rel=preload; as=script, </style.a240d.css>; rel=preload; as=style, </route-measurement.chunk.b0abb.js>; rel=preload; as=script"
+          "value": "</bundle.f7598.js>; rel=preload; as=script, </style.02afd.css>; rel=preload; as=style, </route-login.chunk.b8935.js>; rel=preload; as=script"
         }
       ]
     },
     {
-      "source": "/Media",
+      "source": "/add",
       "headers": [
         {
           "key": "Link",
-          "value": "</bundle.80def.js>; rel=preload; as=script, </style.a240d.css>; rel=preload; as=style, </route-Media.chunk.53605.js>; rel=preload; as=script"
+          "value": "</bundle.f7598.js>; rel=preload; as=script, </style.02afd.css>; rel=preload; as=style, </route-add.chunk.d9d39.js>; rel=preload; as=script"
         }
       ]
     }
diff --git a/src/components/app.js b/src/components/app.js
index e8a8363..869ea0d 100644
--- a/src/components/app.js
+++ b/src/components/app.js
@@ -19,13 +19,21 @@ export default class App extends Component {
     this.authenticate = this.authenticate.bind(this);
 
     this.state = {
-      uid: 'hl8tgg53mkQIUmIh6D8SUsReTGD2',
-      email: 'user@uva.nl',
-      // email: null,
-      // uid: null,
+      // uid: 'hl8tgg53mkQIUmIh6D8SUsReTGD2',
+      // email: 'user@uva.nl',
+      email: null,
+      uid: null,
     };
   }
 
+  componentDidMount() {
+    firebase.auth(fireApp).onAuthStateChanged((user) => {
+      if (user) {
+        this.authHandler(null, { user });
+      }
+    });
+  }
+
   logout(e) {
     e.preventDefault();
     firebase.auth(fireApp).signOut();
@@ -45,6 +53,19 @@ export default class App extends Component {
       });
   }
 
+  authHandler(err, authData) {
+    console.log(authData);
+    if (err) {
+      console.error(err);
+      return;
+    }
+
+    this.setState({
+      uid: authData.user.uid,
+      email: authData.user.email,
+    });
+  }
+
   handleRoute = e => {
     this.currentUrl = e.url;
   };
diff --git a/src/components/removeButton/style.scss b/src/components/removeButton/style.scss
index 4156df2..cfc8327 100644
--- a/src/components/removeButton/style.scss
+++ b/src/components/removeButton/style.scss
@@ -1,9 +1,13 @@
 .remove {
+  background: none;
+  border: 0;
+  border-radius: 0;
   color: var(--main-color);
   float: right;
   font-size: 16px;
   font-weight: 700;
   margin-top: 10px;
+  outline: 0;
   padding: 0;
   text-align: right;
   text-transform: uppercase;