diff --git a/UI/Scheduler/UIxCalFilterPanel.m b/UI/Scheduler/UIxCalFilterPanel.m
index 1767c018e..43437336a 100644
--- a/UI/Scheduler/UIxCalFilterPanel.m
+++ b/UI/Scheduler/UIxCalFilterPanel.m
@@ -36,7 +36,7 @@ static NSArray *filters = nil;
 + (void) initialize
 {
   static NSString *quals[]
-    = {@"view_all", @"view_today", @"view_next7", @"view_next14",
+    = {@"view_today", @"view_all", @"view_next7", @"view_next14",
        @"view_next31", @"view_thismonth", @"view_future",
        @"view_selectedday" };
 
diff --git a/UI/Templates/MailerUI/UIxMailListView.wox b/UI/Templates/MailerUI/UIxMailListView.wox
index f6b566ab6..5ebe71cf9 100644
--- a/UI/Templates/MailerUI/UIxMailListView.wox
+++ b/UI/Templates/MailerUI/UIxMailListView.wox
@@ -58,7 +58,7 @@
             ></tr>
         <var:if condition="showsAllMessages" const:negate="YES"
           ><tr class="tableview"
-            ><td colspan="6" class="tbtv_navcell" align="right"
+            ><td colspan="6" class="tbtv_navcell"
               ><var:if condition="hasPrevious">
                 <a href="#"
                   onclick="openMailboxAtIndex(this);"
diff --git a/UI/Templates/SchedulerUI/UIxCalAptListView.wox b/UI/Templates/SchedulerUI/UIxCalAptListView.wox
index d5336ac3e..9e894e5a6 100644
--- a/UI/Templates/SchedulerUI/UIxCalAptListView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalAptListView.wox
@@ -43,12 +43,13 @@
     <var:foreach list="fetchCoreInfos" item="currentAppointment"
       ><tr class="tableview"
         var:id="currentAppointment.uid"
-        onclick="return onRowClick(event);"
+        onclick="return onAppointmentClick(event);"
         ondblclick="return editDoubleClickedEvent(this);"
         oncontextmenu="return onAppointmentContextMenu(event, this);"
+        var:day="currentSerialDay"
         ><td onmousedown="return false;"
-          var:title="currentAppointment.title"
-          ><var:string value="currentTitle" const:escapeHTML="NO"
+          ><var:string value="currentAppointment.title"
+            const:escapeHTML="NO"
             /></td
           ><td onmousedown="return false;"
           ><var:string value="currentStartTime"/></td
diff --git a/UI/Templates/SchedulerUI/UIxCalDateSelector.wox b/UI/Templates/SchedulerUI/UIxCalDateSelector.wox
index 9b6327b06..3d3cfea97 100644
--- a/UI/Templates/SchedulerUI/UIxCalDateSelector.wox
+++ b/UI/Templates/SchedulerUI/UIxCalDateSelector.wox
@@ -5,15 +5,6 @@
     xmlns:rsrc="OGo:url"
     xmlns:label="OGo:label"
     id="dateSelector">
-
-<!--  const:style="weekcolumnsview_cal"
-const:headerStyle="weekcolumnsview_cal_title"
-const:weekStyle="weekcolumnsview_cal_week"
-:dayHeaderStyle="weekcolumnsview_cal_day_header"
-:dayBodyStyle="weekcolumnsview_cal_content"
-:todayBodyStyle="weekcolumnsview_cal_content_hilite"
-:inactiveDayBodyStyle="weekcolumnsview_cal_content_dimmed" -->
-
     <div id="header">
       <a href="#"
         id="leftArrow"
@@ -21,9 +12,16 @@ const:weekStyle="weekcolumnsview_cal_week"
         onclick="return onDateSelectorGotoMonth(this);"
         ><img id="previous" rsrc:src="arrow-lft-sharp.gif" />
       </a
-        ><span id="monthLabel">
-        <var:string value="headerString" />
-      </span>
+        ><span id="monthLabel"
+        onmousedown="return false;"
+        var:month="headerMonthValue"
+        onclick="popupMonthMenu(event, 'monthListMenu');"
+        ><var:string value="headerMonthString"
+          /></span><span id="yearLabel"
+        onmousedown="return false;"
+        onclick="popupMonthMenu(event, 'yearListMenu');"
+        ><var:string value="headerYearString"
+          /></span>
       <a href="#"
         id="rightArrow"
         var:date="nextMonthAsString"
diff --git a/UI/Templates/SchedulerUI/UIxCalDayView.wox b/UI/Templates/SchedulerUI/UIxCalDayView.wox
index 3e3324e3f..cb89c1fc2 100644
--- a/UI/Templates/SchedulerUI/UIxCalDayView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalDayView.wox
@@ -44,9 +44,7 @@
         <tr>
           <td class="nullHeader">
           </td>
-          <td class="header">
-            coucou
-          </td>
+          <td class="header"><var:string value="labelForDay"/> </td>
         </tr>
 
         <var:if condition="hasHolidayInfo">
diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox
index f96b6feb7..72947064f 100644
--- a/UI/Templates/SchedulerUI/UIxCalMainView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox
@@ -8,8 +8,31 @@
     title="title"
     popup="isPopup"
     >
+    <div class="menu" id="monthListMenu">
+      <ul>
+        <var:foreach list="monthMenuItems" item="monthMenuItem"
+          ><li
+            onmousedown="return false;"
+            onclick="return onMonthMenuItemClick(this);"
+            var:month="monthMenuItem"
+            ><var:string value="monthMenuItemLabel" /></li>
+        </var:foreach
+          ></ul>
+    </div>
+    
+    <div class="menu" id="yearListMenu">
+      <ul>
+        <var:foreach list="yearMenuItems" item="yearMenuItem"
+          ><li
+            onmousedown="return false;"
+            onclick="return onYearMenuItemClick(this);"
+            ><var:string value="yearMenuItem" /></li>
+        </var:foreach
+        ></ul>
+    </div>
+
     <div class="menu" id="appointmentsListMenu">
-      <ul id="sourceList">
+      <ul>
         <li
           onmousedown="return false;"
           onmouseup="newEvent(this);"><var:string label:value="New Event..."/></li>
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index c29299616..a36eb1b39 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -248,8 +248,8 @@ function markMailInWindow(win, msguid, markread) {
   msgDiv = win.document.getElementById("div_" + msguid);
   if (msgDiv) {
     if (markread) {
-      removeClassName(msgDiv, 'mailer_unreadmailsubject');
-      addClassName(msgDiv, 'mailer_readmailsubject');
+      msgDiv.removeClassName("mailer_unreadmailsubject");
+      msgDiv.addClassName("mailer_readmailsubject");
       msgDiv = win.document.getElementById("unreaddiv_" + msguid);
       if (msgDiv)
         {
@@ -266,8 +266,8 @@ function markMailInWindow(win, msguid, markread) {
         }
     }
     else {
-      removeClassName(msgDiv, 'mailer_readmailsubject');
-      addClassName(msgDiv, 'mailer_unreadmailsubject');
+      msgDiv.removeClassName('mailer_readmailsubject');
+      msgDiv.addClassName('mailer_unreadmailsubject');
       msgDiv = win.document.getElementById("readdiv_" + msguid);
       if (msgDiv)
         {
diff --git a/UI/WebServerResources/SchedulerUI.css b/UI/WebServerResources/SchedulerUI.css
index 846e86f0a..84c510485 100644
--- a/UI/WebServerResources/SchedulerUI.css
+++ b/UI/WebServerResources/SchedulerUI.css
@@ -42,7 +42,7 @@ DIV#appointmentsListView
   position: absolute;
   background: #fff;
   width: 100%;
-  height: 18em;
+  height: 15.7em;
   top: 2em;
   overflow: auto;
 }
@@ -111,33 +111,31 @@ DIV#calendarView A
 #dateSelector #header
 { background: #efefef;
   width: 100%;
+  vertical-align: middle;
   text-align: center;
-  padding: 0px;
-  border: 0px;
-  margin: 0px; }
+  padding: .2em 0px;
+  margin: 0px;
+  border: 0px; }
 
 #dateSelector #header A
 {
-  position: absolute;
-  top: 1em;
+  position: relative;
   width: 1em;
 }
 
-#leftArrow
-{
-  left: 1em;
-}
-
-#rightArrow
-{
-  right: 1em;
-}
-
-#dateSelector #header #monthLabel
-{ font-size: medium;
+#dateSelector #header SPAN
+{ cursor: default;
+  font-size: medium;
   vertical-align: middle;
   font-weight: bold;
-  margin: 0px; }
+  border: 1px solid transparent;
+  margin: .5em .2em; }
+
+#dateSelector #header SPAN:hover
+{ border-left: 1px solid #fff;
+  border-top: 1px solid #fff;
+  border-right: 1px solid #ccc;
+  border-bottom: 1px solid #ccc; }
 
 #dateSelector .dayOfWeek
 { color: #00f; }
@@ -189,6 +187,9 @@ DIV#calendarView A
   color: #fff;
 }
 
+TABLE#appointmentsList
+{ width: auto; }
+
 TABLE#appointmentsList TR._selected TD
 { 
   background: #4b6983;
@@ -275,3 +276,14 @@ DIV#calendarContent
   right: 0px;
   overflow: auto;
 }
+
+.menu LI.currentMonth,
+.menu LI.currentYear
+{
+  border-top: 1px solid #aaa;
+  border-left: 1px solid #aaa;
+  border-bottom: 1px solid #fff;
+  border-right: 1px solid #fff;
+  background: #ccc;
+  color: #222;
+}