diff --git a/oef/templates/oef/entries.html b/oef/templates/oef/entries.html
index 78606a60..4d9fc84e 100644
--- a/oef/templates/oef/entries.html
+++ b/oef/templates/oef/entries.html
@@ -4,13 +4,13 @@
 {% block content %}
 
 <h2>Entries</h2>
-Count: {{ entries|length }}
+Count: <span id="count">{{ entries|length }}</span>
 
 <button
-_="on click hide <li.inactive-True/> then show <li.inactive-False/>"
+_="on click hide <li.inactive-True/> then show <li.inactive-False/> then set #count.innerHTML to length of <li.inactive-False/>"
 >Hide inactive</button>
 <button
-_="on click hide <li.inactive-False/> then show <li.inactive-True/>"
+_="on click hide <li.inactive-False/> then show <li.inactive-True/> then set #count.innerHTML to length of <li.inactive-True/>"
 >Hide active</button>
 
 <ul>
diff --git a/oef/views.py b/oef/views.py
index 5e073306..eb4ac544 100644
--- a/oef/views.py
+++ b/oef/views.py
@@ -92,7 +92,7 @@ def replace_questions(request):
         return render(request, "oef/replace_questions.html", {})
 
 def entries(request):
-    entries = Entry.objects.all()
+    entries = Entry.objects.all().order_by("exam_code")
     return render(request, "oef/entries.html", {"entries": entries})