diff --git a/UI/Templates/SchedulerUI/UIxCalDateSelector.wox b/UI/Templates/SchedulerUI/UIxCalDateSelector.wox
index f266e920f..f5650f7b9 100644
--- a/UI/Templates/SchedulerUI/UIxCalDateSelector.wox
+++ b/UI/Templates/SchedulerUI/UIxCalDateSelector.wox
@@ -36,11 +36,10 @@
           ></var:month-label>
       <var:month-title class="contentStyle"
         ><span var:class="extraStyle"
-          ><a href="#"
-            onclick="return onDaySelect(this);"
-            var:day="currentDay.shortDateString"
-            ><var:string value="currentDay.dayOfMonth"/></a
-            ></span
+	       var:day="currentDay.shortDateString" 
+	       onclick="return onDaySelect(this);"
+          ><var:string value="currentDay.dayOfMonth"/>
+            </
           ></var:month-title
         ></var:month-overview>
   </div>
diff --git a/UI/WebServerResources/SchedulerUI.css b/UI/WebServerResources/SchedulerUI.css
index 7ea3c9b41..1d993668d 100644
--- a/UI/WebServerResources/SchedulerUI.css
+++ b/UI/WebServerResources/SchedulerUI.css
@@ -220,41 +220,40 @@ TABLE#dateSelectorTable
 #dateSelector TABLE,
 #dateSelector TABLE TABLE
 { border-collapse: collapse;
+  text-align: center;
   margin: 0px auto;
   width: 100%; }
 
-#dateSelector TABLE#dateSelectorTable TD TABLE TD
-{ width: 0px; /* temp hack */ }
+TABLE#dateSelectorTable TD TABLE TD
+{ width: 5px; /* temp hack */ }
 
-#dateSelector TABLE#dateSelectorTable TD TABLE TD.activeDay,
-#dateSelector TABLE#dateSelectorTable TD TABLE TD.inactiveDay,
-#dateSelector TABLE#dateSelectorTable TD TABLE TD.dayOfToday
-{ width: 1em; }
+TABLE#dateSelectorTable TD TABLE TD.activeDay,
+TABLE#dateSelectorTable TD TABLE TD.inactiveDay,
+TABLE#dateSelectorTable TD TABLE TD.dayOfToday
+{ width: 100%; }
 
-#dateSelector TABLE TABLE TD
+#dateSelector TABLE TABLE TD.activeDay,
+#dateSelector TABLE TABLE TD.inactiveDay,
+#dateSelector TABLE TABLE TD.dayOfToday
 { cursor: pointer;
   margin: 0px;
   padding: 0px;
-  border: 1px solid #fff; 
-  text-align: center; }
+  border: 1px solid #fff; }
 
-#dateSelector TABLE TABLE TD:hover
+#dateSelectorTable TABLE TD.activeDay:hover,
+#dateSelectorTable TABLE TD.inactiveDay:hover
 { border: 1px solid #deebf7; }
 
-#dateSelector TD SPAN
-{ text-align: center;
-  display: block; }
+#dateSelectorTable TABLE TD.activeDay:active,
+#dateSelectorTable TABLE TD.inactiveDay:active
+{ background-color: #ddd; }
 
-#dateSelector TD SPAN A
-{ color: #000;
-  background: inherit;
-  text-decoration: none; }
+#dateSelectorTable TD SPAN
+{ display: block;
+  color: #000;
+  background: inherit; }
 
-#dateSelector TD:active
-{ background-color: #ddd;
-  border: 1px solid #deebf7; }
-
-#dateSelector TD.inactiveDay A
+#dateSelector TD.inactiveDay SPAN
 { color: #dedfde; }
 
 #dateSelector TD.dayOfToday
@@ -264,7 +263,7 @@ TABLE#dateSelectorTable
 #dateSelector TD.dayOfToday._selected
 { background-color: #4b6983; }
 
-#dateSelector TD._selected A
+#dateSelectorTable TABLE TD._selected SPAN
 { color: #fff; }
 
 TABLE#eventsList
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index 8ffd87ce9..550344dc5 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -804,9 +804,9 @@ function changeCalendarDisplay(data, newView) {
                     document.selectedDate.deselect();
 	
                 // Select day in date selector
-                var selectedLink = $$('table#dateSelectorTable a[day='+day+']');
+                var selectedLink = $$('table#dateSelectorTable span[day='+day+']');
                 if (selectedLink.length > 0) {
-                    selectedCell = selectedLink[0].up(1);
+                    selectedCell = selectedLink[0].getParentWithTagName("td");
                     selectedCell.selectElement();
                     document.selectedDate = selectedCell;
                 }
@@ -1178,8 +1178,7 @@ function calendarDisplayCallback(http) {
             observer = $("monthDaysView");
         }
         initMenu($("currentViewMenu"), menu);
-        observer.observe("contextmenu", function(event) {
-                popupMenu(event, 'currentViewMenu', this); });
+        observer.observe("contextmenu", onMenuCurrentView);
 		
         var contentView;
         if (currentView == "monthview")
@@ -1766,6 +1765,10 @@ function onMenuSharing(event) {
     }
 }
 
+function onMenuCurrentView(event) {
+    popupMenu(event, 'currentViewMenu', this);
+}
+
 function configureDragHandles() {
     var handle = $("verticalDragHandle");
     if (handle) {
@@ -1784,7 +1787,7 @@ function configureDragHandles() {
 
 function initCalendarSelector() {
     var selector = $("calendarSelector");
-    updateCalendarStatus();
+    updateCalendarStatus(); // triggers the initial events refresh
     selector.changeNotification = updateCalendarsList;
 
     var list = $("calendarList");