diff --git a/UI/Templates/SchedulerUI/UIxCalMonthView.wox b/UI/Templates/SchedulerUI/UIxCalMonthView.wox
index b23a6f9ca..6e91cc693 100644
--- a/UI/Templates/SchedulerUI/UIxCalMonthView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMonthView.wox
@@ -5,76 +5,104 @@
     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>
+    <a href="#"
+      class="leftNavigationArrow"
+      var:date="prevMonthQueryParameters.month"
+      onclick="return onCalendarGotoDay(this);"
+      ><img rsrc:src="arrow-lft-sharp.gif"/></a>
+    <span class="monthsHeader">
+      <span class="month2"><a href="#"
+          var:date="monthBeforePrevMonthQueryParameters.day"
+          onclick="return onCalendarGotoDay(this);"
+          ><var:string value="monthNameOfTwoMonthAgo"
+            /></a></span
+        ><span class="month1"><a href="#"
+          var:date="prevMonthQueryParameters.day"
+          onclick="return onCalendarGotoDay(this);"
+          ><var:string value="monthNameOfOneMonthAgo"
+            /></a></span
+        ><span class="month0"><var:string value="monthNameOfThisMonth" /></span
+        ><span class="month1"><a href="#"
+          var:date="nextMonthQueryParameters.day"
+          onclick="return onCalendarGotoDay(this);"
+          ><var:string value="monthNameOfNextMonth"
+            /></a></span
+        ><span class="month2"><a href="#"
+          var:date="monthAfterNextMonthQueryParameters.day"
+          onclick="return onCalendarGotoDay(this);"
+          ><var:string value="monthNameOfTheMonthAfterNextMonth"
+            /></a></span
+        ></span>
+    <a href="#"
+      class="rightNavigationArrow"
+      var:date="nextMonthQueryParameters.month"
+      onclick="return onCalendarGotoDay(this);"
+      ><img rsrc:src="arrow-rit-sharp.gif"/></a>
+
+    <div id="calendarContent">
+      <table class="monthOverview">
+        <tr>
+          <var:foreach list="daysToDisplay" item="currentTableDay"
+            ><td class="header"><var:string value="labelForCurrentDayToDisplay"
+                /></td></var:foreach>
+        </tr>
+
         <var:if condition="hasHolidayInfo">
-          <var:string value="holidayInfo"
-            const:class="monthoverview_holidayinfo"
-            />
+          <tr>
+            <td class="hourOfDay" colspan="2">
+              <b><var:string value="holidayInfo.title" /></b>
+            </td>
+          </tr>
         </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 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"
+                  />
+              </var:foreach>
+            </td>
+          </tr>
+        </var:foreach> -->
+
+        <var:foreach list="rangesOf7Days" item="currentRangeOf7Days">
+          <tr>
+            <var:foreach list="currentRangeOf7Days" item="currentTableDay"
+              ><td var:class="dayCellClasses"
+                onclick="onCalendarSelectDay(event, this);"
+                ondblclick="return newEvent(this, 'event');"
+                var:day="currentTableDay.shortDateString"
+                ><span class="dayCellLabel"
+                  ><var:string value="labelForCurrentDayCell" /></span
+                  ><br /><var:foreach
+                  list="aptsForCurrentDate"
+                  item="appointment"
+                  ><var:component className="UIxCalInlineAptView"
+                    appointment="appointment"
+                    formatter="monthAptFormatter"
+                    tooltipFormatter="aptTooltipFormatter"
+                    url="appointmentViewURL"
+                    const:style="dayoverview"
+                    queryDictionary="currentDayQueryParameters"
+                    referenceDate="currentTableDay"
+                    canAccess="canAccessApt"
+                    />
+                </var:foreach></td>
+            </var:foreach>
+          </tr>
         </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>
+      </table>
+    </div>
   </container>