diff --git a/app/event/models.py b/app/event/models.py
index eceb77c..7dccfdf 100644
--- a/app/event/models.py
+++ b/app/event/models.py
@@ -6,7 +6,7 @@ import ox
 class Event(models.Model):
 
     class Meta:
-        ordering = ('position', )
+        ordering = ('position', 'date')
 
     created = models.DateTimeField(auto_now_add=True)
     modified = models.DateTimeField(auto_now=True)
diff --git a/app/event/views.py b/app/event/views.py
index 194b6ca..b79b811 100644
--- a/app/event/views.py
+++ b/app/event/views.py
@@ -63,10 +63,10 @@ def timeline(request):
             },
             "unique_id": event.slug
         })
-        if self.media:
+        if event.media:
             timeline['events'][-1]['media'] = {
-                "url": self.media,
-                "caption": self.media_caption,
+                "url": event.media,
+                "caption": event.media_caption,
             }
     context['timeline_json'] = json.dumps(timeline)
     return render(request, 'timeline.html', context)