diff --git a/UI/Templates/MainUI/SOGoUserHomePage.wox b/UI/Templates/MainUI/SOGoUserHomePage.wox
index c6e38e687..a38fe6935 100644
--- a/UI/Templates/MainUI/SOGoUserHomePage.wox
+++ b/UI/Templates/MainUI/SOGoUserHomePage.wox
@@ -1,104 +1,63 @@
 <?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:rsrc="OGo:url"
-               xmlns:label="OGo:label"
-               xmlns:uix="OGo:uix"
-               className="UIxPageFrame"
-               title="name"
->
-  <var:if condition="canAccess" const:negate="YES">
-    <var:string label:value="Forbidden" const:style="window_label" />
-  </var:if>
-  <var:if condition="canAccess">
-    <table id="skywintable"
-           class="wintable"
-           cellspacing="0"
-           cellpadding="5"
-           width="100%"
+  <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:rsrc="OGo:url"
+    xmlns:label="OGo:label"
+    xmlns:uix="OGo:uix"
+    className="UIxPageFrame"
+    title="name"
     >
-      <tr>
-        <td class="window_label"><var:string label:value="Homepage"/></td>
-      </tr>
-      <tr>
-        <td class="wincontent">
-          <p class="homepagefont">
-            <var:if condition="isNotAllowedToChangeInternetAccess">
-              <var:string label:value="Internet access unauthorized and"
-              /> <var:popup const:name="allowinternet"
-                            list="internetAccessStates"
-                            item="item"
-                            label:string="$itemInternetAccessStateText"
-                            label:selection="internetAccessState_0"
-                            const:disabled="YES"
-                 />
-            </var:if>
-            <var:if condition="isNotAllowedToChangeInternetAccess"
-                    const:negate="YES"
-            >
-              <var:string label:value="Internet access authorized and"
-              /> <var:popup const:name="allowinternet"
-                            list="internetAccessStates"
-                            item="item"
-                            label:string="$itemInternetAccessStateText"
-                            selection="internetAccessState"
-                            const:onchange="toggleInternetAccessState(this)"
-                 />
-            </var:if>
-            <br />
-            <var:string label:value="Automatic vacation messages activation" />:
-            <input type="checkbox"
-                   var:selection="isVacationMessageEnabledForInternet"
-                   var:checked="isVacationMessageEnabledForInternet"
-                   disabled="YES"
-            /> <var:string label:value="Internet" />
-            <input type="checkbox"
-                   var:selection="isVacationMessageEnabledForIntranet"
-                   var:checked="isVacationMessageEnabledForIntranet"
-                   disabled="YES"
-            /> <var:string label:value="Intranet" />
-              <input type="submit"
-                     value="SaveInternetAccessState"
-                     name="saveInternetAccessState:method"
-                     style="display: none;"
-              />
-          </p>
-          <p>
-            <var:component className="UIxCalScheduleOverview"
-                           clientObject="calendarFolder"
-            />
-          </p>
-        </td>
-      </tr>
-      <tr>
-        <td class="wincontent">
-          <table border="0" width="100%" cellpadding="0" cellspacing="0">
-            <tr>
-              <td colspan="2">
-              </td>
-            </tr>
-            <tr bgcolor="#F5F5E9">
-              <td align="left" width="10">
-                <var:entity const:name="nbsp"/>
-              </td>
-              <td align="right">
-                <img border="0"
-                     alt=""
-                     rsrc:src="corner_right.gif"
+    <var:if condition="canAccess" const:negate="YES">
+      <var:string label:value="Forbidden" const:style="window_label" />
+    </var:if>
+    <var:if condition="canAccess">
+      <table id="skywintable"
+        class="wintable"
+        cellspacing="0"
+        cellpadding="5"
+        width="100%"
+        >
+        <tr>
+          <td class="window_label"><var:string label:value="Homepage"/></td>
+        </tr>
+        <tr>
+          <td class="wincontent">
+            <p class="homepagefont">
+              <var:component className="UIxCalScheduleOverview"
+                clientObject="calendarFolder"
                 />
-              </td>
-            </tr>
-            <tr>
-              <td colspan="2" bgcolor="#F5F5E9">
-                <table border="0" width="100%" cellpadding="10" cellspacing="0">
-                  <tr/>
-                </table>
-              </td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-    </table>
-  </var:if>
-</var:component>
+            </p>
+          </td>
+        </tr>
+        <tr>
+          <td class="wincontent">
+            <table border="0" width="100%" cellpadding="0" cellspacing="0">
+              <tr>
+                <td colspan="2">
+                </td>
+              </tr>
+              <tr bgcolor="#F5F5E9">
+                <td align="left" width="10">
+                  <var:entity const:name="nbsp"/>
+                </td>
+                <td align="right">
+                  <img border="0"
+                    alt=""
+                    rsrc:src="corner_right.gif"
+                    />
+                </td>
+              </tr>
+              <tr>
+                <td colspan="2" bgcolor="#F5F5E9">
+                  <table border="0" width="100%" cellpadding="10" cellspacing="0">
+                    <tr/>
+                  </table>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </var:if>
+  </var:component>
diff --git a/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox b/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox
index a805ff5e3..5500bd9e6 100644
--- a/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox
+++ b/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox
@@ -36,7 +36,7 @@
             type="checkbox" var:selection="isPrivate"
             var:checked="isPrivate"
             /><var:string label:value="is private" /></label>
-        <span class="checkBoxList"><var:string label:value="Start time" />
+        <span class="checkBoxList"><var:string label:value="Start Time" />
           <span class="content"><var:component className="UIxTimeDateControl"
             const:controlID="startTime"
             date="aptStartDate"
@@ -45,7 +45,7 @@
             /></span></span>
         <a class="button" href="#" onclick="return toggleDetails();" id="detailsButton"
           ><var:string label:value="Show Details" /></a>
-        <span class="checkBoxList"><var:string label:value="End time" />
+        <span class="checkBoxList"><var:string label:value="End Time" />
           <span class="content"><var:component className="UIxTimeDateControl"
             const:controlID="endTime"
             date="aptEndDate"
@@ -85,7 +85,7 @@
               ></span
             ></label>
         
-        <span class="checkBoxList" id="participantsCB"><var:string label:value="Participants" />
+        <span class="checkBoxList" id="participantsCB"><var:string label:value="Attendees" />
           <span class="content"><var:component className="UIxContactSelector"
               const:selectorId="participants"
               contacts="participants"
diff --git a/UI/WebServerResources/SchedulerUI.css b/UI/WebServerResources/SchedulerUI.css
index 03bea5702..5e50c4b0c 100644
--- a/UI/WebServerResources/SchedulerUI.css
+++ b/UI/WebServerResources/SchedulerUI.css
@@ -180,32 +180,33 @@ DIV#calendarView A
   border-bottom: 1px solid #aaa;
 }
 
-#dateSelector #header
+#dateSelector > .header
 { background: #efefef;
   width: 100%;
+  white-space: nowrap;
   vertical-align: middle;
   text-align: center;
   padding: .2em 0px;
   margin: 0px;
   border: 0px; }
 
-#dateSelector #header A
+#dateSelector > .header A
 {
   width: 1em;
   padding: .4em .2em;
 }
 
-#dateSelector #header #leftArrow
+#dateSelector > .header #leftArrow
 {
   float: left;
 }
 
-#dateSelector #header #rightArrow
+#dateSelector > .header #rightArrow
 {
   float: right;
 }
 
-#dateSelector #header SPAN
+#dateSelector > .header SPAN
 { cursor: default;
   font-size: medium;
   vertical-align: middle;
@@ -213,7 +214,7 @@ DIV#calendarView A
   border: 1px solid transparent;
   margin: .5em .2em; }
 
-#dateSelector #header SPAN:hover
+#dateSelector > .header SPAN:hover
 { border-left: 1px solid #fff;
   border-top: 1px solid #fff;
   border-right: 1px solid #ccc;
diff --git a/UI/WebServerResources/UIxAppointmentEditor.css b/UI/WebServerResources/UIxAppointmentEditor.css
index 0ae5ad38f..69d42737a 100644
--- a/UI/WebServerResources/UIxAppointmentEditor.css
+++ b/UI/WebServerResources/UIxAppointmentEditor.css
@@ -6,7 +6,7 @@ DIV.appointmentLabel
   position: relative;
   line-height: 1.8em;
   text-align: right;
-  width: 10em; }
+  width: 3em; }
 
 DIV.appointmentRightLabel
 { display: inline;
@@ -76,13 +76,13 @@ INPUT#summary, INPUT#location,
 SPAN.content
 { position: absolute;
   top: 0px;
-  left: 10em;
+  left: 8em;
   right: 0px; }
 
 DIV#details TEXTAREA
 { position: absolute;
   top: 0px;
-  left: 10em;
+  left: 8em;
   vertical-align: bottom;
   height: 5em;
   right: 0px;
@@ -91,7 +91,7 @@ DIV#details TEXTAREA
 DIV#details SELECT
 { position: absolute;
   top: 0px;
-  left: 10em; }
+  left: 8em; }
 
 LABEL#isPrivate, LABEL#conflictsLabel
 { position: absolute;
diff --git a/UI/WebServerResources/UIxTaskEditor.css b/UI/WebServerResources/UIxTaskEditor.css
index 0ae5ad38f..641a82d8b 100644
--- a/UI/WebServerResources/UIxTaskEditor.css
+++ b/UI/WebServerResources/UIxTaskEditor.css
@@ -4,9 +4,9 @@ BODY
 DIV.appointmentLabel
 { display: block;
   position: relative;
-  line-height: 1.8em;
+  line-height: 1.7.5em;
   text-align: right;
-  width: 10em; }
+  width: 7.5em; }
 
 DIV.appointmentRightLabel
 { display: inline;
@@ -76,13 +76,13 @@ INPUT#summary, INPUT#location,
 SPAN.content
 { position: absolute;
   top: 0px;
-  left: 10em;
+  left: 7.5em;
   right: 0px; }
 
 DIV#details TEXTAREA
 { position: absolute;
   top: 0px;
-  left: 10em;
+  left: 7.5em;
   vertical-align: bottom;
   height: 5em;
   right: 0px;
@@ -91,7 +91,7 @@ DIV#details TEXTAREA
 DIV#details SELECT
 { position: absolute;
   top: 0px;
-  left: 10em; }
+  left: 7.5em; }
 
 LABEL#isPrivate, LABEL#conflictsLabel
 { position: absolute;