diff --git a/core/migrations/0002_auto_20170412_1447.py b/core/migrations/0002_auto_20170412_1447.py
new file mode 100644
index 0000000000000000000000000000000000000000..592dc9d2199eb7dc7250b274b44dd3bbba027ae6
--- /dev/null
+++ b/core/migrations/0002_auto_20170412_1447.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2017-04-12 14:47
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='feedback',
+            name='created',
+            field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='feedback',
+            name='modified',
+            field=models.DateTimeField(auto_now=True),
+        ),
+    ]
diff --git a/core/migrations/0003_auto_20170412_1507.py b/core/migrations/0003_auto_20170412_1507.py
new file mode 100644
index 0000000000000000000000000000000000000000..be676b4c00bd6fb945f1099b2cec7ff3da2fff94
--- /dev/null
+++ b/core/migrations/0003_auto_20170412_1507.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2017-04-12 15:07
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0002_auto_20170412_1447'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='feedback',
+            name='origin',
+            field=models.IntegerField(choices=[(0, 'was empty'), (1, 'passed unittests'), (2, 'did not compile'), (3, 'could not link'), (4, 'created by a human. yak!')], default=4),
+        ),
+        migrations.AlterField(
+            model_name='feedback',
+            name='status',
+            field=models.IntegerField(choices=[(0, 'editable'), (1, 'accepted'), (2, 'request review'), (3, 'request reassignment')], default=0),
+        ),
+    ]
diff --git a/core/views/user_startpages.py b/core/views/user_startpages.py
index 2889219cc23dcbb55a66bfeeb03fa2dd3fcafc21..22846e7e8e4f454a5bc31d843c1acb3d96455720 100644
--- a/core/views/user_startpages.py
+++ b/core/views/user_startpages.py
@@ -66,7 +66,7 @@ def reviewer_view(request):
         'submission_type_list': get_annotated_feedback_count(),
         'tutor_list': User.objects.annotate(Count('corrected_submissions')).filter(groups__name='Tutors'),
         'submission_list': Submission.objects.all(),
-        'feedback_list_manual': Feedback.objects.filter(origin=Feedback.MANUAL).order_by('status', '-modified'),
+        'feedback_list_manual': Feedback.objects.filter(origin=Feedback.MANUAL).order_by('-status', '-modified'),
         'feedback_list_empty': Feedback.objects.filter(origin=Feedback.WAS_EMPTY),
         'feedback_list_did_not_compile': Feedback.objects.filter(origin=Feedback.DID_NOT_COMPILE),
         'feedback_list_could_not_link': Feedback.objects.filter(origin=Feedback.COULD_NOT_LINK),