diff --git a/UI/Templates/SchedulerUI/UIxCalAptListView.wox b/UI/Templates/SchedulerUI/UIxCalAptListView.wox
index 9e894e5a6..341182b8c 100644
--- a/UI/Templates/SchedulerUI/UIxCalAptListView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalAptListView.wox
@@ -56,7 +56,7 @@
           ><td onmousedown="return false;"
           ><var:string value="currentEndTime"/></td
           ><td onmousedown="return false;"
-          ><var:string value="currentLocation"/></td
+          ><var:string value="currentLocation" const:escapeHTML="NO"/></td
           ></tr
         ></var:foreach>
   </table>
diff --git a/UI/Templates/SchedulerUI/UIxCalDayView.wox b/UI/Templates/SchedulerUI/UIxCalDayView.wox
index cb89c1fc2..12765d5a8 100644
--- a/UI/Templates/SchedulerUI/UIxCalDayView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalDayView.wox
@@ -5,6 +5,7 @@
     xmlns:const="http://www.skyrix.com/od/constant"
     xmlns:rsrc="OGo:url"
     xmlns:label="OGo:label">
+
     <a href="#"
       class="leftNavigationArrow"
       var:date="prevDayQueryParameters.day"
@@ -40,73 +41,10 @@
       ><img rsrc:src="arrow-rit-sharp.gif"/></a>
 
     <div id="calendarContent">
-      <table class="dayoverview_content">
-        <tr>
-          <td class="nullHeader">
-          </td>
-          <td class="header"><var:string value="labelForDay"/> </td>
-        </tr>
-
-        <var:if condition="hasHolidayInfo">
-          <tr>
-            <td class="dayoverview_content_time" colspan="2">
-              <b><var:string value="holidayInfo.title" /></b>
-            </td>
-          </tr>
-        </var:if>
-        <var:foreach list="allDayApts" item="appointment">
-          <tr>
-            <td class="dayoverview_content_time">
-              <var:entity name="nbsp" />
-            </td>
-            <td class="dayoverview_content_apts" width="90%">
-              <var:foreach list="allDayApts" item="appointment">
-                <var:component className="UIxCalInlineAptView"
-                  appointment="appointment"
-                  formatter="aptFormatter"
-                  tooltipFormatter="aptTooltipFormatter"
-                  url="appointmentViewURL"
-                  const:style="dayoverview"
-                  queryDictionary="currentDateQueryParameters"
-                  referenceDate="selectedDate"
-                  canAccess="canAccessApt"
-                  />
-                <br />
-              </var:foreach>
-            </td>
-          </tr>
-        </var:foreach>
-        <var:foreach list="dateRange" item="currentDate">
-          <tr>
-            <td class="dayoverview_content_time">
-              <var:string value="currentDate"
-                const:dateformat="%H:%M"
-                />
-              <br />
-            </td>
-            <td class="dayoverview_content_apts"
-              ondblclick="return newEvent(this);"
-              var:day="currentDayQueryParameters.day"
-              >
-              <var:foreach
-                list="aptsForCurrentDate"
-                item="appointment"
-                >
-                <var:component className="UIxCalInlineAptView"
-                  appointment="appointment"
-                  formatter="aptFormatter"
-                  tooltipFormatter="aptTooltipFormatter"
-                  url="appointmentViewURL"
-                  const:style="dayoverview"
-                  queryDictionary="currentDayQueryParameters"
-                  referenceDate="currentDate"
-                  canAccess="canAccessApt"
-                  />
-                <br />
-              </var:foreach>
-            </td>
-          </tr>
-        </var:foreach>
-      </table>
+      <var:component
+        className="UIxCalDayTable"
+        startDate="startDate"
+        const:CSSClass="dayOverview"
+        const:numberOfDays="1" />
     </div>
   </container>
diff --git a/UI/Templates/SchedulerUI/UIxCalInlineAptView.wox b/UI/Templates/SchedulerUI/UIxCalInlineAptView.wox
index 1d04494c4..0e3c9b6c0 100644
--- a/UI/Templates/SchedulerUI/UIxCalInlineAptView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalInlineAptView.wox
@@ -3,6 +3,7 @@
     xmlns:var="http://www.skyrix.com/od/binding"
     xmlns:const="http://www.skyrix.com/od/constant"
     xmlns:rsrc="OGo:url"
+    class="appointmentView"
     >
     <var:if condition="appointment.isRecurrentEvent">
       <!-- TODO: maxime needs to provide an image instead! -->