diff --git a/UI/Templates/ContactsUI/UIxContactEditor.wox b/UI/Templates/ContactsUI/UIxContactEditor.wox
index 5a1a6f89d..9e9dec0b3 100644
--- a/UI/Templates/ContactsUI/UIxContactEditor.wox
+++ b/UI/Templates/ContactsUI/UIxContactEditor.wox
@@ -8,12 +8,7 @@
     className="UIxPageFrame"
     title="name"
     const:popup="YES"
-
     >
-
-    <var:js-stringtable const:framework="ContactsUI.SOGo"
-      const:identifier="labels" />
-    
     <style>
       table.editsec {
       background-color: #e8e8e0;
diff --git a/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox b/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox
index b7c97bdfd..0816fcb5d 100644
--- a/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox
+++ b/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox
@@ -9,9 +9,6 @@
     const:popup="YES"
     title="name"
     >
-    <var:js-stringtable const:framework="SchedulerUI.SOGo"
-      const:identifier="labels" />
-    
     <form var:href="clientObject.baseURL" name="editform"
       onsubmit="return validateAptEditor()">
 
diff --git a/UI/Templates/SchedulerUI/UIxCalAptListView.wox b/UI/Templates/SchedulerUI/UIxCalAptListView.wox
index 341182b8c..cab3b9103 100644
--- a/UI/Templates/SchedulerUI/UIxCalAptListView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalAptListView.wox
@@ -41,13 +41,14 @@
         ></tr>
 
     <var:foreach list="fetchCoreInfos" item="currentAppointment"
-      ><tr class="tableview"
+      ><tr class="tableview appointmentRow"
         var:id="currentAppointment.uid"
         onclick="return onAppointmentClick(event);"
         ondblclick="return editDoubleClickedEvent(this);"
         oncontextmenu="return onAppointmentContextMenu(event, this);"
         var:day="currentSerialDay"
         ><td onmousedown="return false;"
+          class="subjectCell"
           ><var:string value="currentAppointment.title"
             const:escapeHTML="NO"
             /></td
diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox
index 72947064f..944e9dbf0 100644
--- a/UI/Templates/SchedulerUI/UIxCalMainView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox
@@ -46,12 +46,12 @@
           ><var:string label:value="Edit Selected Event..."/></li>
         <li
           onmousedown="return false;"
-          onmouseup="onDeleteSelectedEvent();"
+          onmouseup="deleteEvent();"
           ><var:string label:value="Delete Selected Event"/></li>
         <li class="separator"></li>
         <li
           onmousedown="return false;"
-          onmouseup="onSelectAll(this);"
+          onmouseup="onSelectAll();"
           ><var:string label:value="Select All"/></li>
         <li class="separator"></li>
         <li
@@ -66,10 +66,21 @@
     </div>
 
     <div id="leftPanel">
-      <div id="dateSelectorView"
-        ><var:component className="UIxCalDateSelector"
-          selectedDate="thisMonth"
-          /></div>
+      <div class="tabsContainer" id="schedulerTabs">
+        <ul>
+          <li target="dateSelectorView"><var:string label:value="Date" /></li>
+          <li target="calendarSelectorView"><var:string label:value="Calendars" /></li>
+        </ul>
+
+        <div id="dateSelectorView"
+          class="tab"
+          ><var:component className="UIxCalDateSelector"
+            selectedDate="thisMonth"
+            /></div>
+        <div id="calendarSelectorView"
+          class="tab"
+          >Soon...</div>
+      </div>
 
       <div id="leftDragHandle"
         class="dragHandle"
diff --git a/UI/Templates/UIxPageFrame.wox b/UI/Templates/UIxPageFrame.wox
index 04e88e4dc..2206478ea 100644
--- a/UI/Templates/UIxPageFrame.wox
+++ b/UI/Templates/UIxPageFrame.wox
@@ -17,7 +17,7 @@
           <meta name="robots" content="stop"/>
           <meta http-equiv="Content-type" content="text/html; charset=iso-8859-1"/>
           <link href="mailto:hh@skyrix.com" rev="made"/>
-
+          <link rel="shortcut icon" rsrc:href="lori_16x16.ico" type="image/x-icon" />
           <link type="text/css" rel="stylesheet" rsrc:href="generic.css" />
           <link type="text/css" rel="stylesheet" rsrc:href="dtree.css" />
           <var:if condition="hasProductSpecificCSS"
@@ -37,14 +37,16 @@
           </script>
 
           <script type="text/javascript" rsrc:src="prototype.js"> <!-- space required --></script>
-
           <script type="text/javascript" rsrc:src="generic.js"> <!-- space required --></script>
           <var:if condition="hasProductSpecificJavaScript"
-            ><script type="text/javascript" var:src="productJavaScriptURL"> <!-- space required --></script>
-          </var:if>
+            ><script type="text/javascript" var:src="productJavaScriptURL"> <!-- space required --></script
+              ></var:if>
           <var:if condition="hasPageSpecificJavaScript"
-            ><script type="text/javascript" var:src="pageJavaScriptURL"> <!-- space required --></script>
-          </var:if>
+            ><script type="text/javascript" var:src="pageJavaScriptURL"> <!-- space required --></script
+              ></var:if>
+          <var:js-stringtable
+            var:framework="productFrameworkName"
+            const:identifier="labels" />
 
           <div id="logConsole">
           </div>
@@ -152,6 +154,19 @@
               </tr>
             </table>
           </var:if>
+          <noscript>
+            <div id="noJavascriptError">
+            </div>
+            <div class="noJavascriptErrorMessage">
+              <var:string label:value="noJavascriptError"
+                /><br /><br /><a var:href="page.context.uri"
+                ><var:string label:value="noJavascriptRetry"
+                  /></a>
+            </div>
+          </noscript>
+          <script type="text/javascript">
+            initTabs();
+          </script>
         </body>
       </html>
     </var:if>