diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 5d7aad0ea..065ea8b67 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -90,10 +90,18 @@ repos:
     rev: v1.31.1
     hooks:
       - id: djlint-reformat
+        pass_filenames: false
         args:
           - OpenOversight/app/templates
-          - --format-js
           - --format-css
           - --profile=jinja
           - --indent=2
           - --quiet
+      - id: djlint
+        require_serial: true
+        pass_filenames: false
+        args:
+          - OpenOversight/app/templates
+          - --profile=jinja
+          - --use-gitignore
+          - --ignore=H006,T028,H031,H021,H013,H011
diff --git a/OpenOversight/app/main/views.py b/OpenOversight/app/main/views.py
index 898e44713..bfc3ad75a 100644
--- a/OpenOversight/app/main/views.py
+++ b/OpenOversight/app/main/views.py
@@ -144,7 +144,7 @@ def browse():
 @sitemap_include
 @main.route("/find", methods=[HTTPMethod.GET, HTTPMethod.POST])
 def get_officer():
-    jsloads = ["js/find_officer.js"]
+    js_loads = ["js/find_officer.js"]
     form = FindOfficerForm()
 
     departments_dict = [dept_choice.toCustomDict() for dept_choice in dept_choices()]
@@ -180,7 +180,7 @@ def get_officer():
         "input_find_officer.html",
         form=form,
         depts_dict=departments_dict,
-        jsloads=jsloads,
+        jsloads=js_loads,
     )
 
 
diff --git a/OpenOversight/app/templates/about.html b/OpenOversight/app/templates/about.html
index 3ac8a0724..5318a92a0 100644
--- a/OpenOversight/app/templates/about.html
+++ b/OpenOversight/app/templates/about.html
@@ -20,7 +20,9 @@
         </small>
       </p>
       <div class="text-center pb-50">
-        <a href="/find" class="btn btn-lg btn-info" id="try-it">Try it</a>
+        <a href="{{ url_for("main.get_officer") }}"
+           class="btn btn-lg btn-info"
+           id="try-it">Try it</a>
       </div>
       <div class="row font-weight-300 text-center display-flex">
         <div class="col-lg-4 col-half-border">
diff --git a/OpenOversight/app/templates/base.html b/OpenOversight/app/templates/base.html
index ae9e206ff..00eef61e0 100644
--- a/OpenOversight/app/templates/base.html
+++ b/OpenOversight/app/templates/base.html
@@ -54,28 +54,28 @@
               <span class="icon-bar"></span>
               <span class="icon-bar"></span>
             </button>
-            <a class="navbar-link navbar-brand" href="/">OpenOversight</a>
+            <a class="navbar-link navbar-brand" href="{{ url_for("main.index") }}">OpenOversight</a>
           </div>
           <div id="navbar" class="navbar-collapse collapse">
             <ul class="nav navbar-nav">
               <li>
-                <a class="navbar-link" href="/browse">Browse</a>
+                <a class="navbar-link" href="{{ url_for("main.browse") }}">Browse</a>
               </li>
               <li>
-                <a class="navbar-link" href="/find">Find an Officer</a>
+                <a class="navbar-link" href="{{ url_for("main.get_officer") }}">Find an Officer</a>
               </li>
               <li>
-                <a class="navbar-link" href="/submit">Submit Images</a>
+                <a class="navbar-link" href="{{ url_for("main.submit_data") }}">Submit Images</a>
               </li>
               <li>
-                <a class="navbar-link" href="/label">Volunteer</a>
+                <a class="navbar-link" href="{{ url_for("main.get_started_labeling") }}">Volunteer</a>
               </li>
               <li>
-                <a class="navbar-link" href="/about">About</a>
+                <a class="navbar-link" href="{{ url_for("main.about_oo") }}">About</a>
               </li>
               {% if current_user and current_user.is_administrator %}
                 <li>
-                  <a class="navbar-link" href="/auth/users">Users</a>
+                  <a class="navbar-link" href="{{ url_for("auth.get_users") }}">Users</a>
                 </li>
               {% endif %}
             </ul>
@@ -154,7 +154,7 @@ <h5>Contact</h5>
             <a href="https://github.com/lucyparsons/openoversight"><i class="fa fa-github fa-3x social"></i></a>
             <a href="mailto:info@lucyparsonslabs.com"><i class="fa fa-envelope-square fa-3x social"></i></a>
             <br>
-            <a href="/privacy" class="btn">Privacy Policy</a>
+            <a href="{{ url_for("main.privacy_oo") }}" class="btn">Privacy Policy</a>
           </p>
         </div>
         <div class="col-sm-4">
diff --git a/OpenOversight/app/templates/browse.html b/OpenOversight/app/templates/browse.html
index 17d9c3377..558640e1a 100644
--- a/OpenOversight/app/templates/browse.html
+++ b/OpenOversight/app/templates/browse.html
@@ -1,7 +1,11 @@
 {% extends "base.html" %}
 {% import "bootstrap/wtf.html" as wtf %}
-{% block title %}Browse OpenOversight{% endblock %}
-{% block meta %}<meta name="description" content="Browse a department on OpenOversight.">{% endblock %}
+{% block title %}
+  Browse OpenOversight
+{% endblock title %}
+{% block meta %}
+  <meta name="description" content="Browse a department on OpenOversight.">
+{% endblock meta %}
 {% block content %}
   <div class="container theme-showcase" role="main">
     <div class="text-center frontpage-leads">
@@ -34,4 +38,4 @@ <h2>
       {% endfor %}
     </div>
   </div>
-{% endblock %}
+{% endblock content %}
diff --git a/OpenOversight/app/templates/cop_face.html b/OpenOversight/app/templates/cop_face.html
index ef30c059e..9aa226f23 100644
--- a/OpenOversight/app/templates/cop_face.html
+++ b/OpenOversight/app/templates/cop_face.html
@@ -45,156 +45,159 @@ <h2>
               {% if department %}
                 <form action="{{ url_for('main.label_data', image_id=image.id, department_id=department.id) }}"
                       method="post">
-                {% else %}
-                  <form action="{{ url_for('main.label_data', image_id=image.id) }}"
-                        method="post">
-                  {% endif %}
-                  {{ form.hidden_tag() }}
-                  <div class="input-group input-group-sm">
-                    <input type="text"
-                           class="hidden form-control"
-                           name="dataX"
-                           id="dataX"
-                           placeholder="x">
-                  </div>
-                  {% for error in form.dataX.errors %}
-                    <p>
-                      <span style="color: red;">[{{ error }}]</span>
-                    </p>
-                  {% endfor %}
-                  <div class="input-group input-group-sm">
-                    <input type="text"
-                           class="hidden form-control"
-                           name="dataY"
-                           id="dataY"
-                           placeholder="y">
-                  </div>
-                  <div class="input-group input-group-sm"></div>
-                  {% for error in form.dataY.errors %}
-                    <p>
-                      <span style="color: red;">[{{ error }}]</span>
-                    </p>
-                  {% endfor %}
-                  <div class="input-group input-group-sm">
-                    <input type="text"
-                           class="hidden form-control"
-                           name="dataWidth"
-                           id="dataWidth"
-                           placeholder="width">
-                  </div>
-                  {% for error in form.dataWidth.errors %}
-                    <p>
-                      <span style="color: red;">[{{ error }}]</span>
-                    </p>
-                  {% endfor %}
-                  <div class="input-group input-group-sm">
-                    <input type="text"
-                           class="hidden form-control"
-                           name="dataHeight"
-                           id="dataHeight"
-                           placeholder="height">
-                  </div>
-                  {% for error in form.dataHeight.errors %}
-                    <p>
-                      <span style="color: red;">[{{ error }}]</span>
-                    </p>
-                  {% endfor %}
-                  <div class="input-group input-group-sm id-input">
-                    <label class="input-group-addon" for="officer_id">OpenOversight ID</label>
-                    <input type="text"
-                           class="form-control"
-                           name="officer_id"
-                           id="officer_id"
-                           placeholder="officer ID">
-                  </div>
-                  {% for error in form.officer_id.errors %}
-                    <p>
-                      <span style="color: red;">[{{ error }}]</span>
-                    </p>
-                  {% endfor %}
-                  <input type="text"
-                         class="hidden form-control"
-                         name="image_id"
-                         id="image_id"
-                         placeholder="image ID"
-                         value="{{ image.id }}">
-                  {% for error in form.image_id.errors %}
-                    <p>
-                      <span style="color: red;">Image: [{{ error }}]</span>
-                    </p>
-                  {% endfor %}
-                  <p>
-                    <div class="input-group addface-button">
-                      <input type="submit"
-                             class="btn btn-sm btn-primary form-control"
-                             value="Add identified face" />
-                    </div>
-                  </p>
-                  <div class="text-center input-explanation">
-                    <div class="text addface-button-explanation">
-                      <b>Explanation</b>: click this button to associate the selected image with the entered OpenOversight ID.
-                    </div>
-                    <div class="text id-explanation">
-                      <b>Explanation</b>: after matching the officer's name, badge number, or face to the roster, enter the officer's OpenOversight ID here.
-                    </div>
-                  </div>
-                </div>
+                </form>
+              {% else %}
+                <form action="{{ url_for('main.label_data', image_id=image.id) }}"
+                      method="post">
+                </form>
+              {% endif %}
+              {{ form.hidden_tag() }}
+              <div class="input-group input-group-sm">
+                <input type="text"
+                       class="hidden form-control"
+                       name="dataX"
+                       id="dataX"
+                       placeholder="x">
+              </div>
+              {% for error in form.dataX.errors %}
+                <p>
+                  <span style="color: red;">[{{ error }}]</span>
+                </p>
+              {% endfor %}
+              <div class="input-group input-group-sm">
+                <input type="text"
+                       class="hidden form-control"
+                       name="dataY"
+                       id="dataY"
+                       placeholder="y">
+              </div>
+              <div class="input-group input-group-sm"></div>
+              {% for error in form.dataY.errors %}
+                <p>
+                  <span style="color: red;">[{{ error }}]</span>
+                </p>
+              {% endfor %}
+              <div class="input-group input-group-sm">
+                <input type="text"
+                       class="hidden form-control"
+                       name="dataWidth"
+                       id="dataWidth"
+                       placeholder="width">
+              </div>
+              {% for error in form.dataWidth.errors %}
+                <p>
+                  <span style="color: red;">[{{ error }}]</span>
+                </p>
+              {% endfor %}
+              <div class="input-group input-group-sm">
+                <input type="text"
+                       class="hidden form-control"
+                       name="dataHeight"
+                       id="dataHeight"
+                       placeholder="height">
+              </div>
+              {% for error in form.dataHeight.errors %}
+                <p>
+                  <span style="color: red;">[{{ error }}]</span>
+                </p>
+              {% endfor %}
+              <div class="input-group input-group-sm id-input">
+                <label class="input-group-addon" for="officer_id">OpenOversight ID</label>
+                <input type="text"
+                       class="form-control"
+                       name="officer_id"
+                       id="officer_id"
+                       placeholder="officer ID">
               </div>
-              <div class="col-sm-2 text-center skip-button">
-                {% if department %}
-                  <a href="{{ url_for('main.label_data', department_id=department.id) }}"
-                     class="btn btn-lg btn-primary"
-                     role="button">
-                  {% else %}
-                    <a href="{{ url_for("main.label_data") }}"
-                       class="btn btn-lg btn-primary"
-                       role="button">
-                    {% endif %}
-                    <span class="glyphicon glyphicon-repeat" aria-hidden="true"></span> Next Photo</a>
+              {% for error in form.officer_id.errors %}
+                <p>
+                  <span style="color: red;">[{{ error }}]</span>
+                </p>
+              {% endfor %}
+              <input type="text"
+                     class="hidden form-control"
+                     name="image_id"
+                     id="image_id"
+                     placeholder="image ID"
+                     value="{{ image.id }}">
+              {% for error in form.image_id.errors %}
+                <p>
+                  <span style="color: red;">Image: [{{ error }}]</span>
+                </p>
+              {% endfor %}
+              <p>
+                <div class="input-group addface-button">
+                  <input type="submit"
+                         class="btn btn-sm btn-primary form-control"
+                         value="Add identified face" />
                 </div>
-                <div class="col-sm-2 text-center done-button">
-                  <a href="{{ url_for('main.complete_tagging', image_id=image.id, department_id=department.id, contains_cops=0) }}"
-                     class="btn btn-sm btn-success">
-                    <span class="glyphicon glyphicon glyphicon-ok" aria-hidden="true"></span>
-                    All officers have been identified!
-                  </a>
+              </p>
+              <div class="text-center input-explanation">
+                <div class="text addface-button-explanation">
+                  <b>Explanation</b>: click this button to associate the selected image with the entered OpenOversight ID.
                 </div>
-                <hr>
-                <div class="row">
-                  <div class="col-sm-12">
-                    <div class="text-center button-explanation">
-                      <div class="text done-button-explanation">
-                        <b>Explanation</b>: click this button ONLY when all officers in it have been identified. This will remove it from the identification queue for ALL users.
-                      </div>
-                      <div class="text skip-button-explanation">
-                        <b>Explanation</b>: click this button if you would like to move on to the next image, without saving any info about this image.
-                      </div>
-                      <div class="text launchroster-button-explanation">
-                        <b>Explanation</b>: click this button to open the police roster.  Use the roster to find the officer's OpenOversight ID.
-                      </div>
-                    </div>
-                  </div>
+                <div class="text id-explanation">
+                  <b>Explanation</b>: after matching the officer's name, badge number, or face to the roster, enter the officer's OpenOversight ID here.
                 </div>
               </div>
-            {% elif current_user.is_disabled == True %}
-              <h3>Your account has been disabled due to too many incorrect classifications/tags!</h3>
-              <p>
-                <a href="mailto:info@lucyparsonslabs.com"
-                   class="btn btn-lg btn-primary"
-                   role="button">Mail us to get it enabled again</a>
-              </p>
+            </div>
+          </div>
+          <div class="col-sm-2 text-center skip-button">
+            {% if department %}
+              <a href="{{ url_for('main.label_data', department_id=department.id) }}"
+                 class="btn btn-lg btn-primary"
+                 role="button"><span class="glyphicon glyphicon-repeat" aria-hidden="true"></span> Next Photo</a>
             {% else %}
-              <h3>All images have been tagged!</h3>
-              <h4>
-                <small class="muted">{{ department.name }}</small>
-              </h4>
-              <p>
-                <a href="{{ url_for("main.submit_data") }}"
-                   class="btn btn-lg btn-primary"
-                   role="button">Submit officer pictures to us</a>
-              </p>
+              <a href="{{ url_for("main.label_data") }}"
+                 class="btn btn-lg btn-primary"
+                 role="button"><span class="glyphicon glyphicon-repeat" aria-hidden="true"></span> Next Photo</a>
             {% endif %}
-          {% endif %}
+          </div>
+          <div class="col-sm-2 text-center done-button">
+            <a href="{{ url_for('main.complete_tagging', image_id=image.id, department_id=department.id, contains_cops=0) }}"
+               class="btn btn-sm btn-success">
+              <span class="glyphicon glyphicon glyphicon-ok" aria-hidden="true"></span>
+              All officers have been identified!
+            </a>
+          </div>
+          <hr>
+          <div class="row">
+            <div class="col-sm-12">
+              <div class="text-center button-explanation">
+                <div class="text done-button-explanation">
+                  <b>Explanation</b>: click this button ONLY when all officers in it have been identified. This will remove it from the identification queue for ALL users.
+                </div>
+                <div class="text skip-button-explanation">
+                  <b>Explanation</b>: click this button if you would like to move on to the next image, without saving any info about this image.
+                </div>
+                <div class="text launchroster-button-explanation">
+                  <b>Explanation</b>: click this button to open the police roster.  Use the roster to find the officer's OpenOversight ID.
+                </div>
+              </div>
+            </div>
+          </div>
         </div>
-      {% endblock %}
-      {% block footer_class %}bottom-10{% endblock %}
+      {% elif current_user.is_disabled == True %}
+        <h3>Your account has been disabled due to too many incorrect classifications/tags!</h3>
+        <p>
+          <a href="mailto:info@lucyparsonslabs.com"
+             class="btn btn-lg btn-primary"
+             role="button">Mail us to get it enabled again</a>
+        </p>
+      {% else %}
+        <h3>All images have been tagged!</h3>
+        <h4>
+          <small class="muted">{{ department.name }}</small>
+        </h4>
+        <p>
+          <a href="{{ url_for("main.submit_data") }}"
+             class="btn btn-lg btn-primary"
+             role="button">Submit officer pictures to us</a>
+        </p>
+      {% endif %}
+    {% endif %}
+  </div>
+{% endblock content %}
+{% block footer_class %}
+  bottom-10
+{% endblock footer_class %}
diff --git a/OpenOversight/app/templates/description_new.html b/OpenOversight/app/templates/description_new.html
index b7abae46b..73efab899 100644
--- a/OpenOversight/app/templates/description_new.html
+++ b/OpenOversight/app/templates/description_new.html
@@ -1,4 +1,4 @@
-{% extends 'form.html' %}
+{% extends "form.html" %}
 {% block page_title %}
   New Description
 {% endblock page_title %}
diff --git a/OpenOversight/app/templates/edit_assignment.html b/OpenOversight/app/templates/edit_assignment.html
index 30a9b0f0c..604054b82 100644
--- a/OpenOversight/app/templates/edit_assignment.html
+++ b/OpenOversight/app/templates/edit_assignment.html
@@ -1,6 +1,8 @@
 {% extends "base.html" %}
 {% import "bootstrap/wtf.html" as wtf %}
-{% block title %}OpenOversight Admin - Edit Officer Assignment{% endblock %}
+{% block title %}
+  OpenOversight Admin - Edit Officer Assignment
+{% endblock title %}
 {% block content %}
   <div class="container theme-showcase" role="main">
     <div class="page-header">
@@ -23,4 +25,4 @@ <h4>
       <br>
     </div>
   </div>
-{% endblock %}
+{% endblock content %}
diff --git a/OpenOversight/app/templates/edit_officer.html b/OpenOversight/app/templates/edit_officer.html
index 20c378564..52200e267 100644
--- a/OpenOversight/app/templates/edit_officer.html
+++ b/OpenOversight/app/templates/edit_officer.html
@@ -1,6 +1,8 @@
 {% extends "base.html" %}
 {% import "bootstrap/wtf.html" as wtf %}
-{% block title %}OpenOversight Admin - Edit Officer{% endblock %}
+{% block title %}
+  OpenOversight Admin - Edit Officer
+{% endblock title %}
 {% block content %}
   <div class="container theme-showcase" role="main">
     <div class="page-header">
@@ -25,4 +27,4 @@ <h1>Edit Officer</h1>
       <br>
     </div>
   </div>
-{% endblock %}
+{% endblock content %}
diff --git a/OpenOversight/app/templates/form.html b/OpenOversight/app/templates/form.html
index 7aca8880c..5ecc44936 100644
--- a/OpenOversight/app/templates/form.html
+++ b/OpenOversight/app/templates/form.html
@@ -8,7 +8,8 @@ <h1>
         {% endblock page_title %}
       </h1>
     </div>
-    {% block page_header %}{% endblock %}
+    {% block page_header %}
+    {% endblock page_header %}
     <div class="col-md-6 col-xs-12">
       {% block form %}
         {{ wtf.quick_form(form, action=post_url, method='post', button_map={'submit':'primary'}) }}
diff --git a/OpenOversight/app/templates/image.html b/OpenOversight/app/templates/image.html
index 87db1d660..d19e5979f 100644
--- a/OpenOversight/app/templates/image.html
+++ b/OpenOversight/app/templates/image.html
@@ -109,12 +109,11 @@ <h3>
                 <a href="{{ url_for('main.label_data', image_id=image.id) }}">
                   <button class="btn btn-primary">Tag this image</button>
                 </a>
-              </form>
-            </p>
-          {% endif %}
+              </p>
+            {% endif %}
+          </div>
         </div>
       </div>
     </div>
   </div>
-</div>
-{% endblock %}
+{% endblock content %}
diff --git a/OpenOversight/app/templates/incident_detail.html b/OpenOversight/app/templates/incident_detail.html
index 41ec0b985..4c855611b 100644
--- a/OpenOversight/app/templates/incident_detail.html
+++ b/OpenOversight/app/templates/incident_detail.html
@@ -1,11 +1,11 @@
-{% extends 'base.html' %}
+{% extends "base.html" %}
 {% set incident = obj %}
 {% block title %}
   {{ incident.department.name }} incident
   {% if incident.report_number %}
     {{ incident.report_number }}{%
     endif %} - OpenOversight
-  {% endblock %}
+  {% endblock title %}
   {% block meta %}
     <meta name="description"
           content="View details for {{ incident.department.name }} incident{% if incident.report_number %} {{ incident.report_number }}{% endif %}.">
@@ -31,9 +31,9 @@
             }]
         }
     </script>
-  {% endblock %}
+  {% endblock meta %}
   {% block content %}
-    <main class='container pt-35 pb-50' role='main'>
+    <main class="container pt-35 pb-50" role="main">
       <a href="{{ url_for("main.incident_api") }}">All Incidents</a>
       {% if incident.department %}
         <p>
@@ -47,10 +47,10 @@ <h1>
           {% if incident.report_number %}{{ incident.report_number }}{% endif %}
         </h1>
         <div>
-          <table class='table table-hover table-responsive'>
+          <table class="table table-hover table-responsive">
             <tbody>
               {% with detail=True %}
-                {% include 'partials/incident_fields.html' %}
+                {% include "partials/incident_fields.html" %}
               {% endwith %}
             </tbody>
           </table>
@@ -60,19 +60,19 @@ <h1>
         <h1>Incident Description</h1>
         {{ incident.description | markdown }}
       </div>
-      {% include 'partials/links_and_videos_row.html' %}
+      {% include "partials/links_and_videos_row.html" %}
       {% if current_user.is_administrator
         or (current_user.is_area_coordinator and current_user.ac_department_id == incident.department_id) %}
         <div class="row">
           <div class="col-sm-12 col-md-6">
             <a class="btn btn-primary"
-               href="{{ '{}/edit'.format(url_for('main.incident_api', obj_id=incident.id) )}}"
+               href="{{ '{}/edit'.format(url_for('main.incident_api', obj_id=incident.id) ) }}"
                role="button">Edit</a>
             <a class="btn btn-danger"
-               href="{{ '{}/delete'.format(url_for('main.incident_api', obj_id=incident.id) )}}"
+               href="{{ '{}/delete'.format(url_for('main.incident_api', obj_id=incident.id) ) }}"
                role="button">Delete</a>
           </div>
         </div>
       {% endif %}
     </main>
-  {% endblock %}
+  {% endblock content %}
diff --git a/OpenOversight/app/templates/incident_list.html b/OpenOversight/app/templates/incident_list.html
index 2b6a5b7a5..eb29661fa 100644
--- a/OpenOversight/app/templates/incident_list.html
+++ b/OpenOversight/app/templates/incident_list.html
@@ -1,6 +1,8 @@
 {% extends "base.html" %}
 {% import "bootstrap/wtf.html" as wtf %}
-{% block title %}View incidents - OpenOversight{% endblock %}
+{% block title %}
+  View incidents - OpenOversight
+{% endblock title %}
 {% block meta %}
   {% if incidents.items|length > 0 %}
     <meta name="description"
@@ -8,7 +10,7 @@
   {% else %}
     <meta name="description" content="No incidents found.">
   {% endif %}
-{% endblock %}
+{% endblock meta %}
 {% block content %}
   <div class="container" role="main">
     <h1>Incidents</h1>
@@ -29,12 +31,12 @@ <h3 class="sidebar-title">Filter incidents</h3>
         </form>
       </div>
       <div class="search-results col-sm-9">
-        {% with paginate=incidents, location='top' %}
+        {% with paginate=incidents, location="top" %}
           {% include "partials/paginate_nav.html" %}
         {% endwith %}
         <ul class="list-group">
-          {% if incidents.items %}
-            <table class='table table-hover table-responsive'>
+          {% if "incidents.items" %}
+            <table class="table table-hover table-responsive">
               <tbody>
                 {% for incident in incidents.items %}
                   {% if not loop.first %}
@@ -56,7 +58,7 @@ <h3>
                       </h3>
                     </td>
                   </tr>
-                  {% include 'partials/incident_fields.html' %}
+                  {% include "partials/incident_fields.html" %}
                 {% endfor %}
               </tbody>
             </table>
@@ -72,7 +74,7 @@ <h3>
             Add New Incident
           </a>
         {% endif %}
-        {% with paginate=incidents, location='bottom' %}
+        {% with paginate=incidents, location="bottom" %}
           {% include "partials/paginate_nav.html" %}
         {% endwith %}
       </div>
@@ -81,4 +83,4 @@ <h3>
 {% endblock content %}
 {% block js_footer %}
   <script src="{{ url_for('static', filename='js/incidentDescription.js') }}"></script>
-{% endblock %}
+{% endblock js_footer %}
diff --git a/OpenOversight/app/templates/incident_new.html b/OpenOversight/app/templates/incident_new.html
index ed9a2048c..655a52311 100644
--- a/OpenOversight/app/templates/incident_new.html
+++ b/OpenOversight/app/templates/incident_new.html
@@ -1,4 +1,4 @@
-{% extends 'form.html' %}
+{% extends "form.html" %}
 {% block page_title %}
   New Incident
 {% endblock page_title %}
diff --git a/OpenOversight/app/templates/index.html b/OpenOversight/app/templates/index.html
index f71c89ab0..64bab3c90 100644
--- a/OpenOversight/app/templates/index.html
+++ b/OpenOversight/app/templates/index.html
@@ -16,9 +16,11 @@ <h1>
             <p>
               Search our public database for available information on officers in your city or to identify an officer with whom you have had a negative interaction.
             </p>
-            <a href="/browse" class="btn btn-lg btn-primary">Browse officers</a>
+            <a href="{{ url_for("main.browse") }}" class="btn btn-lg btn-primary">Browse officers</a>
             <div class="small-horizontal-padding"></div>
-            <a href="/find" id="cpd" class="btn btn-lg btn-primary">Identify officers</a>
+            <a href="{{ url_for("main.get_officer") }}"
+               id="cpd"
+               class="btn btn-lg btn-primary">Identify officers</a>
           </div>
           <div class="col-lg-6 col-half-border bg-white">
             <h1>
@@ -64,4 +66,4 @@ <h1>
       </div>
     </div>
   </div>
-{% endblock %}
+{% endblock content %}
diff --git a/OpenOversight/app/templates/input_find_officer.html b/OpenOversight/app/templates/input_find_officer.html
index 899b4b5ba..a1a0821bb 100644
--- a/OpenOversight/app/templates/input_find_officer.html
+++ b/OpenOversight/app/templates/input_find_officer.html
@@ -1,9 +1,11 @@
 {% extends "base.html" %}
-{% block title %}Find an officer - OpenOversight{% endblock %}
+{% block title %}
+  Find an officer - OpenOversight
+{% endblock title %}
 {% block meta %}
   <meta name="description"
         content="Find an officer you interacted with using this form.">
-{% endblock %}
+{% endblock meta %}
 {% block content %}
   <div role="main">
     <div class="hero-section no-sub">
@@ -259,4 +261,4 @@ <h2>
       </div>
     </form>
   </div>
-{% endblock %}
+{% endblock content %}
diff --git a/OpenOversight/app/templates/label_data.html b/OpenOversight/app/templates/label_data.html
index f79aef695..53a390def 100644
--- a/OpenOversight/app/templates/label_data.html
+++ b/OpenOversight/app/templates/label_data.html
@@ -1,10 +1,12 @@
 {% extends "base.html" %}
 {% import "bootstrap/wtf.html" as wtf %}
-{% block title %}Volunteer with OpenOversight{% endblock %}
+{% block title %}
+  Volunteer with OpenOversight
+{% endblock title %}
 {% block meta %}
   <meta name="description"
         content="Help OpenOversight create transparency with the first public, searchable database of law enforcement officers.">
-{% endblock %}
+{% endblock meta %}
 {% block content %}
   {% if current_user and current_user.is_authenticated %}
     <div class="container theme-showcase" role="main">
@@ -23,7 +25,8 @@ <h1>
         </p>
         <p>New to working on images for OpenOversight? Or just need a refresher?</p>
         <p>
-          <a class="btn btn-lg btn-primary" href="/leaderboard">
+          <a class="btn btn-lg btn-primary"
+             href="{{ url_for("main.leaderboard") }}">
             <span class="glyphicon glyphicon-thumbs-up" aria-hidden="true"></span>
             Leaderboard
           </a>
@@ -145,4 +148,4 @@ <h1>
   </div>
 </div>
 {% endif %}
-{% endblock %}
+{% endblock content %}
diff --git a/OpenOversight/app/templates/leaderboard.html b/OpenOversight/app/templates/leaderboard.html
index 9a58d2099..889aedd44 100644
--- a/OpenOversight/app/templates/leaderboard.html
+++ b/OpenOversight/app/templates/leaderboard.html
@@ -33,4 +33,4 @@ <h2>
       </div>
     </div>
   </div>
-{% endblock %}
+{% endblock content %}
diff --git a/OpenOversight/app/templates/link_new.html b/OpenOversight/app/templates/link_new.html
index 66ce7dc47..f0c881016 100644
--- a/OpenOversight/app/templates/link_new.html
+++ b/OpenOversight/app/templates/link_new.html
@@ -1,4 +1,4 @@
-{% extends 'form.html' %}
+{% extends "form.html" %}
 {% block page_title %}
   New Link
 {% endblock page_title %}
diff --git a/OpenOversight/app/templates/list.html b/OpenOversight/app/templates/list.html
index 2621baed9..aed88d2a3 100644
--- a/OpenOversight/app/templates/list.html
+++ b/OpenOversight/app/templates/list.html
@@ -1,12 +1,12 @@
 {% extends "base.html" %}
 {% block content %}
   <div class="container" role="main">
-    {% with paginate=objects, next_url=url_for(url, page=objects.next_num), prev_url=url_for(url, page=objects.prev_num), location='top' %}
+    {% with paginate=objects, next_url=url_for(url, page=objects.next_num), prev_url=url_for(url, page=objects.prev_num), location="top" %}
       {% include "partials/paginate_nav.html" %}
     {% endwith %}
     {% block list %}
     {% endblock list %}
-    {% with paginate=objects, next_url=url_for(url, page=objects.next_num), prev_url=url_for(url, page=objects.prev_num), location='bottom' %}
+    {% with paginate=objects, next_url=url_for(url, page=objects.next_num), prev_url=url_for(url, page=objects.prev_num), location="bottom" %}
       {% include "partials/paginate_nav.html" %}
     {% endwith %}
   </div>
diff --git a/OpenOversight/app/templates/note_new.html b/OpenOversight/app/templates/note_new.html
index 1e88a63bf..881c103f9 100644
--- a/OpenOversight/app/templates/note_new.html
+++ b/OpenOversight/app/templates/note_new.html
@@ -1,4 +1,4 @@
-{% extends 'form.html' %}
+{% extends "form.html" %}
 {% block page_title %}
   New Note
 {% endblock page_title %}
diff --git a/OpenOversight/app/templates/officer.html b/OpenOversight/app/templates/officer.html
index 3853df8b6..65c8566fb 100644
--- a/OpenOversight/app/templates/officer.html
+++ b/OpenOversight/app/templates/officer.html
@@ -1,5 +1,7 @@
 {% extends "base.html" %}
-{% block title %}{{ officer.full_name() }} - OpenOversight{% endblock %}
+{% block title %}
+  {{ officer.full_name() }} - OpenOversight
+{% endblock title %}
 {% block meta %}
   {% set job_title = officer.job_title() if officer.job_title() and officer.job_title() != 'Not Sure' else 'Employee' %}
   {% set description = 'See detailed information about ' ~ officer.full_name() ~ ', ' ~ job_title ~ ' of the ' ~ officer.department.name ~ '.' %}
@@ -34,41 +36,24 @@
           "@context": "https://schema.org/",
           "@type": "Person",
           "name": "{{ officer.full_name() }}",
-          {
-              %
-              if officer.birth_year %
-          }
+          {% if officer.birth_year %}
           "birthDate": "{{ officer.birth_year }}",
-          {
-              %
-              endif %
-          }
+          {% endif %}
           "gender": "{{ officer.gender_label() }}",
           "jobTitle": "{{ job_title }}",
           "worksFor": {
               "@type": "Organization",
               "name": "{{ officer.department.name | title }}"
           },
-          {
-              %
-              if officer.unique_internal_identifier %
-          }
+          {% if officer.unique_internal_identifier %}
           "identifier": "{{ officer.unique_internal_identifier }}",
-          {
-              %
-              endif %
-          } {
-              %
-              if officer.image_url %
-          }
+          {%endif %}
+          {% if officer.image_url %}
           "image": {
               "@type": "URL",
               "url": "{{ officer.image_url }}"
           },
-          {
-              %
-              endif %
-          }
+          {% endif %}
           "url": {
               "@type": "URL",
               "url": "{{ url_for(request.endpoint, officer_id=officer.id, _external=True) }}"
@@ -98,7 +83,7 @@
           }]
       }
   </script>
-{% endblock %}
+{% endblock meta %}
 {% block content %}
   {% set is_admin_or_coordinator = current_user.is_administrator or (current_user.is_area_coordinator and current_user.ac_department_id == officer.department_id) %}
   <div class="container theme-showcase" role="main">
@@ -136,7 +121,7 @@ <h1>
         {% endif %}
       </div>
       {# end col #}
-      <div class='col-sm-12 col-md-6'>
+      <div class="col-sm-12 col-md-6">
         {% if officer.salaries or is_admin_or_coordinator %}
           {% include "partials/officer_salary.html" %}
         {% endif %}
@@ -151,5 +136,4 @@ <h1>
     </div>
     {# end row #}
   </div>
-  {# end container #}
-{% endblock %}
+{% endblock content %}
diff --git a/OpenOversight/app/templates/partials/incident_form.html b/OpenOversight/app/templates/partials/incident_form.html
index 07643cae3..bf9300c9b 100644
--- a/OpenOversight/app/templates/partials/incident_form.html
+++ b/OpenOversight/app/templates/partials/incident_form.html
@@ -1,7 +1,7 @@
 {% import "bootstrap/wtf.html" as wtf %}
 <form class="form" method="post" role="form">
   {{ form.hidden_tag() }}
-  <div class='text-danger'>{{ wtf.form_errors(form, hiddens="only") }}</div>
+  <div class="text-danger">{{ wtf.form_errors(form, hiddens="only") }}</div>
   {{ wtf.form_field(form.date_field, autofocus="autofocus") }}
   {{ wtf.form_field(form.time_field) }}
   {{ wtf.form_field(form.report_number) }}
diff --git a/OpenOversight/app/templates/partials/links_and_videos_row.html b/OpenOversight/app/templates/partials/links_and_videos_row.html
index 404484fb5..2ac622ca9 100644
--- a/OpenOversight/app/templates/partials/links_and_videos_row.html
+++ b/OpenOversight/app/templates/partials/links_and_videos_row.html
@@ -35,7 +35,7 @@ <h3>Links</h3>
     <a href="{{ url_for("main.link_api_new", officer_id=officer.id) }}"
        class="btn btn-primary">New Link/Video</a>
   {% endif %}
-  {% for type, list in obj.links|groupby("link_type") %}
+  {% for type, list in obj.links | groupby("link_type") %}
     {% if type == "video" %}
       <h3>Videos</h3>
       <ul class="list-group">
diff --git a/OpenOversight/app/templates/partials/officer_incidents.html b/OpenOversight/app/templates/partials/officer_incidents.html
index 4984ab5a5..f6a6f185f 100644
--- a/OpenOversight/app/templates/partials/officer_incidents.html
+++ b/OpenOversight/app/templates/partials/officer_incidents.html
@@ -28,13 +28,13 @@ <h4>
             </h4>
           </td>
         </tr>
-        {% include 'partials/incident_fields.html' %}
+        {% include "partials/incident_fields.html" %}
       {% endfor %}
     </tbody>
   </table>
   {% block js_footer %}
     <script src="{{ url_for('static', filename='js/incidentDescription.js') }}"></script>
-  {% endblock %}
+  {% endblock js_footer %}
 {% endif %}
 {% if is_admin_or_coordinator %}
   <a href="{{ url_for("main.incident_api") + 'new?officer_id={}'.format(officer.id) }}"
diff --git a/OpenOversight/app/templates/partials/paginate.html b/OpenOversight/app/templates/partials/paginate.html
index 9ba924d08..3f83dc697 100644
--- a/OpenOversight/app/templates/partials/paginate.html
+++ b/OpenOversight/app/templates/partials/paginate.html
@@ -2,7 +2,7 @@
   {% if officers.has_prev %}
     <form action="{{ url_for('main.get_gallery', page=officers.prev_num) }}"
           method="post">
-      {% include 'partials/officer_form_fields_hidden.html' %}
+      {% include "partials/officer_form_fields_hidden.html" %}
       <input type="submit" class="btn btn-info btn-md" value=" << " />
     </form>
   {% endif %}
@@ -14,9 +14,8 @@ <h2>
   {% if officers.has_next %}
     <form action="{{ url_for('main.get_gallery', page=officers.next_num) }}"
           method="post">
-      {% include 'partials/officer_form_fields_hidden.html' %}
+      {% include "partials/officer_form_fields_hidden.html" %}
       <input type="submit" class="btn btn-info btn-md" value=" >> " />
     </form>
   {% endif %}
 </div>
-<!-- /.top-paginate -->
diff --git a/OpenOversight/app/templates/partials/paginate_nav.html b/OpenOversight/app/templates/partials/paginate_nav.html
index 377334c3d..1a6615395 100644
--- a/OpenOversight/app/templates/partials/paginate_nav.html
+++ b/OpenOversight/app/templates/partials/paginate_nav.html
@@ -3,23 +3,23 @@
     {% if paginate.has_prev %}
       <li class="previous">
         <a role="button" href="{{ prev_url }}">
-          <span aria-hidden="true">&larr;</span>
+          <span aria-hidden="true">←</span>
           Previous
         </a>
       </li>
     {% endif %}
     {% if paginate.has_next %}
-      Showing {{(paginate.page-1)*paginate.per_page + 1 }}-{{(paginate.page)*paginate.per_page}} of {{ paginate.total }}
+      Showing {{ (paginate.page-1) * paginate.per_page + 1 }}-{{ (paginate.page) * paginate.per_page }} of {{ paginate.total }}
       <li class="next">
         <a role="button" href="{{ next_url }}">
           Next
-          <span aria-hidden="true">&rarr;</span>
+          <span aria-hidden="true">→</span>
         </a>
       </li>
     {% elif paginate.total == 0 %}
       {% if location == 'top' %}Showing 0 of 0{% endif %}
     {% else %}
-      Showing {{(paginate.page-1)*paginate.per_page + 1 }}-{{ paginate.total }} of {{ paginate.total }}
+      Showing {{ (paginate.page-1) * paginate.per_page + 1 }}-{{ paginate.total }} of {{ paginate.total }}
     {% endif %}
   </ul>
 </nav>
diff --git a/OpenOversight/app/templates/privacy.html b/OpenOversight/app/templates/privacy.html
index 411b1ab85..73199763b 100644
--- a/OpenOversight/app/templates/privacy.html
+++ b/OpenOversight/app/templates/privacy.html
@@ -1,9 +1,11 @@
 {% extends "base.html" %}
-{% block title %}Privacy Policy - OpenOversight{% endblock %}
+{% block title %}
+  Privacy Policy - OpenOversight
+{% endblock title %}
 {% block meta %}
   <meta name="description"
         content="Lucy Parsons Labs takes your privacy and security very seriously.">
-{% endblock %}
+{% endblock meta %}
 {% block content %}
   <div role="main">
     <div class="hero-section no-sub">
@@ -64,4 +66,4 @@ <h4>Future Changes</h4>
       </p>
     </div>
   </div>
-{% endblock %}
+{% endblock content %}
diff --git a/OpenOversight/app/templates/profile.html b/OpenOversight/app/templates/profile.html
index f9506f594..23782b993 100644
--- a/OpenOversight/app/templates/profile.html
+++ b/OpenOversight/app/templates/profile.html
@@ -121,4 +121,4 @@ <h2>Officer Identifications</h2>
       </div>
     {% endif %}
   </div>
-{% endblock %}
+{% endblock content %}
diff --git a/OpenOversight/app/templates/sort.html b/OpenOversight/app/templates/sort.html
index e4f871352..4bf6dcac3 100644
--- a/OpenOversight/app/templates/sort.html
+++ b/OpenOversight/app/templates/sort.html
@@ -1,5 +1,7 @@
 {% extends "base.html" %}
-{% block head %}<script src="{{ url_for('static', filename='js/jquery.hotkeys.js') }}"></script>{% endblock %}
+{% block head %}
+  <script src="{{ url_for('static', filename='js/jquery.hotkeys.js') }}"></script>
+{% endblock head %}
 {% block js_footer %}
   <script type="text/javascript">
       $(document).bind('keydown', 'y', function() {
@@ -14,7 +16,7 @@
           window.location = $('#answer-skip').attr('href');
       });
   </script>
-{% endblock %}
+{% endblock js_footer %}
 {% block content %}
   <div class="container theme-showcase" role="main">
     {% if current_user and current_user.is_authenticated %}
@@ -92,4 +94,4 @@ <h3>All images have been classfied!</h3>
       {% endif %}
     {% endif %}
   </div>
-{% endblock %}
+{% endblock content %}
diff --git a/OpenOversight/app/templates/submit_image.html b/OpenOversight/app/templates/submit_image.html
index f6eed910e..ef3d040b5 100644
--- a/OpenOversight/app/templates/submit_image.html
+++ b/OpenOversight/app/templates/submit_image.html
@@ -1,16 +1,18 @@
 {% extends "base.html" %}
 {% import "bootstrap/wtf.html" as wtf %}¬
-{% block title %}Submit images to OpenOversight{% endblock %}
+{% block title %}
+  Submit images to OpenOversight
+{% endblock title %}
 {% block meta %}
   <meta name="description"
         content="Submit images of officers in uniform. Officer faces should be clearly visible in each photograph. It is preferred if the name and/or badge number is also visible.">
-{% endblock %}
+{% endblock meta %}
 {% block head %}
   <link href="{{ url_for('static', filename='css/dropzone.css') }}"
         rel="stylesheet">
   <link href="{{ url_for('static', filename='css/dropzone-override.css') }}"
         rel="stylesheet">
-{% endblock %}
+{% endblock head %}
 {% block content %}
   <div class="container theme-showcase" role="main">
     <div class="page-header">
@@ -44,7 +46,9 @@ <h3>Select the department that the police officer in your image belongs to:</h3>
       <br>
     </div>
     <h3>Drop images here to submit photos of officers:</h3>
-    <form id="my-cop-dropzone" action="/upload/department/1" class="dropzone">
+    <form id="my-cop-dropzone"
+          action="{{ url_for('main.upload', department_id=1) }}"
+          class="dropzone">
     </form>
     <p>
       Drag photographs from your computer directly into the box above or click the box to launch a finder window.
@@ -84,4 +88,4 @@ <h3>High Security Submissions</h3>
       We do not log unique identifying information of visitors to our website, but if you have privacy concerns in submitting photographs, we recommend using <a href="https://www.torproject.org/projects/torbrowser.html.en">Tor Browser.</a>
     </p>
   </div>
-{% endblock %}
+{% endblock content %}
diff --git a/OpenOversight/app/templates/submit_officer_image.html b/OpenOversight/app/templates/submit_officer_image.html
index 634360354..67785418c 100644
--- a/OpenOversight/app/templates/submit_officer_image.html
+++ b/OpenOversight/app/templates/submit_officer_image.html
@@ -4,7 +4,7 @@
         rel="stylesheet">
   <link href="{{ url_for('static', filename='css/dropzone-override.css') }}"
         rel="stylesheet">
-{% endblock %}
+{% endblock head %}
 {% block content %}
   <div class="container theme-showcase" role="main">
     <div class="page-header">
@@ -15,7 +15,7 @@ <h1>
     <div class="header">
       <h3>Drop images here to submit photos of {{ officer.full_name() }} in {{ officer.department.name }}:</h3>
     </div>
-    <form action="/upload/department/{{ officer.department_id }}/officer/{{ officer.id }}"
+    <form action="{{ url_for('main.upload', department_id=officer.department_id, officer_id=officer.id) }}"
           class="dropzone"
           id="my-cop-dropzone">
     </form>
@@ -26,17 +26,17 @@ <h3>Drop images here to submit photos of {{ officer.full_name() }} in {{ officer
        class="btn btn-primary"
        href="{{ url_for('main.officer_profile', officer_id=officer.id) }}">Done uploading images</a>
   </div>
-{% endblock %}
+{% endblock content %}
 {% block js_footer %}
   <script src="{{ url_for('static', filename='js/jquery.min.js') }}"></script>
   <script src="{{ url_for('static', filename='js/dropzone.js') }}"></script>
   <script src="{{ url_for('static', filename='js/init-dropzone.js') }}"></script>
   <script>
-      var csrf_token = "{{ csrf_token() }}";
+      const csrf_token = "{{ csrf_token() }}";
       init_dropzone(
           "#my-cop-dropzone",
           "/upload/department/{{ officer.department_id }}/officer/{{ officer.id }}",
           csrf_token
       );
   </script>
-{% endblock %}
+{% endblock js_footer %}
diff --git a/OpenOversight/app/templates/tag.html b/OpenOversight/app/templates/tag.html
index e8b834a8d..59304812b 100644
--- a/OpenOversight/app/templates/tag.html
+++ b/OpenOversight/app/templates/tag.html
@@ -122,26 +122,25 @@ <h3>
                   <a href="{{ url_for('main.label_data', image_id=face.image.id) }}">
                     <button class="btn btn-primary">Tag this image</button>
                   </a>
-                </form>
-              </p>
-              <h3>
-                Set as featured tag <small>Admin only</small>
-              </h3>
-              <p>
-                <form action="{{ url_for('main.set_featured_tag', tag_id=face.id) }}"
-                      method="post">
-                  <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
-                  <button type="submit"
-                          name="action"
-                          class="btn btn-primary"
-                          {% if face.featured %}disabled{% endif %}>Set as featured tag</button>
-                </form>
-              </p>
-            {% endif %}
+                </p>
+                <h3>
+                  Set as featured tag <small>Admin only</small>
+                </h3>
+                <p>
+                  <form action="{{ url_for('main.set_featured_tag', tag_id=face.id) }}"
+                        method="post">
+                    <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
+                    <button type="submit"
+                            name="action"
+                            class="btn btn-primary"
+                            {% if face.featured %}disabled{% endif %}>Set as featured tag</button>
+                  </form>
+                </p>
+              {% endif %}
+            </div>
           </div>
         </div>
       </div>
     </div>
-  </div>
-{% endif %}
-{% endblock %}
+  {% endif %}
+{% endblock content %}
diff --git a/OpenOversight/app/templates/tutorial.html b/OpenOversight/app/templates/tutorial.html
index 47ad5715a..673ef0920 100644
--- a/OpenOversight/app/templates/tutorial.html
+++ b/OpenOversight/app/templates/tutorial.html
@@ -1,9 +1,11 @@
 {% extends "base.html" %}
-{% block title %}Tutorial - OpenOversight{% endblock %}
+{% block title %}
+  Tutorial - OpenOversight
+{% endblock title %}
 {% block meta %}
   <meta name="description"
         content="Learn how to contribute to OpenOversight.">
-{% endblock %}
+{% endblock meta %}
 {% block content %}
   <div class="container theme-showcase" role="main">
     <div class="container">
@@ -113,4 +115,4 @@ <h2>Ready to get started?</h2>
       </a>
     </div>
   </div>
-{% endblock %}
+{% endblock content %}