diff --git a/actix_mvc_app/src/views/calendar/index.html b/actix_mvc_app/src/views/calendar/index.html
index 244c1ba..0b28aea 100644
--- a/actix_mvc_app/src/views/calendar/index.html
+++ b/actix_mvc_app/src/views/calendar/index.html
@@ -199,17 +199,24 @@
         </div>
         <div class="card-body">
             {% if events is defined and events|length > 0 %}
+            {% set has_all_day_events = false %}
             {% for event in events %}
             {% if event.all_day %}
-            <div class="alert" style="background-color: {{ event.color }}; color: white; cursor: pointer;"
+            {% set_global has_all_day_events = true %}
+            <div class="alert mb-2" style="background-color: {{ event.color }}; color: white; cursor: pointer;"
                 onclick="openEventDetails(event, '{{ event.id }}', '{{ event.title|escape }}', '{{ event.description|escape }}', '{{ event.color }}', {{ event.all_day }}, '{{ event.start_time }}', '{{ event.end_time }}')">
-                <h5>{{ event.title }}</h5>
-                <p>{{ event.description }}</p>
+                <h5 class="mb-1">{{ event.title }}</h5>
+                {% if event.description %}
+                <p class="mb-0">{{ event.description }}</p>
+                {% endif %}
             </div>
             {% endif %}
             {% endfor %}
+            {% if not has_all_day_events %}
+            <p class="text-muted mb-0">No all-day events for this date</p>
+            {% endif %}
             {% else %}
-            <p class="text-muted">No all-day events</p>
+            <p class="text-muted mb-0">No events for this date</p>
             {% endif %}
         </div>
     </div>
@@ -226,7 +233,7 @@
                     {% for event in events %}
                     {% if not event.all_day %}
                     {% set start_hour = event.start_time|extract_hour %}
-                    {% if start_hour == hour|string %}
+                    {% if start_hour == hour %}
                     <div class="alert mb-2" style="background-color: {{ event.color }}; color: white; cursor: pointer;"
                         onclick="openEventDetails(event, '{{ event.id }}', '{{ event.title|escape }}', '{{ event.description|escape }}', '{{ event.color }}', {{ event.all_day }}, '{{ event.start_time }}', '{{ event.end_time }}')">
                         <h5>{{ event.title }}</h5>