diff --git a/generic/templates/generic/exam_users_edit.html b/generic/templates/generic/exam_users_edit.html
index 2fde1ff4..1cc5abc7 100644
--- a/generic/templates/generic/exam_users_edit.html
+++ b/generic/templates/generic/exam_users_edit.html
@@ -31,7 +31,7 @@
 </ol>
 
 {% comment %} Hide the toggle button if there are no users (to add or remove) {% endcomment %}
-{% if current_cid_users or available_cid_users %}
+{% if current_user_users or available_user_users %}
     <p><button class="toggle-all-btn">Toggle all</button></p>
 {% endif %}
 
diff --git a/physics/migrations/0014_rename_rapid_examquestiondetail_question.py b/physics/migrations/0014_rename_rapid_examquestiondetail_question.py
new file mode 100644
index 00000000..7d764e0a
--- /dev/null
+++ b/physics/migrations/0014_rename_rapid_examquestiondetail_question.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.0.2 on 2024-08-28 17:22
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('physics', '0013_alter_exam_markers'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='examquestiondetail',
+            old_name='rapid',
+            new_name='question',
+        ),
+    ]
diff --git a/physics/models.py b/physics/models.py
index 79f62e21..bbfc6a53 100644
--- a/physics/models.py
+++ b/physics/models.py
@@ -141,7 +141,7 @@ class ExamQuestionDetail(models.Model):
     sort_order = models.IntegerField(default=1000)
 
     exam = models.ForeignKey("Exam", on_delete=models.CASCADE)
-    rapid = models.ForeignKey(Question, on_delete=models.CASCADE)
+    question = models.ForeignKey(Question, on_delete=models.CASCADE)
 
     class Meta:
         ordering = ("sort_order",)
diff --git a/rcr/templates/rcr/results.html b/rcr/templates/rcr/results.html
index a3929c8b..b02c66f9 100644
--- a/rcr/templates/rcr/results.html
+++ b/rcr/templates/rcr/results.html
@@ -34,7 +34,7 @@
                         {% if forloop.last %}
                             {{cat}}
                         {% else %}
-                            {{cat}}|
+                            {{cat}} |
 
                         {% endif %}
                     {% endfor %}
@@ -44,7 +44,7 @@
                         {% if forloop.last %}
                             {{cat}}
                         {% else %}
-                            {{cat}}|
+                            {{cat}} |
 
                         {% endif %}
                     {% endfor %}
diff --git a/sbas/migrations/0014_rename_rapid_examquestiondetail_question.py b/sbas/migrations/0014_rename_rapid_examquestiondetail_question.py
new file mode 100644
index 00000000..f5f9ee4f
--- /dev/null
+++ b/sbas/migrations/0014_rename_rapid_examquestiondetail_question.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.0.2 on 2024-08-28 17:22
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sbas', '0013_alter_exam_markers'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='examquestiondetail',
+            old_name='rapid',
+            new_name='question',
+        ),
+    ]
diff --git a/sbas/models.py b/sbas/models.py
index 63c3e889..dc370310 100644
--- a/sbas/models.py
+++ b/sbas/models.py
@@ -159,7 +159,7 @@ class ExamQuestionDetail(models.Model):
     sort_order = models.IntegerField(default=1000)
 
     exam = models.ForeignKey("Exam", on_delete=models.CASCADE)
-    rapid = models.ForeignKey(Question, on_delete=models.CASCADE)
+    question = models.ForeignKey(Question, on_delete=models.CASCADE)
 
     class Meta:
         ordering = ("sort_order",)