diff --git a/UI/Templates/SchedulerUI/UIxCalDayTable.wox b/UI/Templates/SchedulerUI/UIxCalDayTable.wox
index 15662a4c3..0bf0f2e04 100644
--- a/UI/Templates/SchedulerUI/UIxCalDayTable.wox
+++ b/UI/Templates/SchedulerUI/UIxCalDayTable.wox
@@ -1,73 +1,89 @@
 <?xml version="1.0" standalone="yes"?>
-  <container
-    xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:var="http://www.skyrix.com/od/binding"
-    xmlns:const="http://www.skyrix.com/od/constant"
-    xmlns:rsrc="OGo:url"
-    xmlns:label="OGo:label">
-    <div id="daysView" var:class="daysViewClasses">
-      <div class="hours">
-        <var:foreach list="hoursToDisplay" item="currentTableHour"
-          ><div class="hour"><var:string value="currentTableHour" />:00</div
-            ></var:foreach>
-      </div>
-
-      <div class="hourLines">
-        <div class="hourLine hourLine0"><!-- space --></div
-          ><div class="hourLine hourLine1"><!-- space --></div
-          ><div class="hourLine hourLine2"><!-- space --></div
-          ><div class="hourLine hourLine3"><!-- space --></div
-          ><div class="hourLine hourLine4"><!-- space --></div
-          ><div class="hourLine hourLine5"><!-- space --></div
-          ><div class="hourLine hourLine6"><!-- space --></div
-          ><div class="hourLine hourLine7"><!-- space --></div
-          ><div class="hourLine hourLine8"><!-- space --></div
-          ><div class="hourLine hourLine9"><!-- space --></div
-          ><div class="hourLine hourLine10"><!-- space --></div
-          ><div class="hourLine hourLine11"><!-- space --></div
-          ><div class="hourLine hourLine12"><!-- space --></div
-          ><div class="hourLine hourLine13"><!-- space --></div
-          ><div class="hourLine hourLine14"><!-- space --></div
-          ><div class="hourLine hourLine15"><!-- space --></div
-          ><div class="hourLine hourLine16"><!-- space --></div
-          ><div class="hourLine hourLine17"><!-- space --></div
-          ><div class="hourLine hourLine18"><!-- space --></div
-          ><div class="hourLine hourLine19"><!-- space --></div
-          ><div class="hourLine hourLine20"><!-- space --></div
-          ><div class="hourLine hourLine21"><!-- space --></div
-          ><div class="hourLine hourLine22"><!-- space --></div
-          ><div class="hourLine hourLine23"><!-- space --></div>
-      </div>
-
-      <div class="days">
-        <var:foreach list="daysToDisplay" item="currentTableDay"
-          ><div var:class="dayClasses"
-            var:day="currentTableDay.shortDateString"
-            ><div class="header"><var:string value="labelForDay"
-		const:escapeHTML="NO"/></div>
-            <div class="appointments">
-            <var:foreach list="hoursToDisplay" item="currentTableHour"
-              ><div var:class="clickableHourCellClass"
-                var:day="currentTableDay.shortDateString"
-                var:hour="currentAppointmentHour">
-              </div></var:foreach>
-            <var:foreach list="appointmentsForCurrentDay" item="currentAppointment"
-              ><var:component className="UIxCalInlineAptView"
-                dayStartHour="dayStartHour"
-                dayEndHour="dayEndHour"
-                appointment="currentAppointment"
-                formatter="aptFormatter"
-                tooltipFormatter="aptTooltipFormatter"
-                url="appointmentViewURL"
-                const:style="dayoverview"
-                queryDictionary="currentDateQueryParameters"
-                referenceDate="selectedDate"
-                canAccess="canAccessApt"
-                /></var:foreach
-              >
-            </div>
-          </div>
-        </var:foreach>
-      </div>
+<!DOCTYPE container>
+<container
+  xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:var="http://www.skyrix.com/od/binding"
+  xmlns:const="http://www.skyrix.com/od/constant"
+  xmlns:rsrc="OGo:url"
+  xmlns:label="OGo:label">
+  <div id="calendarHeader" var:class="daysViewClasses">
+    <div class="dayLabels"
+      ><var:foreach list="daysToDisplay" item="currentTableDay"
+	><div var:class="dayClasses"
+	  ><var:string value="labelForDate"/><br
+	    /><span class="dayOfWeek"><var:string value="labelForDay"/></span
+	    ></div
+	  ></var:foreach>
     </div>
-  </container>
+    <div class="days"
+      ><var:foreach list="daysToDisplay" item="currentTableDay"
+	><div var:class="dayClasses"><!-- space --></div
+	  ></var:foreach
+	></div>
+  </div>
+
+  <div id="daysView" var:class="daysViewClasses">
+    <div class="hours">
+      <var:foreach list="hoursToDisplay" item="currentTableHour"
+	><div class="hour"><var:string value="currentTableHour" />:00</div
+	  ></var:foreach>
+    </div>
+
+    <div class="hourLines">
+      <div class="hourLine hourLine0"><!-- space --></div
+	><div class="hourLine hourLine1"><!-- space --></div
+	><div class="hourLine hourLine2"><!-- space --></div
+	><div class="hourLine hourLine3"><!-- space --></div
+	><div class="hourLine hourLine4"><!-- space --></div
+	><div class="hourLine hourLine5"><!-- space --></div
+	><div class="hourLine hourLine6"><!-- space --></div
+	><div class="hourLine hourLine7"><!-- space --></div
+	><div class="hourLine hourLine8"><!-- space --></div
+	><div class="hourLine hourLine9"><!-- space --></div
+	><div class="hourLine hourLine10"><!-- space --></div
+	><div class="hourLine hourLine11"><!-- space --></div
+	><div class="hourLine hourLine12"><!-- space --></div
+	><div class="hourLine hourLine13"><!-- space --></div
+	><div class="hourLine hourLine14"><!-- space --></div
+	><div class="hourLine hourLine15"><!-- space --></div
+	><div class="hourLine hourLine16"><!-- space --></div
+	><div class="hourLine hourLine17"><!-- space --></div
+	><div class="hourLine hourLine18"><!-- space --></div
+	><div class="hourLine hourLine19"><!-- space --></div
+	><div class="hourLine hourLine20"><!-- space --></div
+	><div class="hourLine hourLine21"><!-- space --></div
+	><div class="hourLine hourLine22"><!-- space --></div
+	><div class="hourLine hourLine23"><!-- space --></div>
+    </div>
+
+    <div class="days">
+      <var:foreach list="daysToDisplay" item="currentTableDay"
+	><div var:class="dayClasses"
+	  var:day="currentTableDay.shortDateString"
+	  >
+	  <div class="appointments">
+	    <var:foreach list="hoursToDisplay" item="currentTableHour"
+	      ><div var:class="clickableHourCellClass"
+		var:day="currentTableDay.shortDateString"
+		var:hour="currentAppointmentHour">
+	      </div></var:foreach>
+	    <!--            <var:foreach list="appointmentsForCurrentDay" item="currentAppointment"
+	    ><var:component className="UIxCalInlineAptView"
+	    dayStartHour="dayStartHour"
+	    dayEndHour="dayEndHour"
+	    appointment="currentAppointment"
+	    formatter="aptFormatter"
+	    tooltipFormatter="aptTooltipFormatter"
+	    url="appointmentViewURL"
+	    const:style="dayoverview"
+	    queryDictionary="currentDateQueryParameters"
+	    referenceDate="selectedDate"
+	    canAccess="canAccessApt"
+	    /></var:foreach
+	    > -->
+	  </div>
+	</div>
+      </var:foreach>
+    </div>
+  </div>
+</container>
diff --git a/UI/Templates/SchedulerUI/UIxCalDayView.wox b/UI/Templates/SchedulerUI/UIxCalDayView.wox
index 821d803ba..deca9e61b 100644
--- a/UI/Templates/SchedulerUI/UIxCalDayView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalDayView.wox
@@ -1,49 +1,49 @@
 <?xml version="1.0" standalone="yes"?>
-  <container
-    xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:var="http://www.skyrix.com/od/binding"
-    xmlns:const="http://www.skyrix.com/od/constant"
-    xmlns:rsrc="OGo:url"
-    xmlns:label="OGo:label">
-    <a href="#"
-      class="leftNavigationArrow"
-      var:date="prevDayQueryParameters.day"
-      onclick="return onCalendarGotoDay(this);"
-      ><img rsrc:src="arrow-lft-sharp.gif"/></a>
-    <span class="daysHeader">
-      <span class="day2"><a href="#"
-          var:date="dayBeforePrevDayQueryParameters.day"
-          onclick="return onCalendarGotoDay(this);"
-          ><var:string value="dayBeforeYesterdayName"
-            /></a></span
-        ><span class="day1"><a href="#"
-          var:date="prevDayQueryParameters.day"
-          onclick="return onCalendarGotoDay(this);"
-          ><var:string value="yesterdayName"
-            /></a></span
-        ><span class="day0"><var:string value="currentDayName" /></span
-        ><span class="day1"><a href="#"
-          var:date="nextDayQueryParameters.day"
-          onclick="return onCalendarGotoDay(this);"
-          ><var:string value="tomorrowName"
-            /></a></span
-        ><span class="day2"><a href="#"
-          var:date="dayAfterNextDayQueryParameters.day"
-          onclick="return onCalendarGotoDay(this);"
-          ><var:string value="dayAfterTomorrowName"
-            /></a></span
-        ></span>
-    <a href="#"
-      class="rightNavigationArrow"
-      var:date="nextDayQueryParameters.day"
-      onclick="return onCalendarGotoDay(this);"
-      ><img rsrc:src="arrow-rit-sharp.gif"/></a>
-
-    <div id="calendarContent">
-      <var:component
-        className="UIxCalDayTable"
-        startDate="startDate"
-        const:CSSClass="dayOverview"
-        const:numberOfDays="1" />
-    </div>
-  </container>
+<!DOCTYPE container>
+<container
+  xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:var="http://www.skyrix.com/od/binding"
+  xmlns:const="http://www.skyrix.com/od/constant"
+  xmlns:rsrc="OGo:url"
+  xmlns:label="OGo:label">
+  <a href="#"
+    class="leftNavigationArrow"
+    var:date="prevDayQueryParameters.day"
+    onclick="return onCalendarGotoDay(this);"
+    ><img rsrc:src="arrow-lft-sharp.gif"/></a>
+  <span class="daysHeader">
+    <span class="day2"><a href="#"
+	var:date="dayBeforePrevDayQueryParameters.day"
+	onclick="return onCalendarGotoDay(this);"
+	><var:string value="dayBeforeYesterdayName"
+	  /></a></span
+      ><span class="day1"><a href="#"
+	var:date="prevDayQueryParameters.day"
+	onclick="return onCalendarGotoDay(this);"
+	><var:string value="yesterdayName"
+	  /></a></span
+      ><span class="day0"><var:string value="currentDayName" /></span
+      ><span class="day1"><a href="#"
+	var:date="nextDayQueryParameters.day"
+	onclick="return onCalendarGotoDay(this);"
+	><var:string value="tomorrowName"
+	  /></a></span
+      ><span class="day2"><a href="#"
+	var:date="dayAfterNextDayQueryParameters.day"
+	onclick="return onCalendarGotoDay(this);"
+	><var:string value="dayAfterTomorrowName"
+	  /></a></span
+      ></span>
+  <a href="#"
+    class="rightNavigationArrow"
+    var:date="nextDayQueryParameters.day"
+    onclick="return onCalendarGotoDay(this);"
+    ><img rsrc:src="arrow-rit-sharp.gif"/></a>
+  <div id="calendarContent">
+    <var:component
+      className="UIxCalDayTable"
+      startDate="startDate"
+      const:CSSClass="dayOverview"
+      const:numberOfDays="1" />
+  </div>
+</container>
diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox
index fe34f7e23..34c751a41 100644
--- a/UI/Templates/SchedulerUI/UIxCalMainView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox
@@ -89,10 +89,10 @@
       <div id="eventsListView">
 	<table id="eventsList">
 	  <tr>
-	    <td class="headerCell"><span class="sortableTableHeader"><var:string label:value="Title"/></span></td>
+	    <td class="headerCell headerTitle"><span class="sortableTableHeader"><var:string label:value="Title"/></span></td>
 	    <td class="headerCell headerDateTime"><span class="sortableTableHeader"><var:string label:value="Start"/></span></td>
 	    <td class="headerCell headerDateTime"><span class="sortableTableHeader"><var:string label:value="End"/></span></td>
-	    <td class="headerCell"><span class="sortableTableHeader"><var:string label:value="Location"/></span></td>
+	    <td class="headerCell headerLocation"><span class="sortableTableHeader"><var:string label:value="Location"/></span></td>
 	  </tr>
 	</table>
       </div>
diff --git a/UI/Templates/SchedulerUI/UIxCalMonthView.wox b/UI/Templates/SchedulerUI/UIxCalMonthView.wox
index cb098db59..4ef911bc5 100644
--- a/UI/Templates/SchedulerUI/UIxCalMonthView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMonthView.wox
@@ -46,25 +46,25 @@
         ><div var:class="headerDayCellClasses"
           ><var:string value="labelForCurrentDayToDisplay"
             /></div></var:foreach>
-      <div class="days"
+      <div class="days" const:id="monthDaysView"
         ><var:foreach list="daysToDisplay" item="currentTableColumn">
           <var:foreach list="currentTableColumn" item="currentTableDay">
             <div var:class="dayCellClasses"
               var:day="currentTableDay.shortDateString">
               <div class="dayHeader"><var:string value="dayHeaderNumber"/></div>
-              <var:foreach
-                list="aptsForCurrentDate"
-              item="appointment">
-                <var:component className="UIxCalInlineMonthAptView"
-                  appointment="appointment"
-                  formatter="monthAptFormatter"
-                  tooltipFormatter="aptTooltipFormatter"
-                  url="appointmentViewURL"
-                  const:style="dayoverview"
-                queryDictionary="currentDayQueryParameters"
-                  referenceDate="currentTableDay"
-                  canAccess="canAccessApt"
-                  /></var:foreach>
+              <!-- var:foreach
+	      list="aptsForCurrentDate"
+              item="appointment"
+	      var:component className="UIxCalInlineMonthAptView"
+	      appointment="appointment"
+	      formatter="monthAptFormatter"
+	      tooltipFormatter="aptTooltipFormatter"
+	      url="appointmentViewURL"
+	      const:style="dayoverview"
+	      queryDictionary="currentDayQueryParameters"
+	      referenceDate="currentTableDay"
+	      canAccess="canAccessApt"
+	      var:foreach -->
             </div>
           </var:foreach>
         </var:foreach>