diff --git a/UI/WebServerResources/SchedulerUI.css b/UI/WebServerResources/SchedulerUI.css
index 452f9a1f1..46c7b7ad9 100644
--- a/UI/WebServerResources/SchedulerUI.css
+++ b/UI/WebServerResources/SchedulerUI.css
@@ -36,16 +36,15 @@ DIV#tasksListView H2
 DIV#tasksListView LABEL
 { margin: .25em; }
 
-UL#tasksList
-{ position: absolute;
-  cursor: default;
-  width: 100%;
+DIV#calendarsList
+{ height: 100%;
+  padding: 0px;
+  margin: 0px; }
+
+UL#tasksList, UL#uixselector-calendarsList-display
+{ cursor: default;
   margin: .25px;
   padding: 0px;
-  top: 3em;
-  left: .25em;
-  right: .25em;
-  bottom: .25em;
   overflow: auto;
   border-bottom: 1px solid #fff;
   border-right: 1px solid #fff;
@@ -57,6 +56,18 @@ UL#tasksList
   list-style-type: none;
   list-style-image: none; }
 
+UL#tasksList
+{ position: absolute;
+  width: 100%;
+  top: 3em;
+  left: .25em;
+  right: .25em;
+  bottom: .25em; }
+
+UL#uixselector-calendarsList-display
+{ height: 10.5em;
+  margin: 0px; }
+
 UL#tasksList LI
 { white-space: nowrap; }
 
@@ -143,7 +154,6 @@ DIV#calendarView A
 
 #dateSelector
 {
-  width: 100%;
   margin: 0px auto;
   background: #fff;
   border-top: 1px solid #fff; 
@@ -245,19 +255,19 @@ TABLE#appointmentsList
 { width: auto; }
 
 #dateSelector TD._selected,
-UL#tasksList LI._selected,
+UL > LI._selected,
 TABLE#appointmentsList TR._selected TD
 { 
-  background: #4b6983;
-  color: #fff;
+  background: #4b6983 !important;
+  color: #fff !important;
 }
 
 ._unfocused#dateSelector TD._selected,
-UL._unfocused#tasksList LI._selected,
+UL._unfocused > LI._selected,
 TABLE._unfocused#appointmentsList TR._selected TD
 { 
-  background: #dbdad5;
-  color: #fff;
+  background: #dbdad5 !important;;
+  color: #fff !important;;
 }
 
 TABLE.dayOverview,
diff --git a/UI/WebServerResources/generic.css b/UI/WebServerResources/generic.css
index ea2280f9d..90891e93f 100644
--- a/UI/WebServerResources/generic.css
+++ b/UI/WebServerResources/generic.css
@@ -684,7 +684,7 @@ DIV.tabsContainer
   -moz-border-right-colors: ThreeDDarkShadow ThreeDShadow transparent;
   -moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow transparent; }
 
-DIV.tabsContainer UL
+DIV.tabsContainer > UL
 { cursor: default;
   list-style-type: none;
   list-style-image: none;
@@ -692,7 +692,7 @@ DIV.tabsContainer UL
   margin-top: -1.5em;
   padding: 0px; }
 
-DIV.tabsContainer UL LI
+DIV.tabsContainer > UL LI
 { z-index: 3;
   float: left;
   padding: 0px .5em;
@@ -707,21 +707,22 @@ DIV.tabsContainer UL LI
   background: #fff;
   background: #c4c2bd; }
 
-DIV.tabsContainer UL LI.first,
-DIV.tabsContainer UL LI.active
+DIV.tabsContainer > UL LI.first,
+DIV.tabsContainer > UL LI.active
 { border-left: 2px solid #fffffb;
   margin-left: -2px;
   -moz-border-left-colors: -moz-buttonhoverface ThreeDHighlight; }
 
-DIV.tabsContainer UL LI.active
+DIV.tabsContainer > UL LI.active
 { z-index: 5;
   background: #dbdad5;
   padding-top: 2px;
   padding-bottom: 2px;
   margin-top: -2px; }
 
-DIV.tabsContainer DIV.tab
+DIV.tabsContainer > DIV.tab
 { position: absolute;
+  overflow: auto;
   top: .5em;
   left: .5em;
   right: .5em;