diff --git a/firebase.json b/firebase.json
index b0d3626..34b1e49 100644
--- a/firebase.json
+++ b/firebase.json
@@ -1,6 +1,12 @@
 {
   "hosting": {
     "public": "dist",
+    "rewrites": [
+      {
+        "source": "**",
+        "destination": "/index.html"
+      }
+    ],
     "ignore": [
       "firebase.json",
       "**/.*",
diff --git a/src/pages/AccountPage.vue b/src/pages/AccountPage.vue
index 93d398a..6d6ec24 100644
--- a/src/pages/AccountPage.vue
+++ b/src/pages/AccountPage.vue
@@ -3,17 +3,22 @@
 <h1>Account Settings</h1>
 <p v-if="this.user">Your Email: {{ this.user.email }}</p>
 <div>
-    <h3>Enter your current password to edit account settings</h3>
-    <input type="password" v-model="currentPassword" placeholder="Enter existing password">
     <h3>Send a password reset email</h3>
     <input @click="resetPasswordEmail()" type="submit" name="" value="Send Password reset email">
 
+    <h3>Enter your current password to edit account settings</h3>
+    <input v-if="showCurrentPassword" type="text" v-model="currentPassword" placeholder="Enter existing password">
+    <input v-else type="password" v-model="currentPassword" placeholder="Enter existing password">
+    <button @click="this.showCurrentPassword = !this.showCurrentPassword">Eye</button>
+
     <h3>Change email</h3>
     <input type="email" v-model="newEmail" aria-describedby="emailHelp" placeholder="Enter new email">
     <input @click="updateUserEmail()" type="submit" name="" value="Update Email">
 
     <h3>Change password</h3>
-    <input type="password" v-model="newPassword" placeholder="Enter new password">
+    <input v-if="showNewPassword" type="text" v-model="newPassword" placeholder="Enter new password">
+    <input v-else type="password" v-model="newPassword" placeholder="Enter new password">
+    <button @click="this.showNewPassword = !this.showNewPassword">Eye</button>
     <input @click="updateUserPassword()" type="submit" name="" value="Update Password">
 
     <h3>Delete account</h3>
@@ -57,6 +62,8 @@ export default {
             toastMessage: "",
             toastBackground: "",
             reAuthSuccessful: false,
+            showCurrentPassword: false,
+            showNewPassword: false,
             toast
         }
     },
diff --git a/src/pages/LoginPage.vue b/src/pages/LoginPage.vue
index 2884170..0089348 100644
--- a/src/pages/LoginPage.vue
+++ b/src/pages/LoginPage.vue
@@ -8,7 +8,9 @@
       <p>Email Address</p>
       <input type="email" v-model="email" aria-describedby="emailHelp" placeholder="Enter email">
       <p>Password</p>
-      <input type="password" v-model="password" placeholder="Enter password">
+      <input v-if="showPassword" type="text" v-model="password" placeholder="Enter password">
+      <input v-else type="password" v-model="password" placeholder="Enter password">
+      <button @click="this.showPassword = !this.showPassword">Eye</button>
       <input @click="login" type="submit" name="" value="Login">
       <a @click="forgotPassword = !forgotPassword; this.email = ''">Forgot password?</a>
       <a><router-link to="/signup">Don't have an account?</router-link></a>
@@ -53,6 +55,7 @@ export default {
       toastMessage: "",
       toastBackground: "",
       forgotPassword: false,
+      showPassword: false,
       toast
     }
   },
@@ -161,7 +164,7 @@ h1 {
   margin-bottom: 20px;
 }
 
-.loginbox input[type="email"], input[type="password"] {
+.loginbox input[type="email"], input[type="password"], input[type="text"] {
   border: none;
   border-bottom: 1px solid #fff;
   background: transparent;
@@ -175,7 +178,6 @@ h1 {
   cursor: pointer;
   background: #66a3ff;
   color: #000;
-
 }
 
 .loginbox a {
diff --git a/src/pages/SignUpPage.vue b/src/pages/SignUpPage.vue
index 6832a36..aca9e68 100644
--- a/src/pages/SignUpPage.vue
+++ b/src/pages/SignUpPage.vue
@@ -7,7 +7,9 @@
     <p>Email Address</p>
     <input type="email" v-model="email" aria-describedby="emailHelp" placeholder="Enter email">
     <p>Password</p>
-    <input type="password" v-model="password" placeholder="Enter password">
+    <input v-if="showPassword" type="text" v-model="password" placeholder="Enter password">
+    <input v-else type="password" v-model="password" placeholder="Enter password">
+    <button @click="this.showPassword = !this.showPassword">Eye</button>
     <a>Passwords must have 6 or more characters</a>
     <input @click="signup" type="submit" name="" value="Sign Up">
     <a><router-link to="/login">Already have an account?</router-link></a>
@@ -39,6 +41,7 @@ export default {
       password: "",
       toastMessage: "",
       toastBackground: "",
+      showPassword: true,
       toast
     }
   },
@@ -129,7 +132,7 @@ h1 {
   margin-bottom: 20px;
 }
 
-.loginbox input[type="email"], input[type="password"] {
+.loginbox input[type="email"], input[type="password"], input[type="text"] {
   border: none;
   border-bottom: 1px solid #fff;
   background: transparent;
diff --git a/src/router/routes.js b/src/router/routes.js
index 074e778..6f1a9ce 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -25,6 +25,5 @@ export default [
     { path: "/account", component:loadPage('AccountPage'), beforeEnter: isAuth },
     { path: "/signup", component:loadPage('SignUpPage') },
     { path: "/login", component:loadPage('LoginPage') },
-    { path: "/404", component:loadPage('404Page') },
     { path: "/:catchAll(.*)", component:loadPage('404Page') }
 ]
\ No newline at end of file