diff --git a/allianceauth/hrapplications/templates/hrapplications/corpchoice.html b/allianceauth/hrapplications/templates/hrapplications/corpchoice.html
index e22ae52c..a8a35872 100644
--- a/allianceauth/hrapplications/templates/hrapplications/corpchoice.html
+++ b/allianceauth/hrapplications/templates/hrapplications/corpchoice.html
@@ -1,10 +1,15 @@
 {% extends "allianceauth/base-bs5.html" %}
+
 {% load i18n %}
 
-{% block page_title %}{% translate "Choose a Corp" %}{% endblock page_title %}
+{% block page_title %}
+    {% translate "Choose a Corp" %}
+{% endblock page_title %}
+
 {% block content %}
-    <div class="col-lg-12">
-        <h1 class="page-header text-center">{% translate "Choose a Corp" %}</h1>
+    <div>
+        <h1 class="page-header text-center mb-3">{% translate "Choose a Corp" %}</h1>
+
         {% if choices %}
             <div class="panel panel-primary">
                 <div class="panel-heading">{% translate "Available Corps" %}</div>
diff --git a/allianceauth/hrapplications/templates/hrapplications/create.html b/allianceauth/hrapplications/templates/hrapplications/create.html
index e906109a..a5e29f86 100644
--- a/allianceauth/hrapplications/templates/hrapplications/create.html
+++ b/allianceauth/hrapplications/templates/hrapplications/create.html
@@ -1,35 +1,43 @@
 {% extends "allianceauth/base-bs5.html" %}
+
 {% load i18n %}
 
-{% block page_title %}{% translate "Apply To" %} {{ corp.corporation_name }}{% endblock page_title %}
+{% block page_title %}
+    {% translate "Apply To" %} {{ corp.corporation_name }}
+{% endblock page_title %}
+
 {% block content %}
-<div class="col-lg-12">
-    <h1 class="page-header text-center">{% translate "Apply To" %} {{ corp.corporation_name }}</h1>
-    <div class="container-fluid">
-        <div class="col-md-4 col-md-offset-4">
-            <div class="row">
-                <form class="form-signin">
-                    {% csrf_token %}
-                    {% for question in questions %}
-                        <div class="form-group">
-                            <label class="control-label" for="id_{{ question.pk }}">{{ question.title }}</label>
-                            <div class=" ">
-                            {% if question.help_text %}
-                                <div class="text-center">{{ question.help_text }}</div>
-                            {% endif %}
-                            {% for choice in question.choices.all %}
-                                <input type={% if question.multi_select == False %}"radio"{% else %}"checkbox"{% endif %} name="{{ question.pk }}" id="id_{{ question.pk }}_choice_{{ forloop.counter }}" value="{{ choice.choice_text }}">
-                                <label for="id_{{ question.pk }}_choice_{{ forloop.counter }}">{{ choice.choice_text }}</label><br>
-                            {% empty %}
-                                <textarea class="form-control" cols="30" id="id_{{ question.pk }}" name="{{ question.pk }}" rows="4"></textarea>
-                            {% endfor %}
-                        </div>
-                    </div>
-                    {% endfor %}
-                    <button class="btn btn-lg btn-primary btn-block" type="submit" formmethod="post">{% translate "Submit" %}</button>
-                </form>
+    <div>
+        <h1 class="page-header text-center mb-3">{% translate "Apply To" %} {{ corp.corporation_name }}</h1>
+
+        <div class="container-fluid">
+            <div class="col-md-4 col-md-offset-4">
+                <div class="row">
+                    <form class="form-signin">
+                        {% csrf_token %}
+
+                        {% for question in questions %}
+                            <div class="form-group">
+                                <label class="control-label" for="id_{{ question.pk }}">{{ question.title }}</label>
+                                <div>
+                                    {% if question.help_text %}
+                                        <div class="text-center">{{ question.help_text }}</div>
+                                    {% endif %}
+
+                                    {% for choice in question.choices.all %}
+                                        <input type={% if question.multi_select == False %}"radio"{% else %}"checkbox"{% endif %} name="{{ question.pk }}" id="id_{{ question.pk }}_choice_{{ forloop.counter }}" value="{{ choice.choice_text }}">
+                                        <label for="id_{{ question.pk }}_choice_{{ forloop.counter }}">{{ choice.choice_text }}</label><br>
+                                    {% empty %}
+                                        <textarea class="form-control" cols="30" id="id_{{ question.pk }}" name="{{ question.pk }}" rows="4"></textarea>
+                                    {% endfor %}
+                                </div>
+                            </div>
+                        {% endfor %}
+
+                        <button class="btn btn-lg btn-primary btn-block" type="submit" formmethod="post">{% translate "Submit" %}</button>
+                    </form>
+                </div>
             </div>
         </div>
     </div>
-</div>
 {% endblock %}
diff --git a/allianceauth/hrapplications/templates/hrapplications/management.html b/allianceauth/hrapplications/templates/hrapplications/management.html
index b6bdc739..d1fb4b53 100644
--- a/allianceauth/hrapplications/templates/hrapplications/management.html
+++ b/allianceauth/hrapplications/templates/hrapplications/management.html
@@ -1,13 +1,17 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
+
 {% load bootstrap %}
 {% load i18n %}
 
-{% block page_title %}{% translate "HR Application Management" %}{% endblock page_title %}
+{% block page_title %}
+    {% translate "HR Application Management" %}
+{% endblock page_title %}
+
 {% block extra_css %}{% endblock extra_css %}
 
 {% block content %}
-    <div class="col-lg-12">
-        <h1 class="page-header text-center">{% translate "Personal Applications" %}
+    <div>
+        <h1 class="page-header text-center mb-3">{% translate "Personal Applications" %}
             <div class="text-end">
                 {% if create %}
                     <a href="{% url 'hrapplications:create_view' %}">
@@ -18,6 +22,7 @@
                 {% endif %}
             </div>
         </h1>
+
         {% if personal_apps %}
             <div class="panel panel-default">
                 <table class="table table-condensed">
@@ -27,6 +32,7 @@
                         <th class="text-center">{% translate "Status" %}</th>
                         <th class="text-center">{% translate "Actions" %}</th>
                     </tr>
+
                     {% for personal_app in personal_apps %}
                         <tr>
                             <td class="text-center">{{ personal_app.user.username }}</td>
@@ -56,6 +62,7 @@
                 </table>
             </div>
         {% endif %}
+
         {% if perms.auth.human_resources %}
             <h1 class="page-header text-center">{% translate "Application Management" %}
                 <div class="text-end">
@@ -65,10 +72,12 @@
                     </button>
                 </div>
             </h1>
+
             <ul class="nav nav-tabs">
                 <li class="active"><a data-toggle="tab" href="#pending">{% translate "Pending" %}</a></li>
                 <li><a data-toggle="tab" href="#reviewed">{% translate "Reviewed" %}</a></li>
             </ul>
+
             <div class="tab-content">
                 <div id="pending" class="tab-pane fade in active panel panel-default">
                     <div class="panel-body">
@@ -82,6 +91,7 @@
                                     <th class="text-center">{% translate "Status" %}</th>
                                     <th class="text-center">{% translate "Actions" %}</th>
                                 </tr>
+
                                 {% for app in applications %}
                                     <tr>
                                         <td class="text-center">{{ app.created }}</td>
@@ -114,6 +124,7 @@
                         {% endif %}
                     </div>
                 </div>
+
                 <div id="reviewed" class="tab-pane fade panel panel-default">
                     <div class="panel-body">
                         {% if finished_applications %}
@@ -126,6 +137,7 @@
                                     <th class="text-center">{% translate "Status" %}</th>
                                     <th class="text-center">{% translate "Actions" %}</th>
                                 </tr>
+
                                 {% for app in finished_applications %}
                                     <tr>
                                         <td class="text-center">{{ app.created }}</td>
@@ -149,6 +161,7 @@
                                             <a href="{% url 'hrapplications:view' app.id %}" class="btn btn-primary">
                                                 <span class="glyphicon glyphicon-eye-open"></span>
                                             </a>
+
                                             {% if perms.hrapplications.delete_application %}
                                                 <a href="{% url 'hrapplications:remove' app.id %}" class="btn btn-danger">
                                                     <span class="glyphicon glyphicon-remove"></span>
@@ -173,9 +186,13 @@
             <div class="modal-dialog">
                 <div class="modal-content">
                     <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">{% translate "Close" %}</span></button>
+                        <button type="button" class="close" data-dismiss="modal">
+                            <span aria-hidden="true">&times;</span><span class="sr-only">{% translate "Close" %}</span>
+                        </button>
+
                         <h4 class="modal-title" id="myModalLabel">{% translate "Application Search" %}</h4>
                     </div>
+
                     <div class="modal-body">
                         <form class="form-signin" role="form" action="{% url 'hrapplications:search' %}" method="POST">
                             {% csrf_token %}
@@ -184,8 +201,8 @@
                             <button class="btn btn-lg btn-primary btn-block" type="submit">{% translate "Search" %}</button>
                         </form>
                     </div>
-                    <div class="modal-footer">
-                    </div>
+
+                    <div class="modal-footer"></div>
                 </div>
             </div>
         </div>
diff --git a/allianceauth/hrapplications/templates/hrapplications/searchview.html b/allianceauth/hrapplications/templates/hrapplications/searchview.html
index 19b8e801..6ccbe223 100644
--- a/allianceauth/hrapplications/templates/hrapplications/searchview.html
+++ b/allianceauth/hrapplications/templates/hrapplications/searchview.html
@@ -1,12 +1,16 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
+
 {% load bootstrap %}
 {% load i18n %}
 
-{% block page_title %}{% translate "HR Application Management" %}{% endblock page_title %}
+{% block page_title %}
+    {% translate "HR Application Management" %}
+{% endblock page_title %}
+
 {% block extra_css %}{% endblock extra_css %}
 
 {% block content %}
-    <div class="col-lg-12">
+    <div>
         {% if perms.auth.human_resources %}
             <h1 class="page-header text-center">{% translate "Application Search Results" %}
                 <div class="text-end">
@@ -16,6 +20,7 @@
                     </button>
                 </div>
             </h1>
+
             <div class="container-fluid">
                 <table class="table table-bordered">
                     <tr>
@@ -26,6 +31,7 @@
                         <th class="text-center">{% translate "Status" %}</th>
                         <th class="text-center">{% translate "Actions" %}</th>
                     </tr>
+
                     {% for app in applications %}
                         <tr>
                             <td class="text-center">{{ app.id }}</td>
@@ -59,9 +65,13 @@
             <div class="modal-dialog">
                 <div class="modal-content">
                     <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">{% translate "Close" %}</span></button>
+                        <button type="button" class="close" data-dismiss="modal">
+                            <span aria-hidden="true">&times;</span><span class="sr-only">{% translate "Close" %}</span>
+                        </button>
+
                         <h4 class="modal-title" id="myModalLabel">{% translate "Application Search" %}</h4>
                     </div>
+
                     <div class="modal-body">
                         <form class="form-signin" role="form" action="{% url 'hrapplications:search' %}" method="POST">
                             {% csrf_token %}
@@ -70,8 +80,8 @@
                             <button class="btn btn-lg btn-primary btn-block" type="submit">{% translate "Search" %}</button>
                         </form>
                     </div>
-                    <div class="modal-footer">
-                    </div>
+
+                    <div class="modal-footer"></div>
                 </div>
             </div>
         </div>
diff --git a/allianceauth/hrapplications/templates/hrapplications/view.html b/allianceauth/hrapplications/templates/hrapplications/view.html
index 2656db31..87e34eab 100644
--- a/allianceauth/hrapplications/templates/hrapplications/view.html
+++ b/allianceauth/hrapplications/templates/hrapplications/view.html
@@ -1,13 +1,18 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
+
 {% load bootstrap %}
 {% load i18n %}
 
-{% block page_title %}{% translate "View Application" %}{% endblock page_title %}
+{% block page_title %}
+    {% translate "View Application" %}
+{% endblock page_title %}
+
 {% block extra_css %}{% endblock extra_css %}
 
 {% block content %}
-    <div class="col-lg-12">
-        <h1 class="page-header text-center">{% translate "View Application" %}</h1>
+    <div>
+        <h1 class="page-header text-center mb-3">{% translate "View Application" %}</h1>
+
         <div class="container-fluid">
             <div class="col-md-6 col-md-offset-3">
                 <div class="row">
@@ -22,6 +27,7 @@
                         <div class="alert alert-info text-center">{% translate "Reviewer:" %} {{ app.reviewer_str }}</div>
                     {% endif %}
                 </div>
+
                 <div class="row">
                     <div class="panel panel-info">
                         <div class="panel-heading">{% translate "Applicant" %}</div>
@@ -36,6 +42,7 @@
                             </tr>
                         </table>
                     </div>
+
                     <div class="panel panel-info">
                         <div class="panel-heading">{% translate "Characters" %}</div>
                         <table class="table">
@@ -45,6 +52,7 @@
                                 <th class="text-center">{% translate "Corp" %}</th>
                                 <th class="text-center">{% translate "Alliance" %}</th>
                             </tr>
+
                             {% for char in app.characters %}
                                 <tr>
                                     <td class="text-center">
@@ -58,6 +66,7 @@
                         </table>
                     </div>
                 </div>
+
                 <div class="row">
                     {% for response in responses %}
                         <div class="panel panel-default">
@@ -66,6 +75,7 @@
                         </div>
                     {% endfor %}
                 </div>
+
                 {% if buttons %}
                     {% if perms.auth.human_resources %}
                         <div class="row">
@@ -87,12 +97,14 @@
                                             <a href="{% url 'hrapplications:mark_in_progress' app.id %}" class="btn btn-warning">{% translate "Mark in Progress" %}</a>
                                         {% endif %}
                                     {% endif %}
+
                                     {% if perms.hrapplications.add_applicationcomment %}
                                         <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#myModal">{% translate "Comment" %}</button>
                                     {% endif %}
                                 </div>
                             </div>
                         </div>
+
                         <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
                             <div class="panel panel-default">
                                 <div class="panel-heading" role="tab" id="headingThree">
@@ -102,6 +114,7 @@
                                         </a>
                                     </h4>
                                 </div>
+
                                 <div id="collapseThree" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingThree">
                                     <div class="panel-body">
                                         {% for comment in comments %}
@@ -125,6 +138,7 @@
             </div>
         </div>
     </div>
+
     {% if perms.hrapplications.add_applicationcomment %}
         <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
             <div class="modal-dialog">
@@ -133,8 +147,10 @@
                         <button type="button" class="close" data-dismiss="modal">
                             <span aria-hidden="true">&times;</span><span class="sr-only">{% translate "Close" %}</span>
                         </button>
+
                         <h4 class="modal-title" id="myModalLabel">{% translate "Add Comment" %}</h4>
                     </div>
+
                     <div class="modal-body">
                         <form class="form-signin" role="form" action="" method="POST">
                             {% csrf_token %}
@@ -143,6 +159,7 @@
                             <button class="btn btn-lg btn-primary btn-block" type="submit">{% translate "Add Comment" %}</button>
                         </form>
                     </div>
+
                     <div class="modal-footer"></div>
                 </div>
             </div>