diff --git a/oef/models.py b/oef/models.py
index 889e5e24..bc410659 100644
--- a/oef/models.py
+++ b/oef/models.py
@@ -35,6 +35,9 @@ class Entry(models.Model):
         self.questions = self.questions.replace("\r\n", "\n")
         return super().save(*args, **kwargs)
 
+    def get_current_format(self):
+        return Formats.objects.filter(format=self.questions).first()
+
 class Formats(models.Model):
     name = models.CharField(max_length=200)
     format = models.TextField(blank=True)
diff --git a/oef/tables.py b/oef/tables.py
index 7ccf82b1..55b1b4c5 100755
--- a/oef/tables.py
+++ b/oef/tables.py
@@ -16,10 +16,10 @@ from django.utils.html import format_html
 
 class EntryTable(tables.Table):
     view = tables.LinkColumn(
-        "oef:entry_detail", text="Edit", args=[A("pk")], orderable=False
+        "oef:entry_detail", text="View", args=[A("pk")], orderable=False
     )
     edit = tables.LinkColumn(
-        "oef:entry_update", text="View", args=[A("pk")], orderable=False
+        "oef:entry_update", text="Edit", args=[A("pk")], orderable=False
     )
 
     class Meta:
diff --git a/oef/templates/oef/entry_detail_view.html b/oef/templates/oef/entry_detail_view.html
index 99dbc5ec..e02f387f 100644
--- a/oef/templates/oef/entry_detail_view.html
+++ b/oef/templates/oef/entry_detail_view.html
@@ -21,6 +21,9 @@
 
 <p>Comments: {{ entry.comments }}</p>
 
+Current format: {{ entry.get_current_format }}
+
+<br/>
 
 <button
 hx-get="{% url 'oef:entry_detail_formats' entry.pk %}"