diff --git a/ACMAS/app/ACMAS_Web/templates/_base.html b/ACMAS/app/ACMAS_Web/templates/_base.html
index 4193c69..ff2e031 100644
--- a/ACMAS/app/ACMAS_Web/templates/_base.html
+++ b/ACMAS/app/ACMAS_Web/templates/_base.html
@@ -58,6 +58,7 @@
   }
 
   /* home page footer graphic */
+  /*
   .ocean {
     height: 0;
     width: 100%;
@@ -105,7 +106,7 @@
       transform: translate3d(0, 5px, 0);
     }
   }
-
+  */
   /*
 .custom-shape-divider-bottom-1669508581 {
   position: absolute;
@@ -231,7 +232,7 @@
   </nav> {% endcomment %}
 
   <nav class="bg-white border-gray-200 dark:bg-gray-900 dark:border-gray-700">
-    <div class="max-w-screen-xl flex flex-wrap items-center justify-between mx-auto p-4">
+    <div class="flex flex-wrap items-center justify-between mx-auto p-4 mr-4">
       <a href="/">
         <img class="h-9 pr-4" src="../static/img/star.svg" alt="ACMAS star logo">
       </a>
@@ -307,10 +308,10 @@
     {% block content %}
     {% endblock content %}
   </div>
-  <div class="ocean" id="hide-mobile">
+  {% comment %} <div class="ocean" id="hide-mobile">
     <div class="wave"></div>
     <div class="wave"></div>
-  </div>
+  </div> {% endcomment %}
   <!--
   <div class="custom-shape-divider-bottom-1669508581" id="hide-mobile">
     <svg data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1200 120" preserveAspectRatio="none">
diff --git a/ACMAS/app/ACMAS_Web/templates/index.html b/ACMAS/app/ACMAS_Web/templates/index.html
index be568cc..5e6fe36 100644
--- a/ACMAS/app/ACMAS_Web/templates/index.html
+++ b/ACMAS/app/ACMAS_Web/templates/index.html
@@ -16,7 +16,7 @@
 
 
 {% block content %}
-<div class="flex mt-24">
+<div class="flex flex-wrap mt-24 mx-auto max-w-screen-xl">
     <div class="text-7xl" style="color: #327796; font-family: Inter, serif;">Simplify <br> studying with</div>
     <div class="">
         <a href="/">
diff --git a/ACMAS/app/ACMAS_Web/templates/profile.html b/ACMAS/app/ACMAS_Web/templates/profile.html
index 67db9db..d22be1c 100644
--- a/ACMAS/app/ACMAS_Web/templates/profile.html
+++ b/ACMAS/app/ACMAS_Web/templates/profile.html
@@ -1,10 +1,18 @@
 {% extends '_base.html' %}
+{% load component_tags %}
 {% block title %}Profile{% endblock %}
-{% block content %}
-   <h2>Hello {{user.username}}!</h1>
-   <br/> <br/>
 
-   <h4>Want to change it up?</h4>   
-   <a href="{% url 'password_change' %}">Change Password</a>    
-   
-{% endblock%}
\ No newline at end of file
+{% block content %}
+<div class="flex flex-col mt-20">
+   <h1 class="text-3xl font-light text-gray-900 text-center mb-8" style="font-family: Inter, serif;">Hello {{user.username}}!</h1>
+   <div class="w-full flex items-center justify-center pt-2">
+      <br/> <br/>
+      <p class="mt-8">
+          Want to change it up?
+          <a href="{% url 'password_change' %}">
+              {% component "button" text="Change Password" component_type="secondary" value="" %}
+          </a>
+      </p>
+  </div>
+</div>
+{% endblock%}
diff --git a/ACMAS/app/ACMAS_Web/templates/register.html b/ACMAS/app/ACMAS_Web/templates/register.html
index bcf5517..c3e2a83 100644
--- a/ACMAS/app/ACMAS_Web/templates/register.html
+++ b/ACMAS/app/ACMAS_Web/templates/register.html
@@ -1,11 +1,16 @@
 {% extends '_base.html' %}
+{% load component_tags %}
 {% block title %} Create an Account {% endblock %}
-{% block content %}
-    <form method = "POST" class="form-group">
-        {% csrf_token %}
-        {{form}}
-        <button type="submit" class="btn btn-primary">Register</button>
-    </form>
 
+{% block content %}
+<div class="flex flex-col mt-20">
+    <div class="w-full flex items-center justify-center">
+        <form method="POST" class="form-group"> {% csrf_token %}
+            {{ form }}
+            <div class="flex items-center justify-items-center justify-center mt-2">
+                {% component "button" text="Register" component_type="primary" value="submit" %}
+            </div>
+        </form>
+    </div>
+</div>
 {% endblock %}
-
diff --git a/ACMAS/app/ACMAS_Web/templates/registration/login.html b/ACMAS/app/ACMAS_Web/templates/registration/login.html
index 051463d..97dc71f 100644
--- a/ACMAS/app/ACMAS_Web/templates/registration/login.html
+++ b/ACMAS/app/ACMAS_Web/templates/registration/login.html
@@ -1,13 +1,24 @@
 {% extends '_base.html' %}
-{%block title%}
-Login
-{%endblock%}
+{% load component_tags %}
+{% block title %}Login{% endblock %}
 
 {%block content%}
-<form method="POST" class="form-group">
-    {%csrf_token%}
-    {{form}}
-    <button type="submit" class="btn btn-primary">Login</button>
-    <p>Don't have an account? Create one <a href="/register">here</a></p>
-</form>
-{%endblock%}
\ No newline at end of file
+<div class="flex flex-col mt-20">
+    <div class="w-full flex items-center justify-center">
+        <form method="POST" class="form-group"> {% csrf_token %}
+            {{ form }}
+            <div class="flex items-center justify-items-center justify-center mt-2">
+                {% component "button" text="Login" component_type="primary" value="submit" %}
+            </div>
+        </form>
+    </div>
+    <div class="w-full flex items-center justify-center">
+        <p class="mt-8">
+            Don't have an account? Create one
+            <a href="/register">
+                {% component "button" text="Here" component_type="secondary" value="" %}
+            </a>
+        </p>
+    </div>
+</div>
+{%endblock%}
diff --git a/ACMAS/app/ACMAS_Web/templates/search-by-course.html b/ACMAS/app/ACMAS_Web/templates/search-by-course.html
index df474e5..3eaf2f2 100644
--- a/ACMAS/app/ACMAS_Web/templates/search-by-course.html
+++ b/ACMAS/app/ACMAS_Web/templates/search-by-course.html
@@ -27,7 +27,13 @@ <h1 class="text-5xl font-light text-gray-900 text-center mb-8" style="font-famil
           {% component "field" component_type="text" placeholder="Enter Course" name="course" %}
         </div>
         <div>
-          {% component "select" placeholder="Select assignment type" name="type" options="types" %}
+          <select class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500" placeholder="Select assignment type" autocomplete="on" name="type" label="Search type selection">
+            <option style="color: #D4D6D9;" value="All">Select assignment type</option>
+            <option value="All">All</option>
+            <option value="Assignment">Assignment</option>
+            <option value="Exam">Exam</option>
+            <option value="Practice">Practice</option>
+          </select>
         </div>
       </div>
        <!-- Submit Button -->
@@ -38,4 +44,3 @@ <h1 class="text-5xl font-light text-gray-900 text-center mb-8" style="font-famil
   </div>
 </div>
 {% endblock %}
-
diff --git a/ACMAS/app/ACMAS_Web/templates/search-results.html b/ACMAS/app/ACMAS_Web/templates/search-results.html
index fbff344..a148e00 100644
--- a/ACMAS/app/ACMAS_Web/templates/search-results.html
+++ b/ACMAS/app/ACMAS_Web/templates/search-results.html
@@ -31,7 +31,6 @@ <h2>Sorry, we couldn't find what you're looking for.</h2>
         </div>
       {% endif %}
     <div class="grid grid-cols-1">
-      
       {% for file in files %}
         <div class="flex w-full bg-white p-4 rounded-md border border-gray-100 items-center">
           <a class="mr-auto">{{ file.filename }}</a>