diff --git a/helpers/getOverview.js b/helpers/getOverview.js
index 23dcf3a..e084b42 100644
--- a/helpers/getOverview.js
+++ b/helpers/getOverview.js
@@ -36,7 +36,7 @@ module.exports = async function getOverview(symbol) {
     }))
     .catch((err) => {
       console.log(err);
-      res.status(500).render("error/500", { layout: "layouts/simple-page" });
+      res.status(500).render("error/500");
     });
 
   return data;
diff --git a/routes/api/addBalance.js b/routes/api/addBalance.js
index 3d15d61..3d3e1e7 100644
--- a/routes/api/addBalance.js
+++ b/routes/api/addBalance.js
@@ -47,7 +47,7 @@ router.post("/", ensureAuth, async (req, res) => {
       },
       (err) => {
         if (err && err.type === "StripeCardError") {
-          return res.render("error/500", { layout: "layouts/simple-page" });
+          return res.render("error/500");
         } else {
           console.log("Payment Success");
         }
@@ -79,7 +79,7 @@ router.post("/", ensureAuth, async (req, res) => {
     res.redirect("/done");
   } catch (err) {
     console.error(err);
-    res.render("error/500", { layout: "layouts/simple-page" });
+    res.render("error/500");
   }
 });
 
diff --git a/routes/api/cart.js b/routes/api/cart.js
index 89c8a70..ea2fa0a 100644
--- a/routes/api/cart.js
+++ b/routes/api/cart.js
@@ -71,7 +71,7 @@ router.post("/buy", ensureAuth, async (req, res) => {
     }
   } catch (err) {
     console.error(err);
-    res.render("error/500", { layout: "layouts/simple-page" });
+    res.render("error/500");
   }
 });
 
diff --git a/routes/api/edit.js b/routes/api/edit.js
index 237fb78..ff64701 100644
--- a/routes/api/edit.js
+++ b/routes/api/edit.js
@@ -60,7 +60,7 @@ router.put("/", ensureAuth, async (req, res) => {
     res.redirect("/portfolio");
   } catch (err) {
     console.error(err);
-    return res.render("error/500", { layout: "layouts/simple-page" });
+    return res.render("error/500");
   }
 });
 
diff --git a/routes/api/transaction.js b/routes/api/transaction.js
index d6ecc62..c6fce91 100644
--- a/routes/api/transaction.js
+++ b/routes/api/transaction.js
@@ -119,7 +119,7 @@ router.put("/confirm", ensureAuth, async (req, res) => {
     res.redirect("/done");
   } catch (err) {
     console.error(err);
-    res.render("error/500", { layout: "layouts/simple-page" });
+    res.render("error/500");
   }
 });
 
@@ -159,7 +159,7 @@ router.get("/", ensureAuth, async (req, res) => {
     }
   } catch (err) {
     console.error(err);
-    res.render("error/500", { layout: "layouts/simple-page" });
+    res.render("error/500");
   }
 });
 
@@ -208,10 +208,10 @@ router.post("/sell/:id", ensureAuth, async (req, res) => {
       }
     });
 
-    res.redirect("/done", { layout: "layouts/simple-page" });
+    res.redirect("/done");
   } catch (err) {
     console.error(err);
-    res.render("error/500", { layout: "layouts/simple-page" });
+    res.render("error/500");
   }
 });
 
diff --git a/routes/api/user.js b/routes/api/user.js
index cc83642..4389ba1 100644
--- a/routes/api/user.js
+++ b/routes/api/user.js
@@ -96,31 +96,11 @@ router.post("/signup", ensureGuest, (req, res) => {
 // @route    GET /user/signin
 // @access   Public
 router.post("/signin", ensureGuest, (req, res, next) => {
-  const { password, email } = req.body;
-  let errors = [];
-
-  if (!password || !email) {
-    errors.push({ msg: "Please enter all fields" });
-  }
-
-  if (password.length < 6) {
-    errors.push({ msg: "Password must be longer than 6 characters" });
-  }
-
-  if (errors.length > 0) {
-    res.render("login", {
-      layout: "layouts/login",
-      errors,
-      email,
-      password,
-    });
-  } else {
-    passport.authenticate("local", {
-      successRedirect: "/portfolio",
-      failureRedirect: "/",
-      failureFlash: true,
-    })(req, res, next);
-  }
+  passport.authenticate("local", {
+    successRedirect: "/portfolio",
+    failureRedirect: "/",
+    failureFlash: true,
+  })(req, res, next);
 });
 
 module.exports = router;
diff --git a/routes/api/view.js b/routes/api/view.js
index 7da627e..4d37b98 100644
--- a/routes/api/view.js
+++ b/routes/api/view.js
@@ -102,7 +102,7 @@ router.get("/:symbol", ensureAuth, async (req, res) => {
     })
     .catch((err) => {
       console.error(err);
-      res.render("error/404", { layout: "layouts/simple-page" });
+      res.render("error/404");
     });
 });
 
diff --git a/views/done.ejs b/views/done.ejs
index c345a62..2ffd3c5 100644
--- a/views/done.ejs
+++ b/views/done.ejs
@@ -1,109 +1,134 @@
-<!---Card component-->
-<div class="m-2">
-  <div
-    class="flex justify-center items-center done-container max-w-sm mx-auto flex p-5 bg-white rounded-lg shadow-2xl"
-  >
-    <div class="py-4">
-      <h1 class="heading font-bold mb-2 text-6xl text-center text-green-700">
-        Done
-      </h1>
-      <div class="flex justify-center items-center text-green-400 my-6">
-        <i id="check" class="far fa-check-circle fa-7x"></i>
-      </div>
-      <div>
-        <p class="text-black-700 text-center text-2xl font-semibold mt-4">
-          Thank you for using TradeByte
-        </p>
-      </div>
-      <div class="flex justify-center items-center mt-4">
-        <button
-          onClick="back()"
-          class="bg-gray-700 hover:bg-red-400 text-white font-bold py-2 px-3 md:px-5 mx-2 mt-4 mb-3 rounded-full"
-        >
-          <i class="far fa-times-circle"></i> Back
-        </button>
+<!--Thankyou PAGE -->
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Tradebyte</title>
+    <link
+      rel="stylesheet"
+      href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0-2/css/all.min.css"
+      integrity="sha256-46r060N2LrChLLb5zowXQ72/iKKNiw/lAmygmHExk/o="
+      crossorigin="anonymous"
+    />
+    <link
+      href="https://unpkg.com/tailwindcss@^1.0/dist/tailwind.min.css"
+      rel="stylesheet"
+    />
+    <link rel="stylesheet" href="css/style.css" />
+  </head>
 
-        <button
-          class="relative share bg-gray-700 hover:bg-blue-400 text-white font-bold py-2 px-3 md:px-5 mx-2 mt-4 mb-3 rounded-full cursor-pointer"
-          onclick="share(this)"
-        >
-          <i class="fas fa-share-alt"></i> Share
-          <div
-            class="container absolute top-0 left-0 w-48 bg-white shadow-lg rounded mt-10 mb-12 -ml-12 sm:ml-0"
+  <body class="flex justify-center items-center min-h-screen">
+    <!---Card component-->
+    <div class="m-2">
+      <div
+        class="flex justify-center items-center done-container max-w-sm mx-auto flex p-5 bg-white rounded-lg shadow-2xl"
+      >
+        <div class="py-4">
+          <h1
+            class="heading font-bold mb-2 text-6xl text-center text-green-700"
           >
-            <div
-              class="addthis_inline_share_toolbox text-center"
-              data-url="<%= host %>/share/<%= userId %>"
-            ></div>
-            <div class="addthis_sharing_toolbox text-center"></div>
+            Done
+          </h1>
+          <div class="flex justify-center items-center text-green-400 my-6">
+            <i id="check" class="far fa-check-circle fa-7x"></i>
+          </div>
+          <div>
+            <p class="text-black-700 text-center text-2xl font-semibold mt-4">
+              Thank you for using TradeByte
+            </p>
+          </div>
+          <div class="flex justify-center items-center mt-4">
+            <button
+              onClick="back()"
+              class="bg-gray-700 hover:bg-red-400 text-white font-bold py-2 px-3 md:px-5 mx-2 mt-4 mb-3 rounded-full"
+            >
+              <i class="far fa-times-circle"></i> Back
+            </button>
+
+            <button
+              class="relative share bg-gray-700 hover:bg-blue-400 text-white font-bold py-2 px-3 md:px-5 mx-2 mt-4 mb-3 rounded-full cursor-pointer"
+              onclick="share(this)"
+            >
+              <i class="fas fa-share-alt"></i> Share
+              <div
+                class="container absolute top-0 left-0 w-48 bg-white shadow-lg rounded mt-10 mb-12 -ml-12 sm:ml-0"
+              >
+                <div
+                  class="addthis_inline_share_toolbox text-center"
+                  data-url="<%= host %>/share/<%= userId %>"
+                ></div>
+                <div class="addthis_sharing_toolbox text-center"></div>
+              </div>
+            </button>
           </div>
-        </button>
+        </div>
       </div>
     </div>
-  </div>
-</div>
 
-<!---------------------JavaScript-------------------------->
-<script>
-  let AddThisJSLoaded = false; // Addthis not loaded yet
-  let clickedOnShare = false; // share button is not clicked
+    <!---------------------JavaScript-------------------------->
+    <script>
+      let AddThisJSLoaded = false; // Addthis not loaded yet
+      let clickedOnShare = false; // share button is not clicked
 
-  function back() {
-    window.location.href = "/";
-  }
+      function back() {
+        window.location.href = "/";
+      }
 
-  //this is a publicer id
-  let AddthisPubID = "ra-5f3af90d32b2c7af";
-  let AddThisJS =
-    "//s7.addthis.com/js/300/addthis_widget.js#pubid=ra-5f3af90d32b2c7af";
+      //this is a publicer id
+      let AddthisPubID = "ra-5f3af90d32b2c7af";
+      let AddThisJS =
+        "//s7.addthis.com/js/300/addthis_widget.js#pubid=ra-5f3af90d32b2c7af";
 
-  function share(button) {
-    if (!AddThisJSLoaded && !clickedOnShare) {
-      //when AddThis not loaded
-      clickedOnShare = true; // share button is clicked
-      showLoading(button);
-      shareByAddThis(button);
-    } else {
-      toogleAddThisButtons(button);
-    }
-  }
+      function share(button) {
+        if (!AddThisJSLoaded && !clickedOnShare) {
+          //when AddThis not loaded
+          clickedOnShare = true; // share button is clicked
+          showLoading(button);
+          shareByAddThis(button);
+        } else {
+          toogleAddThisButtons(button);
+        }
+      }
 
-  function shareByAddThis(button) {
-    let script = document.createElement("script");
-    script.async = true;
-    script.src = AddThisJS;
+      function shareByAddThis(button) {
+        let script = document.createElement("script");
+        script.async = true;
+        script.src = AddThisJS;
 
-    script.onload = function () {
-      clickedOnShare = false; // AddThis js is loaded
-      addthis.user.ready(function (data) {
-        AddThisJSLoaded = true; //loaded and ready to use
-        hideLoading(button);
-        showAddThisButtons(button);
-      });
-    };
+        script.onload = function () {
+          clickedOnShare = false; // AddThis js is loaded
+          addthis.user.ready(function (data) {
+            AddThisJSLoaded = true; //loaded and ready to use
+            hideLoading(button);
+            showAddThisButtons(button);
+          });
+        };
 
-    script.onerror = function () {
-      clickedOnShare = false; // Addthis JS  failed to laod
-      hideLoading(button);
-    };
+        script.onerror = function () {
+          clickedOnShare = false; // Addthis JS  failed to laod
+          hideLoading(button);
+        };
 
-    document.body.appendChild(script);
-  }
+        document.body.appendChild(script);
+      }
 
-  function showLoading(button) {
-    button.classList.add("loading");
-  }
+      function showLoading(button) {
+        button.classList.add("loading");
+      }
 
-  function hideLoading(button) {
-    //hide the loading
-    button.classList.remove("loading");
-  }
+      function hideLoading(button) {
+        //hide the loading
+        button.classList.remove("loading");
+      }
 
-  function showAddThisButtons(button) {
-    button.classList.add("showAddThisButtons");
-  }
+      function showAddThisButtons(button) {
+        button.classList.add("showAddThisButtons");
+      }
 
-  function toogleAddThisButtons(button) {
-    button.classList.toogle("showAddThisButtons");
-  }
-</script>
+      function toogleAddThisButtons(button) {
+        button.classList.toogle("showAddThisButtons");
+      }
+    </script>
+  </body>
+</html>
diff --git a/views/error/404.ejs b/views/error/404.ejs
index d1104f0..9553453 100644
--- a/views/error/404.ejs
+++ b/views/error/404.ejs
@@ -1,27 +1,56 @@
-<div class="flex justify-center items-center m-2 max-w-xs">
-  <div class="bg-white rounded-lg shadow-xl py-10 px-2">
-    <div class="mb-4">
-      <h1 class="text-center text-6xl font-bold">
-        4 <i class="text-blue-600 fas fa-frown"></i> 4
-      </h1>
-      <h2 class="text-center text-black text-2xl font-bold">PAGE NOT FOUND</h2>
-      <p class="text-black text-center px-2 text-xl mt-2 break-words">
-        The page/stock you are looking for was moved or doesn't exist
-      </p>
-    </div>
-    <div>
-      <p class="text-black text-center text-xl">Let's get back</p>
-    </div>
-    <div style="display: flex; justify-content: center">
-      <button
-        onclick="back()"
-        class="text-blue-600 hover:bg-blue-100 font-bold py-2 px-4 mt-4 border border-blue-700 rounded"
-      >
-        Go to Homepage
-      </button>
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>TradeByte</title>
+    <link
+      rel="stylesheet"
+      href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0-2/css/all.min.css"
+      integrity="sha256-46r060N2LrChLLb5zowXQ72/iKKNiw/lAmygmHExk/o="
+      crossorigin="anonymous"
+    />
+    <link
+      href="https://unpkg.com/tailwindcss@^1.0/dist/tailwind.min.css"
+      rel="stylesheet"
+    />
+    <link rel="stylesheet" href="css/style.css" />
+    <link
+      rel="shortcut icon"
+      href="../images/TradeByte-Favicon.png"
+      type="image/x-icon"
+    />
+  </head>
+
+  <body class="flex justify-center items-center min-h-screen">
+    <div class="flex justify-center items-center m-2 max-w-xs">
+      <div class="bg-white rounded-lg shadow-xl py-10 px-2">
+        <div class="mb-4">
+          <h1 class="text-center text-6xl font-bold">
+            4 <i class="text-blue-600 fas fa-frown"></i> 4
+          </h1>
+          <h2 class="text-center text-black text-2xl font-bold">
+            PAGE NOT FOUND
+          </h2>
+          <p class="text-black text-center px-2 text-xl mt-2 break-words">
+            The page/stock you are looking for was moved or doesn't exist
+          </p>
+        </div>
+        <div>
+          <p class="text-black text-center text-xl">Let's get back</p>
+        </div>
+        <div class="flex justify-center">
+          <button
+            onclick="back()"
+            class="text-blue-600 hover:bg-blue-100 font-bold py-2 px-4 mt-4 border border-blue-700 rounded"
+          >
+            Go to Homepage
+          </button>
+        </div>
+      </div>
     </div>
-  </div>
-</div>
+  </body>
+</html>
 
 <!-- JavaScript -->
 
diff --git a/views/error/500.ejs b/views/error/500.ejs
index 2d89498..ef0a25e 100644
--- a/views/error/500.ejs
+++ b/views/error/500.ejs
@@ -1,28 +1,83 @@
-<div class="flex justify-center items-center m-2 max-w-md">
-  <div class="bg-white rounded-lg shadow-xl py-4 px-2">
-    <div class="mb-4 flex justify-center items-center flex-col px-2 sm:px-6">
-      <h1 class="text-4xl text-center text-black font-bold">ERROR 500</h1>
-      <p class="para text-red-600 text-center mb-2 font-semibold">
-        Unexpected error :(
-      </p>
-      <i class="fas fa-cogs fa-7x my-4"></i>
-      <p class="text-black text-center text-xl mt-2">
-        There seems to be a problem
-      </p>
-      <p class="text-black text-center text-xl mt-2">Let's get to back</p>
-    </div>
-    <div>
-      <div class="flex justify-center items-center">
-        <button
-          onclick="back()"
-          class="text-blue-700 hover:bg-blue-100 font-bold py-2 px-4 mb-2 border border-blue-700 rounded"
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>TradeByte</title>
+    <link
+      rel="stylesheet"
+      href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0-2/css/all.min.css"
+      integrity="sha256-46r060N2LrChLLb5zowXQ72/iKKNiw/lAmygmHExk/o="
+      crossorigin="anonymous"
+    />
+    <link
+      href="https://unpkg.com/tailwindcss@^1.0/dist/tailwind.min.css"
+      rel="stylesheet"
+    />
+    <link rel="stylesheet" href="css/style.css" />
+    <link
+      rel="shortcut icon"
+      href="../images/TradeByte-Favicon.png"
+      type="image/x-icon"
+    />
+
+    <style>
+      #error {
+        color: gray;
+      }
+
+      #cogs {
+        display: flex;
+        justify-content: center;
+      }
+      .error {
+        color: #3a7bd5;
+      }
+      .container {
+        width: 450px;
+      }
+
+      h1 {
+        font-size: 100px;
+        font-weight: bold;
+      }
+
+      .para {
+        font-weight: bold;
+      }
+    </style>
+  </head>
+
+  <body class="flex justify-center items-center min-h-screen">
+    <div class="flex justify-center items-center m-2 max-w-md">
+      <div class="bg-white rounded-lg shadow-xl py-4 px-2">
+        <div
+          class="mb-4 flex justify-center items-center flex-col px-2 sm:px-6"
         >
-          Go to Homepage
-        </button>
+          <h1 class="text-4xl text-center text-black font-bold">ERROR 500</h1>
+          <p class="para text-red-600 text-center mb-2 font-semibold">
+            Unexpected error :(
+          </p>
+          <i class="fas fa-cogs fa-7x my-4"></i>
+          <p class="text-black text-center text-xl mt-2">
+            There seems to be a problem
+          </p>
+          <p class="text-black text-center text-xl mt-2">Let's get to back</p>
+        </div>
+        <div>
+          <div class="flex justify-center items-center">
+            <button
+              onclick="back()"
+              class="text-blue-700 hover:bg-blue-100 font-bold py-2 px-4 mb-2 border border-blue-700 rounded"
+            >
+              Go to Homepage
+            </button>
+          </div>
+        </div>
       </div>
     </div>
-  </div>
-</div>
+  </body>
+</html>
 
 <!-- JavaScript -->
 
diff --git a/views/layouts/simple-page.ejs b/views/layouts/simple-page.ejs
deleted file mode 100644
index 648d879..0000000
--- a/views/layouts/simple-page.ejs
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <link
-      rel="stylesheet"
-      href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0-2/css/all.min.css"
-      integrity="sha256-46r060N2LrChLLb5zowXQ72/iKKNiw/lAmygmHExk/o="
-      crossorigin="anonymous"
-    />
-    <link
-      rel="shortcut icon"
-      href="../images/TradeByte-Favicon.png"
-      type="image/x-icon"
-    />
-    <link rel="stylesheet" href="css/style.css" />
-    <link rel="stylesheet" href="../css/style.css" />
-    <title>TradeByte</title>
-  </head>
-
-  <body class="flex justify-center items-center min-h-screen">
-    <%- body %>
-
-    <script src="javascript/script.js"></script>
-  </body>
-</html>
diff --git a/views/login.ejs b/views/login.ejs
index 0381eac..d309974 100644
--- a/views/login.ejs
+++ b/views/login.ejs
@@ -423,7 +423,7 @@
                   >
                   <p class="text-gray-800 text-2xl truncate">
                     <a target="_blank" href="https://www.linkedin.com/in/fabcodingzest/"><i class="mr-2 fab fa-linkedin"></i></a>
-                    <a target="_blank" href="https://twitter.com/fabcodingzest/"><i class="mr-2 fab fa-instagram"></i></a>
+                    <a target="_blank" href="https://instagram.com/fabcodingzest/"><i class="mr-2 fab fa-instagram"></i></a>
                     <a target="_blank" href="https://www.twitter.com/fabcodingzest/"><i class="mr-2 fab fa-twitter-square"></i></a>
                     <a target="_blank" href="https://github.com/fabcodingzest/"><i class="mr-2 fab fa-github"></i></a>
                     <a target="_blank" href="mailto:fabcodingzest@gmail.com"><i class="fas fa-envelope"></i></a>