diff --git a/web-app/django/VIM/apps/main/static/main/css/login.css b/web-app/django/VIM/apps/main/static/main/css/login.css
index 5c5cb42..fd73e82 100644
--- a/web-app/django/VIM/apps/main/static/main/css/login.css
+++ b/web-app/django/VIM/apps/main/static/main/css/login.css
@@ -3,15 +3,18 @@
   width: 80vw;
 }
 
-.login-container {
+.account-container {
   background-color: white;
   border: 3px solid #9eb384;
   border-radius: 30px;
-  height: auto !important;
+  height: 500px !important;
+  position: relative;
+  color: #435334;
 }
 
-.login-form {
-  color: #435334;
+.message-container {
+  position: absolute;
+  top: 10px;
 }
 
 #signup-decor {
@@ -47,12 +50,12 @@ input::placeholder {
   color: #9eb384;
 }
 
-.sign-in-btn {
+.account-btn {
   background-color: #435334;
   border: 1px solid #435334;
 }
 
-.sign-in-btn:hover {
+.account-btn:hover {
   background-color: #9eb384;
   border: 1px solid #9eb384;
 }
@@ -74,5 +77,10 @@ a:hover {
 }
 
 .errorlist {
-  color: red;
+  margin: 0;
+}
+
+ul {
+  list-style-type: none;
+  padding: 0 0.5rem;
 }
diff --git a/web-app/django/VIM/apps/main/templates/registration/changePassword.html b/web-app/django/VIM/apps/main/templates/registration/changePassword.html
new file mode 100644
index 0000000..062e4d1
--- /dev/null
+++ b/web-app/django/VIM/apps/main/templates/registration/changePassword.html
@@ -0,0 +1,57 @@
+{% extends "base.html" %}
+
+{% load static %}
+
+{% block title %}
+  Change Password
+{% endblock title %}
+
+{% block css_files %}
+  <link rel="stylesheet"
+        type="text/css"
+        href="{% static 'main/css/login.css' %}" />
+{% endblock css_files %}
+
+{% block content %}
+  <div class="container content-container d-flex justify-content-center align-items-center">
+    <div class="col-10 p-4 align-content-center account-container">
+      {% if form.errors %}
+        <div class="alert alert-danger p-2 z-2 d-flex justify-content-end message-container">
+          {% for field, error in form.errors.items %}{{ error }}{% endfor %}
+        </div>
+      {% endif %}
+      <div class="container z-1">
+        <div class="row">
+          <div class="col-6 my-4 login-form" id="change-password">
+            <h5 class="mb-4">
+              <strong>Change Password</strong>
+            </h5>
+            <form method="post">
+              {% csrf_token %}
+              <div class="mb-4">
+                <label for="exampleInputPassword0" class="form-label">Current Password</label>
+                <div>{{ form.old_password }}</div>
+              </div>
+              <div class="mb-4">
+                <label for="exampleInputPassword1" class="form-label">New Password</label>
+                <div>{{ form.new_password1 }}</div>
+              </div>
+              <div class="mb-4">
+                <label for="exampleInputPassword2" class="form-label">
+                  Confirm New Password
+                </label>
+                <div>{{ form.new_password2 }}</div>
+              </div>
+              <button type="submit" class="btn btn-primary account-btn">
+                Change Password
+              </button>
+            </form>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+{% endblock content %}
+
+{% block scripts %}
+{% endblock scripts %}
diff --git a/web-app/django/VIM/apps/main/templates/registration/change_password.html b/web-app/django/VIM/apps/main/templates/registration/change_password.html
deleted file mode 100644
index 2d3f627..0000000
--- a/web-app/django/VIM/apps/main/templates/registration/change_password.html
+++ /dev/null
@@ -1,53 +0,0 @@
-{% extends "base.html" %}
-
-{% load static %}
-
-{% block title %}
-  Change Password
-{% endblock title %}
-
-{% block css_files %}
-  <link rel="stylesheet"
-        type="text/css"
-        href="{% static 'main/css/login.css' %}" />
-{% endblock css_files %}
-
-{% block content %}
-  <div class="container">
-    <div class="row">
-      <div class="mr-3 p-4 col-md-8">
-        {% if form.errors %}
-          <div class="alert alert-danger alert-dismissible">
-            {% for field, error in form.errors.items %}{{ error }}{% endfor %}
-          </div>
-        {% endif %}
-        <div class="col-md mt-4 login-form" id="change-password">
-          <h5 class="mb-4">
-            <strong>Change Password</strong>
-          </h5>
-          <form method="post">
-            {% csrf_token %}
-            <div class="mb-4">
-              <label for="exampleInputPassword0" class="form-label">Current Password</label>
-              {{ form.old_password }}
-            </div>
-            <div class="mb-4">
-              <label for="exampleInputPassword1" class="form-label">New Password</label>
-              {{ form.new_password1 }}
-            </div>
-            <div class="mb-4">
-              <label for="exampleInputPassword2" class="form-label">
-                Confirm New Password
-              </label>
-              {{ form.new_password2 }}
-            </div>
-            <button type="submit" class="btn btn-primary">Change Password</button>
-          </form>
-        </div>
-      </div>
-    </div>
-  </div>
-{% endblock content %}
-
-{% block scripts %}
-{% endblock scripts %}
diff --git a/web-app/django/VIM/apps/main/templates/registration/login.html b/web-app/django/VIM/apps/main/templates/registration/login.html
index ef8be40..365ee97 100644
--- a/web-app/django/VIM/apps/main/templates/registration/login.html
+++ b/web-app/django/VIM/apps/main/templates/registration/login.html
@@ -14,21 +14,15 @@
 
 {% block content %}
   <div class="container content-container d-flex justify-content-center align-items-center">
-    <div class="col-8 p-4 login-container">
-      {% if messages %}
-        <div class="alert alert-success alert-dismissible">
-          {% for message in messages %}{{ message }}{% endfor %}
-        </div>
-      {% endif %}
+    <div class="col-10 p-4 align-content-center account-container">
       {% if form.errors %}
-        <div class="alert alert-danger alert-dismissible">
+        <div class="alert alert-danger p-2 z-2 message-container">
           {% for field, error in form.errors.items %}{{ error }}{% endfor %}
         </div>
       {% endif %}
-      <div class="container">
+      <div class="container z-1">
         <div class="row">
-          <div class="col-6 my-4 px-4 d-flex justify-content-center align-items-center login-form"
-               id="login">
+          <div class="col-6 my-4 px-4 d-flex justify-content-center align-items-center">
             <div class="col-12 mx-4 px-2">
               <h5>
                 <strong>Login</strong>
@@ -43,7 +37,7 @@ <h5>
                   <label for="exampleInputPassword" class="form-label">Password</label>
                   <div>{{ form.password }}</div>
                 </div>
-                <button type="submit" class="btn btn-primary sign-in-btn">Sign in</button>
+                <button type="submit" class="btn btn-primary account-btn">Sign in</button>
                 <p class="mt-2">
                   <a href="{% url 'main:reset_password' %}">Forgot your password?</a>
                 </p>
diff --git a/web-app/django/VIM/apps/main/templates/registration/register.html b/web-app/django/VIM/apps/main/templates/registration/register.html
index 80e3237..692d572 100644
--- a/web-app/django/VIM/apps/main/templates/registration/register.html
+++ b/web-app/django/VIM/apps/main/templates/registration/register.html
@@ -1,51 +1,53 @@
-{% extends "base.html" %}
-
-{% load static %}
-
-{% block title %}
-  Register
-{% endblock title %}
-
-{% block css_files %}
-  <link rel="stylesheet"
-        type="text/css"
-        href="{% static 'main/css/login.css' %}" />
-{% endblock css_files %}
-
-{% block content %}
-  <div class="container">
-    <div class="row">
-      <div class="mr-3 p-4 col-md-8">
-        {% if form.errors %}
-          <div class="alert alert-danger alert-dismissible">
-            {% for field, error in form.errors.items %}{{ error }}{% endfor %}
-          </div>
-        {% endif %}
-        <div class="col-md mt-4 login-form" id="registration">
-          <h5 class="mb-4">
-            <strong>Create a New Account</strong>
-          </h5>
-          <form method="post">
-            {% csrf_token %}
-            <div class="mt-4 mb-4">
-              <label for="exampleInputEmail" class="form-label">Email Address</label>
-              {{ form.username }}
-            </div>
-            <div class="mb-4">
-              <label for="exampleInputPassword1" class="form-label">Password</label>
-              {{ form.password1 }}
-            </div>
-            <div class="mb-4">
-              <label for="exampleInputPassword2" class="form-label">Confirm Password</label>
-              {{ form.password2 }}
-            </div>
-            <button type="submit" class="btn btn-primary">Register</button>
-          </form>
-        </div>
-      </div>
-    </div>
-  </div>
-{% endblock content %}
-
-{% block scripts %}
-{% endblock scripts %}
+{% extends "base.html" %}
+
+{% load static %}
+
+{% block title %}
+  Register
+{% endblock title %}
+
+{% block css_files %}
+  <link rel="stylesheet"
+        type="text/css"
+        href="{% static 'main/css/login.css' %}" />
+{% endblock css_files %}
+
+{% block content %}
+  <div class="container content-container d-flex justify-content-center align-items-center">
+    <div class="col-10 p-4 align-content-center account-container">
+      {% if form.errors %}
+        <div class="alert alert-danger p-2 z-2 message-container">
+          {% for field, error in form.errors.items %}{{ error }}{% endfor %}
+        </div>
+      {% endif %}
+      <div class="container z-1">
+        <div class="row">
+          <div class="col-6 my-4" id="registration">
+            <h5 class="mb-4">
+              <strong>Create a New Account</strong>
+            </h5>
+            <form method="post">
+              {% csrf_token %}
+              <div class="mt-4 mb-4">
+                <label for="exampleInputEmail" class="form-label">Email Address</label>
+                <div>{{ form.username }}</div>
+              </div>
+              <div class="mb-4">
+                <label for="exampleInputPassword1" class="form-label">Password</label>
+                <div>{{ form.password1 }}</div>
+              </div>
+              <div class="mb-4">
+                <label for="exampleInputPassword2" class="form-label">Confirm Password</label>
+                <div>{{ form.password2 }}</div>
+              </div>
+              <button type="submit" class="btn btn-primary account-btn">Register</button>
+            </form>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+{% endblock content %}
+
+{% block scripts %}
+{% endblock scripts %}
diff --git a/web-app/django/VIM/apps/main/templates/registration/resetPassword.html b/web-app/django/VIM/apps/main/templates/registration/resetPassword.html
new file mode 100644
index 0000000..4dc78e9
--- /dev/null
+++ b/web-app/django/VIM/apps/main/templates/registration/resetPassword.html
@@ -0,0 +1,56 @@
+{% extends "base.html" %}
+
+{% load static %}
+
+{% block title %}
+  Reset Password
+{% endblock title %}
+
+{% block css_files %}
+  <link rel="stylesheet"
+        type="text/css"
+        href="{% static 'main/css/login.css' %}" />
+{% endblock css_files %}
+
+{% block content %}
+  <div class="container content-container d-flex justify-content-center align-items-center">
+    <div class="col-10 p-4 align-content-center account-container">
+      {% if form.errors %}
+        <div class="alert alert-danger p-2 z-2 message-container">
+          {% for field, error in form.errors.items %}{{ error }}{% endfor %}
+        </div>
+      {% endif %}
+      <div class="container pb-4 z-1 d-flex flex-column">
+        <div class="row">
+          <div class="col-12">
+            <h5>
+              <strong>Reset Password</strong>
+            </h5>
+            <p class="mt-4">
+              Forgotten your password?
+              <br />
+              Enter your email address below, and we'll email instructions for setting a new one.
+            </p>
+          </div>
+        </div>
+        <div class="row mb-4">
+          <div class="col-12 mb-4">
+            <form method="post">
+              {% csrf_token %}
+              <div class="mt-2 mb-4">
+                <label for="exampleInputEmail" class="form-label">Email Address</label>
+                <div>{{ form.email }}</div>
+              </div>
+              <button type="submit" class="btn btn-primary mb-4 account-btn">
+                Send Password Reset Email
+              </button>
+            </form>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+{% endblock content %}
+
+{% block scripts %}
+{% endblock scripts %}
diff --git a/web-app/django/VIM/apps/main/templates/registration/reset_password_complete.html b/web-app/django/VIM/apps/main/templates/registration/resetPasswordComplete.html
similarity index 88%
rename from web-app/django/VIM/apps/main/templates/registration/reset_password_complete.html
rename to web-app/django/VIM/apps/main/templates/registration/resetPasswordComplete.html
index 5f95362..7ef8f7e 100644
--- a/web-app/django/VIM/apps/main/templates/registration/reset_password_complete.html
+++ b/web-app/django/VIM/apps/main/templates/registration/resetPasswordComplete.html
@@ -1,29 +1,29 @@
-{% extends "base.html" %}
-
-{% load static %}
-
-{% block title %}
-  Reset Password
-{% endblock title %}
-
-{% block css_files %}
-  <link rel="stylesheet"
-        type="text/css"
-        href="{% static 'main/css/login.css' %}" />
-{% endblock css_files %}
-
-{% block content %}
-  <div class="container">
-    <div class="row">
-      <div class="mr-3 p-4 col-md-12">
-        <div class="col-md mt-4 login-form" id="login">
-          <h5>
-            <strong>Password Reset Complete</strong>
-          </h5>
-          <p class="mt-4">
-            Your password has been successfully reset. You can now <a href="{% url 'main:login' %}">log in</a> with your new password.
-          </p>
-        </div>
-      </div>
-    </div>
-  {% endblock content %}
+{% extends "base.html" %}
+
+{% load static %}
+
+{% block title %}
+  Reset Password
+{% endblock title %}
+
+{% block css_files %}
+  <link rel="stylesheet"
+        type="text/css"
+        href="{% static 'main/css/login.css' %}" />
+{% endblock css_files %}
+
+{% block content %}
+  <div class="container">
+    <div class="row">
+      <div class="mr-3 p-4 col-md-12">
+        <div class="col-md mt-4 login-form">
+          <h5>
+            <strong>Password Reset Complete</strong>
+          </h5>
+          <p class="mt-4">
+            Your password has been successfully reset. You can now <a href="{% url 'main:login' %}">log in</a> with your new password.
+          </p>
+        </div>
+      </div>
+    </div>
+  {% endblock content %}
diff --git a/web-app/django/VIM/apps/main/templates/registration/reset_password_confirm.html b/web-app/django/VIM/apps/main/templates/registration/resetPasswordConfirm.html
similarity index 90%
rename from web-app/django/VIM/apps/main/templates/registration/reset_password_confirm.html
rename to web-app/django/VIM/apps/main/templates/registration/resetPasswordConfirm.html
index fbff852..9e4b154 100644
--- a/web-app/django/VIM/apps/main/templates/registration/reset_password_confirm.html
+++ b/web-app/django/VIM/apps/main/templates/registration/resetPasswordConfirm.html
@@ -1,35 +1,35 @@
-{% extends "base.html" %}
-
-{% load static %}
-
-{% block title %}
-  Reset Password
-{% endblock title %}
-
-{% block css_files %}
-  <link rel="stylesheet"
-        type="text/css"
-        href="{% static 'main/css/login.css' %}" />
-{% endblock css_files %}
-
-{% block content %}
-  <div class="container">
-    <div class="row">
-      <div class="mr-3 p-4 col-md-12">
-        <div class="col-md mt-4 login-form" id="login">
-          <h5>
-            <strong>Set New Password</strong>
-          </h5>
-          <form class="mt-4" method="post">
-            {% csrf_token %}
-            {{ form.new_password1.label_tag }}
-            {{ form.new_password1 }}
-            {{ form.new_password2.label_tag }}
-            {{ form.new_password2 }}
-            <button type="submit" class="btn btn-primary">Change Password</button>
-          </form>
-        </div>
-      </div>
-    </div>
-  </div>
-{% endblock content %}
+{% extends "base.html" %}
+
+{% load static %}
+
+{% block title %}
+  Reset Password
+{% endblock title %}
+
+{% block css_files %}
+  <link rel="stylesheet"
+        type="text/css"
+        href="{% static 'main/css/login.css' %}" />
+{% endblock css_files %}
+
+{% block content %}
+  <div class="container">
+    <div class="row">
+      <div class="mr-3 p-4 col-md-12">
+        <div class="col-md mt-4 login-form">
+          <h5>
+            <strong>Set New Password</strong>
+          </h5>
+          <form class="mt-4" method="post">
+            {% csrf_token %}
+            {{ form.new_password1.label_tag }}
+            {{ form.new_password1 }}
+            {{ form.new_password2.label_tag }}
+            {{ form.new_password2 }}
+            <button type="submit" class="btn btn-primary">Change Password</button>
+          </form>
+        </div>
+      </div>
+    </div>
+  </div>
+{% endblock content %}
diff --git a/web-app/django/VIM/apps/main/templates/registration/resetPasswordDone.html b/web-app/django/VIM/apps/main/templates/registration/resetPasswordDone.html
new file mode 100644
index 0000000..eec3ab4
--- /dev/null
+++ b/web-app/django/VIM/apps/main/templates/registration/resetPasswordDone.html
@@ -0,0 +1,40 @@
+{% extends "base.html" %}
+
+{% load static %}
+
+{% block title %}
+  Reset Password
+{% endblock title %}
+
+{% block css_files %}
+  <link rel="stylesheet"
+        type="text/css"
+        href="{% static 'main/css/login.css' %}" />
+{% endblock css_files %}
+
+{% block content %}
+  <div class="container content-container d-flex justify-content-center align-items-center">
+    <div class="col-10 p-4 account-container">
+      {% if form.errors %}
+        <div class="alert alert-danger p-2 z-2 message-container">
+          {% for field, error in form.errors.items %}{{ error }}{% endfor %}
+        </div>
+      {% endif %}
+      <div class="container mt-4 pt-4 z-1 d-flex flex-column">
+        <div class="row">
+          <div class="col-12">
+            <h5>
+              <strong>Password Reset Email Sent</strong>
+            </h5>
+            <p class="mt-4">
+              We've sent you an email with instructions to reset your password. Please check your inbox.
+            </p>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+{% endblock content %}
+
+{% block scripts %}
+{% endblock scripts %}
diff --git a/web-app/django/VIM/apps/main/templates/registration/reset_password_email.html b/web-app/django/VIM/apps/main/templates/registration/resetPasswordEmail.html
similarity index 100%
rename from web-app/django/VIM/apps/main/templates/registration/reset_password_email.html
rename to web-app/django/VIM/apps/main/templates/registration/resetPasswordEmail.html
diff --git a/web-app/django/VIM/apps/main/templates/registration/reset_password.html b/web-app/django/VIM/apps/main/templates/registration/reset_password.html
deleted file mode 100644
index f5c0486..0000000
--- a/web-app/django/VIM/apps/main/templates/registration/reset_password.html
+++ /dev/null
@@ -1,50 +0,0 @@
-{% extends "base.html" %}
-
-{% load static %}
-
-{% block title %}
-  Reset Password
-{% endblock title %}
-
-{% block css_files %}
-  <link rel="stylesheet"
-        type="text/css"
-        href="{% static 'main/css/login.css' %}" />
-{% endblock css_files %}
-
-{% block content %}
-  <div class="container">
-    <div class="row">
-      <div class="mr-3 p-4 col-md-12">
-        {% if messages %}
-          <div class="alert alert-success alert-dismissible">
-            {% for message in messages %}{{ message }}{% endfor %}
-          </div>
-        {% endif %}
-        {% if form.errors %}
-          <div class="alert alert-danger alert-dismissible">
-            {% for field, error in form.errors.items %}{{ error }}{% endfor %}
-          </div>
-        {% endif %}
-        <div class="col-md mt-4 login-form" id="login">
-          <h5>
-            <strong>Reset Password</strong>
-          </h5>
-          <p class="mt-4">
-            Forgotten your password? Enter your email address below, and we'll email instructions for setting a new one.
-          </p>
-          <form method="post">
-            {% csrf_token %}
-            <div class="mt-4 mb-4">
-              <label for="exampleInputEmail" class="form-label">Email Address</label>
-              {{ form.email }}
-            </div>
-            <button type="submit" class="btn btn-primary">
-              Send Password Reset Email
-            </button>
-          </form>
-        </div>
-      </div>
-    </div>
-  </div>
-{% endblock content %}
diff --git a/web-app/django/VIM/apps/main/templates/registration/reset_password_sent.html b/web-app/django/VIM/apps/main/templates/registration/reset_password_sent.html
deleted file mode 100644
index 80c5870..0000000
--- a/web-app/django/VIM/apps/main/templates/registration/reset_password_sent.html
+++ /dev/null
@@ -1,30 +0,0 @@
-{% extends "base.html" %}
-
-{% load static %}
-
-{% block title %}
-  Reset Password
-{% endblock title %}
-
-{% block css_files %}
-  <link rel="stylesheet"
-        type="text/css"
-        href="{% static 'main/css/login.css' %}" />
-{% endblock css_files %}
-
-{% block content %}
-  <div class="container">
-    <div class="row">
-      <div class="mr-3 p-4 col-md-12">
-        <div class="col-md mt-4 login-form" id="login">
-          <h5>
-            <strong>Password Reset Email Sent</strong>
-          </h5>
-          <p class="mt-4">
-            We've sent you an email with instructions to reset your password. Please check your inbox.
-          </p>
-        </div>
-      </div>
-    </div>
-  </div>
-{% endblock content %}
diff --git a/web-app/django/VIM/apps/main/urls.py b/web-app/django/VIM/apps/main/urls.py
index efd585e..55dd3c3 100644
--- a/web-app/django/VIM/apps/main/urls.py
+++ b/web-app/django/VIM/apps/main/urls.py
@@ -14,9 +14,9 @@
         name="logout",
     ),
     path(
-        "change-password/",
+        "password-change/",
         auth_views.PasswordChangeView.as_view(
-            template_name="registration/change_password.html",
+            template_name="registration/changePassword.html",
             success_url="/",
         ),
         name="change_password",
@@ -32,34 +32,34 @@
         name="login",
     ),
     path(
-        "reset-password/",
+        "password-reset/",
         auth_views.PasswordResetView.as_view(
-            template_name="registration/reset_password.html",
-            email_template_name="registration/reset_password_email.html",
-            success_url="/reset-password-sent/",
+            template_name="registration/resetPassword.html",
+            email_template_name="registration/resetPasswordEmail.html",
+            success_url="/password-reset/done/",
         ),
         name="reset_password",
     ),
     path(
-        "reset-password-sent/",
+        "password-reset/done/",
         auth_views.PasswordResetDoneView.as_view(
-            template_name="registration/reset_password_sent.html",
+            template_name="registration/resetPasswordDone.html",
         ),
         name="reset_password_done",
     ),
     path(
         "reset/<uidb64>/<token>",
         auth_views.PasswordResetConfirmView.as_view(
-            template_name="registration/reset_password_confirm.html",
+            template_name="registration/resetPasswordConfirm.html",
             success_url="/reset-password-complete/",
         ),
-        name="reset_password_confirm",
+        name="password_reset_confirm",
     ),
     path(
-        "reset-password-complete/",
+        "reset/done/",
         auth_views.PasswordResetCompleteView.as_view(
-            template_name="registration/reset_password_complete.html",
+            template_name="registration/resetPasswordComplete.html",
         ),
-        name="reset_password_complete",
+        name="password_reset_complete",
     ),
 ]
diff --git a/web-app/django/VIM/templates/base.html b/web-app/django/VIM/templates/base.html
index 33d22b1..8fee959 100644
--- a/web-app/django/VIM/templates/base.html
+++ b/web-app/django/VIM/templates/base.html
@@ -20,7 +20,7 @@
 
   </head>
   <body>
-    <header class="p-3 sticky-top">
+    <header class="p-3 sticky-top align-content-center">
       <div class="container">
         <div class="d-flex flex-wrap align-items-center justify-content-center justify-content-lg-start">
           <ul class="nav nav-underline col-12 col-lg-auto me-lg-auto mb-2 justify-content-center mb-md-0">