diff --git a/app.js b/app.js
index 17c86ee..ca931af 100644
--- a/app.js
+++ b/app.js
@@ -94,8 +94,9 @@ app.get('/login/refresh', async (req, res) => {
 })
 
 app.get('/logout', (req, res) => {
-    res.clearCookie("bearer_token")
-    res.clearCookie("refresh_token")
+    var json = req.headers.cookie.split(';')
+    res.clearCookie("bearer_token", json[0].replace('bearer_token=', ''))
+    res.clearCookie("refresh_token", json[1].replace(' refresh_token=', ''))
     res.render('logout.html')
 })
 
diff --git a/views/index.html b/views/index.html
index 7910245..81e0f03 100644
--- a/views/index.html
+++ b/views/index.html
@@ -21,19 +21,27 @@
     var signedIn = <%= signedIn %>
     var tokenRefreshed = <%= tokenRefreshed %>
     if (signedIn == false) {
+        document.getElementById("refreshedTokenNotification").hidden = true
         document.getElementById("signedIn").hidden = true
         document.getElementById("signedOut").hidden = false
-        document.getElementById("logoutButton").hidden = true
         document.getElementById("refreshTokenButton").hidden = true
-        document.getElementById("refreshedTokenNotification").hidden = true    
+        document.getElementById("loginButton").hidden = false
+        document.getElementById("logoutButton").hidden = true
+    }
+    if (signedIn == true) {
+        document.getElementById("refreshedTokenNotification").hidden = true
+        document.getElementById("signedIn").hidden = false
+        document.getElementById("signedOut").hidden = true
+        document.getElementById("refreshTokenButton").hidden = false
+        document.getElementById("loginButton").hidden = true
+        document.getElementById("logoutButton").hidden = false
     }
     if (tokenRefreshed == true) {
         document.getElementById("refreshedTokenNotification").hidden = false
+        document.getElementById("signedIn").hidden = false
         document.getElementById("signedOut").hidden = true
-    }
-    if (signedIn == true) {
+        document.getElementById("refreshTokenButton").hidden = true
         document.getElementById("loginButton").hidden = true
-        document.getElementById("signedOut").hidden = true
-        document.getElementById("refreshedTokenNotification").hidden = true    
+        document.getElementById("logoutButton").hidden = false
     }
 </script>
\ No newline at end of file