diff --git a/Dockerfile b/Dockerfile
index 6c4c443f..f85ce25a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
 FROM python:3.10-slim
 LABEL maintainer="ACM at FSU <contact@fsu.acm.org>"
 
-ENV PYTHONUNBUFFERED 1
-ENV PYTHONDONTWRITEBYTECODE 1
+ENV PYTHONUNBUFFERED=1
+ENV PYTHONDONTWRITEBYTECODE=1
 
 ARG REQUIREMENTS=requirements.txt
 
@@ -30,6 +30,7 @@ RUN pip install --no-cache-dir -r /tmp/requirements.txt \
   && install -d -m 0755 -o app_user -g app_user /app/media \
   && install -d -m 0755 -o app_user -g app_user /app/media/contest_files \
   && install -d -m 0755 -o app_user -g app_user /app/media/ec_files \
+  && install -d -m 0755 -o app_user -g app_user /app/media/team_files \
   && install -d -m 0755 -o app_user -g app_user /app/media/uploads
 
 # Code and User Setup
diff --git a/src/contestadmin/forms.py b/src/contestadmin/forms.py
index 492664b2..912505b5 100644
--- a/src/contestadmin/forms.py
+++ b/src/contestadmin/forms.py
@@ -43,12 +43,18 @@ class Meta:
         model = Profile
         fields = ["role"]
 
+    
+class AccountStatusForm(forms.Form):
+    STATUS = (
+        (0, 'Activate'),
+        (1, 'Deactivate')
+    )
 
-class ActivateAccountForm(forms.Form):
     username = forms.CharField(
         max_length=150,
         label='Username',
         help_text="Person's account username.")
+    status = forms.ChoiceField(choices=STATUS)
     
 
 class DesignateFacultyTeamForm(forms.Form):
@@ -56,3 +62,11 @@ class DesignateFacultyTeamForm(forms.Form):
         max_length=30,
         label='Team name',
         help_text="Name of faculty team.")
+
+
+class UpdatePasswordForm(forms.Form):
+    username = forms.CharField(
+        max_length=150,
+        label='Username',
+        help_text="Person's account username.")
+    password = forms.CharField()
diff --git a/src/contestadmin/tasks.py b/src/contestadmin/tasks.py
index d9e06e16..4f26a85d 100644
--- a/src/contestadmin/tasks.py
+++ b/src/contestadmin/tasks.py
@@ -266,6 +266,38 @@ def generate_ec_reports():
         f'Processed extra credit files for {num_courses} courses')
 
 
+@shared_task
+def generate_team_csvs():
+    """
+    Celery task which creates CSV files containing team data per division.
+    """
+    
+    for division in Team.DIVISION:
+        if division[0] == 1:  # Upper
+            team_file = f"{MEDIA_ROOT}/team_files/upper.csv"
+        else:  # Lower
+            team_file = f"{MEDIA_ROOT}/team_files/lower.csv"
+
+        with open(team_file, 'w', newline='') as team_csv:        
+            writer = csv.writer(
+                team_csv, delimiter=',', quoting=csv.QUOTE_MINIMAL)
+            
+            # File header
+            writer.writerow(['team_division', 'team_name', 'questions_answered', 'domjudge_id', 'team_active', 'team_members'])
+            
+            # Team data
+            teams = Team.objects.filter(division=division[0])
+            for team in teams:
+                writer.writerow([
+                    team.get_division_code(),
+                    team.name,
+                    team.questions_answered,
+                    team.contest_id,
+                    'T' if team.is_active() else 'F',
+                    '_'.join(team.get_members())
+                ])
+
+
 @shared_task
 def email_faculty(domain):
     """
diff --git a/src/contestadmin/templates/contestadmin/dashboard.html b/src/contestadmin/templates/contestadmin/dashboard.html
index 287b9f2e..efd2e98a 100644
--- a/src/contestadmin/templates/contestadmin/dashboard.html
+++ b/src/contestadmin/templates/contestadmin/dashboard.html
@@ -25,6 +25,9 @@ <h1 class="text-center">Contest Dashboard</h1>
 				<i class="fa-solid fa-clock-rotate-left fa-fw"></i> Pre-Contest
 			</div>
 			<div class="card-body overflow-auto">
+				<div class="row justify-content-center">
+					<button type="button" class="btn btn-primary btn-sm my-1" data-toggle="modal" data-target="#walkinModal"> <i class="fa-solid fa-person-walking fa-fw"></i> Create Walk-in teams</button>
+				</div>
 				<div class="row justify-content-center">
 					<a class="btn btn-primary btn-sm my-1" href="{% url 'gen_dj_files' %}" onclick="return confirm('Are you certain you want to generate the DOMjudge files?');"><i class="fa-solid fa-file-circle-plus fa-fw"></i> Generate DOMjudge TSVs</a>
 					{% if dj_files_available %}					
@@ -73,7 +76,6 @@ <h1 class="text-center">Contest Dashboard</h1>
 			</div>
 			<div class="card-body overflow-auto">
 				<div class="row justify-content-center">
-					
 					{% if dj_results_processed %}					
 						<!--<button type="button" class="btn btn-primary btn-sm my-1" data-toggle="modal" data-target="#generateEcReportsModal">Generate Reports</button>-->
 						<a class="btn btn-primary btn-sm my-1" href="{% url 'gen_ec_reports' %}" onclick="return confirm('Are you certain you want to generate the extra credit files?');"><i class="fa-solid fa-file-circle-plus fa-fw"></i> Generate Reports</a>
@@ -101,15 +103,34 @@ <h1 class="text-center">Contest Dashboard</h1>
 		<!-- Contest tools card -->
 		<div class="card mt-4 border-secondary">
 			<div class="card-header font-weight-bold bg-secondary text-white">
-				<i class="fa-solid fa-wrench fa-fw"></i> Contest Tools 
+				<i class="fa-solid fa-wrench fa-fw"></i> Tools 
 			</div>
 			<div class="card-body overflow-auto">
-				<div class="row justify-content-center">
-					<button type="button" class="btn btn-primary btn-sm my-1" data-toggle="modal" data-target="#walkinModal"> <i class="fa-solid fa-person-walking fa-fw"></i> Create Walk-in teams</button>
+				<div class="row">
+					<div class="col-lg-6">
+						<div class="row justify-content-center">
+							<button type="button" class="btn btn-primary btn-sm my-1" data-toggle="modal" data-target="#accountStatusModal"><i class="fa-solid fa-user-gear fa-fw"></i> Update Account Status</button>
+						</div>
+						<div class="row justify-content-center">
+							<a class="btn btn-primary btn-sm my-1" href="{% url 'generate_team_csvs' %}" onclick="return confirm('Are you certain you want to generate the team data CSVs?');"><i class="fa-solid fa-file-circle-plus fa-fw"></i> Generate Team CSVs</a>
+							{% if team_csvs_available %}					
+								<a class="btn text-dark" href="{% url 'download_team_csvs' %}" role="button"><i class="fa fa-download fa-md" aria-hidden="true"></i></a>
+							{% else %}
+								<a class="btn text-secondary disabled" href="#" role="button"><i class="fa fa-download fa-md" aria-hidden="true"></i></a>
+							{% endif %}
+						</div>
+					</div>
+					<div class="col-lg-6">
+						<div class="row justify-content-center">
+							<button type="button" class="btn btn-primary btn-sm my-1" data-toggle="modal" data-target="#facultyTeamModal"><i
+									class="fa-solid fa-chalkboard-user fa-fw"></i> Designate Faculty Team</button>
+						</div>
+						<div class="row justify-content-center">
+							<button type="button" class="btn btn-primary btn-sm my-1" data-toggle="modal" data-target="#checkinModal"><i class="fa-solid fa-robot fa-fw"></i> Check in/out Users</button>
+						</div>
+					</div>
 				</div>
-				<div class="row justify-content-center">
-					<button type="button" class="btn btn-primary btn-sm my-1" data-toggle="modal" data-target="#checkinModal"><i class="fa-solid fa-robot fa-fw"></i> Check in/out Users</button>
-				</div>							
+											
 			</div>
 		</div>
 		<!-- Contest tools card end -->
@@ -142,17 +163,22 @@ <h1 class="text-center">Contest Dashboard</h1>
 		<!-- Account tools card -->
 		<div class="card mt-4 border-secondary">
 			<div class="card-header font-weight-bold bg-secondary text-white">
-				<i class="fa-solid fa-wrench fa-fw"></i> Account Tools
+				<i class="fa-solid fa-user-shield fa-fw"></i> Change User Password
 			</div>
-			<div class="card-body overflow-auto">
-				<div class="row justify-content-center">
-					<button type="button" class="btn btn-primary btn-sm my-1" data-toggle="modal" data-target="#activateAccountModal"><i class="fa-solid fa-user-check fa-fw"></i> Activate User Account</button>
+			<form method="post" onSubmit="return confirm('Are you certain you want to update this user password?');">
+				<div class="card-body overflow-auto">
+					{% csrf_token %}
+					<div class="form-group">
+						{{ update_password_form.username | placeholder:"Username" }}
+					</div>
+					<div class="form-group">
+						{{ update_password_form.password | placeholder:"New password" }}
+					</div>
 				</div>
-				<div class="row justify-content-center">
-					<button type="button" class="btn btn-primary btn-sm my-1" data-toggle="modal" data-target="#facultyTeamModal"><i
-							class="fa-solid fa-chalkboard-user fa-fw"></i> Designate Faculty Team</button>
+				<div class="card-footer">
+					<button class="btn btn-primary btn-sm" type="submit">Save</button>
 				</div>
-			</div>
+			</form>
 		</div>
 		<!-- Account tools card end -->
 	</div>
@@ -257,7 +283,6 @@ <h1 class="text-center">Contest Dashboard</h1>
 	</div>
 	<!-- Volunteer Summary card end -->
 
-
 	<!-- Create Walk-in Teams Modal -->
 	<div class="modal fade" id="walkinModal" tabindex="-1" role="dialog"
 		aria-labelledby="confirmClearModalCenterTitle" aria-hidden="true">
@@ -294,7 +319,6 @@ <h5 class="mb-0">{{ field.label_tag }}</h5>
 	</div>
 	<!-- End Create Walk-in Teams Modal -->
 
-
 	<!-- Checkin/Checkout Users Modal -->
 	<div class="modal fade" id="checkinModal" tabindex="-1" role="dialog" aria-labelledby="confirmClearModalCenterTitle"
 		aria-hidden="true">
@@ -330,20 +354,22 @@ <h5 class="modal-title" id="confirmClearModalLongTitle">Check in/out Users</h5>
 	</div>
 	<!-- End Create Walk-in Teams Modal -->
 
-
-	<!-- Activate Account Modal -->
-	<div class="modal fade" id="activateAccountModal" tabindex="-1" role="dialog"
+	<!-- Account Status Modal -->
+	<div class="modal fade" id="accountStatusModal" tabindex="-1" role="dialog"
 		aria-labelledby="confirmClearModalCenterTitle" aria-hidden="true">
 		<div class="modal-dialog modal-dialog-centered" role="document">
 			<div class="modal-content">
 				<div class="modal-header">
-					<h5 class="modal-title" id="confirmClearModalLongTitle">Activate User Account</h5>
+					<h5 class="modal-title" id="confirmClearModalLongTitle">Update Account Status</h5>
 				</div>
-				<form method="post" onSubmit="return confirm('Are you certain you want to activate this account?');">
+				<form method="post" onSubmit="return confirm('Are you certain you want to update this account?');">
 					<div class="modal-body overflow-auto">
 						{% csrf_token %}
 						<div class="form-group">
-							{{ activate_account_form.username | placeholder:"Username"}}
+							{{ account_status_form.username | placeholder:"Username" }}
+						</div>
+						<div class="form-group">
+							{{ account_status_form.status }}
 						</div>
 					</div>
 					<div class="card-footer">
@@ -354,8 +380,7 @@ <h5 class="modal-title" id="confirmClearModalLongTitle">Activate User Account</h
 			</div>
 		</div>
 	</div>
-	<!-- End Activate Account Modal -->
-
+	<!-- End Account Status Modal -->
 
 	<!-- Designate Faculty Team Modal -->
 	<div class="modal fade" id="facultyTeamModal" tabindex="-1" role="dialog"
diff --git a/src/contestadmin/urls.py b/src/contestadmin/urls.py
index d2a16b8b..e8fa359c 100644
--- a/src/contestadmin/urls.py
+++ b/src/contestadmin/urls.py
@@ -15,5 +15,7 @@
     path('ec_files/generate', login_required((user_passes_test(contestadmin_auth, login_url='/', redirect_field_name=None))(views.GenerateExtraCreditReports.as_view())), name='gen_ec_reports'),
     path('faculty/<uidb64>/', views.FacultyDashboard.as_view(), name='fac_ec_dashboard'),
     path('faculty/<uidb64>/download', views.FacultyDashboard.download, name='fac_ec_files_dl'),
-    path('statistics/', views.contest_statistics, name='contest_stats')
+    path('statistics/', views.contest_statistics, name='contest_stats'),
+    path('team_csvs/generate', views.ExportTeamData.as_view(), name='generate_team_csvs'),
+    path('team_csvs/download', views.ExportTeamData.download, name='download_team_csvs')
 ]
diff --git a/src/contestadmin/utils.py b/src/contestadmin/utils.py
index 704432c8..640cfadd 100644
--- a/src/contestadmin/utils.py
+++ b/src/contestadmin/utils.py
@@ -1,7 +1,19 @@
+from django.contrib.auth.mixins import UserPassesTestMixin
+
 """
 Functions useable by @user_passes_test view decorator. Each function accepts a User object
 as its only parameter.
 """
 
 def contestadmin_auth(user):
-	return user.profile.role == 5 or user.is_superuser
+    return user.profile.role == 5 or user.is_superuser
+
+
+class ContestAdminAuthMixin(UserPassesTestMixin):
+    """
+    Mixin which integrates the contestadmin_auth test into a UserPassesTestMixin.
+    - Enables class based view support of the test.
+    """
+
+    def test_func(self):
+        return contestadmin_auth(self.request.user)
diff --git a/src/contestadmin/views.py b/src/contestadmin/views.py
index adc5384a..bfe693dd 100644
--- a/src/contestadmin/views.py
+++ b/src/contestadmin/views.py
@@ -1,8 +1,10 @@
 import os
 
 from django.contrib import messages
-from django.contrib.auth.models import User
 from django.contrib.auth.decorators import login_required, user_passes_test
+from django.contrib.auth.mixins import LoginRequiredMixin
+from django.contrib.auth.models import User
+from django.contrib.auth.password_validation import validate_password
 from django.db import transaction
 from django.http import HttpResponse
 from django.utils.encoding import force_str
@@ -15,7 +17,7 @@
 
 from . import forms
 from . import tasks
-from .utils import contestadmin_auth
+from .utils import contestadmin_auth, ContestAdminAuthMixin
 from contestadmin.models import Contest
 from contestsuite.settings import MEDIA_ROOT
 from lfg.models import LFGProfile
@@ -192,6 +194,53 @@ def get(self, request):
         return redirect('admin_dashboard')
 
 
+class ExportTeamData(LoginRequiredMixin, ContestAdminAuthMixin, View):
+    """
+    View which creates and serves a zip file containing contest team data per division.
+    """
+
+    def get(self, request):
+        """
+        Schedules generation of CSV files.
+        """
+
+        tasks.generate_team_csvs.delay()
+        messages.info(request, 'Team data CSVs generation scheduled.', fail_silently=True)
+
+        return redirect('admin_dashboard')
+
+    def download(self):
+        """
+        Serves a ZIP file containing all team data CSV files. 
+        """
+        
+        fpath = f"{MEDIA_ROOT}/team_files/"
+
+        # Initialize zip file
+        in_memory = BytesIO()
+        zip = ZipFile(in_memory, 'a')
+
+        # Add team csvs to zip file
+        for fname in os.listdir(fpath):
+            zip.write(fpath+fname, fname)
+
+        # fix for Linux zip files read in Windows
+        for file in zip.filelist:
+            file.create_system = 0 
+
+        zip.close()
+
+        # Initialize response
+        response = HttpResponse(content_type='application/zip')
+        response['Content-Disposition'] = 'attachment; filename=team_data_csvs.zip'
+        
+        # Write zip file to response
+        in_memory.seek(0)    
+        response.write(in_memory.read())
+        
+        return response
+    
+
 @login_required
 @user_passes_test(contestadmin_auth, login_url='/', redirect_field_name=None)
 @transaction.atomic
@@ -208,10 +257,10 @@ def dashboard(request):
         file_form = forms.ResultsForm(request.POST, request.FILES)
         checkin_form = forms.CheckinUsersForm(request.POST)
         channel_form = forms.ClearChannelForm(request.POST)
+        update_password_form = forms.UpdatePasswordForm(request.POST)
         profile_role_form = forms.UpdateProfileRoleForm(request.POST)
-        activate_account_form = forms.ActivateAccountForm(request.POST)
-        faculty_team_form = forms.DesignateFacultyTeamForm(
-            request.POST)
+        account_status_form = forms.AccountStatusForm(request.POST)
+        faculty_team_form = forms.DesignateFacultyTeamForm(request.POST)
 
         # Process walk-in team creation form
         if walkin_form.is_valid():
@@ -229,6 +278,25 @@ def dashboard(request):
                 channel_form.cleaned_data['channel_id'])
             messages.info(request, 'Clear channel task scheduled.',
                           fail_silently=True)
+        # Process password update form
+        elif update_password_form.is_valid():
+            try:
+                user = User.objects.get(username=update_password_form.cleaned_data['username'])
+            except:
+                messages.error(request, 'User not found.', fail_silently=True)
+            else:
+                try:
+                    validate_password(update_password_form.cleaned_data['password'], user)
+                except:
+                    messages.error(request, 'Please try a different password.', fail_silently=True)
+                else:
+                    try:
+                        user.set_password(update_password_form.cleaned_data['password'])
+                        user.save()
+                    except:
+                        messages.error(request, 'Password save failed.', fail_silently=True)
+                    else:
+                        messages.success(request, 'Password updated.', fail_silently=True)
         # Process profile role change form
         elif profile_role_form.is_valid():
             try:
@@ -243,21 +311,35 @@ def dashboard(request):
             else:
                 messages.success(request, 'Updated user role.',
                                  fail_silently=True)
-        # Process admin account activation form
-        elif activate_account_form.is_valid():
+        # Process account status update form
+        elif account_status_form.is_valid():
             try:
                 account = User.objects.get(
-                    username=activate_account_form.cleaned_data['username'])
-                # Activate account
-                account.is_active = True
-                account.profile.email_confirmed = True
-                account.save()
+                    username=account_status_form.cleaned_data['username'])
             except:
                 messages.error(
-                    request, 'Account activation failed.', fail_silently=True)
+                    request, 'Unable to locate username in database.', fail_silently=True)
             else:
-                messages.success(
-                    request, 'Activated user account.', fail_silently=True)
+                if account_status_form.cleaned_data['status'] == '0':
+                    # Activate account
+                    account.is_active = True
+                    account.profile.email_confirmed = True
+                elif account_status_form.cleaned_data['status'] == '1':
+                    # Deactivate account
+                    account.is_active = False
+                
+                try:
+                    account.save()
+                except:
+                    messages.error(
+                        request, 'Account status update failed.', fail_silently=True)
+                else:
+                    if account_status_form.cleaned_data['status'] == '0':
+                        messages.success(
+                            request, 'Activated user account.', fail_silently=True)
+                    elif account_status_form.cleaned_data['status'] == '1':
+                        messages.success(
+                            request, 'Deactivated user account.', fail_silently=True)   
         # Process faculty team designation form
         elif faculty_team_form.is_valid():
             try:
@@ -302,8 +384,9 @@ def dashboard(request):
         file_form = forms.ResultsForm()
         checkin_form = forms.CheckinUsersForm()
         channel_form = forms.ClearChannelForm()
+        update_password_form = forms.UpdatePasswordForm()
         profile_role_form = forms.UpdateProfileRoleForm()
-        activate_account_form = forms.ActivateAccountForm()
+        account_status_form = forms.AccountStatusForm()
         faculty_team_form = forms.DesignateFacultyTeamForm()
         
     
@@ -324,6 +407,9 @@ def dashboard(request):
         context['dj_files_available'] = True
     else:
         context['dj_files_available'] = False
+
+    # Determine if team CSVs have been generated
+    context['team_csvs_available'] = True if len(os.listdir(f"{MEDIA_ROOT}/team_files/")) > 0 else False
     
     # Volunteer card data
     context['volunteers'] = [user for user in Profile.objects.order_by('role').all() if user.is_volunteer()]
@@ -333,8 +419,9 @@ def dashboard(request):
     context['file_form'] = file_form
     context['gen_walkin_form'] = walkin_form
     context['channel_form'] = channel_form
+    context['update_password_form'] = update_password_form
     context['profile_role_form'] = profile_role_form
-    context['activate_account_form'] = activate_account_form
+    context['account_status_form'] = account_status_form
     context["faculty_team_form"] = faculty_team_form
 
     return render(request, 'contestadmin/dashboard.html', context)
diff --git a/src/core/management/commands/initadmin.py b/src/core/management/commands/initadmin.py
index aa6291b0..8dd2ce69 100644
--- a/src/core/management/commands/initadmin.py
+++ b/src/core/management/commands/initadmin.py
@@ -8,7 +8,7 @@ class Command(BaseCommand):
 
     def handle(self, *args, **options):
         if User.objects.count() == 0:
-            admin = User.objects.create_superuser(username='contestadmin', email='contest@fsu.acm.org', password='seminoles1!', first_name='Administrator')
+            admin = User.objects.create_superuser(username='contestadmin', email='contest@fsu.acm.org', password='seminoles1!', first_name='Contest Admin', last_name='Team')
             admin.save()
         else:
-            print('Admin accounts can only be initialized if no Accounts exist')
\ No newline at end of file
+            print('Skipping default superuser account creation. The account already exists.')
diff --git a/src/core/urls.py b/src/core/urls.py
index cf102a5f..4beb086a 100644
--- a/src/core/urls.py
+++ b/src/core/urls.py
@@ -3,9 +3,8 @@
 from . import views
 
 urlpatterns = [
-    # contest suite homepage
-    path('', views.index, name='index'),
-    path('contact/', views.contact, name='contact'),
-    path('faq/', views.faq, name='faq'),
-    path('teams/', views.teams, name='teams'),
+    path('', views.IndexTemplateView.as_view(), name='index'),
+    path('contact/', views.ContactTemplateView.as_view(), name='contact'),
+    path('faq/', views.FaqTemplateView.as_view(), name='faq'),
+    path('teams/', views.TeamsTemplateView.as_view(), name='teams'),
 ]
diff --git a/src/core/views.py b/src/core/views.py
index 503690d7..6398ffb0 100644
--- a/src/core/views.py
+++ b/src/core/views.py
@@ -1,5 +1,5 @@
-from django.shortcuts import render
 from django.core.cache import cache
+from django.views.generic.base import TemplateView
 
 import requests as req
 
@@ -12,114 +12,122 @@
 
 # Create your views here.
 
-def index(request):
+class IndexTemplateView(TemplateView):
     """
     View to display site index(home) page. Displays announcements, DOMjudge server status, and information on 
     extra credit courses, participation, teams, and looking for group participants. 
     """
 
-    context = {}
+    template_name = 'core/index.html'
 
-    # Get cached DOMjudge server status or ping server
-    if cache.get('domjudge_status'):
-        context['domjudge_status'] = cache.get('domjudge_status')
-    else:
-        try:
-            r = req.head(DOMJUDGE_URL)
-        except req.ConnectionError:
-            context['domjudge_status'] = None
+    def get_context_data(self, **kwargs):
+        # Call the base implementation first to get a context
+        context = super().get_context_data(**kwargs)
+
+        # Get cached DOMjudge server status or ping server
+        if cache.get('domjudge_status'):
+            context['domjudge_status'] = cache.get('domjudge_status')
         else:
-            context['domjudge_status'] = r.status_code
-            cache.set('domjudge_status', r.status_code, CACHE_TIMEOUT)
-    
-    # Get contest object or set to None
-    context['contest'] = cache.get_or_set(
-        'contest_model', Contest.objects.first(), CACHE_TIMEOUT)
-    
-    # Get published announcements
-    context['announcements'] = (Announcement.objects.filter(status=1))
-    # Get all courses
-    context['courses'] = Course.objects.all()
-
-    if context['contest'] and context['contest'].lfg_active:
-        # Get Looking For Group profile totals
-        context['lfg_profiles_upper'] = LFGProfile.objects.filter(active=True).filter(division=1).count()
-        context['lfg_profiles_lower'] = LFGProfile.objects.filter(active=True).filter(division=2).count()
-
-    ### Teams ###
-
-    teams_set = Team.objects.all()
-    participants_set = Profile.objects.all()
-
-    # Aggregate upper division team and participant info
-    upper_teams_set = teams_set.filter(division=1).filter(
-        faculty=False).exclude(num_members=0)
-    context['num_upper_teams'] = upper_teams_set.count()
-    context['num_upper_participants'] = participants_set.filter(
-        team__division=1).count()
-
-    #  Aggregate lower division team and participant info
-    lower_teams_set = teams_set.filter(division=2).filter(
-        faculty=False).exclude(num_members=0)
-    context['num_lower_teams'] = lower_teams_set.count()
-    context['num_lower_participants'] = participants_set.filter(
-        team__division=2).count()
-
-    # Aggregate faculty team and participant info
-    faculty_teams_set = teams_set.filter(faculty=True).exclude(num_members=0)
-    context['num_faculty_teams'] = faculty_teams_set.count()
-    context['num_faculty_participants'] = participants_set.filter(
-        team__faculty=True).count()
-
-    return render(request, 'core/index.html', context)
-
-
-def contact(request):
+            try:
+                r = req.head(DOMJUDGE_URL)
+            except req.ConnectionError:
+                context['domjudge_status'] = None
+            else:
+                context['domjudge_status'] = r.status_code
+                cache.set('domjudge_status', r.status_code, CACHE_TIMEOUT)
+
+        # Get contest object or set to None
+        context['contest'] = cache.get_or_set(
+            'contest_model', Contest.objects.first(), CACHE_TIMEOUT)
+        
+        # Get published announcements
+        context['announcements'] = (Announcement.objects.filter(status=1))
+        # Get all courses
+        context['courses'] = Course.objects.all()
+
+        if context['contest'] and context['contest'].lfg_active:
+            # Get Looking For Group profile totals
+            context['lfg_profiles_upper'] = LFGProfile.objects.filter(active=True).filter(division=1).count()
+            context['lfg_profiles_lower'] = LFGProfile.objects.filter(active=True).filter(division=2).count()
+
+        ### Teams ###
+
+        teams_set = Team.objects.all()
+        participants_set = Profile.objects.all()
+
+        # Aggregate upper division team and participant info
+        upper_teams_set = teams_set.filter(division=1).filter(
+            faculty=False).exclude(num_members=0)
+        context['num_upper_teams'] = upper_teams_set.count()
+        context['num_upper_participants'] = participants_set.filter(
+            team__division=1).count()
+
+        #  Aggregate lower division team and participant info
+        lower_teams_set = teams_set.filter(division=2).filter(
+            faculty=False).exclude(num_members=0)
+        context['num_lower_teams'] = lower_teams_set.count()
+        context['num_lower_participants'] = participants_set.filter(
+            team__division=2).count()
+
+        # Aggregate faculty team and participant info
+        faculty_teams_set = teams_set.filter(faculty=True).exclude(num_members=0)
+        context['num_faculty_teams'] = faculty_teams_set.count()
+        context['num_faculty_participants'] = participants_set.filter(
+            team__faculty=True).count()
+        
+        return context
+
+
+class ContactTemplateView(TemplateView):
     """
     View to display contact us page.
     """
 
-    return render(request, 'core/contact.html')
+    template_name = 'core/contact.html'
 
 
-def faq(request):
+class FaqTemplateView(TemplateView):
     """
     View to display faq page.
     """
 
-    return render(request, 'core/faq.html')
+    template_name = 'core/faq.html'
 
 
-def teams(request):
+class TeamsTemplateView(TemplateView):
     """
     View to display teams page.
     """
 
-    context = {}
+    template_name = 'core/teams.html'
+
+    def get_context_data(self, **kwargs):
+        # Call the base implementation first to get a context
+        context = super().get_context_data(**kwargs)
 
-    # Get contest object or set to None
-    context['contest'] = cache.get_or_set(
-        'contest_model', Contest.objects.first(), CACHE_TIMEOUT)
+        # Get contest object or set to None
+        context['contest'] = cache.get_or_set(
+            'contest_model', Contest.objects.first(), CACHE_TIMEOUT)
 
-    teams_set = Team.objects.all()
-    participants_set = Profile.objects.all()
+        teams_set = Team.objects.all()
+        participants_set = Profile.objects.all()
 
-    # Aggregate upper division team and participant info
-    upper_teams_set = teams_set.filter(division=1).filter(faculty=False).exclude(num_members=0)
-    context['upper_teams'] = upper_teams_set.order_by('-questions_answered', 'score', 'name')
-    context['num_upper_teams'] = upper_teams_set.count()
-    context['num_upper_participants'] = participants_set.filter(team__division=1).count()
+        # Aggregate upper division team and participant info
+        upper_teams_set = teams_set.filter(division=1).filter(faculty=False).exclude(num_members=0)
+        context['upper_teams'] = upper_teams_set.order_by('-questions_answered', 'score', 'name')
+        context['num_upper_teams'] = upper_teams_set.count()
+        context['num_upper_participants'] = participants_set.filter(team__division=1).count()
 
-    #  Aggregate lower division team and participant info
-    lower_teams_set = teams_set.filter(division=2).filter(faculty=False).exclude(num_members=0)
-    context['lower_teams'] = lower_teams_set.order_by('-questions_answered', 'score', 'name')
-    context['num_lower_teams'] = lower_teams_set.count()
-    context['num_lower_participants'] = participants_set.filter(team__division=2).count()
+        #  Aggregate lower division team and participant info
+        lower_teams_set = teams_set.filter(division=2).filter(faculty=False).exclude(num_members=0)
+        context['lower_teams'] = lower_teams_set.order_by('-questions_answered', 'score', 'name')
+        context['num_lower_teams'] = lower_teams_set.count()
+        context['num_lower_participants'] = participants_set.filter(team__division=2).count()
 
-    # Aggregate faculty team and participant info
-    faculty_teams_set = teams_set.filter(faculty=True).exclude(num_members=0)
-    context['faculty_teams'] = faculty_teams_set.order_by('-questions_answered', 'score', 'name')
-    context['num_faculty_teams'] = faculty_teams_set.count()
-    context['num_faculty_participants'] = participants_set.filter(team__faculty=True).count()
+        # Aggregate faculty team and participant info
+        faculty_teams_set = teams_set.filter(faculty=True).exclude(num_members=0)
+        context['faculty_teams'] = faculty_teams_set.order_by('-questions_answered', 'score', 'name')
+        context['num_faculty_teams'] = faculty_teams_set.count()
+        context['num_faculty_participants'] = participants_set.filter(team__faculty=True).count()
 
-    return render(request, 'core/teams.html', context)
+        return context
diff --git a/src/manager/views.py b/src/manager/views.py
index ff9938aa..1ee860d3 100644
--- a/src/manager/views.py
+++ b/src/manager/views.py
@@ -38,7 +38,7 @@ def dashboard(request):
     context['team_members'] = User.objects.filter(profile__team=request.user.profile.team).exclude(username=request.user.username)
 
     # Generate account some useful account notifications
-    if not request.user.profile.has_team():
+    if not request.user.profile.has_team() and not request.user.profile.is_volunteer():
         messages.warning(
             request, 'You are not a member of a registered team. You must be a team member in order to compete. Check out the FAQ for more information.')
     if not request.user.profile.has_courses() and context['total_num_courses'] > 0:
@@ -47,7 +47,7 @@ def dashboard(request):
     if request.user.profile.fsu_id is None or request.user.profile.fsu_id == '':
         messages.info(
             request, 'Your FSU ID is blank. You must add it to your profile in order to receive extra credit. Check out the FAQ for more information.')
-    if request.user.profile.fsu_num is None or request.user.profile.fsu_num == '':
+    if (request.user.profile.fsu_num is None or request.user.profile.fsu_num == '') and not request.user.profile.is_volunteer():
         messages.info(
             request, 'Your FSU number is blank. You must add it to your profile in order to swipe check in using your FSUCard on contest day. Check out the FAQ for more information.')
 
diff --git a/src/media/team_files/placeholder.txt b/src/media/team_files/placeholder.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/src/templates/base.html b/src/templates/base.html
index 4b574665..58a6f53c 100644
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -107,7 +107,7 @@
                   target="_blank" rel="external noopener"><i class="fa-solid fa-file-circle-question fa-fw"></i> Example Questions</a>
                 <a class="dropdown-item" href="https://drive.google.com/drive/folders/1uCylEYyFdXdxD_BxplYZIioW6_ragXTq?usp=sharing"
                   target="_blank" rel="external noopener"><i class="fa-solid fa-book fa-fw"></i> Registration Guide</a>
-                <a class="dropdown-item" href="https://www.domjudge.org/docs/team-manual.pdf"
+                <a class="dropdown-item" href="https://www.domjudge.org/docs/manual/7.3/team.html"
                   target="_blank" rel="external noopener"><i class="fa-solid fa-book fa-fw"></i> Team Manual</a>
                 <a class="dropdown-item" href="https://bit.ly/JoinProgClub" target="_blank" rel="external noopener"><i class="fa-solid fa-people-group fa-fw"></i> Programming Club</a>
               </div>