diff --git a/UI/Templates/SchedulerUI/UIxCalDayTable.wox b/UI/Templates/SchedulerUI/UIxCalDayTable.wox
new file mode 100644
index 000000000..18c920e6a
--- /dev/null
+++ b/UI/Templates/SchedulerUI/UIxCalDayTable.wox
@@ -0,0 +1,81 @@
+<?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">
+    <table
+      var:class="cssClass"
+      var:id="cssId">
+      <tr>
+        <td class="nullHeader">
+        </td>
+        <var:foreach list="daysToDisplay" item="currentTableDay"
+          ><td class="header"><var:string value="labelForDay"/></td
+            ></var:foreach>
+      </tr>
+
+      <var:if condition="hasHolidayInfo">
+        <tr>
+          <td class="hourOfDay" colspan="2">
+            <b><var:string value="holidayInfo.title" /></b>
+          </td>
+        </tr>
+      </var:if>
+
+      <var:foreach list="allDayApts" item="appointment">
+        <tr>
+          <td class="hourOfDay">
+            <var:entity name="nbsp" />
+          </td>
+          <td class="contentOfDay" 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="hoursToDisplay" item="currentTableHour">
+        <tr>
+          <td class="hourOfDay">
+            <var:string value="currentTableHour"
+              />:00
+          </td>
+          <var:foreach list="daysToDisplay" item="currentTableDay"
+            ><td class="contentOfDay"
+              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>
+          </var:foreach>
+        </tr>
+      </var:foreach>
+    </table>
+  </container>
diff --git a/UI/Templates/SchedulerUI/UIxCalMonthView.wox b/UI/Templates/SchedulerUI/UIxCalMonthView.wox
new file mode 100644
index 000000000..b23a6f9ca
--- /dev/null
+++ b/UI/Templates/SchedulerUI/UIxCalMonthView.wox
@@ -0,0 +1,80 @@
+<?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">
+    <var:month-overview
+      list="appointments"
+      item="appointment"
+      currentDay="currentDay"
+      index="dayIndex"
+      year="year"
+      month="month"
+      const:startDateKey="startDate"
+      const:endDateKey="endDate"
+      const:class="monthoverview"
+      contentStyle="contentStyle"
+      >
+      <var:month-info>
+        <var:if condition="hasHolidayInfo">
+          <var:string value="holidayInfo"
+            const:class="monthoverview_holidayinfo"
+            />
+        </var:if>
+        <var:foreach list="allDayApts" item="appointment">
+          <var:component className="UIxCalInlineAptView"
+            appointment="appointment"
+            formatter="aptFormatter"
+            tooltipFormatter="aptTooltipFormatter"
+            url="appointmentViewURL"
+            const:style="monthoverview"
+            referenceDate="currentDay"
+            canAccess="canAccessApt"
+            />
+          <br />
+        </var:foreach>
+      </var:month-info>
+      <var:month-label const:orientation="top"
+        dayOfWeek="dayOfWeek"
+        const:class="monthoverview_title"
+        >
+        <var:string value="localizedDayOfWeekName"/>
+      </var:month-label>
+      <var:month-label const:orientation="left"
+        weekOfYear="weekOfYear"
+        class="weekStyle"
+        >
+        <a href="weekoverview"
+          var:queryDictionary="currentWeekQueryParameters"
+          ><var:string value="weekOfYear"/></a>
+      </var:month-label>
+      <var:month-title class="contentStyle">
+        <span class="monthoverview_day">
+          <a href="dayoverview"
+            var:queryDictionary="currentDayQueryParameters"
+            ><var:string value="currentDay.dayOfMonth"/></a>
+        </span>
+        <!-- removed for 0.8
+        <br/>
+        <span class="monthoverview_day_new">
+        <a href="new"
+        var:queryDictionary="currentDayQueryParameters"
+        >[<var:string label:value="new"/>]</a>
+      </span>-->
+      </var:month-title>
+      <var:month class="contentStyle">
+        <var:component className="UIxCalInlineAptView"
+          appointment="appointment"
+          formatter="aptFormatter"
+          tooltipFormatter="aptTooltipFormatter"
+          url="appointmentViewURL"
+          const:style="monthoverview"
+          referenceDate="currentDay"
+          canAccess="canAccessApt"
+          />
+        <br />
+      </var:month>
+    </var:month-overview>
+  </container>
diff --git a/UI/Templates/SchedulerUI/UIxCalWeekView.wox b/UI/Templates/SchedulerUI/UIxCalWeekView.wox
new file mode 100644
index 000000000..be9544814
--- /dev/null
+++ b/UI/Templates/SchedulerUI/UIxCalWeekView.wox
@@ -0,0 +1,50 @@
+<?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="prevWeekQueryParameters.day"
+      onclick="return onCalendarGotoDay(this);"
+      ><img rsrc:src="arrow-lft-sharp.gif"/></a>
+    <span class="weeksHeader">
+      <span class="week2"><a href="#"
+          var:date="weekBeforePrevWeekQueryParameters.day"
+          onclick="return onCalendarGotoDay(this);"
+          ><var:string value="weekBeforeLastWeekName"
+            /></a></span
+        ><span class="week1"><a href="#"
+          var:date="prevWeekQueryParameters.day"
+          onclick="return onCalendarGotoDay(this);"
+          ><var:string value="lastWeekName"
+            /></a></span
+        ><span class="week0"><var:string value="currentWeekName" /></span
+        ><span class="week1"><a href="#"
+          var:date="nextWeekQueryParameters.day"
+          onclick="return onCalendarGotoDay(this);"
+          ><var:string value="nextWeekName"
+            /></a></span
+        ><span class="week2"><a href="#"
+          var:date="weekAfterNextWeekQueryParameters.day"
+          onclick="return onCalendarGotoDay(this);"
+          ><var:string value="weekAfterNextWeekName"
+            /></a></span
+        ></span>
+    <a href="#"
+      class="rightNavigationArrow"
+      var:date="nextWeekQueryParameters.day"
+      onclick="return onCalendarGotoDay(this);"
+      ><img rsrc:src="arrow-rit-sharp.gif"/></a>
+
+    <div id="calendarContent">
+      <var:component
+        className="UIxCalDayTable"
+        startDate="startDate"
+        const:CSSClass="weekOverview"
+        const:numberOfDays="7" />
+    </div>
+  </container>