diff --git a/templates/events.html b/templates/events.html
index b7846a7..c3076fe 100644
--- a/templates/events.html
+++ b/templates/events.html
@@ -6,10 +6,11 @@
     <span><h1>{% block title %} Events {% endblock %}</h1></span>
     <b>Current Date: {{ currDay }} </b> <br> <br>
     <div>
-        {% for event in events if event.scheduled_date == currDay %}
+        {% for period in periods %}
             <div>
-                {% set convertedTime = datetime.strptime(event.period.periodTime, "%H:%M:%S") %}
-                <p><b>Period {{ event.period_num }}</b> <br> Time: {{ convertedTime.strftime("%I:%M %p") }} </p>
+                {% set convertedTime = datetime.strptime(period.periodTime, "%H:%M:%S") %}
+                <p><b>Period {{ period.period }}</b> <br> Time: {{ convertedTime.strftime("%I:%M %p") }} </p>
+                {% for event in events if event.scheduled_date == currDay and event.period == period %}
                 <b>
                         <a href="/task/{{ event.tasks.id }}">
                             {{ event.tasks.title }}
@@ -18,6 +19,9 @@
                 <div>
                     <p>{{ event.tasks.description }}</p>
                 </div>
+                {% else %}
+                    <div><p>(no task assigned... yet)</p></div>
+                {% endfor %}
                 <hr>
             </div>
         {% endfor %}