diff --git a/_data/events.yml b/_data/events.yml
index e74fcf0..6a5a737 100644
--- a/_data/events.yml
+++ b/_data/events.yml
@@ -377,3 +377,13 @@
   event_link: "https://www.meetup.com/cloud-native-linz/events/306377483/"
   registrations: ""
   recording: []
+
+- id: 39
+  edition: "Cloud Native Linz - TBD"
+  date: "2025-04-29"
+  host: "tractive"
+  event_link: ""
+  registrations: ""
+  participants: ""
+  recording: []
+
diff --git a/_layouts/default.html b/_layouts/default.html
index f179bd5..89d274b 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -34,7 +34,7 @@ <h1 class="site-name"><a href="{{ site.baseurl }}/">{{ site.name }}</a></h1>
               <a href="{{ site.baseurl }}/join">Join us!</a>
               <a href="{{ site.baseurl }}/speaker-info">Speaker Info</a>
               <a href="{{ site.baseurl }}/slides">Slides & Content</a>
-              <a href="{{ site.baseurl }}/statistics">Events</a>
+              <a href="{{ site.baseurl }}/events">Events</a>
               <a href="{{ site.baseurl }}/random-number-generator">🎲</a>
               <!--
               <a href="{{ site.baseurl }}/search">Search</a>
diff --git a/_pages/statistics.md b/_pages/events.md
similarity index 72%
rename from _pages/statistics.md
rename to _pages/events.md
index 516fec4..3752ce5 100644
--- a/_pages/statistics.md
+++ b/_pages/events.md
@@ -1,7 +1,7 @@
 ---
 layout: page
 title: Events
-permalink: /statistics/
+permalink: /events/
 ---
 
 <style>
@@ -17,13 +17,37 @@ permalink: /statistics/
     text-align: center; /* Center align text horizontally */
     vertical-align: middle; /* Center align text vertically */
   }
+  .today-event {
+    background-color: #e6f3ff;
+    border-left: 4px solid #0066cc;
+    padding: 10px;
+    margin: 5px 0;
+  }
+  .today-label {
+    display: inline-block;
+    padding: 2px 8px;
+    margin-right: 8px;
+    background-color: #0066cc;
+    color: white;
+    border-radius: 12px;
+    font-size: 0.8em;
+    font-weight: bold;
+  }
+  .host-label {
+    display: inline-block;
+    padding: 2px 8px;
+    margin-right: 8px;
+    background-color: #f0f0f0;
+    border-radius: 12px;
+    font-size: 0.8em;
+  }
 </style>
 
 {% assign upcoming_events = false %}
 {% for event in site.data.events %}
   {% assign event_date = event.date | date: "%Y-%m-%d" %}
   {% assign today = site.time | date: "%Y-%m-%d" %}
-  {% if event_date > today %}
+  {% if event_date >= today %}
     {% assign upcoming_events = true %}
     {% break %}
   {% endif %}
@@ -35,14 +59,18 @@ permalink: /statistics/
   {% for event in site.data.events %}
     {% assign event_date = event.date | date: "%Y-%m-%d" %}
     {% assign today = site.time | date: "%Y-%m-%d" %}
-    {% if event_date > today %}
-      <tr>
+    {% if event_date >= today %}
+      <tr {% if event_date == today %}class="today-event"{% endif %}>
         <td>
-          <span class="date-label">{{ event.date }}
+          {% if event_date == today %}
+            <span class="today-label">TODAY</span>
+          {% else %}
+            <span class="date-label">{{ event.date }}</span>
+          {% endif %}
           {% if !event.host || event.host != "" %}
-          - hosted by {{ event.host }}
+            <span class="host-label">hosted by {{ event.host }}</span>
           {% endif %}
-          </span><br>
+          <br>
           <strong><a href="{{ event.event_link }}">{{ event.edition }}</a></strong>
         </td>
       </tr>
diff --git a/makefile b/makefile
index 7251032..e0523fd 100644
--- a/makefile
+++ b/makefile
@@ -8,6 +8,9 @@ FORCE_POLLING_FLAG = --force_polling
 # Default target
 all: serve
 
+# Helper for Juergen ;)
+run: serve-livereload
+
 # Serve the site
 serve:
 	$(JEKYLL_CMD)