diff --git a/website/templates/account/login.html b/website/templates/account/login.html
index 985383d0c..02b9b55da 100644
--- a/website/templates/account/login.html
+++ b/website/templates/account/login.html
@@ -9,23 +9,23 @@
 {% get_providers as socialaccount_providers %}
 <div class="flex items-center min-h-screen p-4 bg-gray-100 lg:justify-center">
     <div
-      class="flex flex-col  lg:scale-150 overflow-hidden bg-white rounded-md shadow-lg max md:flex-row md:flex-1 lg:max-w-screen-md"
+      class="flex flex-col  lg:scale-150 overflow-hidden bg-white rounded-md shadow-lg max md:flex-row md:flex-1 lg:max-w-screen-sm"
     >
       <div
         class="p-4 py-6 text-white bg-red-500 md:w-80 md:flex-shrink-0 md:flex md:flex-col md:items-center md:justify-evenly"
       >
         <div class="my-3 text-4xl font-bold tracking-wider text-center">
-          <a href="#">BUGHEIST</a>
+          <a href="{% url 'index' %}" class="hover:no-underline text-white hover:text-white">BUGHEIST</a>
         </div>
         <p class="mt-6 font-normal text-center text-white text-xl md:mt-0">
             OWASP BLT is a bug logging tool to report issues and get points, companies are held accountable.
         </p>
         <p class="flex flex-col items-center justify-center text-sm mt-10 text-center">
           <span>Don't have an account?</span>
-          <a href="{% url 'account_signup' %}" class="underline">Get Started!</a>
+          <a href="{% url 'account_signup' %}" class="underline text-white">Get Started!</a>
         </p>
         <p class="mt-6 text-sm text-center text-white">
-          Read our <a href="{% url 'terms' %}" class="underline">terms</a> and <a href="{% url 'terms' %}" class="underline">conditions</a>
+          Read our <a href="{% url 'terms' %}" class="underline text-white">terms</a> and <a href="{% url 'terms' %}" class="underline text-white">conditions</a>
         </p>
       </div>
       <div class="p-5 bg-white md:flex-1">
@@ -38,7 +38,7 @@ <h3 class="my-4 text-2xl font-semibold text-gray-700">Account Login</h3>
               autofocus
               id="id_login"
               name="login"
-              class="px-4 py-2 transition duration-300 border border-gray-300 rounded focus:border-transparent focus:outline-none focus:ring-4 focus:ring-red-200"
+              class="px-4 py-2 w-[100%] h-[28px] transition duration-300 border border-gray-300 rounded focus:border-transparent focus:outline-none focus:ring-4 focus:ring-red-200"
               />
             <span class="help-block">{{ form.login.errors }}</span>
           </div>
@@ -51,7 +51,7 @@ <h3 class="my-4 text-2xl font-semibold text-gray-700">Account Login</h3>
               type="password"
               id="id_password"
               name="password"
-              class="px-4 py-2 transition duration-300 border border-gray-300 rounded focus:border-transparent focus:outline-none focus:ring-4 focus:ring-red-200"
+              class="px-4 py-2 w-[100%] h-[28px] transition duration-300 border border-gray-300 rounded focus:border-transparent focus:outline-none focus:ring-4 focus:ring-red-200"
             />
             <span class="help-block">{{ form.password.errors }}</span>
           </div>
@@ -68,7 +68,7 @@ <h3 class="my-4 text-2xl font-semibold text-gray-700">Account Login</h3>
             <button
               type="submit"
               name="login_button"
-              class="w-full px-4 py-2 text-lg font-semibold text-white transition-colors duration-300 bg-red-500 rounded-md shadow hover:bg-red-600 focus:outline-none focus:ring-red-200 focus:ring-4"
+              class="px-4 py-2 w-[100%] h-[28px] text-lg font-semibold text-white transition-colors duration-300 bg-red-500 rounded-md shadow hover:bg-red-600 focus:outline-none focus:ring-red-200 focus:ring-4"
             >
               Log in
             </button>
@@ -89,7 +89,7 @@ <h3 class="my-4 text-2xl font-semibold text-gray-700">Account Login</h3>
             <div class="flex flex-col space-y-4">
               <a
                 href="{% url 'github_callback' %}"
-                class="flex items-center justify-center px-4 py-2 space-x-2 transition-colors duration-300 border border-gray-800 rounded-md group hover:bg-gray-800 focus:outline-none hover:no-underline"
+                class="w-[100%] h-[28px] flex items-center justify-center px-4 py-2 space-x-2 transition-colors duration-300 border border-gray-800 rounded-md group hover:bg-gray-800 focus:outline-none hover:no-underline"
               >
                 <span>
                   <svg
@@ -109,7 +109,7 @@ <h3 class="my-4 text-2xl font-semibold text-gray-700">Account Login</h3>
 
               <a
                 href="{% url 'google_callback' %}"
-                class="flex items-center justify-center px-4 py-2 space-x-2 transition-colors duration-300 border border-gray-800 rounded-md group hover:bg-gray-800 focus:outline-none hover:no-underline"
+                class="w-[100%] h-[28px] flex items-center justify-center px-4 py-2 space-x-2 transition-colors duration-300 border border-gray-800 rounded-md group hover:bg-gray-800 focus:outline-none hover:no-underline"
               >
                 <span>
                   <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 text-gray-800 fill-current group-hover:text-white" viewBox="0 0 24 24"><path d="M12 0c-6.627 0-12 5.373-12 12s5.373 12 12 12 12-5.373 12-12-5.373-12-12-12zm-2.917 16.083c-2.258 0-4.083-1.825-4.083-4.083s1.825-4.083 4.083-4.083c1.103 0 2.024.402 2.735 1.067l-1.107 1.068c-.304-.292-.834-.63-1.628-.63-1.394 0-2.531 1.155-2.531 2.579 0 1.424 1.138 2.579 2.531 2.579 1.616 0 2.224-1.162 2.316-1.762h-2.316v-1.4h3.855c.036.204.064.408.064.677.001 2.332-1.563 3.988-3.919 3.988zm9.917-3.5h-1.75v1.75h-1.167v-1.75h-1.75v-1.166h1.75v-1.75h1.167v1.75h1.75v1.166z"/></svg>
@@ -119,7 +119,7 @@ <h3 class="my-4 text-2xl font-semibold text-gray-700">Account Login</h3>
 
             <a
               href="{% url 'facebook_callback' %}"
-              class="flex items-center justify-center px-4 py-2 space-x-2 transition-colors duration-300 border border-gray-800 rounded-md group hover:bg-gray-800 focus:outline-none hover:no-underline"
+              class="w-[100%] h-[28px] flex items-center justify-center px-4 py-2 space-x-2 transition-colors duration-300 border border-gray-800 rounded-md group hover:bg-gray-800 focus:outline-none hover:no-underline"
             >
               <span>
                 <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 text-gray-800 fill-current group-hover:text-white" viewBox="0 0 24 24"><path d="M22.675 0h-21.35c-.732 0-1.325.593-1.325 1.325v21.351c0 .731.593 1.324 1.325 1.324h11.495v-9.294h-3.128v-3.622h3.128v-2.671c0-3.1 1.893-4.788 4.659-4.788 1.325 0 2.463.099 2.795.143v3.24l-1.918.001c-1.504 0-1.795.715-1.795 1.763v2.313h3.587l-.467 3.622h-3.12v9.293h6.116c.73 0 1.323-.593 1.323-1.325v-21.35c0-.732-.593-1.325-1.325-1.325z"/></svg>
diff --git a/website/templates/account/signup.html b/website/templates/account/signup.html
index 7d3ae7ab5..fc1fd6381 100644
--- a/website/templates/account/signup.html
+++ b/website/templates/account/signup.html
@@ -3,22 +3,22 @@
 {% load i18n %}
 
 {% block content %}
-<div class="flex items-center min-h-screen p-4 bg-gray-100 lg:justify-center">
+<div class="flex items-center w-[100%] min-h-screen p-4 bg-gray-100 lg:justify-center">
     <div
-      class="flex flex-col  lg:scale-150 overflow-hidden bg-white rounded-md shadow-lg max md:flex-row md:flex-1 lg:max-w-screen-md"
+      class="flex flex-col  lg:scale-150 overflow-hidden bg-white rounded-md shadow-lg max md:flex-row md:flex-1 lg:max-w-screen-sm"
     >
       <div
         class="p-4 py-6 text-white bg-red-500 md:w-80 md:flex-shrink-0 md:flex md:flex-col md:items-center md:justify-evenly"
       >
         <div class="my-3 text-4xl font-bold tracking-wider text-center">
-          <a href="#">BUGHEIST</a>
+          <a href="{% url 'index' %}" class="hover:no-underline text-white hover:text-white">BUGHEIST</a>
         </div>
         <p class="mt-6 font-normal text-center text-white text-xl md:mt-0">
             OWASP BLT is a bug logging tool to report issues and get points, companies are held accountable.
         </p>
         <p class="flex flex-col items-center justify-center text-sm mt-10 text-center">
           <span>Already have an account?</span>
-          <a href="{% url 'account_login' %}" class="underline">Login!</a>
+          <a href="{% url 'account_login' %}" class="underline text-white">Login!</a>
         </p>
         <p class="mt-6 text-sm text-center text-white">
           Read our <a href="{% url 'terms' %}" class="underline">terms</a> and <a href="{% url 'terms' %}" class="underline">conditions</a>
@@ -35,7 +35,7 @@ <h3 class="my-4 text-2xl font-semibold text-gray-700">Account SignUp</h3>
               type="text"
               id="id_username"
               name="username"
-              class="px-4 py-2 transition duration-300 border border-gray-300 rounded focus:border-transparent focus:outline-none focus:ring-4 focus:ring-red-200"
+              class="px-4 py-2 w-[100%] h-[28px]  transition duration-300 border border-gray-300 rounded focus:border-transparent focus:outline-none focus:ring-4 focus:ring-red-200"
               />
               <span class="help-block">{{ form.username.errors }}</span>
           </div>
@@ -45,7 +45,7 @@ <h3 class="my-4 text-2xl font-semibold text-gray-700">Account SignUp</h3>
               type="email"
               id="id_email"
               name="email"
-              class="px-4 py-2 transition duration-300 border border-gray-300 rounded focus:border-transparent focus:outline-none focus:ring-4 focus:ring-red-200"
+              class="px-4 py-2 w-[100%] h-[28px] transition duration-300 border border-gray-300 rounded focus:border-transparent focus:outline-none focus:ring-4 focus:ring-red-200"
               />
             <span class="help-block">{{ form.email.errors }}</span>
           </div>
@@ -57,7 +57,7 @@ <h3 class="my-4 text-2xl font-semibold text-gray-700">Account SignUp</h3>
               type="password"
               id="id_password"
               name="password1"
-              class="px-4 py-2 transition duration-300 border border-gray-300 rounded focus:border-transparent focus:outline-none focus:ring-4 focus:ring-red-200"
+              class="px-4 py-2 w-[100%] h-[28px] transition duration-300 border border-gray-300 rounded focus:border-transparent focus:outline-none focus:ring-4 focus:ring-red-200"
             />
             <span class="help-block">{{ form.password1.errors }}</span>
           </div>
@@ -69,7 +69,7 @@ <h3 class="my-4 text-2xl font-semibold text-gray-700">Account SignUp</h3>
               type="password"
               id="id_password2"
               name="password2"
-              class="px-4 py-2 transition duration-300 border border-gray-300 rounded focus:border-transparent focus:outline-none focus:ring-4 focus:ring-red-200"
+              class="px-4 py-2 w-[100%] h-[28px] transition duration-300 border border-gray-300 rounded focus:border-transparent focus:outline-none focus:ring-4 focus:ring-red-200"
             />
             <span class="help-block">{{ form.password2.errors }}</span>
           </div>
@@ -80,7 +80,7 @@ <h3 class="my-4 text-2xl font-semibold text-gray-700">Account SignUp</h3>
             <button
               type="submit"
               name="signup_button"
-              class="w-full px-4 py-2 text-lg font-semibold text-white transition-colors duration-300 bg-red-500 rounded-md shadow hover:bg-red-600 focus:outline-none focus:ring-red-200 focus:ring-4"
+              class="px-4 py-2 w-[30%] h-[28px] text-lg font-semibold text-white transition-colors duration-300 bg-red-500 rounded-md shadow hover:bg-red-600 focus:outline-none focus:ring-red-200 focus:ring-4"
             >
               Sign Up
             </button>