diff --git a/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox b/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox
index 663ae4713..01f274220 100644
--- a/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox
+++ b/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox
@@ -1,170 +1,47 @@
 <?xml version='1.0' standalone='yes'?>
-  <var:component
-    xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:var="http://www.skyrix.com/od/binding"
-    xmlns:const="http://www.skyrix.com/od/constant"
-    xmlns:uix="OGo:uix"
-    xmlns:rsrc="OGo:url"
-    xmlns:label="OGo:label"
-    className="UIxPageFrame"
-    const:popup="YES"
-    title="name"
-    var:toolbar="toolbar">
-    <script type="text/javascript" rsrc:src="skycalendar.js">
-    </script>
-
-    <form var:href="saveUrl" name="editform" onsubmit="return validateAptEditor();">
-      <var:if condition="hasErrorText">
-        <p style="background-color: #AA0000;"><var:string value="errorText"
-            /></p>
-        <hr />
-      </var:if>
-
-      <div id="editorTabs" class="tabsContainer">
-        <ul>
-          <li target="eventView"><var:string label:value="Event" /></li>
-          <li target="recurrenceView"><var:string label:value="Recurrence" /></li>
-          <li target="attendeesView"><var:string label:value="Attendees" /></li>
-        </ul>
-
-        <div id="eventView" class="tab">
-          <label><var:string label:value="Title" /><span class="content"
-              ><input type="text" name="summary" id="summary"
-                class="textField"
-                var:value="title"
-                /></span></label>
-          <label><var:string label:value="Location" /><span class="content"
-              ><input type="text" name="location" id="location"
-                class="textField"
-                var:value="location"
-                /></span></label>
-          <hr />
-          <span class="checkBoxList"><var:string label:value="From" />
-            <span class="content"><var:component className="UIxTimeDateControl"
-                const:controlID="startTime"
-                date="aptStartDate"
-                const:dayStartHour="0"
-                const:dayEndHour="23"
-                /><label><input class="checkBox"
-                  type="checkbox" var:selection="isAllDay"
-                  var:checked="isAllDay"
-                  /><var:string label:value="All Day"
-                  /></label></span></span>
-          <span class="checkBoxList"><var:string label:value="To" />
-            <span class="content"><var:component className="UIxTimeDateControl"
-                const:controlID="endTime"
-                date="aptEndDate"
-                const:dayStartHour="0"
-                const:dayEndHour="23"
-                /></span></span>
-          <hr />
-          <!-- label id="isPrivate"><input class="checkBox"
-          type="checkbox" var:selection="isPrivate"
-          var:checked="isPrivate"
-          /><var:string label:value="is private" /></label -->
-          <label><var:string label:value="Calendar" />
-            <span class="content"><var:popup list="availableCalendars" item="item"
-                const:onChange="onChangeCalendar(this);"
-                string="item" selection="componentOwner" /></span></label>
-          <label><var:string label:value="Privacy" />
-            <span class="content"><var:popup list="privacyClasses" item="item"
-                string="itemPrivacyText" selection="privacy"
-                /></span></label>
-          <label><var:string label:value="Priority" />
-            <span class="content"><var:popup list="priorities" item="item"
-                string="itemPriorityText" selection="priority"
-                /></span></label>
-          <label><var:string label:value="Status" />
-            <span class="content"><var:popup list="statusTypes" item="item"
-                string="itemStatusText" selection="status"
-                /></span></label>
-<!--          <span id="categoriesCB" class="checkBoxList"
-            ><var:string label:value="Categories"
-              /><span class="content categoriesContent"><var:checkbox-list
-                list="categoryItems"
-                item="item"
-                suffix="itemCategoryText"
-                selections="categories"
-                /></span></span> -->
-          <hr />
-          <label id="commentArea"><var:string label:value="Description"
-              /><textarea name="comment" var:value="comment" /></label> 
-          <label id="urlArea"><var:string label:value="URL" />
-            <span class="content"><input type="text" name="url" id="url"
-                size="40"
-                onkeyup="validateBrowseURL(this);"
-                class="textField"
-                var:value="url"
-                /><a id="browseUrlBtn" var:class="urlButtonClasses" var:href="#" onclick="return browseUrl(this, event);"><var:string value="Browse URL" /><var:string label:value="Browse URL" /></a
-                ></span></label>
-        </div>
-
-        <div id="recurrenceView" class="tab">
-          <label><var:string label:value="Cycle"
-              />
-            <span class="content"
-              ><var:popup list="cycles" item="item"
-                label:string="$cycleLabel"
-                selection="cycle"
-                const:onChange="toggleCycleVisibility(this, 'cycleSelectionFirstLevel', 0);"
-                /><span id="cycleSelectionFirstLevel"
-                ><var:popup list="cycleEnds" item="item"
-                  label:string="$item" value="item"
-                  selection="cycleEnd"
-                  const:onChange="toggleCycleVisibility(this, 'cycleSelectionSecondLevel', 'cycle_end_never');"
-                  const:id="cycle_end_mode_selection"
-                  /><span id="cycleSelectionSecondLevel"
-                  ><var:component className="UIxTimeDateControl"
-                    date="cycleUntilDate"
-                    label="foo"
-                    const:controlID="cycleUntilDate"
-                    const:displayTimeControl="NO"
-                    /></span
-                  ></span
-                ></span
-              ></label>
-        </div>
-
-        <div id="attendeesView" class="tab"
-          ><var:component className="UIxFreeBusyUserSelector"
-            const:selectorId="participants"
-            contacts="participants"
-            var:startDate="aptStartDate" var:endDate="aptEndDate" /></div>
-      </div>
-
-      <script type="text/javascript">
-        initTimeWidgets( { 'start': { 'hour': document.forms['editform']['startTime_time_hour'],
-                                      'minute': document.forms['editform']['startTime_time_minute'],
-                                      'date': document.forms['editform']['startTime_date'] },
-                           'end': { 'hour': document.forms['editform']['endTime_time_hour'],
-                                    'minute': document.forms['editform']['endTime_time_minute'],
-                                    'date': document.forms['editform']['endTime_date'] } } );
-        redisplayFreeBusyZone();
-      </script>
-      <!-- div id="buttons">
-      <input
-      type="submit"
-      class="button"
-      label:value="Save"
-      name="submitmeeting" />
-      <input
-      type="submit"
-      class="button"
-      label:value="Cancel"
-      name="cancel"
-      onclick="window.close(); return false;" />
-      <var:if condition="isUIxDebugEnabled">
-      <input type="submit"
-      class="button"
-      value="Test" name="test:method" />
-    </var:if>
-    </div -->
-      <input type="hidden" name="ical" var:value="iCalString" />
-      <!-- input type="hidden" id="jsaction" -->
-    </form>
-    <!--
-    <var:if condition="canEditComponent" const:negate="YES">
-    Forbidden ... <var:redirect const:setURL="view" />
-  </var:if>
-    -->
-  </var:component>
+<!DOCTYPE var:component>
+<var:component
+  xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:var="http://www.skyrix.com/od/binding"
+  xmlns:const="http://www.skyrix.com/od/constant"
+  xmlns:uix="OGo:uix"
+  xmlns:rsrc="OGo:url"
+  xmlns:label="OGo:label"
+  className="UIxComponentEditor"
+  var:component="event"
+  var:toolbar="toolbar"
+  var:saveURL="saveURL">
+  <label><span id="allDay" class="content"><input class="checkBox"
+        type="checkbox" var:selection="isAllDay"
+        var:checked="isAllDay"
+        /><var:string label:value="All day Event"
+        /></span></label>
+  <span class="checkBoxList"><var:string label:value="Start:" />
+    <span class="content"><var:component className="UIxTimeDateControl"
+        const:controlID="startTime"
+        date="aptStartDate"
+        const:dayStartHour="0"
+        const:dayEndHour="23"
+        /></span></span>
+  <span class="checkBoxList"><var:string label:value="End:" />
+    <span class="content"><var:component className="UIxTimeDateControl"
+        const:controlID="endTime"
+        date="aptEndDate"
+        const:dayStartHour="0"
+        const:dayEndHour="23"
+        /></span></span>
+  <hr />
+  <label><var:string label:value="Repeat:" />
+    <span class="content"><var:popup list="repeatList" item="item"
+        label:noSelectionString="repeat_NEVER"
+        const:disabledValue="-"
+        string="itemRepeatText" selection="repeat"
+        /></span></label>
+  <hr />
+  <label><var:string label:value="Reminder:" />
+    <span class="content"><var:popup list="reminderList" item="item"
+        const:disabledValue="-"
+        label:noSelectionString="reminder_NONE"
+        string="itemReminderText" selection="reminder"
+        /></span></label>
+</var:component>
diff --git a/UI/Templates/SchedulerUI/UIxCalInlineMonthAptView.wox b/UI/Templates/SchedulerUI/UIxCalInlineMonthAptView.wox
index bb289e918..de2393c88 100644
--- a/UI/Templates/SchedulerUI/UIxCalInlineMonthAptView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalInlineMonthAptView.wox
@@ -20,6 +20,6 @@
       ><span class="eventHeader"><var:string value="startHour"
           const:escapeHTML="NO" />
         <var:string value="appointment.title" const:escapeHTML="NO"
-          /></div>
+          /></span></div>
   </div>
 </div>
diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox
index c6357450f..ec44153e8 100644
--- a/UI/Templates/SchedulerUI/UIxCalMainView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox
@@ -7,6 +7,9 @@
     className="UIxPageFrame"
     title="title"
     >
+    <div class="preload" style="visibility: hidden;">
+      <img rsrc:src="event-gradient.png"/>
+    </div>
     <div class="menu" id="monthListMenu">
       <ul>
         <var:foreach list="monthMenuItems" item="monthMenuItem"
diff --git a/UI/Templates/SchedulerUI/UIxFreeBusyUserSelector.wox b/UI/Templates/SchedulerUI/UIxFreeBusyUserSelector.wox
index ad7589c98..a21b1d09b 100644
--- a/UI/Templates/SchedulerUI/UIxFreeBusyUserSelector.wox
+++ b/UI/Templates/SchedulerUI/UIxFreeBusyUserSelector.wox
@@ -1,4 +1,5 @@
 <?xml version='1.0' standalone='yes'?>
+<!DOCTYPE var:component>
   <container
     xmlns="http://www.w3.org/1999/xhtml"
     xmlns:var="http://www.skyrix.com/od/binding"
@@ -6,74 +7,4 @@
     xmlns:uix="OGo:uix"
     xmlns:rsrc="OGo:url"
     xmlns:label="OGo:label">
-    <script type="text/javascript" rsrc:src="UIxFreeBusyUserSelector.js"><!-- space --></script>
-    <script type="text/javascript">
-      freeBusySelectorId = '<var:string value="selectorId" />';
-    </script>
-    <input type="hidden"
-      var:id="selectorId"
-      var:name="selectorId"
-      var:value="initialContactsAsString" />
-    <div class="freeBusyView" var:id="freeBusyViewId">
-      <var:component className="UIxFreeBusyUserSelectorTable"
-        contacts="contacts"
-        dayStartHour="dayStartHour"
-        dayEndHour="dayEndHour"
-        startDate="startDate"
-        endDate="endDate" />
-    </div>
-    <div class="legend" onmousedown="return false;">
-      <hr />
-      <ul>
-        <li><img rsrc:src="required-participant.png"
-            /><var:string label:value="Required participant" /></li>
-        <li><img rsrc:src="optional-participant.png"
-            /><var:string label:value="Optional participant" /></li>
-        <li><img rsrc:src="chair.png"
-            /><var:string label:value="Chair" /></li>
-      </ul>
-      <ul>
-        <li><img rsrc:src="needs-action.png"
-            /><var:string label:value="Needs action" /></li>
-        <li><img rsrc:src="accepted.png"
-            /><var:string label:value="Accepted" /></li>
-        <li><img rsrc:src="declined.png"
-            /><var:string label:value="Declined" /></li>
-        <li><img rsrc:src="tentative.png"
-            /><var:string label:value="Tentative" /></li>
-      </ul>
-      <ul>
-        <li><span class="colorBox free"><!-- spacer --></span><var:string label:value="Free" /></li>
-        <li><span class="colorBox busy"><!-- spacer --></span><var:string label:value="Busy" /></li>
-        <li><span class="colorBox maybe-busy"><!-- spacer --></span><var:string label:value="Maybe busy" /></li>
-        <li><span class="colorBox noFreeBusy"><!-- spacer --></span><var:string label:value="No free-busy information" /></li>
-      </ul>
-    </div>
-    <div id="freeBusyFooter">
-      <hr />
-      <div id="freeBusyButtons">
-        <a href="#" class="button _disabled"><var:string label:value="Previous slot" /></a>
-        <a href="#" class="button _disabled"><var:string label:value="Next slot" /></a><br />
-        <a href="#" class="button _disabled"><var:string label:value="Previous hour" /></a>
-        <a href="#" class="button _disabled"><var:string label:value="Next hour" /></a>
-      </div>
-      <div id="freeBusyReplicas">
-        <label><var:string label:value="From"
-            /><var:component className="UIxTimeDateControl"
-            const:disabled="yes"
-            const:controlID="FBStartTimeReplica"
-            date="startDate"
-            const:dayStartHour="0"
-            const:dayEndHour="23"
-            /></label>
-        <label><var:string label:value="To"
-            /><var:component className="UIxTimeDateControl"
-            const:disabled="yes"
-            const:controlID="FBEndTimeReplica"
-            date="endDate"
-            const:dayStartHour="0"
-            const:dayEndHour="23"
-            /></label>
-      </div>
-    </div>
   </container>
diff --git a/UI/Templates/SchedulerUI/UIxFreeBusyUserSelectorTable.wox b/UI/Templates/SchedulerUI/UIxFreeBusyUserSelectorTable.wox
index f1e60c01b..f38461108 100644
--- a/UI/Templates/SchedulerUI/UIxFreeBusyUserSelectorTable.wox
+++ b/UI/Templates/SchedulerUI/UIxFreeBusyUserSelectorTable.wox
@@ -1,67 +1 @@
 <?xml version='1.0' standalone='yes'?>
-  <table class="freeBusy"
-    xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:var="http://www.skyrix.com/od/binding"
-    xmlns:const="http://www.skyrix.com/od/constant"
-    xmlns:uix="OGo:uix"
-    xmlns:rsrc="OGo:url"
-    xmlns:label="OGo:label">
-    <thead>
-      <tr class="freeBusyHeader1"
-        ><th class="attendees"></th
-          ><var:foreach list="daysToDisplay" item="currentDayToDisplay"
-          ><th colspan="11"><var:string value="currentFormattedDay" /></th
-            ></var:foreach
-          ></tr>
-      <tr class="freeBusyHeader2"
-        ><th class="attendees"></th
-          ><var:foreach list="daysToDisplay" item="currentDayToDisplay"
-          ><var:foreach list="hoursToDisplay" item="currentHourToDisplay"
-            ><th><var:string value="currentHourToDisplay" const:numberformat="00:"/>00</th
-              ></var:foreach
-            ></var:foreach
-          ></tr>
-      <tr class="freeBusyHeader3"
-        ><th class="attendees"></th
-          ><var:foreach list="daysToDisplay" item="currentDayToDisplay"
-          ><var:foreach list="hoursToDisplay" item="currentHourToDisplay"
-            ><th><span class="freeBusyZoneElement"><!-- space --></span><span class="freeBusyZoneElement"><!-- space --></span><span class="freeBusyZoneElement"><!-- space --></span><span class="freeBusyZoneElement"><!-- space --></span></th
-              ></var:foreach
-            ></var:foreach
-          ></tr>
-    </thead>
-    <tbody>
-      <var:foreach list="contacts" item="currentContact"
-        ><tr><td class="attendees"
-            ><var:if condition="currentContactHasStatus"
-              ><img var:src="currentContactStatusImage"
-                /></var:if
-            ><input type="text"
-              var:value="currentContactName"
-              var:uid="currentContactId"
-              class="textField" /></td
-            ><var:foreach list="daysToDisplay" item="currentDayToDisplay"
-            ><var:foreach list="hoursToDisplay" item="currentHourToDisplay"
-              ><td></td
-                ></var:foreach
-              ></var:foreach>
-        </tr></var:foreach>
-      <tr class="futureAttendee"
-        ><td class="attendees"><input type="text" class="textField"
-            readonly="readonly" /></td
-          ><var:foreach list="daysToDisplay" item="currentDayToDisplay"
-          ><var:foreach list="hoursToDisplay" item="currentHourToDisplay"
-            ><td></td
-              ></var:foreach
-            ></var:foreach
-          ></tr>
-      <tr class="attendeeModel"
-        ><td class="attendees"><input type="text" class="textField" /></td
-          ><var:foreach list="daysToDisplay" item="currentDayToDisplay"
-          ><var:foreach list="hoursToDisplay" item="currentHourToDisplay"
-            ><td></td
-              ></var:foreach
-            ></var:foreach
-          ></tr>
-    </tbody>
-  </table>
diff --git a/UI/Templates/SchedulerUI/UIxTaskEditor.wox b/UI/Templates/SchedulerUI/UIxTaskEditor.wox
index b9196e0c7..cd71c8cc9 100644
--- a/UI/Templates/SchedulerUI/UIxTaskEditor.wox
+++ b/UI/Templates/SchedulerUI/UIxTaskEditor.wox
@@ -1,178 +1,62 @@
 <?xml version='1.0' standalone='yes'?>
-  <var:component
-    xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:var="http://www.skyrix.com/od/binding"
-    xmlns:const="http://www.skyrix.com/od/constant"
-    xmlns:uix="OGo:uix"
-    xmlns:rsrc="OGo:url"
-    xmlns:label="OGo:label"
-    className="UIxPageFrame"
-    const:popup="YES"
-    title="name"
-    var:toolbar="toolbar">
-    <script type="text/javascript" rsrc:src="skycalendar.js">
-    </script>
-
-    <form var:href="saveUrl" name="editform" onsubmit="return validateTaskEditor();">
-      <var:if condition="hasErrorText">
-        <p style="background-color: #AA0000;"><var:string value="errorText"
-            /></p>
-        <hr />
-      </var:if>
-
-      <div id="editorTabs" class="tabsContainer">
-        <ul>
-          <li target="taskView"><var:string label:value="Task" /></li>
-          <li target="recurrenceView"><var:string label:value="Recurrence" /></li>
-          <li target="attendeesView"><var:string label:value="Attendees" /></li>
-        </ul>
-
-        <div id="taskView" class="tab">
-          <label><var:string label:value="Title" /><span class="content"
-              ><input type="text" name="summary" id="summary"
-                class="textField"
-                var:value="title"
-                /></span></label>
-          <label><var:string label:value="Location" /><span class="content"
-              ><input type="text" name="location" id="location"
-                class="textField"
-                var:value="location"
-                /></span></label>
-          <hr />
-          <span class="checkBoxList"><var:string label:value="Date" />
-            <span class="content"><input var:checked="hasStartDate"
-                id="startDateCB"
-                type="checkbox" class="checkBox"
-                onchange="onTimeControlCheck(this);"
-                /><var:component className="UIxTimeDateControl"
-                var:disabled="startDateDisabled"
-                const:controlID="startTime"
-                date="taskStartDate"
-                const:dayStartHour="0"
-                const:dayEndHour="23"
-                /></span></span>
-          <span class="checkBoxList"><var:string label:value="Due Time" />
-            <span class="content"><input var:checked="hasDueDate"
-                id="dueDateCB"
-                type="checkbox" class="checkBox"
-                onchange="onTimeControlCheck(this);"
-                /><var:component className="UIxTimeDateControl"
-                var:disabled="dueDateDisabled"
-                const:controlID="dueTime"
-                date="taskDueDate"
-                const:dayStartHour="0"
-                const:dayEndHour="23"
-                /></span></span>
-          <hr />
-          <!-- label id="isPrivate"><input class="checkBox"
-          type="checkbox" var:selection="isPrivate"
-          var:checked="isPrivate"
-          /><var:string label:value="is private" /></label -->
-          <label><var:string label:value="Calendar" />
-            <span class="content"><var:popup list="availableCalendars" item="item"
-                const:onChange="onChangeCalendar(this);"
-                string="item" selection="componentOwner" /></span></label>
-          <label><var:string label:value="Privacy" />
-            <span class="content"><var:popup list="privacyClasses" item="item"
-                string="itemPrivacyText" selection="privacy"
-                /></span></label>
-          <label><var:string label:value="Priority" />
-            <span class="content"><var:popup list="priorities" item="item"
-                string="itemPriorityText" selection="priority"
-                /></span></label>
-          <label><var:string label:value="Status" />
-            <span class="content"><var:popup list="statusTypes" item="item"
-                string="itemStatusText" selection="status"
-                /></span></label>
-<!--          <span id="categoriesCB" class="checkBoxList"
-            ><var:string label:value="Categories"
-              /><span class="content categoriesContent"><var:checkbox-list
-                list="categoryItems"
-                item="item"
-                suffix="itemCategoryText"
-                selections="categories"
-                /></span></span> -->
-          <hr />
-          <label id="commentArea"><var:string label:value="Description"
-              /><textarea name="comment" var:value="comment" /></label> 
-          <label id="urlArea"><var:string label:value="URL" />
-            <span class="content"><input type="text" name="url" id="url"
-                size="40"
-                onkeyup="validateBrowseURL(this);"
-                class="textField"
-                var:value="url"
-                /><a id="browseUrlBtn" var:class="urlButtonClasses" var:href="#" onclick="return browseUrl(this, event);"><var:string value="Browse URL" /><var:string label:value="Browse URL" /></a
-                ></span></label>
-        </div>
-
-        <div id="recurrenceView" class="tab">
-          <label><var:string label:value="Cycle"
-              />
-            <span class="content"
-              ><var:popup list="cycles" item="item"
-                label:string="$cycleLabel"
-                selection="cycle"
-                const:onChange="toggleCycleVisibility(this, 'cycleSelectionFirstLevel', 0);"
-                /><span id="cycleSelectionFirstLevel"
-                ><var:popup list="cycleEnds" item="item"
-                  label:string="$item" value="item"
-                  selection="cycleEnd"
-                  const:onChange="toggleCycleVisibility(this, 'cycleSelectionSecondLevel', 'cycle_end_never');"
-                  const:id="cycle_end_mode_selection"
-                  /><span id="cycleSelectionSecondLevel"
-                  ><var:component className="UIxTimeDateControl"
-                    date="cycleUntilDate"
-                    label="foo"
-                    const:controlID="cycleUntilDate"
-                    const:displayTimeControl="NO"
-                    /></span
-                  ></span
-                ></span
-              ></label>
-        </div>
-
-        <div id="attendeesView" class="tab">
-          <span class="checkBoxList" id="participantsCB"><var:string label:value="Attendees" />
-            <span class="content"><var:component className="UIxContactSelector"
-                const:selectorId="participants"
-                contacts="participants"
-                /></span></span>
-        </div>
-      </div>
-
-      <script type="text/javascript">
-        initTimeWidgets( { 'start': { 'hour': document.forms['editform']['startTime_time_hour'],
-                                      'minute': document.forms['editform']['startTime_time_minute'],
-                                      'date': document.forms['editform']['startTime_date'] },
-                           'due': { 'hour': document.forms['editform']['dueTime_time_hour'],
-                                    'minute': document.forms['editform']['dueTime_time_minute'],
-                                    'date': document.forms['editform']['dueTime_date'] } } );
-      </script>
-
-      <!-- div id="buttons">
-      <input
-      type="submit"
-      class="button"
-      label:value="Save"
-      name="submitmeeting" />
-      <input
-      type="submit"
-      class="button"
-      label:value="Cancel"
-      name="cancel"
-      onclick="window.close(); return false;" />
-      <var:if condition="isUIxDebugEnabled">
-      <input type="submit"
-      class="button"
-      value="Test" name="test:method" />
-    </var:if>
-    </div -->
-      <input type="hidden" name="ical" var:value="iCalString" />
-      <!-- input type="hidden" id="jsaction" -->
-    </form>
-    <!--
-    <var:if condition="canEditComponent" const:negate="YES">
-    Forbidden ... <var:redirect const:setURL="view" />
-  </var:if>
-    -->
-  </var:component>
+<!DOCTYPE var:component>
+<var:component
+  xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:var="http://www.skyrix.com/od/binding"
+  xmlns:const="http://www.skyrix.com/od/constant"
+  xmlns:uix="OGo:uix"
+  xmlns:rsrc="OGo:url"
+  xmlns:label="OGo:label"
+  className="UIxComponentEditor"
+  var:component="todo"
+  var:toolbar="toolbar"
+  var:saveURL="saveURL">
+  <span class="checkBoxList"><var:string label:value="Start:" />
+    <span class="content"><input var:checked="hasStartDate"
+	id="startDateCB" type="checkbox" class="checkBox"
+	onchange="onTimeControlCheck(this);"
+	/><var:component className="UIxTimeDateControl"
+	var:disabled="startDateDisabled"
+	const:controlID="startTime"
+	date="taskStartDate"
+	const:dayStartHour="0"
+	const:dayEndHour="23"
+	/></span></span>
+  <span class="checkBoxList"><var:string label:value="Due Date:" />
+    <span class="content"><input var:checked="hasDueDate"
+	id="dueDateCB" type="checkbox" class="checkBox"
+	onchange="onTimeControlCheck(this);"
+	/><var:component className="UIxTimeDateControl"
+	var:disabled="dueDateDisabled"
+	const:controlID="dueTime"
+	date="taskDueDate"
+	const:dayStartHour="0"
+	const:dayEndHour="23"
+	/></span></span>
+  <span class="checkBoxList"><var:string label:value="Status:" />
+    <span class="content"><var:popup list="statusList" item="item"
+	const:id="statusList"
+        label:noSelectionString="status_NOT-SPECIFIED"
+        string="itemStatusText" selection="status"
+        /><var:component className="UIxTimeDateControl"
+	const:displayTimeControl="0"
+	var:disabled="statusDateDisabled"
+	const:controlID="statusTime"
+	date="statusDate"
+	const:dayStartHour="0"
+	const:dayEndHour="23"
+	/><input type="text" name="statusPercent"
+	id="statusPercent"
+	class="textField"
+	var:value="statusPercent"
+	var:disabled="statusPercentDisabled"
+	/><var:string label:value="% complete"
+	/></span></span>
+  <hr />
+  <label><var:string label:value="Repeat:" />
+    <span class="content"><var:popup list="repeatList" item="item"
+        label:noSelectionString="repeat_NEVER"
+        const:disabledValue="-"
+        string="itemRepeatText" selection="repeat"
+        /></span></label>
+</var:component>
diff --git a/UI/Templates/SchedulerUI/UIxTimeDateControl.wox b/UI/Templates/SchedulerUI/UIxTimeDateControl.wox
index ec427222a..c16235b30 100644
--- a/UI/Templates/SchedulerUI/UIxTimeDateControl.wox
+++ b/UI/Templates/SchedulerUI/UIxTimeDateControl.wox
@@ -17,7 +17,8 @@
       />
     <var:if condition="displayTimeControl">
       <var:if condition="disabled">
-        <select var:shadow-value="hour" var:name="hourSelectId" const:disabled="disabled">
+        <select var:shadow-value="hour"
+	  var:id="hourSelectId" var:name="hourSelectId" const:disabled="disabled">
           <var:foreach list="selectableHours" item="hourOption"
             ><var:if condition="isCurrentHour"
               ><option var:value="hourValue" selected="selected"
@@ -28,7 +29,8 @@
                   /></option></var:if>
           </var:foreach
             ></select>
-        <select var:shadow-value="minute" var:name="minuteSelectId" const:disabled="disabled">
+        <select var:shadow-value="minute"
+	  var:id="minuteSelectId" var:name="minuteSelectId" const:disabled="disabled">
           <var:foreach list="selectableMinutes" item="minuteOption"
             ><var:if condition="isCurrentMinute"
               ><option var:value="minuteValue" selected="selected"
@@ -43,7 +45,7 @@
       </var:if
 
         ><var:if condition="disabled" const:negate="YES">
-        <select var:shadow-value="hour" var:name="hourSelectId">
+        <select var:shadow-value="hour" var:id="hourSelectId" var:name="hourSelectId">
           <var:foreach list="selectableHours" item="hourOption"
             ><var:if condition="isCurrentHour"
               ><option var:value="hourValue" selected="selected"
@@ -54,7 +56,7 @@
                   /></option></var:if>
           </var:foreach
             ></select>
-        <select var:shadow-value="minute" var:name="minuteSelectId">
+        <select var:shadow-value="minute" var:id="minuteSelectId" var:name="minuteSelectId">
           <var:foreach list="selectableMinutes" item="minuteOption"
             ><var:if condition="isCurrentMinute"
               ><option var:value="minuteValue" selected="selected"
diff --git a/UI/Templates/UIxToolbar.wox b/UI/Templates/UIxToolbar.wox
index 9b9f7836f..5ba95b34b 100644
--- a/UI/Templates/UIxToolbar.wox
+++ b/UI/Templates/UIxToolbar.wox
@@ -19,15 +19,20 @@
                 ><img class="buttonImage"
                   var:src="buttonImage"
                   var:alt="buttonInfo.image"
-                  /><br
+                  /><var:if condition="hasMenu"
+                  ><img class="buttonMenuArrow"
+                    rsrc:src="arrow-dwn-sharp.gif"
+                    var:alt="buttonInfo.image"
+                    /></var:if
+                  ><br
                   /><span class="buttonLabel"
                   ><var:string
                     value="buttonLabel"
                     /></span
-              ></span
-                ></a>
-          </var:if>
-          <var:if condition="isButtonEnabled"
+                  ></span
+                ></a
+              ></var:if
+            ><var:if condition="isButtonEnabled"
             const:negate="YES"
             ><span class="disabledToolbarButton"
               ><img class="buttonImage"
@@ -38,15 +43,15 @@
                 ><var:string
                   value="buttonLabel"
                   /></span
-                ></span>
-          </var:if>
-        </var:foreach>
+                ></span
+              ></var:if
+            ></var:foreach>
         <var:if condition="isLastGroup" const:negate="YES"
           ><span class="toolbarSeparator"
             ><var:entity const:name="nbsp"
-           /></span
-        ></var:if>
-      </var:foreach>
+              /></span
+            ></var:if>
+        </var:foreach>
       <img id="progressIndicator" rsrc:src="busy.gif" />
     </div>
   </var:if>