diff --git a/epicyon-calendar.css b/epicyon-calendar.css
index 4379aa1bc..eb95c0642 100644
--- a/epicyon-calendar.css
+++ b/epicyon-calendar.css
@@ -104,7 +104,13 @@ a:link {
 }
 
 .calendar__day__event {
-    font-size: 2rem;
+    float: left;
+    font-size: 30px;
+    position: relative;
+}
+.calendar__day__time {
+    float: left;
+    font-size: 28px;
     position: relative;
 }
 
diff --git a/webinterface.py b/webinterface.py
index 9b571673e..d1ba1cafd 100644
--- a/webinterface.py
+++ b/webinterface.py
@@ -2848,22 +2848,22 @@ def htmlCalendarDay(translate: {}, \
             if ev['type']=='Event':
                 if ev.get('startTime'):
                     eventDate=datetime.strptime(ev['startTime'],"%Y-%m-%dT%H:%M:%S%z")            
-                    eventTime=eventDate.strftime("%H:%M")
+                    eventTime=eventDate.strftime("%H:%M").strip()
                 if ev.get('name'):
-                    eventDescription=ev['name']
+                    eventDescription=ev['name'].strip()
             elif ev['type']=='Place':
                 if ev.get('name'):
                     eventPlace=ev['name']
         if eventTime and eventDescription and eventPlace:
-            calendarStr+='<tr><td class="calendar__day__event"><b>'+eventTime+'</b></td><td class="calendar__day__event"><i>'+eventPlace+'</i>: '+eventDescription+'</td></tr>\n'
+            calendarStr+='<tr><td class="calendar__day__time"><b>'+eventTime+'</b></td><td class="calendar__day__event">'+eventPlace+'<br>'+eventDescription+'</td></tr>\n'
         elif eventTime and eventDescription and not eventPlace:
-            calendarStr+='<tr><td class="calendar__day__event"><b>'+eventTime+'</b></td><td class="calendar__day__event">'+eventDescription+'</td></tr>\n'
+            calendarStr+='<tr><td class="calendar__day__time"><b>'+eventTime+'</b></td><td class="calendar__day__event">'+eventDescription+'</td></tr>\n'
         elif not eventTime and eventDescription and not eventPlace:
-            calendarStr+='<tr><td class="calendar__day__event"></td><td class="calendar__day__event">'+eventDescription+'</td></tr>\n'
+            calendarStr+='<tr><td class="calendar__day__time"></td><td class="calendar__day__event">'+eventDescription+'</td></tr>\n'
         elif not eventTime and eventDescription and eventPlace:
-            calendarStr+='<tr><td class="calendar__day__event"></td><td class="calendar__day__event"><i>'+eventPlace+'</i>: '+eventDescription+'</td></tr>\n'
+            calendarStr+='<tr><td class="calendar__day__time"></td><td class="calendar__day__event">'+eventPlace+'<br>'+eventDescription+'</td></tr>\n'
         elif eventTime and not eventDescription and eventPlace:
-            calendarStr+='<tr><td class="calendar__day__event"><b>'+eventTime+'</b></td><td class="calendar__day__event"><i>'+eventPlace+'</i></td></tr>\n'
+            calendarStr+='<tr><td class="calendar__day__time"><b>'+eventTime+'</b></td><td class="calendar__day__event">'+eventPlace+'</td></tr>\n'
     
     calendarStr+='</tbody>\n'
     calendarStr+='</table></main>\n'