From 34a1fbd1ca05f05dd1ee94959972fd21b83f194d Mon Sep 17 00:00:00 2001
From: Jennifer Kuenning <72825410+jkueloc@users.noreply.github.com>
Date: Mon, 12 Aug 2024 08:55:49 -0400
Subject: [PATCH] Revert "Merge branch 'main' into release" (#2486)

This reverts commit 0d1b6f047bfa539f9c174a7c61d8527ca7df1910, reversing
changes made to 2ad61b57b61a0c3c552e62d5758c25f76531cf07.

This merge to release was a mistake and needs to be reverted.
---
 .eslintrc.yaml                                |    1 -
 concordia/admin/__init__.py                   |   43 +-
 concordia/admin/filters.py                    |   21 +-
 concordia/admin/forms.py                      |   18 +-
 concordia/documents.py                        |    3 -
 ...tions_userprofile_review_count_and_more.py |   43 -
 .../0098_userprofile_create_and_population.py |   40 -
 concordia/models.py                           |  154 +-
 concordia/signals/handlers.py                 |    8 +-
 concordia/static/js/src/asset-reservation.js  |   16 +-
 concordia/static/js/src/banner.js             |   18 -
 concordia/static/js/src/contribute.js         |   23 -
 concordia/static/js/src/guide.js              |   86 --
 concordia/static/js/src/ocr.js                |    7 -
 concordia/static/js/src/quick-tips.js         |   38 -
 concordia/static/js/src/viewer-split.js       |  146 --
 concordia/static/js/src/viewer.js             |  200 ---
 concordia/tasks.py                            |   12 +-
 .../admin/concordia/item/change_form.html     |   15 +
 .../admin/concordia/topic/change_form.html    |   19 +
 .../templates/emails/unusual_activity.txt     |    2 +-
 .../transcriptions/asset_detail.html          | 1239 ++++++++++++++++-
 .../asset_reservation_failure_modal.html      |   19 -
 .../asset_detail/captcha_modal.html           |   38 -
 .../transcriptions/asset_detail/editor.html   |  118 --
 .../language_selection_modal.html             |   33 -
 .../asset_detail/navigation.html              |   49 -
 .../asset_detail/ocr_help_modal.html          |   27 -
 .../asset_detail/ocr_transcription_modal.html |   24 -
 .../asset_detail/quick_tips_modal.html        |   42 -
 .../asset_detail/review_accepted_modal.html   |   35 -
 .../successful_submission_modal.html          |   35 -
 .../transcriptions/asset_detail/tags.html     |   47 -
 .../transcriptions/asset_detail/viewer.html   |  121 --
 .../asset_detail/viewer_filters.html          |  125 --
 .../transcriptions/topic_detail.html          |    4 +-
 concordia/tests/test_admin.py                 |    6 +-
 concordia/tests/test_models.py                |  142 +-
 concordia/tests/test_views.py                 |    9 +-
 exporter/tabular_export/admin.py              |   22 +-
 40 files changed, 1377 insertions(+), 1671 deletions(-)
 delete mode 100644 concordia/migrations/0097_alter_sitereport_options_userprofile_review_count_and_more.py
 delete mode 100644 concordia/migrations/0098_userprofile_create_and_population.py
 delete mode 100644 concordia/static/js/src/banner.js
 delete mode 100644 concordia/static/js/src/guide.js
 delete mode 100644 concordia/static/js/src/ocr.js
 delete mode 100644 concordia/static/js/src/quick-tips.js
 delete mode 100644 concordia/static/js/src/viewer-split.js
 delete mode 100644 concordia/static/js/src/viewer.js
 create mode 100644 concordia/templates/admin/concordia/topic/change_form.html
 delete mode 100644 concordia/templates/transcriptions/asset_detail/asset_reservation_failure_modal.html
 delete mode 100644 concordia/templates/transcriptions/asset_detail/captcha_modal.html
 delete mode 100644 concordia/templates/transcriptions/asset_detail/editor.html
 delete mode 100644 concordia/templates/transcriptions/asset_detail/language_selection_modal.html
 delete mode 100644 concordia/templates/transcriptions/asset_detail/navigation.html
 delete mode 100644 concordia/templates/transcriptions/asset_detail/ocr_help_modal.html
 delete mode 100644 concordia/templates/transcriptions/asset_detail/ocr_transcription_modal.html
 delete mode 100644 concordia/templates/transcriptions/asset_detail/quick_tips_modal.html
 delete mode 100644 concordia/templates/transcriptions/asset_detail/review_accepted_modal.html
 delete mode 100644 concordia/templates/transcriptions/asset_detail/successful_submission_modal.html
 delete mode 100644 concordia/templates/transcriptions/asset_detail/tags.html
 delete mode 100644 concordia/templates/transcriptions/asset_detail/viewer.html
 delete mode 100644 concordia/templates/transcriptions/asset_detail/viewer_filters.html

diff --git a/.eslintrc.yaml b/.eslintrc.yaml
index 56959c746..989beb8c0 100644
--- a/.eslintrc.yaml
+++ b/.eslintrc.yaml
@@ -15,7 +15,6 @@ rules:
     'unicorn/prefer-query-selector': off # See https://github.com/sindresorhus/eslint-plugin-unicorn/issues/276
     'unicorn/prefer-node-append': off
     'unicorn/prefer-ternary': off
-    'unicorn/no-lonely-if': off
 env:
     browser: true
     es2024: true
diff --git a/concordia/admin/__init__.py b/concordia/admin/__init__.py
index e6a53c48c..0462e8891 100644
--- a/concordia/admin/__init__.py
+++ b/concordia/admin/__init__.py
@@ -9,6 +9,7 @@
 from django.contrib.auth.admin import UserAdmin
 from django.contrib.auth.decorators import permission_required
 from django.contrib.auth.models import User
+from django.db.models import Count
 from django.http import HttpResponseRedirect
 from django.shortcuts import get_object_or_404, render
 from django.template.defaultfilters import truncatechars
@@ -79,7 +80,6 @@
     SubmittedFilter,
     TagCampaignListFilter,
     TagCampaignStatusListFilter,
-    TopicListFilter,
     TranscriptionCampaignListFilter,
     TranscriptionCampaignStatusListFilter,
     TranscriptionProjectListFilter,
@@ -93,9 +93,8 @@
     CampaignAdminForm,
     CardAdminForm,
     GuideAdminForm,
-    ItemAdminForm,
     ProjectAdminForm,
-    TopicAdminForm,
+    SanitizedDescriptionAdminForm,
 )
 
 logger = logging.getLogger(__name__)
@@ -111,18 +110,13 @@ class ConcordiaUserAdmin(UserAdmin):
     )
 
     def get_queryset(self, request):
-        qs = super().get_queryset(request).select_related("profile")
+        qs = super().get_queryset(request)
+        qs = qs.annotate(Count("transcription"))
         return qs
 
-    @admin.display(
-        description="Transcription Count", ordering="profile__transcribe_count"
-    )
+    @admin.display(ordering="transcription__count")
     def transcription_count(self, obj):
-        return obj.profile.transcribe_count
-
-    @admin.display(description="Review Count", ordering="profile__review_count")
-    def review_count(self, obj):
-        return obj.profile.review_count
+        return obj.transcription__count
 
     EXPORT_FIELDS = (
         "username",
@@ -134,31 +128,17 @@ def review_count(self, obj):
         "is_superuser",
         "date_joined",
         "last_login",
-        "profile__transcribe_count",
-        "profile__review_count",
+        "transcription__count",
     )
 
-    EXTRA_VERBOSE_NAMES = {
-        "profile__transcribe_count": "transcription count",
-        "profile__review_count": "review count",
-    }
-
     def export_users_as_csv(self, request, queryset):
         return export_to_csv_action(
-            self,
-            request,
-            queryset,
-            field_names=self.EXPORT_FIELDS,
-            extra_verbose_names=self.EXTRA_VERBOSE_NAMES,
+            self, request, queryset, field_names=self.EXPORT_FIELDS
         )
 
     def export_users_as_excel(self, request, queryset):
         return export_to_excel_action(
-            self,
-            request,
-            queryset,
-            field_names=self.EXPORT_FIELDS,
-            extra_verbose_names=self.EXTRA_VERBOSE_NAMES,
+            self, request, queryset, field_names=self.EXPORT_FIELDS
         )
 
     actions = (anonymize_action, export_users_as_csv, export_users_as_excel)
@@ -378,8 +358,8 @@ class ResourceAdmin(admin.ModelAdmin, CustomListDisplayFieldsMixin):
     list_filter = (
         "resource_type",
         ResourceCampaignStatusListFilter,
-        TopicListFilter,
         ResourceCampaignListFilter,
+        "title",
     )
 
     def formfield_for_foreignkey(self, db_field, request, **kwargs):
@@ -416,7 +396,7 @@ def get_fields(self, request, obj=None):
 
 @admin.register(Topic)
 class TopicAdmin(admin.ModelAdmin):
-    form = TopicAdminForm
+    form = SanitizedDescriptionAdminForm
 
     list_display = (
         "id",
@@ -543,7 +523,6 @@ def item_import_view(self, request, object_id):
 
 @admin.register(Item)
 class ItemAdmin(admin.ModelAdmin):
-    form = ItemAdminForm
     list_display = ("title", "item_id", "campaign_title", "project", "published")
     list_display_links = ("title", "item_id")
     search_fields = [
diff --git a/concordia/admin/filters.py b/concordia/admin/filters.py
index 4148a0d5b..236c31337 100644
--- a/concordia/admin/filters.py
+++ b/concordia/admin/filters.py
@@ -1,7 +1,7 @@
 from django.contrib import admin
 from django.utils.translation import gettext_lazy as _
 
-from ..models import Campaign, Project, Topic
+from ..models import Campaign, Project
 
 
 class NullableTimestampFilter(admin.SimpleListFilter):
@@ -92,25 +92,6 @@ def queryset(self, request, queryset):
         return queryset
 
 
-class TopicListFilter(admin.SimpleListFilter):
-    """
-    Base class for admin topic filters
-    """
-
-    title = "Topic"
-    template = "admin/long_name_filter.html"
-    parameter_name = "topic__id__exact"
-
-    def lookups(self, request, model_admin):
-        queryset = Topic.objects.all()
-        return queryset.values_list("id", "title").order_by("title")
-
-    def queryset(self, request, queryset):
-        if self.value():
-            return queryset.filter(**{self.parameter_name: self.value()})
-        return queryset
-
-
 class ProjectCampaignListFilter(CampaignListFilter):
     parameter_name = "campaign__id__exact"
     status_filter_parameter = "campaign__status"
diff --git a/concordia/admin/forms.py b/concordia/admin/forms.py
index 49df703b5..ff3011a36 100644
--- a/concordia/admin/forms.py
+++ b/concordia/admin/forms.py
@@ -3,7 +3,7 @@
 from django.core.cache import caches
 from tinymce.widgets import TinyMCE
 
-from ..models import Campaign, Card, Guide, Item, Project, Topic
+from ..models import Campaign, Card, Guide, Project
 
 FRAGMENT_ALLOWED_TAGS = {
     "a",
@@ -90,15 +90,6 @@ def clean_short_description(self):
         )
 
 
-class TopicAdminForm(SanitizedDescriptionAdminForm):
-    class Meta(SanitizedDescriptionAdminForm.Meta):
-        model = Topic
-        widgets = {
-            "description": TinyMCE(),
-            "short_description": TinyMCE(),
-        }
-
-
 class CampaignAdminForm(SanitizedDescriptionAdminForm):
     class Meta(SanitizedDescriptionAdminForm.Meta):
         model = Campaign
@@ -117,13 +108,6 @@ class Meta(SanitizedDescriptionAdminForm.Meta):
         }
 
 
-class ItemAdminForm(forms.ModelForm):
-    class Meta:
-        model = Item
-        widgets = {"description": TinyMCE()}
-        fields = "__all__"
-
-
 class CardAdminForm(forms.ModelForm):
     class Meta:
         model = Card
diff --git a/concordia/documents.py b/concordia/documents.py
index 1060e3a6e..1a0620914 100644
--- a/concordia/documents.py
+++ b/concordia/documents.py
@@ -41,7 +41,6 @@ class Django:
 
         fields = [
             "created_on",
-            "report_name",
             "assets_total",
             "assets_published",
             "assets_not_started",
@@ -55,14 +54,12 @@ class Django:
             "projects_unpublished",
             "anonymous_transcriptions",
             "transcriptions_saved",
-            "daily_review_actions",
             "distinct_tags",
             "tag_uses",
             "campaigns_published",
             "campaigns_unpublished",
             "users_registered",
             "users_activated",
-            "registered_contributors",
             "daily_active_users",
         ]
 
diff --git a/concordia/migrations/0097_alter_sitereport_options_userprofile_review_count_and_more.py b/concordia/migrations/0097_alter_sitereport_options_userprofile_review_count_and_more.py
deleted file mode 100644
index 73264a261..000000000
--- a/concordia/migrations/0097_alter_sitereport_options_userprofile_review_count_and_more.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# Generated by Django 4.2.13 on 2024-07-29 17:30
-
-import django.db.models.deletion
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ("concordia", "0096_transcription_source"),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name="sitereport",
-            options={"get_latest_by": "created_on", "ordering": ("-created_on",)},
-        ),
-        migrations.AddField(
-            model_name="userprofile",
-            name="review_count",
-            field=models.IntegerField(
-                default=0, verbose_name="transcription review count"
-            ),
-        ),
-        migrations.AddField(
-            model_name="userprofile",
-            name="transcribe_count",
-            field=models.IntegerField(
-                default=0, verbose_name="transcription save/submit count"
-            ),
-        ),
-        migrations.AlterField(
-            model_name="userprofile",
-            name="user",
-            field=models.OneToOneField(
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="profile",
-                to=settings.AUTH_USER_MODEL,
-            ),
-        ),
-    ]
diff --git a/concordia/migrations/0098_userprofile_create_and_population.py b/concordia/migrations/0098_userprofile_create_and_population.py
deleted file mode 100644
index 36efd5bc7..000000000
--- a/concordia/migrations/0098_userprofile_create_and_population.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# Generated by Django 4.2.13 on 2024-07-29 17:40
-
-from django.conf import settings
-from django.db import migrations
-
-
-def create_and_populate_profiles(apps, schema_editor):
-    User = apps.get_model("auth", "User")
-    UserProfile = apps.get_model("concordia", "UserProfile")
-    db_alias = schema_editor.connection.alias
-    for user in User.objects.using(db_alias).all().iterator(chunk_size=10000):
-        profile, created = UserProfile.objects.using(db_alias).get_or_create(user=user)
-        for activity in user.userprofileactivity_set.all():
-            profile.transcribe_count += activity.transcribe_count
-            profile.review_count += activity.review_count
-        profile.save()
-
-
-def revert_create_and_populate_profiles(apps, schema_editor):
-    # We can't actually revert the data to the state it was before,
-    # and there's no actual need to, but we need this function to be
-    # able to reverse this migration
-    pass
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        (
-            "concordia",
-            "0097_alter_sitereport_options_userprofile_review_count_and_more",
-        ),
-    ]
-
-    operations = [
-        migrations.RunPython(
-            create_and_populate_profiles, revert_create_and_populate_profiles
-        ),
-    ]
diff --git a/concordia/models.py b/concordia/models.py
index e9c8b7939..495082209 100644
--- a/concordia/models.py
+++ b/concordia/models.py
@@ -11,7 +11,7 @@
 from django.core.cache import cache
 from django.core.exceptions import ValidationError
 from django.core.validators import RegexValidator
-from django.db import models
+from django.db import connection, models
 from django.db.models import Count, ExpressionWrapper, F, JSONField, Q
 from django.db.models.functions import Round
 from django.db.models.signals import post_save
@@ -27,10 +27,8 @@
 
 User._meta.get_field("email").__dict__["_unique"] = True
 
-ONE_MINUTE = datetime.timedelta(minutes=1)
 ONE_DAY = datetime.timedelta(days=1)
 ONE_DAY_AGO = timezone.now() - ONE_DAY
-THRESHOLD = 3
 
 
 def resource_file_upload_path(instance, filename):
@@ -74,53 +72,9 @@ def get_email_reconfirmation_key(self):
     def validate_reconfirmation_email(self, email):
         return email == self.get_email_for_reconfirmation()
 
-    def review_incidents(self, recent_accepts, recent_rejects, threshold=THRESHOLD):
-        accepts = recent_accepts.filter(reviewed_by=self).values_list(
-            "accepted", flat=True
-        )
-        rejects = recent_rejects.filter(reviewed_by=self).values_list(
-            "rejected", flat=True
-        )
-        timestamps = list(accepts) + list(rejects)
-        timestamps.sort()
-        incidents = 0
-        for i in range(len(timestamps)):
-            count = 1
-            for j in range(i + 1, len(timestamps)):
-                if (timestamps[j] - timestamps[i]).seconds <= 60:
-                    count += 1
-                    if count == threshold:
-                        incidents += 1
-                        break
-                else:
-                    break
-        return incidents
-
-    def transcribe_incidents(self, transcriptions, threshold=THRESHOLD):
-        recent_transcriptions = transcriptions.filter(user=self).order_by("submitted")
-        timestamps = recent_transcriptions.values_list("submitted", flat=True)
-        incidents = 0
-        for i in range(len(timestamps)):
-            count = 1
-            for j in range(i + 1, len(timestamps)):
-                if (timestamps[j] - timestamps[i]).seconds <= 60:
-                    count += 1
-                    if count == threshold:
-                        incidents += 1
-                        break
-                else:
-                    break
-        return incidents
-
 
 class UserProfile(MetricsModelMixin("userprofile"), models.Model):
-    user = models.OneToOneField(User, on_delete=models.CASCADE, related_name="profile")
-    transcribe_count = models.IntegerField(
-        default=0, verbose_name="transcription save/submit count"
-    )
-    review_count = models.IntegerField(
-        default=0, verbose_name="transcription review count"
-    )
+    user = models.ForeignKey(User, on_delete=models.CASCADE)
 
 
 class OverlayPosition(object):
@@ -838,49 +792,63 @@ def recent_review_actions(self, days=1):
         START = timezone.now() - datetime.timedelta(days=days)
         return self.review_actions(START)
 
-    def review_incidents(self):
-        user_incident_count = []
-        recent_accepts = self.filter(
-            accepted__gte=ONE_DAY_AGO,
-            reviewed_by__is_superuser=False,
-            reviewed_by__is_staff=False,
-        )
-        recent_rejects = self.filter(
-            rejected__gte=ONE_DAY_AGO,
-            reviewed_by__is_superuser=False,
-            reviewed_by__is_staff=False,
-        )
-        recent_actions = recent_accepts.union(recent_rejects)
-        user_ids = set(
-            recent_actions.order_by("reviewed_by").values_list("reviewed_by", flat=True)
-        )
-
-        for user_id in user_ids:
-            user = ConcordiaUser.objects.get(id=user_id)
-            incident_count = user.review_incidents(recent_accepts, recent_rejects)
-            if incident_count > 0:
-                user_incident_count.append((user.id, user.username, incident_count))
-
-        return user_incident_count
-
-    def transcribe_incidents(self):
-        user_incident_count = []
-        transcriptions = self.get_queryset().filter(
-            submitted__gte=ONE_DAY_AGO, user__is_superuser=False, user__is_staff=False
-        )
-        user_ids = (
-            transcriptions.order_by("user")
-            .distinct("user")
-            .values_list("user", flat=True)
-        )
-
-        for user_id in user_ids:
-            user = ConcordiaUser.objects.get(id=user_id)
-            incident_count = user.transcribe_incidents(transcriptions)
-            if incident_count > 0:
-                user_incident_count.append((user.id, user.username, incident_count))
-
-        return user_incident_count
+    def reviewing_too_quickly(self, start=ONE_DAY_AGO):
+        with connection.cursor() as cursor:
+            cursor.execute(
+                f"""SELECT u.id, u.username, COUNT(*)
+                FROM concordia_transcription t1
+                JOIN concordia_transcription t2
+                ON t1.id < t2.id
+                JOIN concordia_transcription t3
+                ON t2.id < t3.id
+                AND t1.reviewed_by_id = t2.reviewed_by_id
+                AND t2.reviewed_by_id = t3.reviewed_by_id
+                AND t1.accepted >= '{start}'
+                AND t2.accepted >= '{start}'
+                AND t3.accepted >= '{start}'
+                AND ABS(
+                    EXTRACT(EPOCH FROM (t1.updated_on - t2.updated_on))
+                ) < 60
+                AND ABS(
+                    EXTRACT(EPOCH FROM (t1.updated_on - t3.updated_on))
+                ) < 60
+                AND ABS(EXTRACT(
+                    EPOCH FROM (t2.updated_on - t3.updated_on))
+                ) < 60
+                JOIN auth_user u on t1.reviewed_by_id = u.id
+                WHERE u.is_superuser = FALSE and u.is_staff = False
+                GROUP BY u.id, u.username"""  # nosec B608
+            )
+            return cursor.fetchall()
+
+    def transcribing_too_quickly(self, start=ONE_DAY_AGO):
+        with connection.cursor() as cursor:
+            cursor.execute(
+                f"""SELECT u.id, u.username, COUNT(*)
+                FROM concordia_transcription t1
+                JOIN concordia_transcription t2
+                ON t1.id < t2.id
+                JOIN concordia_transcription t3
+                ON t2.id < t3.id
+                AND t1.user_id = t2.user_id
+                AND t2.user_id = t3.user_id
+                AND t1.submitted >= '{start}'
+                AND t2.submitted >= '{start}'
+                AND t3.submitted >= '{start}'
+                AND ABS(
+                    EXTRACT(EPOCH FROM (t1.created_on - t2.created_on))
+                ) < 60
+                AND ABS(
+                    EXTRACT(EPOCH FROM (t1.created_on - t3.created_on))
+                ) < 60
+                AND ABS(
+                    EXTRACT(EPOCH FROM (t2.created_on - t3.created_on))
+                ) < 60
+                JOIN auth_user u on t1.user_id = u.id
+                WHERE u.is_superuser = FALSE and u.is_staff = False
+                GROUP BY u.id, u.username"""  # nosec B608
+            )
+            return cursor.fetchall()
 
 
 class Transcription(MetricsModelMixin("transcription"), models.Model):
@@ -994,13 +962,10 @@ def on_transcription_save(sender, instance, **kwargs):
             user=user,
             campaign=instance.asset.item.project.campaign,
         )
-        profile, created = UserProfile.objects.get_or_create(user=user)
         if created:
             setattr(user_profile_activity, attr_name, 1)
-            setattr(profile, attr_name, 1)
         else:
             setattr(user_profile_activity, attr_name, F(attr_name) + 1)
-            setattr(profile, attr_name, F(attr_name) + 1)
         q = Q(transcription__user=user) | Q(transcription__reviewed_by=user)
         user_profile_activity.asset_count = (
             Asset.objects.filter(q)
@@ -1009,7 +974,6 @@ def on_transcription_save(sender, instance, **kwargs):
             .count()
         )
         user_profile_activity.save()
-        profile.save()
 
 
 post_save.connect(on_transcription_save, sender=Transcription)
diff --git a/concordia/signals/handlers.py b/concordia/signals/handlers.py
index 72f12620b..47451cfae 100644
--- a/concordia/signals/handlers.py
+++ b/concordia/signals/handlers.py
@@ -14,7 +14,7 @@
 from django_registration.signals import user_activated, user_registered
 from flags.state import flag_enabled
 
-from ..models import Asset, Transcription, TranscriptionStatus, UserProfile
+from ..models import Asset, Transcription, TranscriptionStatus
 from ..tasks import calculate_difficulty_values
 from .signals import reservation_obtained, reservation_released
 
@@ -191,9 +191,3 @@ def send_asset_reservation_message(
 @receiver(post_delete, sender=Asset)
 def remove_file_from_s3(sender, instance, using, **kwargs):
     instance.storage_image.delete(save=False)
-
-
-@receiver(post_save, sender=settings.AUTH_USER_MODEL)
-def create_user_profile(sender, instance, *args, **kwargs):
-    if not hasattr(instance, "profile"):
-        UserProfile.objects.create(user=instance)
diff --git a/concordia/static/js/src/asset-reservation.js b/concordia/static/js/src/asset-reservation.js
index 9e2299b59..bb1ef4cfe 100644
--- a/concordia/static/js/src/asset-reservation.js
+++ b/concordia/static/js/src/asset-reservation.js
@@ -1,7 +1,5 @@
 /* global jQuery displayMessage displayHtmlMessage buildErrorMessage Sentry */
-/* exported attemptToReserveAsset reserveAssetForEditing */
-
-const assetData = document.currentScript.dataset;
+/* exported attemptToReserveAsset */
 
 function attemptToReserveAsset(reservationURL, findANewPageURL, actionType) {
     var $transcriptionEditor = jQuery('#transcription-editor');
@@ -97,15 +95,3 @@ function attemptToReserveAsset(reservationURL, findANewPageURL, actionType) {
         }
     });
 }
-
-function reserveAssetForEditing() {
-    if (assetData.reserveAssetUrl) {
-        attemptToReserveAsset(assetData.reserveAssetUrl, '', 'transcribe');
-    }
-}
-
-jQuery(function () {
-    if (assetData.reserveForEditing) {
-        reserveAssetForEditing();
-    }
-});
diff --git a/concordia/static/js/src/banner.js b/concordia/static/js/src/banner.js
deleted file mode 100644
index a46e3ea2a..000000000
--- a/concordia/static/js/src/banner.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/* global $ */
-
-if (typeof Storage !== 'undefined') {
-    if (!(window.screen.width < 1024 || window.screen.height < 768)) {
-        for (var key in localStorage) {
-            if (key.startsWith('banner-')) {
-                if ($('#' + key).hasClass('alert')) {
-                    $('#' + key).attr('hidden', true);
-                }
-            }
-        }
-    }
-}
-
-$('#no-interface-banner').click(function (event) {
-    localStorage.setItem(event.target.parentElement.id, true);
-    $('#' + event.target.parentElement.id).attr('hidden', true);
-});
diff --git a/concordia/static/js/src/contribute.js b/concordia/static/js/src/contribute.js
index f477ef02e..30f9c8942 100644
--- a/concordia/static/js/src/contribute.js
+++ b/concordia/static/js/src/contribute.js
@@ -766,27 +766,4 @@ function setupPage() {
     }
 }
 
-let transcriptionForm = document.getElementById('transcription-editor');
-let ocrForm = document.getElementById('ocr-transcription-form');
-
-let formChanged = false;
-transcriptionForm.addEventListener('change', function () {
-    formChanged = true;
-});
-transcriptionForm.addEventListener('submit', function () {
-    formChanged = false;
-});
-if (ocrForm) {
-    ocrForm.addEventListener('submit', function () {
-        formChanged = false;
-    });
-}
-window.addEventListener('beforeunload', function (event) {
-    if (formChanged) {
-        // Some browsers ignore this value and always display a built-in message instead
-        return (event.returnValue =
-            "The transcription you've started has not been saved.");
-    }
-});
-
 setupPage();
diff --git a/concordia/static/js/src/guide.js b/concordia/static/js/src/guide.js
deleted file mode 100644
index 2bfe28570..000000000
--- a/concordia/static/js/src/guide.js
+++ /dev/null
@@ -1,86 +0,0 @@
-/* global $ trackUIInteraction */
-/* exported openOffcanvas closeOffcanvas showPane hidePane */
-
-function openOffcanvas() {
-    var guide = document.getElementById('guide-sidebar');
-    guide.classList.remove('offscreen');
-    guide.style.borderWidth = '0 0 thick thick';
-    guide.style.borderStyle = 'solid';
-    guide.style.borderColor = '#0076ad';
-    document.getElementById('open-guide').style.display = 'none';
-    document.addEventListener('keydown', function (event) {
-        if (event.key == 'Escape') {
-            closeOffcanvas();
-        }
-    });
-}
-
-function closeOffcanvas() {
-    var guide = document.getElementById('guide-sidebar');
-    guide.classList.add('offscreen');
-
-    guide.style.border = 'none';
-    document.getElementById('open-guide').style.display = 'block';
-}
-
-function showPane(elementId) {
-    document.getElementById(elementId).classList.add('show', 'active');
-    document.getElementById('guide-nav').classList.remove('show', 'active');
-}
-
-function hidePane(elementId) {
-    document.getElementById(elementId).classList.remove('show', 'active');
-    document.getElementById('guide-nav').classList.add('show', 'active');
-}
-
-function trackHowToInteraction(element, label) {
-    trackUIInteraction(element, 'How To Guide', 'click', label);
-}
-
-$('#open-guide').on('click', function () {
-    trackHowToInteraction($(this), 'Open');
-});
-$('#close-guide').on('click', function () {
-    trackHowToInteraction($(this), 'Close');
-});
-$('#previous-guide').on('click', function () {
-    trackHowToInteraction($(this), 'Back');
-});
-$('#next-guide').on('click', function () {
-    trackHowToInteraction($(this), 'Next');
-});
-$('#guide-bars').on('click', function () {
-    trackHowToInteraction($(this), 'Hamburger Menu');
-});
-$('#guide-sidebar .nav-link').on('click', function () {
-    let label = $(this).text().trim();
-    trackHowToInteraction($(this), label);
-});
-
-$('#guide-carousel')
-    .carousel({
-        interval: false,
-        wrap: false,
-    })
-    .on('slide.bs.carousel', function (event) {
-        if (event.to == 0) {
-            $('#guide-bars').addClass('d-none');
-        } else {
-            $('#guide-bars').removeClass('d-none');
-        }
-    });
-
-$('#previous-card').hide();
-
-$('#card-carousel').on('slid.bs.carousel', function () {
-    if ($('#card-carousel .carousel-item:first').hasClass('active')) {
-        $('#previous-card').hide();
-        $('#next-card').show();
-    } else if ($('#card-carousel .carousel-item:last').hasClass('active')) {
-        $('#previous-card').show();
-        $('#next-card').hide();
-    } else {
-        $('#previous-card').show();
-        $('#next-card').show();
-    }
-});
diff --git a/concordia/static/js/src/ocr.js b/concordia/static/js/src/ocr.js
deleted file mode 100644
index 8c5cf0d07..000000000
--- a/concordia/static/js/src/ocr.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/* global $ */
-/* exported selectLanguage */
-
-function selectLanguage() {
-    $('#ocr-transcription-modal').modal('hide');
-    $('#language-selection-modal').modal('show');
-}
diff --git a/concordia/static/js/src/quick-tips.js b/concordia/static/js/src/quick-tips.js
deleted file mode 100644
index 139eb3acf..000000000
--- a/concordia/static/js/src/quick-tips.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/* global $ trackUIInteraction setTutorialHeight */
-
-function trackQuickTipsInteraction(element, label) {
-    trackUIInteraction(element, 'Quick Tips', 'click', label);
-}
-
-var mainContentHeight = $('#contribute-main-content').height();
-if (mainContentHeight < 710) {
-    $('.sidebar').height(mainContentHeight - 130);
-}
-
-$('#tutorial-popup').on('shown.bs.modal', function () {
-    setTutorialHeight();
-});
-
-$('#quick-tips').on('click', function () {
-    trackQuickTipsInteraction($(this), 'Open');
-});
-$('#previous-card').on('click', function () {
-    trackQuickTipsInteraction($(this), 'Back');
-});
-$('#next-card').on('click', function () {
-    trackQuickTipsInteraction($(this), 'Next');
-});
-$('.carousel-indicators li').on('click', function () {
-    let index = [...this.parentElement.children].indexOf(this);
-    trackQuickTipsInteraction($(this), `Carousel ${index}`);
-});
-$('#tutorial-popup').on('hidden.bs.modal', function () {
-    // We're tracking whenever the popup closes, so we don't separately track the close button being clicked
-    trackUIInteraction($(this), 'Quick Tips', 'click', 'Close');
-});
-$('#tutorial-popup').on('shown-on-load', function () {
-    // We set a timeout to make sure the analytics code is loaded before trying to track
-    setTimeout(function () {
-        trackUIInteraction($(this), 'Quick Tips', 'load', 'Open');
-    }, 1000);
-});
diff --git a/concordia/static/js/src/viewer-split.js b/concordia/static/js/src/viewer-split.js
deleted file mode 100644
index 2769b7b49..000000000
--- a/concordia/static/js/src/viewer-split.js
+++ /dev/null
@@ -1,146 +0,0 @@
-/* global Split seadragonViewer */
-
-let pageSplit;
-let contributeContainer = document.getElementById('contribute-container');
-let ocrSection = document.getElementById('ocr-section');
-let editorColumn = document.getElementById('editor-column');
-let viewerColumn = document.getElementById('viewer-column');
-let layoutColumns = ['#viewer-column', '#editor-column'];
-let verticalKey = 'transcription-split-sizes-vertical';
-let horizontalKey = 'transcription-split-sizes-horizontal';
-
-let sizesVertical = localStorage.getItem(verticalKey);
-
-if (sizesVertical) {
-    sizesVertical = JSON.parse(sizesVertical);
-} else {
-    sizesVertical = [50, 50];
-}
-
-let sizesHorizontal = localStorage.getItem(horizontalKey);
-
-if (sizesHorizontal) {
-    sizesHorizontal = JSON.parse(sizesHorizontal);
-} else {
-    sizesHorizontal = [50, 50];
-}
-
-let splitDirection = localStorage.getItem('transcription-split-direction');
-
-if (splitDirection) {
-    splitDirection = JSON.parse(splitDirection);
-} else {
-    splitDirection = 'h';
-}
-
-function saveSizes(sizes) {
-    let sizeKey;
-    if (splitDirection == 'h') {
-        sizeKey = horizontalKey;
-        sizesHorizontal = sizes;
-    } else {
-        sizeKey = verticalKey;
-        sizesVertical = sizes;
-    }
-    localStorage.setItem(sizeKey, JSON.stringify(sizes));
-}
-
-function saveDirection(direction) {
-    localStorage.setItem(
-        'transcription-split-direction',
-        JSON.stringify(direction),
-    );
-}
-
-function verticalSplit() {
-    splitDirection = 'v';
-    saveDirection(splitDirection);
-    contributeContainer.classList.remove('flex-row');
-    contributeContainer.classList.add('flex-column');
-    viewerColumn.classList.remove('h-100');
-    if (ocrSection != undefined) {
-        editorColumn.prepend(ocrSection);
-    }
-
-    return Split(layoutColumns, {
-        sizes: sizesVertical,
-        minSize: 100,
-        gutterSize: 8,
-        direction: 'vertical',
-        elementStyle: function (dimension, size, gutterSize) {
-            return {
-                'flex-basis': 'calc(' + size + '% - ' + gutterSize + 'px)',
-            };
-        },
-        gutterStyle: function (dimension, gutterSize) {
-            return {
-                'flex-basis': gutterSize + 'px',
-            };
-        },
-        onDragEnd: saveSizes,
-    });
-}
-function horizontalSplit() {
-    splitDirection = 'h';
-    saveDirection(splitDirection);
-    contributeContainer.classList.remove('flex-column');
-    contributeContainer.classList.add('flex-row');
-    viewerColumn.classList.add('h-100');
-    if (ocrSection != undefined) {
-        viewerColumn.append(ocrSection);
-    }
-    return Split(layoutColumns, {
-        sizes: sizesHorizontal,
-        minSize: 100,
-        gutterSize: 8,
-        elementStyle: function (dimension, size, gutterSize) {
-            return {
-                'flex-basis': 'calc(' + size + '% - ' + gutterSize + 'px)',
-            };
-        },
-        gutterStyle: function (dimension, gutterSize) {
-            return {
-                'flex-basis': gutterSize + 'px',
-            };
-        },
-        onDragEnd: saveSizes,
-    });
-}
-
-document
-    .getElementById('viewer-layout-horizontal')
-    .addEventListener('click', function () {
-        if (splitDirection != 'h') {
-            if (pageSplit != undefined) {
-                pageSplit.destroy();
-            }
-            pageSplit = horizontalSplit();
-            setTimeout(function () {
-                // Some quirk in the viewer makes this
-                // sometimes not work depending on
-                // the rotation, unless it's delayed.
-                // Less than 10ms didn't reliable work.
-                seadragonViewer.viewport.zoomTo(1);
-            }, 10);
-        }
-    });
-
-document
-    .getElementById('viewer-layout-vertical')
-    .addEventListener('click', function () {
-        if (splitDirection != 'v') {
-            if (pageSplit != undefined) {
-                pageSplit.destroy();
-            }
-            pageSplit = verticalSplit();
-            setTimeout(function () {
-                seadragonViewer.viewport.zoomTo(1);
-            }, 10);
-        }
-    });
-
-if (splitDirection == 'v') {
-    pageSplit = verticalSplit();
-} else {
-    pageSplit = horizontalSplit();
-}
diff --git a/concordia/static/js/src/viewer.js b/concordia/static/js/src/viewer.js
deleted file mode 100644
index 9ad073409..000000000
--- a/concordia/static/js/src/viewer.js
+++ /dev/null
@@ -1,200 +0,0 @@
-/* global OpenSeadragon screenfull debounce */
-/* exported seadragonView stepUp stepDown resetImageFilterForms */
-
-const viewerData = document.currentScript.dataset;
-
-var seadragonViewer = OpenSeadragon({
-    id: 'asset-image',
-    prefixUrl: viewerData.prefixUrl,
-    tileSources: {
-        type: 'image',
-        url: viewerData.tileSourceUrl,
-    },
-    gestureSettingsTouch: {
-        pinchRotate: true,
-    },
-    showNavigator: true,
-    showRotationControl: true,
-    showFlipControl: true,
-    toolbar: 'viewer-controls',
-    zoomInButton: 'viewer-zoom-in',
-    zoomOutButton: 'viewer-zoom-out',
-    homeButton: 'viewer-home',
-    rotateLeftButton: 'viewer-rotate-left',
-    rotateRightButton: 'viewer-rotate-right',
-    flipButton: 'viewer-flip',
-    crossOriginPolicy: 'Anonymous',
-});
-
-// We need to define our own fullscreen function rather than using OpenSeadragon's
-// because the built-in fullscreen function overwrites the DOM with the viewer,
-// breaking our extra controls, such as the image filters.
-if (screenfull.isEnabled) {
-    let fullscreenButton = document.querySelector('#viewer-fullscreen');
-    fullscreenButton.addEventListener('click', function (event) {
-        event.preventDefault();
-        let targetElement = document.querySelector(
-            fullscreenButton.dataset.target,
-        );
-        if (screenfull.isFullscreen) {
-            screenfull.exit();
-        } else {
-            screenfull.request(targetElement);
-        }
-    });
-}
-
-// The buttons configured as controls for the viewer don't properly get focus
-// when clicked. This mostly isn't a problem, but causes odd-looking behavior
-// when one of the extra buttons in the control bar is clicked (and therefore
-// focused) first--clicking the control button leaves the focus on the extra
-// button.
-// TODO: Attempting to add focus to the clicked button here doesn't consistently
-// work for unknown reasons, so it just removes focus from the extra buttons
-// for now
-let viewerControlButtons = document.querySelectorAll('.viewer-control-button');
-for (const node of viewerControlButtons) {
-    node.addEventListener('click', function () {
-        let focusedButton = document.querySelector(
-            '.extra-control-button:focus',
-        );
-        if (focusedButton) {
-            focusedButton.blur();
-        }
-    });
-}
-
-/*
- * Image filter handling
- */
-
-let availableFilters = [
-    {
-        formId: 'gamma-form',
-        inputId: 'gamma',
-        getFilter: function () {
-            let value = document.getElementById(this.inputId).value;
-            if (
-                !Number.isNaN(value) &&
-                value != 1 &&
-                value >= 0 &&
-                value <= 5
-            ) {
-                return OpenSeadragon.Filters.GAMMA(value);
-            }
-        },
-    },
-    {
-        formId: 'invert-form',
-        inputId: 'invert',
-        getFilter: function () {
-            let value = document.getElementById(this.inputId).checked;
-            if (value) {
-                return OpenSeadragon.Filters.INVERT();
-            }
-        },
-    },
-    {
-        formId: 'threshold-form',
-        inputId: 'threshold',
-        getFilter: function () {
-            let value = document.getElementById(this.inputId).value;
-            if (!Number.isNaN(value) && value > 0 && value <= 255) {
-                return OpenSeadragon.Filters.THRESHOLDING(value);
-            }
-        },
-    },
-];
-
-function updateFilters() {
-    let filters = [];
-    for (const filterData of availableFilters) {
-        let filter = filterData.getFilter();
-        if (filter) {
-            filters.push(filter);
-        }
-    }
-
-    seadragonViewer.setFilterOptions({
-        filters: {
-            processors: filters,
-        },
-    });
-}
-
-for (const filterData of availableFilters) {
-    let form = document.getElementById(filterData.formId);
-    if (form) {
-        form.addEventListener('change', updateFilters);
-        form.addEventListener('reset', function () {
-            // We use setTimeout to push the updateFilters
-            // call to the next event cycle in order to
-            // call it after the form is reset, instead
-            // of before, which is when this listener
-            // triggers
-            setTimeout(updateFilters);
-        });
-    }
-
-    let input = document.getElementById(filterData.inputId);
-    if (input) {
-        // We use debounce here so that updateFilters is only called once,
-        // after the user stops typing or scrolling with their mousewheel
-        input.addEventListener(
-            'keyup',
-            debounce(() => updateFilters()),
-        );
-        input.addEventListener(
-            'wheel',
-            debounce(() => updateFilters()),
-        );
-    }
-}
-
-/*
- * Image filter form handling
- */
-function stepUp(id) {
-    let input = document.getElementById(id);
-    input.stepUp();
-    input.dispatchEvent(new Event('input', {bubbles: true}));
-    input.dispatchEvent(new Event('change', {bubbles: true}));
-    return false;
-}
-
-function stepDown(id) {
-    let input = document.getElementById(id);
-    input.stepDown();
-    input.dispatchEvent(new Event('input', {bubbles: true}));
-    input.dispatchEvent(new Event('change', {bubbles: true}));
-    return false;
-}
-
-function resetImageFilterForms() {
-    for (const filterData of availableFilters) {
-        let form = document.getElementById(filterData.formId);
-        form.reset();
-    }
-}
-
-let gammaNumber = document.getElementById('gamma');
-let gammaRange = document.getElementById('gamma-range');
-
-gammaNumber.addEventListener('input', function () {
-    gammaRange.value = gammaNumber.value;
-});
-
-gammaRange.addEventListener('input', function () {
-    gammaNumber.value = gammaRange.value;
-});
-
-let thresholdNumber = document.getElementById('threshold');
-let thresholdRange = document.getElementById('threshold-range');
-
-thresholdNumber.addEventListener('input', function () {
-    thresholdRange.value = thresholdNumber.value;
-});
-
-thresholdRange.addEventListener('input', function () {
-    thresholdNumber.value = thresholdRange.value;
-});
diff --git a/concordia/tasks.py b/concordia/tasks.py
index 8445b0670..bb3054dad 100644
--- a/concordia/tasks.py
+++ b/concordia/tasks.py
@@ -1043,6 +1043,14 @@ def fix_storage_images(campaign_slug=None, asset_start_id=None):
         logger.debug("%s / %s (%s%%)", count, full_count, str(count / full_count * 100))
 
 
+def transcribing_too_quickly():
+    return Transcription.objects.transcribing_too_quickly()
+
+
+def reviewing_too_quickly():
+    return Transcription.objects.reviewing_too_quickly()
+
+
 @celery_app.task(ignore_result=True)
 def clear_sessions():
     # This clears expired Django sessions in the database
@@ -1059,8 +1067,8 @@ def unusual_activity():
         "title": "Unusual User Activity Report for "
         + timezone.now().strftime("%b %d %Y, %I:%M %p"),
         "domain": "https://" + site.domain,
-        "transcriptions": Transcription.objects.transcribe_incidents(),
-        "reviews": Transcription.objects.review_incidents(),
+        "transcriptions": transcribing_too_quickly(),
+        "reviews": reviewing_too_quickly(),
     }
 
     text_body_template = loader.get_template("emails/unusual_activity.txt")
diff --git a/concordia/templates/admin/concordia/item/change_form.html b/concordia/templates/admin/concordia/item/change_form.html
index 835d87b2e..4e0dc3352 100644
--- a/concordia/templates/admin/concordia/item/change_form.html
+++ b/concordia/templates/admin/concordia/item/change_form.html
@@ -29,3 +29,18 @@
     {% endif %}
     {{ block.super }}
 {% endblock %}
+
+{% block extrahead %}
+    {{ block.super }}
+
+    {% include 'fragments/codemirror.html' %}
+{% endblock extrahead %}
+
+
+{% block content %}
+    {{ block.super }}
+
+    <script>
+        setupCodeMirror(document.getElementById('id_description'), 'html');
+    </script>
+{% endblock content %}
diff --git a/concordia/templates/admin/concordia/topic/change_form.html b/concordia/templates/admin/concordia/topic/change_form.html
new file mode 100644
index 000000000..e461b658c
--- /dev/null
+++ b/concordia/templates/admin/concordia/topic/change_form.html
@@ -0,0 +1,19 @@
+{% extends "admin/change_form.html" %}
+
+{% load i18n admin_urls static %}
+
+{% block extrahead %}
+    {{ block.super }}
+
+    {% include 'fragments/codemirror.html' %}
+{% endblock extrahead %}
+
+
+{% block content %}
+    {{ block.super }}
+
+    <script>
+        setupCodeMirror(document.getElementById('id_description'), 'html');
+        setupCodeMirror(document.getElementById('id_short_description'), 'html');
+    </script>
+{% endblock content %}
diff --git a/concordia/templates/emails/unusual_activity.txt b/concordia/templates/emails/unusual_activity.txt
index daba6e152..eb2bf8549 100644
--- a/concordia/templates/emails/unusual_activity.txt
+++ b/concordia/templates/emails/unusual_activity.txt
@@ -6,7 +6,7 @@ Incidents of two or more transcriptions submitted within a single minute:
     No transcriptions fell within the window.
 {% endfor %}
 Incidents of two or more transcriptions reviewed within a single minute:
-{% for row in reviews %}
+{% for row in reviews_by %}
     {{ row.1 }} | {{ row.2 }}
 {% empty %}
     No reviews fell within the window.
diff --git a/concordia/templates/transcriptions/asset_detail.html b/concordia/templates/transcriptions/asset_detail.html
index f67474313..5ed967fbf 100644
--- a/concordia/templates/transcriptions/asset_detail.html
+++ b/concordia/templates/transcriptions/asset_detail.html
@@ -18,25 +18,6 @@
     <meta property="og.description" content="{{ asset.item.project.description }}" />
     <meta property="og.type" content="website" />
     <meta property="og.image" content="{{ thumbnail_url }}" />
-
-    <script defer src="{% static 'split.js/dist/split.min.js' %}"></script>
-    <script defer src="{% static 'openseadragon/build/openseadragon/openseadragon.min.js' %}"></script>
-    <script defer src="{% static 'openseadragon-filtering/openseadragon-filtering.js' %}"></script>
-    <script defer src="{% static 'js/contribute.js' %}"></script>
-    <script defer src="{% static 'js/viewer-split.js' %}"></script>
-    <script defer src="{% static 'js/guide.js' %}"></script>
-    <script defer src="{% static 'js/quick-tips.js' %}"></script>
-    <script defer src="{% static 'js/ocr.js' %}"></script>
-    <script defer src="{% static 'js/asset-reservation.js' %}"
-            data-reserve-asset-url="{% url 'reserve-asset' asset.pk %}"
-            {% if transcription_status == "not_started" or transcription_status == "in_progress" or user.is_authenticated%}
-                data-reserve-for-editing=1
-            {% endif %}
-    ></script>
-    <script defer src="{% static 'js/viewer.js' %}"
-            data-prefix-url="{% static 'openseadragon/build/openseadragon/images/' %}"
-            data-tile-source-url="{% asset_media_url asset %}?canvas"
-    ></script>
 {% endblock head_content %}
 
 {% block breadcrumbs %}
@@ -54,13 +35,330 @@
 
     <div id="contribute-main-content" class="container-fluid flex-grow-1 d-flex flex-column d-print-block">
         <div id="navigation-container" class="row p-1 px-3 d-print-none bg-light">
-            {% include "transcriptions/asset_detail/navigation.html" %}
+            <nav id="asset-navigation" class="d-flex flex-wrap flex-grow-1 justify-content-sm-between align-items-center d-print-block" role="navigation">
+                <div class="d-flex align-items-center">
+                    <form class="p-1" onsubmit="document.location.href = encodeURI(document.getElementById('asset-selection').value); return false">
+                        <div class="input-group input-group-sm flex-nowrap">
+                            <div class="input-group-prepend">
+                                <label class="input-group-text p-0 pr-1 border-0" for="asset-selection">Page</label>
+                            </div>
+                            <select id="asset-selection" class="custom-select custom-select-sm">
+                                {% for sequence, slug in asset_navigation %}
+                                    <option {% if sequence == asset.sequence %}selected{% endif %} value="{% url 'transcriptions:asset-detail' campaign.slug project.slug item.item_id slug %}">{{ sequence }}</option>
+                                {% endfor %}
+                            </select>
+                            <div class="input-group-append">
+                                <button type="submit" class="btn btn-primary">Go</button>
+                            </div>
+                        </div>
+                    </form>
+
+                    <div class="btn-group btn-group-sm p-1">
+                        <a class="btn btn-primary {% if not previous_asset_url %}disabled{% endif %}" {% if previous_asset_url %}href="{{ previous_asset_url }}"{% else %}aria-disabled="true"{% endif %}>
+                            <span class="fas fa-chevron-left"></span>
+                            <span class="sr-only">Previous Page</span>
+                        </a>
+                        <a class="btn btn-primary {% if not next_asset_url %}disabled{% endif %}" {% if next_asset_url %}href="{{ next_asset_url }}"{% else %}aria-disabled="true"{% endif %}>
+                            <span class="fas fa-chevron-right"></span>
+                            <span class="sr-only">Next Page</span>
+                        </a>
+                    </div>
+
+                    <div class="btn-group btn-group-sm p-1">
+                        <button hidden id="go-fullscreen" class="btn btn-primary text-nowrap" data-target="contribute-main-content">
+                            <span class="fas fa-arrows-alt"></span>
+                            Fullscreen
+                        </button>
+                    </div>
+                </div>
+
+                <div class="btn-group align-self-end">
+                    {% if asset.resource_url %}
+                        <div class="btn-group-sm p-1" role="navigation" aria-label="Link to the original source for this item">
+                            <a class="btn btn-outline-primary text-nowrap" target="_blank" rel=noopener title="View the original source for this item in a new tab" href="{{ asset.resource_url }}{% if 'sp=' not in asset.resource_url %}?sp={{ asset.sequence }}{% endif %}">View on www.loc.gov <i class="fa fa-external-link-alt"></i></a>
+                        </div>
+                    {% endif %}
+
+                    <div class="btn-group-sm p-1" role="navigation" aria-label="Link to the next editable page">
+                        <a class="btn btn-outline-primary text-nowrap" title="Move to the next page in this item that needs help" href="{{ next_open_asset_url }}">Find a new page &rarr;</a>
+                    </div>
+                </div>
+            </nav>
         </div>
         <div id="contribute-container" class="d-flex flex-grow-1 d-print-block border">
             <div id="viewer-column" class="pl-0 d-flex align-items-stretch bg-dark d-print-block flex-column">
-                {% include "transcriptions/asset_detail/viewer.html" %}
-                {% include "transcriptions/asset_detail/ocr_help_modal.html" %}
-                {% include "transcriptions/asset_detail/viewer_filters.html" %}
+                <div id="viewer-controls" class="m-1 text-center d-print-none">
+                    <div class="d-inline-flex justify-content-between">
+                        <div class="d-flex btn-group m-1">
+                            <button id="viewer-layout-vertical" class="btn btn-dark viewer-control-button" title="Vertical Layout">
+                                <span class="fas fa-grip-lines"></span>
+                            </button>
+                            <button id="viewer-layout-horizontal" class="btn btn-dark" title="Horizontal Layout">
+                                <span class="fas fa-grip-lines-vertical"></span>
+                            </button>
+                        </div>
+
+                        <div class="d-flex btn-group m-1">
+                            <button type="button" id="viewer-home" class="btn btn-dark viewer-control-button" title="Fit Image to Viewport">
+                                <span class="fas fa-compress"></span>
+                            </button>
+                        </div>
+
+                        <div class="d-flex btn-group m-1">
+                            <button id="viewer-zoom-in" class="btn btn-dark viewer-control-button" title="Zoom In">
+                                <span class="fas fa-search-plus"></span>
+                            </button>
+                            <button id="viewer-zoom-out" class="btn btn-dark" title="Zoom Out">
+                                <span class="fas fa-search-minus"></span>
+                            </button>
+                        </div>
+
+                        <div class="d-flex btn-group m-1">
+                            <button id="viewer-rotate-left" class="btn btn-dark viewer-control-button" title="Rotate Left">
+                                <span class="fas fa-undo"></span>
+                            </button>
+                            <button id="viewer-rotate-right" class="btn btn-dark viewer-control-button" title="Rotate Right">
+                                <span class="fas fa-redo"></span>
+                            </button>
+                        </div>
+
+                        <div class="d-flex btn-group m-1">
+                            <button id="viewer-flip" class="btn btn-dark viewer-control-button" title="Flip">
+                                <span class="fas fa-exchange-alt"></span>
+                            </button>
+                        </div>
+
+                        <div class="d-flex btn-group m-1">
+                            <button type="button" class="btn btn-dark extra-control-button" title="Image Filters" data-toggle="collapse" data-target="#image-filters">
+                                <span class="fas fa-sliders-h" aria-label="Image Filters"></span>
+                            </button>
+                        </div>
+
+                        <div class="d-flex btn-group m-1">
+                            <button type="button" id="viewer-fullscreen" class="btn btn-dark extra-control-button" title="View Full Screen" data-target="#viewer-column">
+                                <span class="fas fa-expand"></span>
+                            </button>
+                        </div>
+
+                        <div class="d-flex btn-group m-1">
+                            <button type="button" class="btn btn-dark extra-control-button" title="Viewer keyboard shortcuts" data-toggle="modal" data-target="#keyboard-help-modal">
+                                <span class="fas fa-question-circle" aria-label="Viewer keyboard shortcuts"></span>
+                            </button>
+                        </div>
+                    </div>
+                </div>
+                <div id="keyboard-help-modal" class="modal" tabindex="-1" role="dialog">
+                    <div class="modal-dialog modal-dialog-centered" role="document">
+                        <div class="modal-content">
+                            <div class="modal-header">
+                                <h5 class="modal-title">Keyboard Shortcuts</h5>
+                                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                                    <span aria-hidden="true">&times;</span>
+                                </button>
+                            </div>
+                            <div class="modal-body">
+                                <h6>Viewer Shortcuts</h6>
+                                <table class="table table-compact table-responsive">
+                                    <tr>
+                                        <th><kbd>w</kbd>, up arrow</th>
+                                        <td>Scroll the viewport up</td>
+                                    </tr>
+                                    <tr>
+                                        <th><kbd>s</kbd>, down arrow</th>
+                                        <td>Scroll the viewport down</td>
+                                    </tr>
+                                    <tr>
+                                        <th><kbd>a</kbd>, left arrow</th>
+                                        <td>Scroll the viewport left</td>
+                                    </tr>
+                                    <tr>
+                                        <th><kbd>d</kbd>, right arrow </th>
+                                        <td>Scroll the viewport right</td>
+                                    </tr>
+                                    <tr>
+                                        <th><kbd>0</kbd></th>
+                                        <td>Fit the entire image to the viewport</td>
+                                    </tr>
+                                    <tr>
+                                        <th><kbd>-</kbd>, <kbd>_</kbd>, Shift+<kbd>W</kbd>, Shift+Up arrow</th>
+                                        <td>Zoom the viewport out</td>
+                                    </tr>
+                                    <tr>
+                                        <th><kbd>=</kbd>, <kbd>+</kbd>, Shift+<kbd>S</kbd>, Shift+Down arrow</th>
+                                        <td>Scroll the viewport in</td>
+                                    </tr>
+                                    <tr>
+                                        <th><kbd>r</kbd></th>
+                                        <td>Rotate the viewport clockwise</td>
+                                    </tr>
+                                    <tr>
+                                        <th><kbd>R</kbd></th>
+                                        <td>Rotate the viewport counterclockwise</td>
+                                    </tr>
+                                    <tr>
+                                        <th><kbd>f</kbd></th>
+                                        <td>Flip the viewport horizontally</td>
+                                    </tr>
+                                </table>
+                            </div>
+                            <div class="modal-footer">
+                                <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div id="ocr-help-modal" class="modal" tabindex="-1" role="dialog">
+                    <div class="modal-dialog modal-dialog-centered" role="document">
+                        <div class="modal-content">
+                            <div class="modal-header">
+                                <h5 class="modal-title">About Transcribe with OCR</h5>
+                                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                                    <span aria-hidden="true">&times;</span>
+                                </button>
+                            </div>
+                            <div class="modal-body">
+                                <h6 class="modal-title">What is OCR?</h6>
+                                <p>OCR stands for Optical Character Recognition. OCR is a software tool that can extract print text from some documents.</p>
+                                <h6>When will OCR work well?</h6>
+                                <p>OCR does not work on handwriting. It only works for printed or typed text, meaning text created by a typewriter, printing press, or other mechanical means. OCR will do best on consistent and clear images of modern typefaces.</p>
+                                <h6>Do I still need to review pages started with OCR?</h6>
+                                <p>Yes! OCR is imperfect. It may not work well for some or all parts of a typed page, but it can be a great starting point. If you start a page with OCR, you should read the text closely before submitting. If you are reviewing a OCR-ed page, you also still need to review.</p>
+                                <h6>Who can use "Transcribe with OCR"?</h6>
+                                <p><a href="{% url 'registration_register' %}">Register for an account</a> and <a href="{% url 'registration_login' %}?next={{ request.path }}">log in</a> to use this feature.</p>
+                                <h6>Why does <span class="font-italic">By the People</span> have this feature?</h6>
+                                <p>We always want to use volunteer time effectively. When the Library of Congress digitizes a large group of printed pages, it will usually OCR them. The materials in By the People campaigns are not good candidates for applying OCR at scale, either because they are handwritten, a mixed collection of handwritten and print materials, or printed on paper or in a typeface that does not produce accurate OCR results. However, OCR can still be a useful starting point for some typed pages. Use it if it if you like it or skip it if you don’t!</p>
+                            </div>
+                            <div class="modal-footer justify-content-center">
+                                <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div id="image-filters" class="m-1 text-center d-print-none collapse">
+                    <hr class="m-0" />
+                    <ul class="d-inline-flex mt-1 btn-group nav nav-tabs" role="tablist">
+                        <li class="nav-item" role="presentation">
+                            <button id="viewer-gamma" class="btn btn-dark nav-link active" title="Adjust gamma" data-toggle="tab" data-target="#gamma-filter" role="tab">
+                                Brightness
+                            </button>
+                        </li>
+                        <li class="nav-item" role="presentation">
+                            <button id="viewer-invert" class="btn btn-dark nav-link" title="Invert colors" data-toggle="tab" data-target="#invert-filter" role="tab">
+                                Invert
+                            </button>
+                        </li>
+                        <li class="nav-item" role="presentation">
+                            <button id="viewer-threshold" class="btn btn-dark nav-link" title="Adjust threshold" data-toggle="tab" data-target="#threshold-filter" role="tab">
+                                Contrast
+                            </button>
+                        </li>
+                    </ul>
+                    <div class="btn-group m-1">
+                        <button id="viewer-reset" class="btn" title="Reset all filters" onclick="resetImageFilterForms()">
+                            Reset All
+                        </button>
+                    </div>
+                    <div id="filter-tabs" class="tab-content">
+                        <div id="gamma-filter" class="tab-pane pt-1 pl-3 show active" role="tabpanel">
+                            <form id="gamma-form" class="form-inline" onsubmit="return false;">
+                                <div class="row ml-0 mr-3 number-input">
+                                    <div class="col p-1">
+                                        <input
+                                            type="number"
+                                            id="gamma"
+                                            name="gamma"
+                                            min="0"
+                                            max="5"
+                                            step="0.01"
+                                            value="1.00"
+                                        />
+                                        <label class="visually-hidden" for="gamma">Gamma</label>
+                                    </div>
+                                    <div class="col p-0">
+                                        <div class="row m-0">
+                                            <button type="button" class="arrow-button" onclick="stepUp('gamma')">
+                                                <span class="fas fa-chevron-up" />
+                                                <span class="visually-hidden">Increase</span>
+                                            </button>
+                                        </div>
+                                        <div class="row m-0">
+                                            <button type="button" class="arrow-button" onclick="stepDown('gamma')">
+                                                <span class="fas fa-chevron-down" />
+                                                <span class="visually-hidden">Decrease</span>
+                                            </button>
+                                        </div>
+                                    </div>
+                                </div>
+                                <input
+                                    type="range"
+                                    id="gamma-range"
+                                    name="gamma-range"
+                                    min="0"
+                                    max="5"
+                                    step="0.01"
+                                    value="1.00"
+                                    class="filter-slider flex-grow-1"
+                                />
+                                <label class="visually-hidden" for="gamma-range">Gamma</label>
+                                <input type="reset" class="btn btn-link underline-link font-weight-bold" value="Reset filter" />
+                            </form>
+                        </div>
+                        <div id="invert-filter" class="tab-pane pt-2" role="tabpanel" style="background-color: white;">
+                            <form id="invert-form" onsubmit="return false;">
+                                <label class="ml-2 align-middle">Off</label>
+                                <div class="custom-control custom-switch custom-control-inline ml-1 mr-2">
+                                    <input type="checkbox" id="invert" name="invert" class="custom-control-input" role="switch" />
+                                    <label class="custom-control-label" for="invert"><span class="visually-hidden">Invert</span></label>
+                                </div>
+                                <label class="align-middle">On</label>
+                            </form>
+                        </div>
+                        <div id="threshold-filter" class="tab-pane pt-1 pl-3" role="tabpanel">
+                            <form id="threshold-form" class="form-inline" onsubmit="return false;">
+                                <div class="row ml-0 mr-3 number-input">
+                                    <div class="col p-1">
+                                        <input
+                                            type="number"
+                                            id="threshold"
+                                            name="threshold"
+                                            min="0"
+                                            max="255"
+                                            step="1"
+                                            value="0"
+                                        />
+                                        <label class="visually-hidden" for="threshold">Threshold</label>
+                                    </div>
+                                    <div class="col p-0">
+                                        <div class="row m-0">
+                                            <button type="button" class="arrow-button" onclick="stepUp('threshold')">
+                                                <span class="fas fa-chevron-up" />
+                                                <span class="visually-hidden">Increase</span>
+                                            </button>
+                                        </div>
+                                        <div class="row m-0">
+                                            <button type="button" class="arrow-button" onclick="stepDown('threshold')">
+                                                <span class="fas fa-chevron-down" />
+                                                <span class="visually-hidden">Decrease</span>
+                                            </button>
+                                        </div>
+                                    </div>
+                                </div>
+                                <input
+                                    type="range"
+                                    id="threshold-range"
+                                    name="threshold-range"
+                                    min="0"
+                                    max="255"
+                                    step="1"
+                                    value="0"
+                                    class="filter-slider flex-grow-1"
+                                />
+                                <label class="visually-hidden" for="threshold-range">Threshold</label>
+                                <input type="reset" class="btn btn-link underline-link font-weight-bold" value="Reset filter" />
+                            </form>
+                        </div>
+                    </div>
+                </div>
                 <div id="asset-image" class="h-100 bg-dark d-print-none w-100"></div>
                 {% if not disable_ocr %}
                     <div id="ocr-section" class="row pl-3 pb-4 bg-white print-none">
@@ -79,8 +377,172 @@
             </div>
 
             <div id="editor-column" class="d-flex justify-content-between p-3 d-print-block flex-column">
-                {% include "transcriptions/asset_detail/editor.html" %}
-                {% include "transcriptions/asset_detail/tags.html" %}
+                <div class="flex-grow-1 d-flex d-print-block flex-column">
+                    <div id="transcription-status-display">
+                        <h2 id="display-submitted" {% if transcription_status != 'submitted' %}hidden{% endif %}>
+                            <span class="fas fa-list"></span>
+                            Needs review
+                        </h2>
+                        <h2 id="display-completed" {% if transcription_status != 'completed' %}hidden{% endif %}>
+                            <span class="fas fa-check"></span>
+                            Completed
+                        </h2>
+                        <h2 id="display-notstarted" {% if transcription_status != "not_started" %}hidden{% endif %}>
+                            <span class="fas fa-edit"></span>
+                            Not started
+                        </h2>
+                        <h2 id="display-inprogress" {% if transcription_status != "in_progress" %}hidden{% endif %}>
+                            <span class="fas fa-edit"></span>
+                            In progress
+                        </h2>
+                        <span id="display-conflict" hidden>
+                            <span class="fas fa-exclamation-triangle"></span>
+                            Another user is transcribing this page
+                        </span>
+                    </div>
+
+                    <form id="transcription-editor" class="ajax-submission flex-grow-1 d-flex flex-column d-print-block" method="post" action="{% url 'save-transcription' asset_pk=asset.pk %}" data-transcription-status="{{ transcription_status }}" {% if transcription %}data-transcription-id="{{ transcription.pk|default:'' }}" {% if transcription.submitted %}data-unsaved-changes="true"{% endif %} data-submit-url="{% url 'submit-transcription' pk=transcription.pk %}" data-review-url="{% url 'review-transcription' pk=transcription.pk %}"{% endif %}>
+                        {% csrf_token %}
+                        <input type="hidden" name="supersedes" value="{{ transcription.pk|default:'' }}" />
+
+                        <div class="row justify-content-sm-between px-3">
+                            <span id="transcription-status-message">
+                                <h2 id="message-contributors" {% if transcription_status == 'not_started' %}hidden{% endif %}>
+                                    Registered Contributors: <span id="message-contributors-num" class="font-weight-normal">{{ registered_contributors }}</span>
+                                </h2>
+                                <span id="message-notstarted" {% if transcription_status != 'not_started' %}hidden{% endif %}>
+                                    Transcribe this page.
+                                </span>
+                                <span id="message-inprogress" {% if transcription_status != 'in_progress' %}hidden{% endif %}>
+                                    Someone started this transcription. Can you finish it?
+                                </span>
+                                <span id="message-submitted" {% if transcription_status != 'submitted' %}hidden{% endif %}>
+                                    Check this transcription thoroughly. Accept if correct!
+                                </span>
+                                <span id="message-completed" {% if transcription_status != 'completed' %}hidden{% endif %}>
+                                    This transcription is finished! You can read and add tags.
+                                </span>
+                            </span>
+                            <div class="align-items-center align-self-end btn-group">
+                                <a class="font-weight-bold" id="quick-tips" data-toggle="modal" data-target="#tutorial-popup" role="button">
+                                    <u>Quick Tips</u>
+                                </a>
+                            </div>
+                        </div>
+
+                        {% spaceless %}
+                            <div id="loading-container" class="pb-2">
+                                <div id="ocr-loading" class="spinner-border" role="status" aria-hidden="true" hidden>
+                                    <span class="sr-only">Loading...</span>
+                                </div>
+                            </div>
+                            <div class="d-flex flex-column flex-grow-1" id="transcription-input-container">
+                                <textarea readonly class="form-control rounded flex-grow-1 d-print-none" name="text" id="transcription-input" placeholder="{% if transcription_status == 'not_started' or transcription_status == 'in_progress' %}Go ahead, start typing. You got this!{% else %}Nothing to transcribe{% endif %}" aria-label="Transcription input">
+                                    {{ transcription.text }}
+                                </textarea>
+                                {% if guides %}
+                                    <button id="open-guide" class="btn btn-primary" type="button" onclick="openOffcanvas()">How-To Guide</button>
+                                    {% include "fragments/_how-to-guide.html" %}
+                                {% endif %}
+                            </div>
+
+                            <div class="print-transcription-text" aria-hidden="true" style="display: none;">{{ transcription.text }}</div>
+
+                            <div class="my-3 d-print-none d-flex flex-wrap justify-content-center align-items-center">
+                                {% if transcription_status == 'not_started' or transcription_status == 'in_progress' %}
+                                    <div class="form-check w-100 text-center mt-0 mb-3">
+                                        <input id="nothing-to-transcribe" type="checkbox" class="form-check-input" />
+                                        <label class="form-check-label" for="nothing-to-transcribe">
+                                            Nothing to transcribe
+                                        </label>
+
+                                        <a tabindex="0" class="btn btn-link d-inline py-0" role="button" data-toggle="popover" data-placement="top" data-trigger="focus click hover" title="Nothing to transcribe?" data-html="true" data-content="If there is no text to transcribe, check this box and click &quot;Submit&quot;. Learn more about what to transcribe and what to skip in &quot;How To.&quot;">
+                                            <span class="fas fa-question-circle" aria-label="Open Help"></span>
+                                        </a>
+                                    </div>
+
+                                    <button id="save-transcription-button" disabled type="submit" class="btn btn-primary mx-1" title="Save the text you entered above">
+                                        Save
+                                    </button>
+                                    <button id="rollback-transcription-button" {% if not undo_available %}disabled{% endif %} type="button" class="btn btn-outline-primary mx-1" title="Undo" data-url="{% url 'rollback-transcription' asset_pk=asset.pk %}">
+                                        <span class="fas fa-undo"></span> Undo
+                                    </button>
+                                    <button id="rollforward-transcription-button" {% if not redo_available %}disabled{% endif %} type="button" class="btn btn-outline-primary mx-1" title="Redo" data-url="{% url 'rollforward-transcription' asset_pk=asset.pk %}">
+                                        Redo <span class="fas fa-redo"></span>
+                                    </button>
+                                    <button id="submit-transcription-button" disabled type="button" class="btn btn-primary mx-1" title="Request another volunteer to review the text you entered above">
+                                        Submit for Review
+                                    </button>
+
+                                {% elif transcription_status == 'submitted' %}
+                                    {% if not user.is_authenticated %}
+                                        <p class="help-text">
+                                            <a href="{% url 'registration_register' %}">Register</a>
+                                            or
+                                            <a href="{% url 'login' %}?next={{ request.path|urlencode }}">login</a>
+                                            to help review
+                                        </p>
+                                    {% else %}
+                                        <button id="reject-transcription-button" disabled type="button" class="btn btn-primary mx-1" title="Correct errors you see in the text">Edit</button>
+                                        {% if transcription.user.pk == user.pk %}
+                                            <p class="help-text mt-2">You submitted this transcription. You can re-open it for editing if you wish to make changes before another volunteer reviews it.</p>
+                                        {% else %}
+                                            <button id="accept-transcription-button" disabled type="button" class="btn btn-primary mx-1" title="Confirm that the text is accurately transcribed">Accept</button>
+                                        {% endif %}
+                                    {% endif %}
+                                {% endif %}
+                            </div>
+                        {% endspaceless %}
+                    </form>
+
+                </div>
+                <div id="tag-editor" class="flex-shrink-1">
+                    <h2 id="tag-label" class="border-top pt-3 pb-2"><a
+                        data-toggle="collapse" href="#tag-form" role="button" aria-expanded="false"
+                        aria-controls="tag-form"><i class="fas fa-plus-square"></i> <span
+                            id="tag-count-text" class="text-dark">Tags (<span id="tag-count">{{ tags|length }}</span>)</span></a></h2>
+                    <form id="tag-form" class="ajax-submission collapse" method="post" action="{% url 'submit-tags' asset_pk=asset.pk %}">
+                        {% csrf_token %}
+                        <div class="d-print-none">
+                            {% if user.is_authenticated %}
+                                <div class="form-row">
+                                    <div class="col input-group">
+                                        <input type="text" id="new-tag-input" class="form-control" placeholder="Add a new tag…" aria-label="Add a new tag" pattern="[\- _À-ž'\w]{1,50}">
+                                        <div class="input-group-append">
+                                            <button id="new-tag-button" class="btn btn-outline-primary" type="button" title="Add tags to the page">Add</button>
+                                        </div>
+                                        <div class="invalid-feedback">
+                                            Tags must be between 1-50 characters and may contain only letters, numbers, dashes, underscores, apostrophes, and spaces
+                                        </div>
+                                    </div>
+                                </div>
+                            {% else %}
+                                <p class="help-text anonymous-only text-center d-print-none">
+                                    Want to tag this page?
+
+                                    <a href="{% url 'registration_register' %}">Register</a>
+                                    or
+                                    <a href="{% url 'login' %}?next={{ request.path|urlencode }}">login</a>
+                                    to add tags.
+                                </p>
+                            {% endif %}
+                        </div>
+
+                        <ul id="current-tags" class="d-flex flex-wrap list-unstyled mb-0 d-print-block">
+                            {% for tag in tags %}
+                                <li class="btn btn-outline-dark btn-sm">
+                                    <label class="m-0">
+                                        <input type="hidden" name="tags" value="{{ tag }}" />
+                                        {{ tag }}
+                                    </label>
+                                    <button type="button" class="close authenticated-only" data-dismiss="alert" aria-label="Remove previous tag" hidden>
+                                        <span aria-hidden="true" class="fas fa-times"></span>
+                                    </button>
+                                </li>
+                            {% endfor %}
+                        </ul>
+                    </form>
+                </div>
             </div>
         </div>
         <div id="help-container" class="mt-1 d-print-none">
@@ -97,26 +559,739 @@
             </div>
         </div>
         <div id="asset-reservation-failure-modal" class="modal" tabindex="-1" role="dialog">
-            {% include "transcriptions/asset_detail/asset_reservation_failure_modal.html" %}
+            <div class="modal-dialog modal-dialog-centered" role="document">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h5 class="modal-title">Someone else is already transcribing this page</h5>
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                            <span aria-hidden="true">&times;</span>
+                        </button>
+                    </div>
+                    <div class="modal-body">
+                        <p>You can help by transcribing a new page, adding tags to this page, or coming back later to review this page's transcription.</p>
+                    </div>
+                    <div class="modal-footer">
+                        <a class="btn btn-primary" href="{{ next_open_asset_url }}">
+                            Find new page
+                        </a>
+                        <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
+                    </div>
+                </div>
+            </div>
         </div>
         <div id="successful-submission-modal" class="modal" tabindex="-1" role="dialog">
-            {% include "transcriptions/asset_detail/successful_submission_modal.html" %}
+            <div class="modal-dialog modal-dialog-centered" role="document">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h5 class="modal-title">Nice Job!</h5>
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                            <span aria-hidden="true">&times;</span>
+                        </button>
+                    </div>
+                    <div class="modal-body">
+                        <p>
+                            This page has been submitted for review.
+                        </p>
+                        <p>
+                            What do you want to do next?
+                        </p>
+                    </div>
+                    <div class="modal-footer d-block text-center">
+                        <p>
+                            <a class="btn btn-primary" href="{{ next_review_asset_url }}">
+                                Review a new page
+                            </a>
+                        </p>
+                        <p>
+                            <a class="btn btn-primary" href="{{ next_open_asset_url }}">
+                                Transcribe a new page
+                            </a>
+                        </p>
+                        <p>
+                            <button type="button" class="btn btn-primary" data-dismiss="modal">
+                                Add Tags
+                            </button>
+                        </p>
+                    </div>
+                </div>
+            </div>
         </div>
         <div id="review-accepted-modal" class="modal" tabindex="-1" role="dialog">
-            {% include "transcriptions/asset_detail/review_accepted_modal.html" %}
+            <div class="modal-dialog modal-dialog-centered" role="document">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h5 class="modal-title">Nice Job!</h5>
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                            <span aria-hidden="true">&times;</span>
+                        </button>
+                    </div>
+                    <div class="modal-body">
+                        <p>
+                            Thanks for your help - we've saved your decision.
+                        </p>
+                        <p>
+                            What do you want to do next?
+                        </p>
+                    </div>
+                    <div class="modal-footer d-block text-center">
+                        <p>
+                            <a class="btn btn-primary" href="{{ next_review_asset_url }}">
+                                Review a new page
+                            </a>
+                        </p>
+                        <p>
+                            <a class="btn btn-primary" href="{{ next_open_asset_url }}">
+                                Transcribe a new page
+                            </a>
+                        </p>
+                        <p>
+                            <button type="button" class="btn btn-primary" data-dismiss="modal">
+                                Add Tags
+                            </button>
+                        </p>
+                    </div>
+                </div>
+            </div>
         </div>
         <div id="captcha-modal" class="modal" tabindex="-1" role="alertdialog" aria-labeledby="captcha-modal-title" aria-describedby="captcha-modal-description">
-            {% include "transcriptions/asset_detail/captcha_modal.html" %}
+            <form action="{% url 'ajax-captcha' %}" class="modal-dialog modal-dialog-centered">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h5 id="captcha-modal-title" class="modal-title">Please confirm you are not a robot</h5>
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                            <span aria-hidden="true">&times;</span>
+                        </button>
+                    </div>
+                    <div class="modal-body">
+                        <div class="form-row">
+                            <div id="captcha-modal-description" class="help-text">
+                                <p class="sr-only">
+                                    To prevent abuse non-logged in users are
+                                    required to solve a captcha periodically. An
+                                    audio alternative is under development. You may
+                                    also avoid this challenge by
+                                    <a href="{% url 'login' %}?next={{ request.path|urlencode }}" rel="nofollow">logging in</a>.
+                                </p>
+                                Before continuing please enter the letters in the image
+                                below so we know you are a human:
+                            </div>
+                            <img id="captcha-image" class="d-block my-3 mx-auto border rounded" alt="Type the letters in the image">
+                        </div>
+                        <div class="form-row">
+                            <input name="response" class="form-control" autocomplete="off" aria-label="Please enter the letters in the image below">
+                        </div>
+                        <input type="hidden" name="key"/>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="submit" class='btn btn-secondary js-captcha-refresh'>
+                            Show me another image
+                        </button>
+                        <button type="submit" class="btn btn-primary">
+                            Continue
+                        </button>
+                    </div>
+                </div>
+            </form>
         </div>
         <div id="ocr-transcription-modal" class="modal" tabindex="-1" role="dialog">
-            {% include "transcriptions/asset_detail/ocr_transcription_modal.html" %}
+            <div class="modal-dialog modal-dialog-centered" role="document">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                            <span aria-hidden="true" class="text-primary">&times;</span>
+                        </button>
+                    </div>
+                    <div class="modal-body">
+                        <div class="bg-light p-3">
+                            <h5 class="modal-title mb-3">Are you sure?</h5>
+                            <p>Clicking "Transcribe with OCR" will remove all existing transcription text and replace it with automatically generated text. We recommend saving existing text in a separate document if you may want to revisit it.</p>
+                        </div>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-primary" data-dismiss="modal">Cancel</button>
+                        {% if transcription_status == "not_started" or transcription_status == "in_progress" %}
+                            <input type="hidden" name="supersedes" value="{{ transcription.pk|default:'' }}" />
+                            <a tabindex="0" class="btn btn-link d-inline p-0" role="button" data-placement="top"  id="select-language-button" onclick="selectLanguage()">
+                                <span class="underline-link font-weight-bold">Yes, Select Language</span>
+                            </a>
+                        {% endif %}
+                    </div>
+                </div>
+            </div>
         </div>
         <div id="language-selection-modal" class="modal" tabindex="-1" role="dialog">
-            {% include "transcriptions/asset_detail/language_selection_modal.html" %}
+            <div class="modal-dialog modal-dialog-centered" role="document">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                            <span aria-hidden="true" class="text-primary">&times;</span>
+                        </button>
+                    </div>
+                    <form id="ocr-transcription-form" class="ajax-submission" method="post" action="{% url 'generate-ocr-transcription' asset_pk=asset.pk %}" data-lock-element="#transcription-editor">
+                        <div class="modal-body">
+                            <div class="bg-light p-3">
+                                <h5 class="modal-title mb-3">Select language</h5>
+                                <p>Select the language the transcription is in from the list below.</p>
+                                <div class="text-center pb-1">
+                                    <select id="language" name="language" size="7">
+                                        {% for language in languages %}
+                                            <option value="{{ language.0 }}"{% if language.0 == "eng" %} selected="selected"{% endif %}>
+                                                {{ language.1 }}
+                                            </option>
+                                        {% endfor %}
+                                    </select>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="modal-footer">
+                            <button type="button" class="btn btn-primary" data-dismiss="modal">Cancel</button>
+                            {% if transcription_status == "not_started" or transcription_status == "in_progress" %}
+                                <input type="hidden" name="supersedes" value="{{ transcription.pk|default:'' }}" />
+                                <button id="ocr-transcription-button" class="btn btn-link underline-link font-weight-bold" disabled>Replace Text</button>
+                            {% endif %}
+                        </div>
+                    </form>
+                </div>
+            </div>
         </div>
     </div>
     <div class="print-transcription-image d-none d-print-block"><img class="img-fluid" alt="Scanned image of the current content page" src="{% asset_media_url asset %}"></div>
     {% if cards %}
-        {% include "transcriptions/asset_detail/quick_tips_modal.html" %}
+        <div id="tutorial-popup" class="modal" tabindex="-1" role="dialog">
+            <div class="modal-dialog modal-dialog-centered" role="document">
+                <div class="modal-content">
+                    <div class="modal-header border-bottom-0">
+                        <h4>Quick Tips</h4>
+                        <button type="button" class="close text-primary" data-dismiss="modal" aria-label="Close">
+                            <span aria-hidden="true">x</span>
+                        </button>
+                    </div>
+                    <div class="modal-body">
+                        <div id="card-carousel" class="carousel slide" data-interval="false">
+                            <div class="carousel-inner">
+                                {% for card in cards %}
+                                    <div class="carousel-item pb-4 {% if forloop.first %} active {% endif %}">
+                                        <div class="position-static d-flex flex-column justify-content-around">
+                                            {% if card.image %}
+                                                <img src="{{ card.image.url }}"{% if card.image_alt_text %} alt="{{ card.image_alt_text }}"{% endif %}>
+                                            {% endif %}
+                                            {% if card.display_heading %}
+                                                <h5>{{ card.display_heading }}</h5>
+                                            {% endif %}
+                                            <p>{{ card.body_text|safe }}</p>
+                                        </div>
+                                    </div>
+                                {% endfor %}
+                            </div>
+                            <a id="previous-card" href="#card-carousel" role="button" data-slide="prev">
+                                <strong><u><&nbsp;Back</u></strong>
+                            </a>
+                            <ol class="carousel-indicators d-none d-lg-flex">
+                                {% for card in cards %}
+                                    <li data-target="#card-carousel" data-slide-to="{{ forloop.counter0 }}" {% if forloop.first %}class="active" {% endif %}></li>
+                                {% endfor %}
+                            </ol>
+                            <a id="next-card" href="#card-carousel" data-slide="next">
+                                <strong><u>Next&nbsp;></u></strong>
+                            </a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
     {% endif %}
 {% endblock main_content %}
+
+{% block body_scripts %}
+    <script src="{% static 'split.js/dist/split.min.js' %}"></script>
+    <script src="{% static 'openseadragon/build/openseadragon/openseadragon.min.js' %}"></script>
+    <script src="{% static 'openseadragon-filtering/openseadragon-filtering.js' %}"></script>
+    <script src="{% static 'js/contribute.js' %}"></script>
+    <script src="{% static 'js/asset-reservation.js' %}"></script>
+    <script>
+        if (typeof(Storage) !== "undefined") {
+            if (!(window.screen.width < 1024 || window.screen.height < 768)) {
+                for(var i in localStorage)
+                {
+                    if (i.startsWith("banner-")) {
+                        if ($('#' + i).hasClass("alert")) {
+                            $('#' + i).attr("hidden", true);
+                        }
+                    }
+                }
+            }
+        }
+        $("#no-interface-banner").click(function(event) {
+            localStorage.setItem(event.target.parentElement.id, true);
+            $('#' + event.target.parentElement.id).attr("hidden", true);
+        });
+    </script>
+
+    <script>
+        var seadragonViewer = OpenSeadragon({
+            id: "asset-image",
+            prefixUrl:
+                "{% static 'openseadragon/build/openseadragon/images/' %}",
+            tileSources: {
+                type: "image",
+                url: "{% asset_media_url asset %}?canvas"
+            },
+            gestureSettingsTouch: {
+                pinchRotate: true
+            },
+            showNavigator:  true,
+            showRotationControl: true,
+            showFlipControl: true,
+            toolbar: "viewer-controls",
+            zoomInButton: "viewer-zoom-in",
+            zoomOutButton: "viewer-zoom-out",
+            homeButton: "viewer-home",
+            rotateLeftButton: "viewer-rotate-left",
+            rotateRightButton: "viewer-rotate-right",
+            flipButton: "viewer-flip",
+            crossOriginPolicy: "Anonymous"
+        });
+
+      // We need to define our own fullscreen function rather than using OpenSeadragon's
+      // because the built-in fullscreen function overwrites the DOM with the viewer,
+      // breaking our extra controls, such as the image filters.
+        if (screenfull.isEnabled) {
+            let fullscreenButton = document.querySelector("#viewer-fullscreen");
+            fullscreenButton.addEventListener('click', function(event) {
+                event.preventDefault();
+                let targetElement = document.querySelector(fullscreenButton.dataset.target);
+                if(screenfull.isFullscreen){
+                    screenfull.exit();
+                } else {
+                    screenfull.request(targetElement);
+                }
+            });
+        }
+
+      // The buttons configured as controls for the viewer don't properly get focus
+      // when clicked. This mostly isn't a problem, but causes odd-looking behavior
+      // when one of the extra buttons in the control bar is clicked (and therefore
+      // focused) first--clicking the control button leaves the focus on the extra
+      // button.
+      // TODO: Attempting to add focus to the clicked button here doesn't consistently
+      // work for unknown reasons, so it just removes focus from the extra buttons
+      // for now
+        let viewerControlButtons = document.querySelectorAll('.viewer-control-button');
+        viewerControlButtons.forEach(function(node){
+            node.addEventListener('click', function(event){
+                focusedButton = document.querySelector('.extra-control-button:focus');
+                if(focusedButton){
+                    focusedButton.blur();
+                }
+
+            })
+        });
+
+                                                                                          /*
+                                                                                          * Image filter handling
+                                                                                          */
+
+        let availableFilters = [
+            {
+                formId: 'gamma-form',
+                inputId: 'gamma',
+                getFilter: function () {
+                    value = document.getElementById(this.inputId).value;
+                    if(!Number.isNaN(value) && value != 1 && value >= 0 && value <= 5){
+                        return OpenSeadragon.Filters.GAMMA(value);
+                    }
+                },
+            },
+            {
+                formId: 'invert-form',
+                inputId: 'invert',
+                getFilter: function() {
+                    value = document.getElementById(this.inputId).checked;
+                    if(value){
+                        return OpenSeadragon.Filters.INVERT();
+                    }
+                }
+            },
+            {
+                formId: 'threshold-form',
+                inputId: 'threshold',
+                getFilter: function() {
+                    value = document.getElementById(this.inputId).value;
+                    if(!Number.isNaN(value) && value > 0 && value <= 255){
+                        return OpenSeadragon.Filters.THRESHOLDING(value);
+                    }
+                }
+            }
+        ];
+
+        function updateFilters() {
+            let filters = [];
+            availableFilters.forEach(function (filterData) {
+                let filter = filterData.getFilter();
+                if(filter){
+                    filters.push(filter);
+                }
+            });
+            seadragonViewer.setFilterOptions({
+                filters: {
+                    processors: filters,
+                },
+            });
+        }
+
+        availableFilters.forEach(function (filterData) {
+            form = document.getElementById(filterData.formId)
+            if(form){
+                form.addEventListener('change', updateFilters);
+                form.addEventListener('reset', function(){
+              // We use setTimeout to push the updateFilters
+              // call to the next event cycle in order to
+              // call it after the form is reset, instead
+              // of before, which is when this listener
+              // triggers
+                    setTimeout(updateFilters);
+                });
+            }
+            input = document.getElementById(filterData.inputId)
+            if(input){
+              // We use debounce here so that updateFilters is only called once,
+              // after the user stops typing or scrolling with their mousewheel
+                input.addEventListener('keyup', debounce(() => updateFilters()));
+                input.addEventListener('wheel', debounce(() => updateFilters()));
+            }
+        });
+    </script>
+
+    <script>
+        let pageSplit;
+        let contributeContainer = document.getElementById("contribute-container");
+        let ocrSection = document.getElementById("ocr-section");
+        let editorColumn = document.getElementById("editor-column");
+        let viewerColumn = document.getElementById("viewer-column");
+        let layoutColumns = ["#viewer-column", "#editor-column"];
+        let verticalKey = 'transcription-split-sizes-vertical';
+        let horizontalKey = 'transcription-split-sizes-horizontal';
+
+        let sizesVertical = localStorage.getItem(verticalKey);
+
+        if (sizesVertical) {
+            sizesVertical = JSON.parse(sizesVertical);
+        } else {
+            sizesVertical = [50, 50];
+        }
+
+        let sizesHorizontal = localStorage.getItem(horizontalKey);
+
+        if (sizesHorizontal) {
+            sizesHorizontal = JSON.parse(sizesHorizontal);
+        } else {
+            sizesHorizontal = [50, 50];
+        }
+
+        let splitDirection = localStorage.getItem("transcription-split-direction");
+
+        if (splitDirection){
+            splitDirection = JSON.parse(splitDirection);
+        } else {
+            splitDirection = "h";
+        }
+
+        function saveSizes(sizes){
+            let sizeKey;
+            if(splitDirection == "h"){
+                sizeKey = horizontalKey;
+                sizesHorizontal = sizes;
+            } else {
+                sizeKey = verticalKey;
+                sizesVertical = sizes;
+            }
+            localStorage.setItem(sizeKey, JSON.stringify(sizes));
+        }
+
+        function saveDirection(direction){
+            localStorage.setItem('transcription-split-direction', JSON.stringify(direction))
+        }
+
+        function verticalSplit(){
+            splitDirection = "v";
+            saveDirection(splitDirection);
+            contributeContainer.classList.remove("flex-row");
+            contributeContainer.classList.add("flex-column");
+            viewerColumn.classList.remove("h-100");
+            if(ocrSection != null){
+                editorColumn.prepend(ocrSection);
+            }
+
+            return Split(layoutColumns, {
+                sizes: sizesVertical,
+                minSize: 100,
+                gutterSize: 8,
+                direction: 'vertical',
+                elementStyle: function(dimension, size, gutterSize) {
+                    return {
+                        "flex-basis": "calc(" + size + "% - " + gutterSize + "px)"
+                    };
+                },
+                gutterStyle: function(dimension, gutterSize) {
+                    return {
+                        "flex-basis": gutterSize + "px"
+                    };
+                },
+                onDragEnd: saveSizes,
+            });
+        }
+        function horizontalSplit(){
+            splitDirection = "h";
+            saveDirection(splitDirection);
+            contributeContainer.classList.remove("flex-column");
+            contributeContainer.classList.add("flex-row");
+            viewerColumn.classList.add("h-100");
+            if(ocrSection != null){
+                viewerColumn.append(ocrSection);
+            }
+            return Split(layoutColumns, {
+                sizes: sizesHorizontal,
+                minSize: 100,
+                gutterSize: 8,
+                elementStyle: function(dimension, size, gutterSize) {
+                    return {
+                        "flex-basis": "calc(" + size + "% - " + gutterSize + "px)"
+                    };
+                },
+                gutterStyle: function(dimension, gutterSize) {
+                    return {
+                        "flex-basis": gutterSize + "px"
+                    };
+                },
+                onDragEnd: saveSizes,
+            });
+        }
+
+        document.getElementById("viewer-layout-horizontal").addEventListener('click', function(){
+            if(splitDirection != "h"){
+                if(pageSplit != null){
+                    pageSplit.destroy();
+                }
+                pageSplit = horizontalSplit();
+                setTimeout(function(){
+                    // Some quirk in the viewer makes this
+                    // sometimes not work depending on
+                    // the rotation, unless it's delayed.
+                    // Less than 10ms didn't reliable work.
+                    seadragonViewer.viewport.zoomTo(1);
+                }, 10);
+            }
+        });
+
+        document.getElementById("viewer-layout-vertical").addEventListener('click', function(){
+            if(splitDirection != "v"){
+                if(pageSplit != null){
+                    pageSplit.destroy();
+                }
+                pageSplit = verticalSplit();
+                setTimeout(function(){
+                    seadragonViewer.viewport.zoomTo(1);
+                }, 10);
+            }
+        });
+
+        if (splitDirection == "v") {
+            pageSplit = verticalSplit();
+        } else {
+            pageSplit = horizontalSplit();
+        }
+    </script>
+
+    <script>
+        function reserveAssetForEditing(){
+            attemptToReserveAsset("{% url 'reserve-asset' asset.pk %}", "", "transcribe");
+        }
+        {% if transcription_status == "not_started" or transcription_status == "in_progress" %}
+            attemptToReserveAsset("{% url 'reserve-asset' asset.pk %}",
+                "",
+                "transcribe");
+        {% elif user.is_authenticated %}
+            reserveAssetForEditing();
+        {% endif %}
+    </script>
+
+    <script>
+        let transcriptionForm = document.getElementById("transcription-editor");
+        let $transcriptionEditor = $("#transcription-editor");
+        let ocrForm = document.getElementById("ocr-transcription-form");
+        let $ocrForm = $("#ocr-transcription-form");
+
+        let formChanged = false;
+        transcriptionForm.addEventListener('change', function(){
+            formChanged = true;
+        });
+        transcriptionForm.addEventListener('submit', function(){
+            formChanged = false;
+        });
+        if(ocrForm){
+            ocrForm.addEventListener('submit', function(){
+                formChanged = false;
+            });
+        }
+        window.addEventListener('beforeunload', function(event){
+            if(formChanged){
+              // Some browsers ignore this value and always display a built-in message instead
+                return event.returnValue = "The transcription you've started has not been saved.";
+            }
+        });
+    </script>
+
+    <script>
+      /*
+      * Image filter form handling
+      */
+        function stepUp(id){
+            let input = document.getElementById(id);
+            input.stepUp();
+            input.dispatchEvent(new Event('input', { bubbles: true }));
+            input.dispatchEvent(new Event('change', { bubbles: true }));
+            return false;
+        }
+
+        function stepDown(id){
+            let input = document.getElementById(id);
+            input.stepDown();
+            input.dispatchEvent(new Event('input', { bubbles: true }));
+            input.dispatchEvent(new Event('change', { bubbles: true }));
+            return false;
+        }
+
+        function resetImageFilterForms(){
+            availableFilters.forEach(function (filterData) {
+                form = document.getElementById(filterData.formId);
+                form.reset();
+            });
+        }
+
+        let gammaNumber = document.getElementById("gamma");
+        let gammaRange = document.getElementById("gamma-range");
+
+        gammaNumber.addEventListener('input', function(){
+            gammaRange.value = gammaNumber.value;
+        });
+
+        gammaRange.addEventListener('input', function(){
+            gammaNumber.value = gammaRange.value;
+        });
+
+        let thresholdNumber = document.getElementById("threshold");
+        let thresholdRange = document.getElementById("threshold-range");
+
+        thresholdNumber.addEventListener('input', function(){
+            thresholdRange.value = thresholdNumber.value;
+        });
+
+        thresholdRange.addEventListener('input', function(){
+            thresholdNumber.value = thresholdRange.value;
+        });
+    </script>
+    <script>
+        function openOffcanvas() {
+            var guide = document.getElementById("guide-sidebar");
+            guide.classList.remove("offscreen");
+            guide.style.borderWidth = "0 0 thick thick";
+            guide.style.borderStyle = "solid";
+            guide.style.borderColor = "#0076ad";
+            document.getElementById("open-guide").style.display = "none";
+            document.addEventListener('keydown', function(e) {
+                if (e.key == "Escape") {
+                    closeOffcanvas();
+                }
+            });
+
+        }
+        function closeOffcanvas() {
+            var guide = document.getElementById("guide-sidebar");
+            guide.classList.add("offscreen");
+
+            guide.style.border = "none";
+            document.getElementById("open-guide").style.display = "block";
+        }
+
+        function showPane(elementId) {
+            document.getElementById(elementId).classList.add('show', 'active');
+            document.getElementById('guide-nav').classList.remove('show', 'active');
+        }
+        function hidePane(elementId) {
+            document.getElementById(elementId).classList.remove('show', 'active');
+            document.getElementById('guide-nav').classList.add('show', 'active');
+        }
+        $("#guide-carousel").carousel({
+            interval: false,
+            wrap: false
+        }).on('slide.bs.carousel', function (e) {
+            if (e.to == 0) {
+                $("#guide-bars").addClass("d-none");
+            }
+            else {
+                $("#guide-bars").removeClass("d-none");
+            }
+        });
+        $("#previous-card").hide();
+        $("#card-carousel").on("slid.bs.carousel", function () {
+            if ($("#card-carousel .carousel-item:first").hasClass("active")) {
+                $("#previous-card").hide();
+                $("#next-card").show();
+            } else if ($("#card-carousel .carousel-item:last").hasClass("active")) {
+                $("#previous-card").show();
+                $("#next-card").hide();
+            } else {
+                $("#previous-card").show();
+                $("#next-card").show();
+            }
+        });
+    </script>
+    <script>
+        $("#tutorial-popup").on("shown.bs.modal", function() {
+            setTutorialHeight();
+        });
+        function selectLanguage() {
+            $("#ocr-transcription-modal").modal("hide");
+            $("#language-selection-modal").modal("show");
+        }
+        var mainContentHeight = $("#contribute-main-content").height()
+        if (mainContentHeight < 710) {
+            $(".sidebar").height(mainContentHeight - 130);
+        }
+    </script>
+    <script>
+        function trackQuickTipsInteraction(element, label) {
+            trackUIInteraction(element, 'Quick Tips', 'click', label);
+        }
+        function trackHowToInteraction(element, label){
+            trackUIInteraction(element, 'How To Guide' , 'click', label);
+        }
+
+        $("#quick-tips").on("click", function(event) { trackQuickTipsInteraction($(this), "Open")});
+        $("#previous-card").on("click", function(event){ trackQuickTipsInteraction($(this), "Back")});
+        $("#next-card").on("click", function(event){ trackQuickTipsInteraction($(this), "Next")});
+        $(".carousel-indicators li").on("click", function(event){
+            let index = [...this.parentElement.children].indexOf(this)
+            trackQuickTipsInteraction($(this), `Carousel ${index}`)
+        });
+        $("#open-guide").on("click", function(event) { trackHowToInteraction($(this), "Open")});
+        $("#close-guide").on("click", function(event) { trackHowToInteraction($(this), "Close")});
+        $("#previous-guide").on("click", function(event) { trackHowToInteraction($(this), "Back")});
+        $("#next-guide").on("click", function(event) { trackHowToInteraction($(this), "Next")});
+        $("#guide-bars").on("click", function(event) { trackHowToInteraction($(this), "Hamburger Menu")});
+        $("#guide-sidebar .nav-link").on("click", function(event) {
+            let label = $(this).text().trim();
+            trackHowToInteraction($(this), label);
+        });
+        $("#tutorial-popup").on("hidden.bs.modal", function(){
+            // We're tracking whenever the popup closes, so we don't separately track the close button being clicked
+            trackUIInteraction($(this), 'Quick Tips', 'click', "Close");
+        });
+        $("#tutorial-popup").on("shown-on-load", function(){
+            // We set a timeout to make sure the analytics code is loaded before trying to track
+            setTimeout(function(){
+                trackUIInteraction($(this), 'Quick Tips', 'load', 'Open');
+            }, 1000);
+        });
+    </script>
+{% endblock body_scripts %}
diff --git a/concordia/templates/transcriptions/asset_detail/asset_reservation_failure_modal.html b/concordia/templates/transcriptions/asset_detail/asset_reservation_failure_modal.html
deleted file mode 100644
index a84b36411..000000000
--- a/concordia/templates/transcriptions/asset_detail/asset_reservation_failure_modal.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<div class="modal-dialog modal-dialog-centered" role="document">
-    <div class="modal-content">
-        <div class="modal-header">
-            <h5 class="modal-title">Someone else is already transcribing this page</h5>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                <span aria-hidden="true">&times;</span>
-            </button>
-        </div>
-        <div class="modal-body">
-            <p>You can help by transcribing a new page, adding tags to this page, or coming back later to review this page's transcription.</p>
-        </div>
-        <div class="modal-footer">
-            <a class="btn btn-primary" href="{{ next_open_asset_url }}">
-                Find new page
-            </a>
-            <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
-        </div>
-    </div>
-</div>
diff --git a/concordia/templates/transcriptions/asset_detail/captcha_modal.html b/concordia/templates/transcriptions/asset_detail/captcha_modal.html
deleted file mode 100644
index 2ca5c457d..000000000
--- a/concordia/templates/transcriptions/asset_detail/captcha_modal.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<form action="{% url 'ajax-captcha' %}" class="modal-dialog modal-dialog-centered">
-    <div class="modal-content">
-        <div class="modal-header">
-            <h5 id="captcha-modal-title" class="modal-title">Please confirm you are not a robot</h5>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                <span aria-hidden="true">&times;</span>
-            </button>
-        </div>
-        <div class="modal-body">
-            <div class="form-row">
-                <div id="captcha-modal-description" class="help-text">
-                    <p class="sr-only">
-                        To prevent abuse non-logged in users are
-                        required to solve a captcha periodically. An
-                        audio alternative is under development. You may
-                        also avoid this challenge by
-                        <a href="{% url 'login' %}?next={{ request.path|urlencode }}" rel="nofollow">logging in</a>.
-                    </p>
-                    Before continuing please enter the letters in the image
-                    below so we know you are a human:
-                </div>
-                <img id="captcha-image" class="d-block my-3 mx-auto border rounded" alt="Type the letters in the image">
-            </div>
-            <div class="form-row">
-                <input name="response" class="form-control" autocomplete="off" aria-label="Please enter the letters in the image below">
-            </div>
-            <input type="hidden" name="key"/>
-        </div>
-        <div class="modal-footer">
-            <button type="submit" class='btn btn-secondary js-captcha-refresh'>
-                Show me another image
-            </button>
-            <button type="submit" class="btn btn-primary">
-                Continue
-            </button>
-        </div>
-    </div>
-</form>
diff --git a/concordia/templates/transcriptions/asset_detail/editor.html b/concordia/templates/transcriptions/asset_detail/editor.html
deleted file mode 100644
index 92a09da5e..000000000
--- a/concordia/templates/transcriptions/asset_detail/editor.html
+++ /dev/null
@@ -1,118 +0,0 @@
-<div class="flex-grow-1 d-flex d-print-block flex-column">
-    <div id="transcription-status-display">
-        <h2 id="display-submitted" {% if transcription_status != 'submitted' %}hidden{% endif %}>
-            <span class="fas fa-list"></span>
-            Needs review
-        </h2>
-        <h2 id="display-completed" {% if transcription_status != 'completed' %}hidden{% endif %}>
-            <span class="fas fa-check"></span>
-            Completed
-        </h2>
-        <h2 id="display-notstarted" {% if transcription_status != "not_started" %}hidden{% endif %}>
-            <span class="fas fa-edit"></span>
-            Not started
-        </h2>
-        <h2 id="display-inprogress" {% if transcription_status != "in_progress" %}hidden{% endif %}>
-            <span class="fas fa-edit"></span>
-            In progress
-        </h2>
-        <span id="display-conflict" hidden>
-            <span class="fas fa-exclamation-triangle"></span>
-            Another user is transcribing this page
-        </span>
-    </div>
-
-    <form id="transcription-editor" class="ajax-submission flex-grow-1 d-flex flex-column d-print-block" method="post" action="{% url 'save-transcription' asset_pk=asset.pk %}" data-transcription-status="{{ transcription_status }}" {% if transcription %}data-transcription-id="{{ transcription.pk|default:'' }}" {% if transcription.submitted %}data-unsaved-changes="true"{% endif %} data-submit-url="{% url 'submit-transcription' pk=transcription.pk %}" data-review-url="{% url 'review-transcription' pk=transcription.pk %}"{% endif %}>
-        {% csrf_token %}
-        <input type="hidden" name="supersedes" value="{{ transcription.pk|default:'' }}" />
-
-        <div class="row justify-content-sm-between px-3">
-            <span id="transcription-status-message">
-                <h2 id="message-contributors" {% if transcription_status == 'not_started' %}hidden{% endif %}>
-                    Registered Contributors: <span id="message-contributors-num" class="font-weight-normal">{{ registered_contributors }}</span>
-                </h2>
-                <span id="message-notstarted" {% if transcription_status != 'not_started' %}hidden{% endif %}>
-                    Transcribe this page.
-                </span>
-                <span id="message-inprogress" {% if transcription_status != 'in_progress' %}hidden{% endif %}>
-                    Someone started this transcription. Can you finish it?
-                </span>
-                <span id="message-submitted" {% if transcription_status != 'submitted' %}hidden{% endif %}>
-                    Check this transcription thoroughly. Accept if correct!
-                </span>
-                <span id="message-completed" {% if transcription_status != 'completed' %}hidden{% endif %}>
-                    This transcription is finished! You can read and add tags.
-                </span>
-            </span>
-            <div class="align-items-center align-self-end btn-group">
-                <a class="font-weight-bold" id="quick-tips" data-toggle="modal" data-target="#tutorial-popup" role="button">
-                    <u>Campaign Tips</u>
-                </a>
-            </div>
-        </div>
-
-        {% spaceless %}
-            <div id="loading-container" class="pb-2">
-                <div id="ocr-loading" class="spinner-border" role="status" aria-hidden="true" hidden>
-                    <span class="sr-only">Loading...</span>
-                </div>
-            </div>
-            <div class="d-flex flex-column flex-grow-1" id="transcription-input-container">
-                <textarea readonly class="form-control rounded flex-grow-1 d-print-none" name="text" id="transcription-input" placeholder="{% if transcription_status == 'not_started' or transcription_status == 'in_progress' %}Go ahead, start typing. You got this!{% else %}Nothing to transcribe{% endif %}" aria-label="Transcription input">
-                    {{ transcription.text }}
-                </textarea>
-                {% if guides %}
-                    <button id="open-guide" class="btn btn-primary" type="button" onclick="openOffcanvas()">How-To Guide</button>
-                    {% include "fragments/_how-to-guide.html" %}
-                {% endif %}
-            </div>
-
-            <div class="print-transcription-text" aria-hidden="true" style="display: none;">{{ transcription.text }}</div>
-
-            <div class="my-3 d-print-none d-flex flex-wrap justify-content-center align-items-center">
-                {% if transcription_status == 'not_started' or transcription_status == 'in_progress' %}
-                    <div class="form-check w-100 text-center mt-0 mb-3">
-                        <input id="nothing-to-transcribe" type="checkbox" class="form-check-input" />
-                        <label class="form-check-label" for="nothing-to-transcribe">
-                            Nothing to transcribe
-                        </label>
-
-                        <a tabindex="0" class="btn btn-link d-inline py-0" role="button" data-toggle="popover" data-placement="top" data-trigger="focus click hover" title="Nothing to transcribe?" data-html="true" data-content="If there is no text to transcribe, check this box and click &quot;Submit&quot;. Learn more about what to transcribe and what to skip in &quot;How To.&quot;">
-                            <span class="fas fa-question-circle" aria-label="Open Help"></span>
-                        </a>
-                    </div>
-
-                    <button id="save-transcription-button" disabled type="submit" class="btn btn-primary mx-1" title="Save the text you entered above">
-                        Save
-                    </button>
-                    <button id="rollback-transcription-button" {% if not undo_available %}disabled{% endif %} type="button" class="btn btn-outline-primary mx-1" title="Undo" data-url="{% url 'rollback-transcription' asset_pk=asset.pk %}">
-                        <span class="fas fa-undo"></span> Undo
-                    </button>
-                    <button id="rollforward-transcription-button" {% if not redo_available %}disabled{% endif %} type="button" class="btn btn-outline-primary mx-1" title="Redo" data-url="{% url 'rollforward-transcription' asset_pk=asset.pk %}">
-                        Redo <span class="fas fa-redo"></span>
-                    </button>
-                    <button id="submit-transcription-button" disabled type="button" class="btn btn-primary mx-1" title="Request another volunteer to review the text you entered above">
-                        Submit for Review
-                    </button>
-
-                {% elif transcription_status == 'submitted' %}
-                    {% if not user.is_authenticated %}
-                        <p class="help-text">
-                            <a href="{% url 'registration_register' %}">Register</a>
-                            or
-                            <a href="{% url 'login' %}?next={{ request.path|urlencode }}">login</a>
-                            to help review
-                        </p>
-                    {% else %}
-                        <button id="reject-transcription-button" disabled type="button" class="btn btn-primary mx-1" title="Correct errors you see in the text">Edit</button>
-                        {% if transcription.user.pk == user.pk %}
-                            <p class="help-text mt-2">You submitted this transcription. You can re-open it for editing if you wish to make changes before another volunteer reviews it.</p>
-                        {% else %}
-                            <button id="accept-transcription-button" disabled type="button" class="btn btn-primary mx-1" title="Confirm that the text is accurately transcribed">Accept</button>
-                        {% endif %}
-                    {% endif %}
-                {% endif %}
-            </div>
-        {% endspaceless %}
-    </form>
-</div>
diff --git a/concordia/templates/transcriptions/asset_detail/language_selection_modal.html b/concordia/templates/transcriptions/asset_detail/language_selection_modal.html
deleted file mode 100644
index 63ba19e31..000000000
--- a/concordia/templates/transcriptions/asset_detail/language_selection_modal.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<div class="modal-dialog modal-dialog-centered" role="document">
-    <div class="modal-content">
-        <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                <span aria-hidden="true" class="text-primary">&times;</span>
-            </button>
-        </div>
-        <form id="ocr-transcription-form" class="ajax-submission" method="post" action="{% url 'generate-ocr-transcription' asset_pk=asset.pk %}" data-lock-element="#transcription-editor">
-            <div class="modal-body">
-                <div class="bg-light p-3">
-                    <h5 class="modal-title mb-3">Select language</h5>
-                    <p>Select the language the transcription is in from the list below.</p>
-                    <div class="text-center pb-1">
-                        <select id="language" name="language" size="7">
-                            {% for language in languages %}
-                                <option value="{{ language.0 }}"{% if language.0 == "eng" %} selected="selected"{% endif %}>
-                                    {{ language.1 }}
-                                </option>
-                            {% endfor %}
-                        </select>
-                    </div>
-                </div>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-primary" data-dismiss="modal">Cancel</button>
-                {% if transcription_status == "not_started" or transcription_status == "in_progress" %}
-                    <input type="hidden" name="supersedes" value="{{ transcription.pk|default:'' }}" />
-                    <button id="ocr-transcription-button" class="btn btn-link underline-link font-weight-bold" disabled>Replace Text</button>
-                {% endif %}
-            </div>
-        </form>
-    </div>
-</div>
diff --git a/concordia/templates/transcriptions/asset_detail/navigation.html b/concordia/templates/transcriptions/asset_detail/navigation.html
deleted file mode 100644
index 6f9c2259c..000000000
--- a/concordia/templates/transcriptions/asset_detail/navigation.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<nav id="asset-navigation" class="d-flex flex-wrap flex-grow-1 justify-content-sm-between align-items-center d-print-block" role="navigation">
-    <div class="d-flex align-items-center">
-        <form class="p-1" onsubmit="document.location.href = encodeURI(document.getElementById('asset-selection').value); return false">
-            <div class="input-group input-group-sm flex-nowrap">
-                <div class="input-group-prepend">
-                    <label class="input-group-text p-0 pr-1 border-0" for="asset-selection">Page</label>
-                </div>
-                <select id="asset-selection" class="custom-select custom-select-sm">
-                    {% for sequence, slug in asset_navigation %}
-                        <option {% if sequence == asset.sequence %}selected{% endif %} value="{% url 'transcriptions:asset-detail' campaign.slug project.slug item.item_id slug %}">{{ sequence }}</option>
-                    {% endfor %}
-                </select>
-                <div class="input-group-append">
-                    <button type="submit" class="btn btn-primary">Go</button>
-                </div>
-            </div>
-        </form>
-
-        <div class="btn-group btn-group-sm p-1">
-            <a class="btn btn-primary {% if not previous_asset_url %}disabled{% endif %}" {% if previous_asset_url %}href="{{ previous_asset_url }}"{% else %}aria-disabled="true"{% endif %}>
-                <span class="fas fa-chevron-left"></span>
-                <span class="sr-only">Previous Page</span>
-            </a>
-            <a class="btn btn-primary {% if not next_asset_url %}disabled{% endif %}" {% if next_asset_url %}href="{{ next_asset_url }}"{% else %}aria-disabled="true"{% endif %}>
-                <span class="fas fa-chevron-right"></span>
-                <span class="sr-only">Next Page</span>
-            </a>
-        </div>
-
-        <div class="btn-group btn-group-sm p-1">
-            <button hidden id="go-fullscreen" class="btn btn-primary text-nowrap" data-target="contribute-main-content">
-                <span class="fas fa-arrows-alt"></span>
-                Fullscreen
-            </button>
-        </div>
-    </div>
-
-    <div class="btn-group align-self-end">
-        {% if asset.resource_url %}
-            <div class="btn-group-sm p-1" role="navigation" aria-label="Link to the original source for this item">
-                <a class="btn btn-outline-primary text-nowrap" target="_blank" rel=noopener title="View the original source for this item in a new tab" href="{{ asset.resource_url }}{% if 'sp=' not in asset.resource_url %}?sp={{ asset.sequence }}{% endif %}">View on www.loc.gov <i class="fa fa-external-link-alt"></i></a>
-            </div>
-        {% endif %}
-
-        <div class="btn-group-sm p-1" role="navigation" aria-label="Link to the next editable page">
-            <a class="btn btn-outline-primary text-nowrap" title="Move to the next page in this item that needs help" href="{{ next_open_asset_url }}">Find a new page &rarr;</a>
-        </div>
-    </div>
-</nav>
diff --git a/concordia/templates/transcriptions/asset_detail/ocr_help_modal.html b/concordia/templates/transcriptions/asset_detail/ocr_help_modal.html
deleted file mode 100644
index b491590cf..000000000
--- a/concordia/templates/transcriptions/asset_detail/ocr_help_modal.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<div id="ocr-help-modal" class="modal" tabindex="-1" role="dialog">
-    <div class="modal-dialog modal-dialog-centered" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title">About Transcribe with OCR</h5>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
-                <h6 class="modal-title">What is OCR?</h6>
-                <p>OCR stands for Optical Character Recognition. OCR is a software tool that can extract print text from some documents.</p>
-                <h6>When will OCR work well?</h6>
-                <p>OCR does not work on handwriting. It only works for printed or typed text, meaning text created by a typewriter, printing press, or other mechanical means. OCR will do best on consistent and clear images of modern typefaces.</p>
-                <h6>Do I still need to review pages started with OCR?</h6>
-                <p>Yes! OCR is imperfect. It may not work well for some or all parts of a typed page, but it can be a great starting point. If you start a page with OCR, you should read the text closely before submitting. If you are reviewing a OCR-ed page, you also still need to review.</p>
-                <h6>Who can use "Transcribe with OCR"?</h6>
-                <p><a href="{% url 'registration_register' %}">Register for an account</a> and <a href="{% url 'registration_login' %}?next={{ request.path }}">log in</a> to use this feature.</p>
-                <h6>Why does <span class="font-italic">By the People</span> have this feature?</h6>
-                <p>We always want to use volunteer time effectively. When the Library of Congress digitizes a large group of printed pages, it will usually OCR them. The materials in By the People campaigns are not good candidates for applying OCR at scale, either because they are handwritten, a mixed collection of handwritten and print materials, or printed on paper or in a typeface that does not produce accurate OCR results. However, OCR can still be a useful starting point for some typed pages. Use it if it if you like it or skip it if you don’t!</p>
-            </div>
-            <div class="modal-footer justify-content-center">
-                <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/concordia/templates/transcriptions/asset_detail/ocr_transcription_modal.html b/concordia/templates/transcriptions/asset_detail/ocr_transcription_modal.html
deleted file mode 100644
index 39ef4601b..000000000
--- a/concordia/templates/transcriptions/asset_detail/ocr_transcription_modal.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<div class="modal-dialog modal-dialog-centered" role="document">
-    <div class="modal-content">
-        <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                <span aria-hidden="true" class="text-primary">&times;</span>
-            </button>
-        </div>
-        <div class="modal-body">
-            <div class="bg-light p-3">
-                <h5 class="modal-title mb-3">Are you sure?</h5>
-                <p>Clicking "Transcribe with OCR" will remove all existing transcription text and replace it with automatically generated text. We recommend saving existing text in a separate document if you may want to revisit it.</p>
-            </div>
-        </div>
-        <div class="modal-footer">
-            <button type="button" class="btn btn-primary" data-dismiss="modal">Cancel</button>
-            {% if transcription_status == "not_started" or transcription_status == "in_progress" %}
-                <input type="hidden" name="supersedes" value="{{ transcription.pk|default:'' }}" />
-                <a tabindex="0" class="btn btn-link d-inline p-0" role="button" data-placement="top"  id="select-language-button" onclick="selectLanguage()">
-                    <span class="underline-link font-weight-bold">Yes, Select Language</span>
-                </a>
-            {% endif %}
-        </div>
-    </div>
-</div>
diff --git a/concordia/templates/transcriptions/asset_detail/quick_tips_modal.html b/concordia/templates/transcriptions/asset_detail/quick_tips_modal.html
deleted file mode 100644
index 9d6337a28..000000000
--- a/concordia/templates/transcriptions/asset_detail/quick_tips_modal.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<div id="tutorial-popup" class="modal" tabindex="-1" role="dialog">
-    <div class="modal-dialog modal-dialog-centered" role="document">
-        <div class="modal-content">
-            <div class="modal-header border-bottom-0">
-                <h4>Campaign Tips</h4>
-                <button type="button" class="close text-primary" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">x</span>
-                </button>
-            </div>
-            <div class="modal-body">
-                <div id="card-carousel" class="carousel slide" data-interval="false">
-                    <div class="carousel-inner">
-                        {% for card in cards %}
-                            <div class="carousel-item pb-4 {% if forloop.first %} active {% endif %}">
-                                <div class="position-static d-flex flex-column justify-content-around">
-                                    {% if card.image %}
-                                        <img src="{{ card.image.url }}"{% if card.image_alt_text %} alt="{{ card.image_alt_text }}"{% endif %}>
-                                    {% endif %}
-                                    {% if card.display_heading %}
-                                        <h5>{{ card.display_heading }}</h5>
-                                    {% endif %}
-                                    <p>{{ card.body_text|safe }}</p>
-                                </div>
-                            </div>
-                        {% endfor %}
-                    </div>
-                    <a id="previous-card" href="#card-carousel" role="button" data-slide="prev">
-                        <strong><u><&nbsp;Back</u></strong>
-                    </a>
-                    <ol class="carousel-indicators d-none d-lg-flex">
-                        {% for card in cards %}
-                            <li data-target="#card-carousel" data-slide-to="{{ forloop.counter0 }}" {% if forloop.first %}class="active" {% endif %}></li>
-                        {% endfor %}
-                    </ol>
-                    <a id="next-card" href="#card-carousel" data-slide="next">
-                        <strong><u>Next&nbsp;></u></strong>
-                    </a>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/concordia/templates/transcriptions/asset_detail/review_accepted_modal.html b/concordia/templates/transcriptions/asset_detail/review_accepted_modal.html
deleted file mode 100644
index 5bb447160..000000000
--- a/concordia/templates/transcriptions/asset_detail/review_accepted_modal.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<div class="modal-dialog modal-dialog-centered" role="document">
-    <div class="modal-content">
-        <div class="modal-header">
-            <h5 class="modal-title">Nice Job!</h5>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                <span aria-hidden="true">&times;</span>
-            </button>
-        </div>
-        <div class="modal-body">
-            <p>
-                Thanks for your help - we've saved your decision.
-            </p>
-            <p>
-                What do you want to do next?
-            </p>
-        </div>
-        <div class="modal-footer d-block text-center">
-            <p>
-                <a class="btn btn-primary" href="{{ next_review_asset_url }}">
-                    Review a new page
-                </a>
-            </p>
-            <p>
-                <a class="btn btn-primary" href="{{ next_open_asset_url }}">
-                    Transcribe a new page
-                </a>
-            </p>
-            <p>
-                <button type="button" class="btn btn-primary" data-dismiss="modal">
-                    Add Tags
-                </button>
-            </p>
-        </div>
-    </div>
-</div>
diff --git a/concordia/templates/transcriptions/asset_detail/successful_submission_modal.html b/concordia/templates/transcriptions/asset_detail/successful_submission_modal.html
deleted file mode 100644
index 45cdb964a..000000000
--- a/concordia/templates/transcriptions/asset_detail/successful_submission_modal.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<div class="modal-dialog modal-dialog-centered" role="document">
-    <div class="modal-content">
-        <div class="modal-header">
-            <h5 class="modal-title">Nice Job!</h5>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                <span aria-hidden="true">&times;</span>
-            </button>
-        </div>
-        <div class="modal-body">
-            <p>
-                This page has been submitted for review.
-            </p>
-            <p>
-                What do you want to do next?
-            </p>
-        </div>
-        <div class="modal-footer d-block text-center">
-            <p>
-                <a class="btn btn-primary" href="{{ next_review_asset_url }}">
-                    Review a new page
-                </a>
-            </p>
-            <p>
-                <a class="btn btn-primary" href="{{ next_open_asset_url }}">
-                    Transcribe a new page
-                </a>
-            </p>
-            <p>
-                <button type="button" class="btn btn-primary" data-dismiss="modal">
-                    Add Tags
-                </button>
-            </p>
-        </div>
-    </div>
-</div>
diff --git a/concordia/templates/transcriptions/asset_detail/tags.html b/concordia/templates/transcriptions/asset_detail/tags.html
deleted file mode 100644
index 0df583244..000000000
--- a/concordia/templates/transcriptions/asset_detail/tags.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<div id="tag-editor" class="flex-shrink-1">
-    <h2 id="tag-label" class="border-top pt-3 pb-2"><a
-        data-toggle="collapse" href="#tag-form" role="button" aria-expanded="false"
-        aria-controls="tag-form"><i class="fas fa-plus-square"></i> <span
-            id="tag-count-text" class="text-dark">Tags (<span id="tag-count">{{ tags|length }}</span>)</span></a></h2>
-    <form id="tag-form" class="ajax-submission collapse" method="post" action="{% url 'submit-tags' asset_pk=asset.pk %}">
-        {% csrf_token %}
-        <div class="d-print-none">
-            {% if user.is_authenticated %}
-                <div class="form-row">
-                    <div class="col input-group">
-                        <input type="text" id="new-tag-input" class="form-control" placeholder="Add a new tag…" aria-label="Add a new tag" pattern="[\- _À-ž'\w]{1,50}">
-                        <div class="input-group-append">
-                            <button id="new-tag-button" class="btn btn-outline-primary" type="button" title="Add tags to the page">Add</button>
-                        </div>
-                        <div class="invalid-feedback">
-                            Tags must be between 1-50 characters and may contain only letters, numbers, dashes, underscores, apostrophes, and spaces
-                        </div>
-                    </div>
-                </div>
-            {% else %}
-                <p class="help-text anonymous-only text-center d-print-none">
-                    Want to tag this page?
-
-                    <a href="{% url 'registration_register' %}">Register</a>
-                    or
-                    <a href="{% url 'login' %}?next={{ request.path|urlencode }}">login</a>
-                    to add tags.
-                </p>
-            {% endif %}
-        </div>
-
-        <ul id="current-tags" class="d-flex flex-wrap list-unstyled mb-0 d-print-block">
-            {% for tag in tags %}
-                <li class="btn btn-outline-dark btn-sm">
-                    <label class="m-0">
-                        <input type="hidden" name="tags" value="{{ tag }}" />
-                        {{ tag }}
-                    </label>
-                    <button type="button" class="close authenticated-only" data-dismiss="alert" aria-label="Remove previous tag" hidden>
-                        <span aria-hidden="true" class="fas fa-times"></span>
-                    </button>
-                </li>
-            {% endfor %}
-        </ul>
-    </form>
-</div>
diff --git a/concordia/templates/transcriptions/asset_detail/viewer.html b/concordia/templates/transcriptions/asset_detail/viewer.html
deleted file mode 100644
index edd395d35..000000000
--- a/concordia/templates/transcriptions/asset_detail/viewer.html
+++ /dev/null
@@ -1,121 +0,0 @@
-<div id="viewer-controls" class="m-1 text-center d-print-none">
-    <div class="d-inline-flex justify-content-between">
-        <div class="d-flex btn-group m-1">
-            <button id="viewer-layout-vertical" class="btn btn-dark viewer-control-button" title="Vertical Layout">
-                <span class="fas fa-grip-lines"></span>
-            </button>
-            <button id="viewer-layout-horizontal" class="btn btn-dark" title="Horizontal Layout">
-                <span class="fas fa-grip-lines-vertical"></span>
-            </button>
-        </div>
-
-        <div class="d-flex btn-group m-1">
-            <button type="button" id="viewer-home" class="btn btn-dark viewer-control-button" title="Fit Image to Viewport">
-                <span class="fas fa-compress"></span>
-            </button>
-        </div>
-
-        <div class="d-flex btn-group m-1">
-            <button id="viewer-zoom-in" class="btn btn-dark viewer-control-button" title="Zoom In">
-                <span class="fas fa-search-plus"></span>
-            </button>
-            <button id="viewer-zoom-out" class="btn btn-dark" title="Zoom Out">
-                <span class="fas fa-search-minus"></span>
-            </button>
-        </div>
-
-        <div class="d-flex btn-group m-1">
-            <button id="viewer-rotate-left" class="btn btn-dark viewer-control-button" title="Rotate Left">
-                <span class="fas fa-undo"></span>
-            </button>
-            <button id="viewer-rotate-right" class="btn btn-dark viewer-control-button" title="Rotate Right">
-                <span class="fas fa-redo"></span>
-            </button>
-        </div>
-
-        <div class="d-flex btn-group m-1">
-            <button id="viewer-flip" class="btn btn-dark viewer-control-button" title="Flip">
-                <span class="fas fa-exchange-alt"></span>
-            </button>
-        </div>
-
-        <div class="d-flex btn-group m-1">
-            <button type="button" class="btn btn-dark extra-control-button" title="Image Filters" data-toggle="collapse" data-target="#image-filters">
-                <span class="fas fa-sliders-h" aria-label="Image Filters"></span>
-            </button>
-        </div>
-
-        <div class="d-flex btn-group m-1">
-            <button type="button" id="viewer-fullscreen" class="btn btn-dark extra-control-button" title="View Full Screen" data-target="#viewer-column">
-                <span class="fas fa-expand"></span>
-            </button>
-        </div>
-
-        <div class="d-flex btn-group m-1">
-            <button type="button" class="btn btn-dark extra-control-button" title="Viewer keyboard shortcuts" data-toggle="modal" data-target="#keyboard-help-modal">
-                <span class="fas fa-question-circle" aria-label="Viewer keyboard shortcuts"></span>
-            </button>
-        </div>
-    </div>
-</div>
-
-<div id="keyboard-help-modal" class="modal" tabindex="-1" role="dialog">
-    <div class="modal-dialog modal-dialog-centered" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title">Keyboard Shortcuts</h5>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
-                <h6>Viewer Shortcuts</h6>
-                <table class="table table-compact table-responsive">
-                    <tr>
-                        <th><kbd>w</kbd>, up arrow</th>
-                        <td>Scroll the viewport up</td>
-                    </tr>
-                    <tr>
-                        <th><kbd>s</kbd>, down arrow</th>
-                        <td>Scroll the viewport down</td>
-                    </tr>
-                    <tr>
-                        <th><kbd>a</kbd>, left arrow</th>
-                        <td>Scroll the viewport left</td>
-                    </tr>
-                    <tr>
-                        <th><kbd>d</kbd>, right arrow </th>
-                        <td>Scroll the viewport right</td>
-                    </tr>
-                    <tr>
-                        <th><kbd>0</kbd></th>
-                        <td>Fit the entire image to the viewport</td>
-                    </tr>
-                    <tr>
-                        <th><kbd>-</kbd>, <kbd>_</kbd>, Shift+<kbd>W</kbd>, Shift+Up arrow</th>
-                        <td>Zoom the viewport out</td>
-                    </tr>
-                    <tr>
-                        <th><kbd>=</kbd>, <kbd>+</kbd>, Shift+<kbd>S</kbd>, Shift+Down arrow</th>
-                        <td>Scroll the viewport in</td>
-                    </tr>
-                    <tr>
-                        <th><kbd>r</kbd></th>
-                        <td>Rotate the viewport clockwise</td>
-                    </tr>
-                    <tr>
-                        <th><kbd>R</kbd></th>
-                        <td>Rotate the viewport counterclockwise</td>
-                    </tr>
-                    <tr>
-                        <th><kbd>f</kbd></th>
-                        <td>Flip the viewport horizontally</td>
-                    </tr>
-                </table>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/concordia/templates/transcriptions/asset_detail/viewer_filters.html b/concordia/templates/transcriptions/asset_detail/viewer_filters.html
deleted file mode 100644
index 3170aae21..000000000
--- a/concordia/templates/transcriptions/asset_detail/viewer_filters.html
+++ /dev/null
@@ -1,125 +0,0 @@
-<div id="image-filters" class="m-1 text-center d-print-none collapse">
-    <hr class="m-0" />
-    <ul class="d-inline-flex mt-1 btn-group nav nav-tabs" role="tablist">
-        <li class="nav-item" role="presentation">
-            <button id="viewer-gamma" class="btn btn-dark nav-link active" title="Adjust gamma" data-toggle="tab" data-target="#gamma-filter" role="tab">
-                Brightness
-            </button>
-        </li>
-        <li class="nav-item" role="presentation">
-            <button id="viewer-invert" class="btn btn-dark nav-link" title="Invert colors" data-toggle="tab" data-target="#invert-filter" role="tab">
-                Invert
-            </button>
-        </li>
-        <li class="nav-item" role="presentation">
-            <button id="viewer-threshold" class="btn btn-dark nav-link" title="Adjust threshold" data-toggle="tab" data-target="#threshold-filter" role="tab">
-                Contrast
-            </button>
-        </li>
-    </ul>
-    <div class="btn-group m-1">
-        <button id="viewer-reset" class="btn" title="Reset all filters" onclick="resetImageFilterForms()">
-            Reset All
-        </button>
-    </div>
-    <div id="filter-tabs" class="tab-content">
-        <div id="gamma-filter" class="tab-pane pt-1 pl-3 show active" role="tabpanel">
-            <form id="gamma-form" class="form-inline" onsubmit="return false;">
-                <div class="row ml-0 mr-3 number-input">
-                    <div class="col p-1">
-                        <input
-                            type="number"
-                            id="gamma"
-                            name="gamma"
-                            min="0"
-                            max="5"
-                            step="0.01"
-                            value="1.00"
-                        />
-                        <label class="visually-hidden" for="gamma">Gamma</label>
-                    </div>
-                    <div class="col p-0">
-                        <div class="row m-0">
-                            <button type="button" class="arrow-button" onclick="stepUp('gamma')">
-                                <span class="fas fa-chevron-up" />
-                                <span class="visually-hidden">Increase</span>
-                            </button>
-                        </div>
-                        <div class="row m-0">
-                            <button type="button" class="arrow-button" onclick="stepDown('gamma')">
-                                <span class="fas fa-chevron-down" />
-                                <span class="visually-hidden">Decrease</span>
-                            </button>
-                        </div>
-                    </div>
-                </div>
-                <input
-                    type="range"
-                    id="gamma-range"
-                    name="gamma-range"
-                    min="0"
-                    max="5"
-                    step="0.01"
-                    value="1.00"
-                    class="filter-slider flex-grow-1"
-                />
-                <label class="visually-hidden" for="gamma-range">Gamma</label>
-                <input type="reset" class="btn btn-link underline-link font-weight-bold" value="Reset filter" />
-            </form>
-        </div>
-        <div id="invert-filter" class="tab-pane pt-2" role="tabpanel" style="background-color: white;">
-            <form id="invert-form" onsubmit="return false;">
-                <label class="ml-2 align-middle">Off</label>
-                <div class="custom-control custom-switch custom-control-inline ml-1 mr-2">
-                    <input type="checkbox" id="invert" name="invert" class="custom-control-input" role="switch" />
-                    <label class="custom-control-label" for="invert"><span class="visually-hidden">Invert</span></label>
-                </div>
-                <label class="align-middle">On</label>
-            </form>
-        </div>
-        <div id="threshold-filter" class="tab-pane pt-1 pl-3" role="tabpanel">
-            <form id="threshold-form" class="form-inline" onsubmit="return false;">
-                <div class="row ml-0 mr-3 number-input">
-                    <div class="col p-1">
-                        <input
-                            type="number"
-                            id="threshold"
-                            name="threshold"
-                            min="0"
-                            max="255"
-                            step="1"
-                            value="0"
-                        />
-                        <label class="visually-hidden" for="threshold">Threshold</label>
-                    </div>
-                    <div class="col p-0">
-                        <div class="row m-0">
-                            <button type="button" class="arrow-button" onclick="stepUp('threshold')">
-                                <span class="fas fa-chevron-up" />
-                                <span class="visually-hidden">Increase</span>
-                            </button>
-                        </div>
-                        <div class="row m-0">
-                            <button type="button" class="arrow-button" onclick="stepDown('threshold')">
-                                <span class="fas fa-chevron-down" />
-                                <span class="visually-hidden">Decrease</span>
-                            </button>
-                        </div>
-                    </div>
-                </div>
-                <input
-                    type="range"
-                    id="threshold-range"
-                    name="threshold-range"
-                    min="0"
-                    max="255"
-                    step="1"
-                    value="0"
-                    class="filter-slider flex-grow-1"
-                />
-                <label class="visually-hidden" for="threshold-range">Threshold</label>
-                <input type="reset" class="btn btn-link underline-link font-weight-bold" value="Reset filter" />
-            </form>
-        </div>
-    </div>
-</div>
diff --git a/concordia/templates/transcriptions/topic_detail.html b/concordia/templates/transcriptions/topic_detail.html
index 6f159a8c3..cd230eb5e 100644
--- a/concordia/templates/transcriptions/topic_detail.html
+++ b/concordia/templates/transcriptions/topic_detail.html
@@ -14,12 +14,12 @@
 
 {% block breadcrumbs %}
     <li class="breadcrumb-item"><a class="primary-text" href="{% url 'campaign-topic-list' %}">Campaigns</a></li>
-    <li class="breadcrumb-item active" aria-current="page" title="{{ topic.title }}"><span class="text-truncate">{{ topic.title }}</span></li>
+    <li class="breadcrumb-item active" aria-current="page" title="{{ topic.title }}">{{ topic.title }}</li>
 {% endblock breadcrumbs %}
 
 {% block main_content %}
     <div class="container py-3">
-        <div class="row mb-4">
+        <div class="row">
             <div class="col-md-9">
                 <h1>{{ topic.title }}</h1>
                 <div class="hero-text">{{ topic.description|safe }}</div>
diff --git a/concordia/tests/test_admin.py b/concordia/tests/test_admin.py
index 8fe3f680f..b524503ad 100644
--- a/concordia/tests/test_admin.py
+++ b/concordia/tests/test_admin.py
@@ -79,9 +79,9 @@ def test_csv_export(self):
         self.assertEqual(len(content), 4)  # Includes empty line at the end of the file
         test_data = [
             b"username,email address,first name,last name,active,staff status,"
-            + b"superuser status,last login,transcription count,review count",
-            b"testsuperuser,testsuperuser@example.com,,,True,True,True,,0,0",
-            b"testuser,testuser@example.com,,,True,False,False,,0,0",
+            + b"superuser status,last login,transcription__count",
+            b"testsuperuser,testsuperuser@example.com,,,True,True,True,,0",
+            b"testuser,testuser@example.com,,,True,False,False,,0",
             b"",
         ]
         self.assertEqual(content, test_data)
diff --git a/concordia/tests/test_models.py b/concordia/tests/test_models.py
index bee7580fa..bfc4dec81 100644
--- a/concordia/tests/test_models.py
+++ b/concordia/tests/test_models.py
@@ -114,110 +114,6 @@ def test_review_actions(self):
         end = timezone.now() - timedelta(days=1)
         self.assertEqual(Transcription.objects.review_actions(start, end).count(), 1)
 
-    def test_review_incidents(self):
-        self.transcription1.accepted = timezone.now()
-        self.transcription1.reviewed_by = self.create_user(username="tester2")
-        self.transcription1.save()
-        self.transcription2.accepted = self.transcription1.accepted + timedelta(
-            seconds=29
-        )
-        self.transcription2.reviewed_by = self.transcription1.reviewed_by
-        self.transcription2.save()
-        users = Transcription.objects.review_incidents()
-        self.assertNotIn(self.transcription1.user.id, users)
-
-        transcription3 = create_transcription(
-            asset=self.transcription1.asset,
-            user=self.transcription1.user,
-            reviewed_by=self.transcription1.reviewed_by,
-            accepted=self.transcription1.accepted + timedelta(seconds=58),
-        )
-        transcription4 = create_transcription(
-            asset=self.transcription1.asset,
-            user=self.transcription1.user,
-            reviewed_by=self.transcription1.reviewed_by,
-            accepted=transcription3.accepted + timedelta(minutes=1, seconds=1),
-        )
-        users = Transcription.objects.review_incidents()
-        self.assertEqual(len(users), 1)
-        self.assertEqual(
-            users[0],
-            (
-                self.transcription1.reviewed_by.id,
-                self.transcription1.reviewed_by.username,
-                1,
-            ),
-        )
-
-        create_transcription(
-            asset=self.transcription1.asset,
-            user=self.transcription1.user,
-            reviewed_by=self.transcription1.reviewed_by,
-            accepted=transcription4.accepted + timedelta(seconds=29),
-        )
-        create_transcription(
-            asset=self.transcription1.asset,
-            user=self.transcription1.user,
-            reviewed_by=self.transcription1.reviewed_by,
-            accepted=transcription4.accepted + timedelta(seconds=58),
-        )
-        users = Transcription.objects.review_incidents()
-        self.assertEqual(len(users), 1)
-        self.assertEqual(
-            users[0],
-            (
-                self.transcription1.reviewed_by.id,
-                self.transcription1.reviewed_by.username,
-                2,
-            ),
-        )
-
-    def test_transcribe_incidents(self):
-        self.transcription1.submitted = timezone.now()
-        self.transcription1.save()
-        self.transcription2.submitted = self.transcription1.submitted + timedelta(
-            seconds=29
-        )
-        self.transcription2.user = self.transcription1.user
-        self.transcription2.save()
-        users = Transcription.objects.transcribe_incidents()
-        self.assertEqual(len(users), 0)
-        self.assertNotIn(self.transcription1.user.id, users)
-
-        transcription3 = create_transcription(
-            asset=self.transcription1.asset,
-            user=self.transcription1.user,
-            submitted=self.transcription1.submitted + timedelta(seconds=58),
-        )
-        transcription4 = create_transcription(
-            asset=self.transcription1.asset,
-            user=self.transcription1.user,
-            submitted=transcription3.submitted + timedelta(minutes=1, seconds=1),
-        )
-        create_transcription(
-            asset=self.transcription1.asset,
-            user=self.transcription1.user,
-            submitted=transcription4.submitted + timedelta(seconds=59),
-        )
-        users = Transcription.objects.transcribe_incidents()
-        self.assertEqual(len(users), 1)
-        self.assertEqual(
-            users[0],
-            (self.transcription1.user.id, self.transcription1.user.username, 1),
-        )
-
-        create_transcription(
-            asset=self.transcription1.asset,
-            user=self.transcription1.user,
-            submitted=self.transcription1.submitted + timedelta(minutes=1, seconds=59),
-        )
-        users = Transcription.objects.transcribe_incidents()
-        self.assertEqual(len(users), 1)
-        self.assertEqual(
-            users[0],
-            (self.transcription1.user.id, self.transcription1.user.username, 2),
-        )
-
 
 class TranscriptionTestCase(CreateTestUsers, TestCase):
     def setUp(self):
@@ -280,6 +176,44 @@ def test_status(self):
             TranscriptionStatus.CHOICE_MAP[TranscriptionStatus.COMPLETED],
         )
 
+    def test_reviewing_too_quickly(self):
+        self.transcription1.accepted = timezone.now()
+        self.transcription1.reviewed_by = self.create_user(username="tester2")
+        self.transcription1.save()
+        self.transcription2.accepted = self.transcription1.accepted
+        self.transcription2.reviewed_by = self.transcription1.reviewed_by
+        self.transcription2.save()
+        transcriptions = Transcription.objects.reviewing_too_quickly()
+        self.assertEqual(len(transcriptions), 0)
+
+        transcription3 = create_transcription(
+            asset=self.transcription1.asset,
+            user=self.transcription1.user,
+            reviewed_by=self.transcription1.reviewed_by,
+            accepted=self.transcription1.accepted,
+        )
+        transcriptions = Transcription.objects.reviewing_too_quickly()
+        self.assertEqual(len(transcriptions), 1)
+        self.assertEqual(transcriptions[0][0], transcription3.reviewed_by.id)
+
+    def test_transcribing_too_quickly(self):
+        self.transcription1.submitted = timezone.now()
+        self.transcription1.save()
+        self.transcription2.submitted = self.transcription1.submitted
+        self.transcription2.user = self.transcription1.user
+        self.transcription2.save()
+        transcriptions = Transcription.objects.transcribing_too_quickly()
+        self.assertEqual(len(transcriptions), 0)
+
+        transcription3 = create_transcription(
+            asset=self.transcription1.asset,
+            user=self.transcription1.user,
+            submitted=self.transcription1.submitted,
+        )
+        transcriptions = Transcription.objects.transcribing_too_quickly()
+        self.assertEqual(len(transcriptions), 1)
+        self.assertEqual(transcriptions[0][0], transcription3.user.id)
+
 
 class AssetTranscriptionReservationTest(CreateTestUsers, TestCase):
     def setUp(self):
diff --git a/concordia/tests/test_views.py b/concordia/tests/test_views.py
index ea912bef1..23e4fd2da 100644
--- a/concordia/tests/test_views.py
+++ b/concordia/tests/test_views.py
@@ -577,8 +577,8 @@ def test_asset_reservation_competition(self):
         # to edit it after logging in
 
         # 4 queries =
-        # 1 expiry + 1 acquire + 2 get user ID + 2 get user profile from request
-        with self.assertNumQueries(6):
+        # 1 expiry + 1 acquire + 2 get user ID from request
+        with self.assertNumQueries(4):
             resp = self.client.post(reverse("reserve-asset", args=(asset.pk,)))
         self.assertEqual(200, resp.status_code)
         self.assertEqual(1, AssetTranscriptionReservation.objects.count())
@@ -682,9 +682,8 @@ def test_asset_reservation_tombstone(self):
 
         self.client.logout()
 
-        # 1 reservation check + 1 acquire + 2 get user ID
-        # + 2 get user profile from request
-        expected_queries = 6
+        # 1 reservation check + 1 acquire + 2 get user ID from request
+        expected_queries = 4
         if settings.SESSION_ENGINE.endswith("db"):
             # + 1 session check
             expected_queries += 1
diff --git a/exporter/tabular_export/admin.py b/exporter/tabular_export/admin.py
index 9892b43f0..5c368a889 100644
--- a/exporter/tabular_export/admin.py
+++ b/exporter/tabular_export/admin.py
@@ -49,17 +49,10 @@ def inner(modeladmin, request, queryset, filename=None, *args, **kwargs):
 
 @ensure_filename("xlsx")
 def export_to_excel_action(
-    modeladmin,
-    request,
-    queryset,
-    filename=None,
-    field_names=None,
-    extra_verbose_names=None,
+    modeladmin, request, queryset, filename=None, field_names=None
 ):
     """Django admin action which exports selected records as an Excel XLSX download"""
-    headers, rows = flatten_queryset(
-        queryset, field_names=field_names, extra_verbose_names=extra_verbose_names
-    )
+    headers, rows = flatten_queryset(queryset, field_names=field_names)
     return export_to_excel_response(filename, headers, rows)
 
 
@@ -68,17 +61,10 @@ def export_to_excel_action(
 
 @ensure_filename("csv")
 def export_to_csv_action(
-    modeladmin,
-    request,
-    queryset,
-    filename=None,
-    field_names=None,
-    extra_verbose_names=None,
+    modeladmin, request, queryset, filename=None, field_names=None
 ):
     """Django admin action which exports the selected records as a CSV download"""
-    headers, rows = flatten_queryset(
-        queryset, field_names=field_names, extra_verbose_names=extra_verbose_names
-    )
+    headers, rows = flatten_queryset(queryset, field_names=field_names)
     return export_to_csv_response(filename, headers, rows)