diff --git a/themes/lumbung-theme/layouts/events/list.html b/themes/lumbung-theme/layouts/events/list.html
index 387ce42..739ad2c 100644
--- a/themes/lumbung-theme/layouts/events/list.html
+++ b/themes/lumbung-theme/layouts/events/list.html
@@ -3,26 +3,36 @@
     <section class='entries'>
         
         {{ $now := (now.Format "060102" ) }}
-        <div class="upcoming event-list">
-            <div class='tape-label'><span>upcoming events</span></div>
-            {{ range .Pages }}
+
+        {{ $upcoming := slice }}
+        {{ $past := slice}}
+
+        {{ range .Pages }}
                 {{ $t := (substr .Params.event_end 2 8) }} 
                 {{ $time := ( replace $t "-" "") }}   
                 {{ if ge $time $now }}
-                    {{- partial "event_list_item.html" . -}}
+                    {{ $upcoming = $upcoming | append . }}
+                {{ else if gt $now $time }}
+                    {{ $past = $past | append . }}
                 {{ end }}
             {{ end }}
-        </div>
+
+        {{ with $upcoming }}
+        <div class="upcoming event-list">
+            <div class='tape-label'><span>upcoming events</span></div>
+            {{ range $upcoming}}
+            {{- partial "event_list_item.html" . -}}
+            {{end}}
+            </div>
+        {{end}}
+        {{ with $past }}
         <div class="past event-list">
             <div class='tape-label'><span>past events</span></div>
-            {{ range .Pages }}
-                {{ $t := (substr .Params.event_end 2 8) }} 
-                {{ $time := ( replace $t "-" "") }}   
-                {{ if gt $now $time }}
-                    {{- partial "event_list_item.html" . -}}
-                {{ end }}
+            {{ range $past }}
+            {{- partial "event_list_item.html" . -}}
             {{ end }}
         </div>
+        {{ end }}
           
     </section>        
   </main>