diff --git a/ChangeLog b/ChangeLog
index 00c96993d..e392f283f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-08-14  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/Templates: put the templates related to SchedulerUI in its
+	own directory.
+
 	* SoObjects/Contacts/NGLdapEntry+Contact.m ([NGLdapEntry
 	-asDictionaryWithAttributeNames:withUID:andCName:cName]): add an
 	entry for "uid" with the field name representing the login name of
diff --git a/UI/Templates/AnaisUI/AnaisAttendeeSelector.wox b/UI/Templates/AnaisUI/AnaisAttendeeSelector.wox
new file mode 100644
index 000000000..410f74d9a
--- /dev/null
+++ b/UI/Templates/AnaisUI/AnaisAttendeeSelector.wox
@@ -0,0 +1,62 @@
+<?xml version='1.0' standalone='yes'?>
+<span
+  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"
+  class="aptview_text"
+>
+  <script language="JavaScript">
+    <var:string value="jsCode" const:escapeHTML="NO" />
+  </script>
+  <var:component className="AnaisSelector"
+                 label:title="Search in Anais"
+                 var:windowId="windowId"
+                 var:division="division"
+                 var:callback="callbackName" />
+  <var:if condition="withAddressBook">
+    <var:component className="UIxContactSelector"
+                   label:title="Search in Addressbook"
+                   var:windowId="windowId"
+                   var:callback="callbackName" />
+  </var:if>
+  <hr />
+  <table var:id="tableId">
+    <var:if condition="showDefaultAttendees">
+      <tr>
+        <td><input type="checkbox"
+                   checked="YES"
+                   var:value="combinedInfoForUser"
+                   var:id="emailForUser"
+                   var:name="checkboxId"
+             /></td>
+        <td><var:string value="cnForUser" /></td>
+      </tr>
+    </var:if>
+
+    <var:foreach list="attendees" item="attendee">
+      <tr>
+        <var:if condition="withCN">
+          <td><input type="checkbox"
+                     checked="YES"
+                     var:value="combinedInfo"
+                     var:id="attendee.rfc822Email"
+                     var:name="checkboxId"
+              /></td>
+        </var:if>
+
+        <var:if condition="withCN" const:negate="YES">
+          <td><input type="checkbox"
+                     checked="YES"
+                     var:value="attendee.rfc822Email"
+                     var:id="attendee.rfc822Email"
+                     var:name="checkboxId"
+              /></td>
+        </var:if>
+
+        <td><var:string value="attendee.cnForDisplay" /></td>
+      </tr>
+    </var:foreach>
+  </table>
+</span>
diff --git a/UI/Templates/UIxContactSelector.wox b/UI/Templates/AnaisUI/AnaisSelector.wox
similarity index 100%
rename from UI/Templates/UIxContactSelector.wox
rename to UI/Templates/AnaisUI/AnaisSelector.wox
diff --git a/UI/Templates/AnaisUI/AnaisUidSelector.wox b/UI/Templates/AnaisUI/AnaisUidSelector.wox
new file mode 100644
index 000000000..546fdd424
--- /dev/null
+++ b/UI/Templates/AnaisUI/AnaisUidSelector.wox
@@ -0,0 +1,68 @@
+<?xml version='1.0' standalone='yes'?>
+
+<table 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"
+       width="100%"
+       border="0"
+ >
+  <script language="JavaScript">
+    <var:string value="jsCode" const:escapeHTML="NO" />
+  </script>
+  <tr valign="top">
+    <td align="left">
+      <table cellspacing="2" cellpadding="0">
+        <tr valign="middle">
+          <td>
+            <var:component className="AnaisSelector"
+                           label:title="Search in Anais"
+                           const:windowId="UidSelector"
+                           const:callback="addUid"
+            />
+            <var:component className="UIxContactSelector"
+                           label:title="Search in Addressbook"
+                           const:windowId="UidSelector"
+                           const:callback="addUid"
+            />
+          </td>
+          <td id="addMeToo" class="button_submit_env" var:style="meTooStyle">
+            <a href="javascript:addMeToo()"
+               class="button_submit"
+            ><var:string label:value="me too" /></a>
+          </td>
+          <td id="clearUidList" class="button_submit_env">
+            <a href="javascript:clearUidList()"
+                class="button_submit"
+             ><var:string label:value="clear" /></a>
+          </td>
+          <td id="showUidList" class="button_submit_env">
+            <form var:href="showHref">
+              <input type="hidden"
+                     name="anaisUIDString"
+                     id="anaisUIDString"
+                     var:value="calendarUIDString"
+              />
+              <input type="hidden"
+                     name="previousMethod"
+                     var:value="ownMethodName"
+              />
+              <input type="submit" label:value="show" class="button_auto" />
+            </form>
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+  <tr valign="middle">
+    <td id="anaisUIDList"
+        align="left"
+        class="anais_uids"
+    ><var:foreach list="calendarUIDs"
+                  item="uid"
+     ><var:string value="prettyUid"
+                  const:escapeHTML="NO"
+      /></var:foreach></td>
+  </tr>
+</table>
diff --git a/UI/Templates/ContactsUI/UIxContactSelector.wox b/UI/Templates/ContactsUI/UIxContactSelector.wox
new file mode 100644
index 000000000..69f0b924f
--- /dev/null
+++ b/UI/Templates/ContactsUI/UIxContactSelector.wox
@@ -0,0 +1,43 @@
+<?xml version='1.0' standalone='yes'?>
+  <container 
+    xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:var="http://www.skyrix.com/od/binding"
+    xmlns:const="http://www.skyrix.com/od/constant"
+    xmlns:uix="OGo:uix"
+    xmlns:label="OGo:label"
+    xmlns:rsrc="OGo:url"
+    >
+    <div class="contactSelector" var:id="selectorId">
+      <input type="hidden"
+        var:id="selectorIdList"
+        var:name="selectorId"
+        var:value="initialParticipantIds" />
+      <div
+        class="contactList"
+        var:id="selectorIdDisplay"
+        var:name="selectorIdDisplay">
+        <var:string value="initialParticipants" />
+      </div>
+<!--      <span 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"
+        class="button_submit_env"
+        >
+        <script language="JavaScript">
+          <var:string value="jsCode" const:escapeHTML="NO" />
+        </script>
+        <a var:href="jsFunctionHref"
+          class="button_submit"
+          ><var:string value="title" /></a>
+      </span> -->
+      <input class="button"
+        type="submit"
+        label:value="Search in Addressbook"
+        onclick="return onContactSelectorPopup(this);" />
+      <input class="button"
+        type="submit"
+        onclick="return onContactRefresh(this);"
+        label:value="Refresh" />
+    </div>
+  </container>
diff --git a/UI/Templates/ContactsUI/UIxContactsListView.wox b/UI/Templates/ContactsUI/UIxContactsListView.wox
index 3c503b2d3..7e6548c26 100644
--- a/UI/Templates/ContactsUI/UIxContactsListView.wox
+++ b/UI/Templates/ContactsUI/UIxContactsListView.wox
@@ -43,6 +43,8 @@
         <var:foreach list="contactInfos" item="currentContact">
           <tr class="tableview"
             var:id="currentContact.c_name"
+            var:contactname="currentContact.cn"
+            var:contactid="currentContact.c_uid"
             onclick="return onRowClick(event);"
             ondblclick="return onContactRowDblClick(event, this);"
             oncontextmenu="return onContactContextMenu(event, this);">
diff --git a/UI/Templates/ContactsUI/UIxContactsListViewContainer.wox b/UI/Templates/ContactsUI/UIxContactsListViewContainer.wox
index 1d8e02457..b4f924195 100644
--- a/UI/Templates/ContactsUI/UIxContactsListViewContainer.wox
+++ b/UI/Templates/ContactsUI/UIxContactsListViewContainer.wox
@@ -8,6 +8,7 @@
     xmlns:rsrc="OGo:url"
     className="UIxPageFrame"
     title="name"
+    popup="popup"
     >
     <var:if condition="hideFrame" const:negate="YES">
       <div class="menu" id="contactFolderMenu">
diff --git a/UI/Templates/ContactsUI/UIxContactsSelectionView.wox b/UI/Templates/ContactsUI/UIxContactsSelectionView.wox
new file mode 100644
index 000000000..d5455e7a1
--- /dev/null
+++ b/UI/Templates/ContactsUI/UIxContactsSelectionView.wox
@@ -0,0 +1,60 @@
+<?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:uix="OGo:uix"
+    xmlns:label="OGo:label"
+    xmlns:rsrc="OGo:url"
+    className="UIxContactsSelectionViewContainer"
+    title="name"
+    >
+
+    <var:component className="UIxContactsFilterPanel" qualifier="qualifier" />
+
+    <!-- the content -->
+    <table border="0" width="100%" id="contactsList" multiselect="yes">
+      <tbody>
+        <tr class="tableview">
+          <!-- localize -->
+          <td class="tbtv_headercell">
+            <var:component className="UIxSortableTableHeader"
+              label:label="Lastname"
+              const:sortKey="cn"
+              const:href="view"
+              var:queryDictionary="context.request.formValues"
+              />
+          </td>
+          <td class="tbtv_headercell">
+            <var:component className="UIxSortableTableHeader"
+              label:label="EMail"
+              const:sortKey="mail"
+              const:href="view"
+              var:queryDictionary="context.request.formValues"
+              />
+          </td>
+          <td class="tbtv_headercell">
+            <var:string label:value="Phone" />
+          </td>
+          <td class="tbtv_headercell">
+            <var:string label:value="Location" />
+          </td>
+        </tr>
+
+        <var:foreach list="contactInfos" item="currentContact">
+          <tr class="tableview"
+            var:id="currentContact.c_name"
+            var:contactname="currentContact.cn"
+            var:contactid="currentContact.c_uid"
+            onclick="return onRowClick(event);"
+            ondblclick="return onContactRowDblClick(event, this);"
+            oncontextmenu="return onContactContextMenu(event, this);">
+            <td onmousedown="return false;"><img rsrc:src="abcard.gif" /><var:string value="currentContact.cn" /></td>
+            <td onmousedown="return false;"><var:string value="currentContact.mail"            /></td>
+            <td onmousedown="return false;"><var:string value="currentContact.telephonenumber" /></td>
+            <td onmousedown="return false;"><var:string value="currentContact.l"               /></td>
+          </tr>
+        </var:foreach>
+      </tbody>
+    </table>
+  </var:component>
diff --git a/UI/Templates/UIxSieveEditor.wox b/UI/Templates/MailerUI/UIxSieveEditor.wox
similarity index 100%
rename from UI/Templates/UIxSieveEditor.wox
rename to UI/Templates/MailerUI/UIxSieveEditor.wox
diff --git a/UI/Templates/UIxAppointmentEditor.wox b/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox
similarity index 91%
rename from UI/Templates/UIxAppointmentEditor.wox
rename to UI/Templates/SchedulerUI/UIxAppointmentEditor.wox
index 4731e00e5..bfaf3edcf 100644
--- a/UI/Templates/UIxAppointmentEditor.wox
+++ b/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox
@@ -6,16 +6,9 @@
     xmlns:uix="OGo:uix"
     xmlns:label="OGo:label"
     className="UIxPageFrame"
+    const:popup="YES"
     title="name"
     >
-    <script type="text/javascript">
-      function submitMeeting(thisForm) {
-      thisForm.submit();
-      opener.window.location.reload();
-      window.close();
-      }
-    </script>
-
     <var:js-stringtable const:framework="SchedulerUI.SOGo"
       const:identifier="labels" />
     
@@ -229,9 +222,12 @@
                     <var:string label:value="Participants" />:</span>
                 </td>
                 <td align="left" bgcolor="#FFFFF0">
-                  <span class="aptview_text">
-                    <!-- use '1' instead of 'YES', otherwise breaks on OSX -->
-                    <var:component className="AnaisSelector"
+                 <span class="aptview_text">
+                    <var:component className="UIxContactSelector"
+                      const:selectorId="participants"
+                      contacts="participants"
+                      />
+<!--                    <var:component className="AnaisSelector"
 		      const:selectorID="participant"
 		      const:role="REQ-PARTICIPANT"
 		      attendees="participants"
@@ -239,14 +235,14 @@
 		      var:cnForUser="cnForUser"
 		      const:withCN="1"
 		      const:withAddressBook="1"
-		      />
+		      /> -->
                   </span>
                 </td>
               </tr>
             </table>
           </td>
         </tr>
-        <tr>
+<!--        <tr>
           <td>
             <table border="0" cellpadding="2" cellspacing="0" width="100%"
 	      bgcolor="#e8e8e0"
@@ -266,22 +262,22 @@
                 </td>
                 <td align="left" bgcolor="#FFFFF0">
                   <span class="aptview_text">
-		    <!--
+                    <var:component className="UIxContactSelector"
+                      const:selectorId="rs" />
+
                     <var:component className="AnaisAttendeeSelector"
 		    const:selectorID="resource"
 		    const:role="NON-PARTICIPANT"
 		    attendees="resources"
 		    const:withCN="YES"
-		    const:withAddressBook="YES"
+		    const:withAddressBook="YES" 
                     />
-		    -->
-                    TODO: need attendee selector (AB)
                   </span>
                 </td>
               </tr>
             </table>
           </td>
-        </tr>
+        </tr> -->
         <tr>
           <td>
             <table border="0" cellpadding="2" cellspacing="0" width="100%"
@@ -322,21 +318,28 @@
         </tr>
         <tr>
           <td>
-	    <input type="submit" label:value="Save" name="save:method"
+	    <input
+              type="submit"
+              class="button"
+              label:value="Save"
+              name="save:method"
 	      onclick="submitMeeting(this.form); return false;" />
-	    <span class="button_auto_env"
-              ><a href="../weekoverview"
-		onclick="window.close(); return false;"
-		var:queryDictionary="queryParameters"
-		class="button_auto"
-		><var:string label:value="Cancel" /></a></span>
+            <input
+              type="submit"
+              class="button"
+              label:value="Cancel"
+              name="cancel"
+              onclick="window.close(); return false;" />
 	    <var:if condition="isUIxDebugEnabled">
-	      <input type="submit" value="Test" name="test:method" />
+	      <input type="submit"
+                class="button"
+                value="Test" name="test:method" />
 	    </var:if>
           </td>
         </tr>
       </table>
       <input type="hidden" name="ical" var:value="iCalString" />
+      <input type="hidden" id="jsaction" />
     </form>
     <!--
     <var:if condition="canEditApt" const:negate="YES">
diff --git a/UI/Templates/UIxAppointmentPrintview.wox b/UI/Templates/SchedulerUI/UIxAppointmentPrintview.wox
similarity index 100%
rename from UI/Templates/UIxAppointmentPrintview.wox
rename to UI/Templates/SchedulerUI/UIxAppointmentPrintview.wox
diff --git a/UI/Templates/UIxAppointmentProposal.wox b/UI/Templates/SchedulerUI/UIxAppointmentProposal.wox
similarity index 95%
rename from UI/Templates/UIxAppointmentProposal.wox
rename to UI/Templates/SchedulerUI/UIxAppointmentProposal.wox
index 5e45c70eb..7f7131f5e 100644
--- a/UI/Templates/UIxAppointmentProposal.wox
+++ b/UI/Templates/SchedulerUI/UIxAppointmentProposal.wox
@@ -120,14 +120,13 @@
             </tr>
             <tr><td colspan="2"> </td></tr>
             <tr valign="top">
-              <td align="right" width="15%" bgcolor="#E8E8E0">
-                <span class="aptview_text">
-                  <var:string label:value="Search in Anais" />:
-                </span>
+              <td colspan="2">
+                  <var:component className="UIxContactSelector"
+                    const:selectorId="resources" />
               </td>
+<!--
               <td align="left" bgcolor="#FFFFF0">
                 <span class="aptview_text">
-<!--
                   <var:component className="AnaisAttendeeSelector"
                                  const:selectorID="resource"
                                  const:role="NON-PARTICIPANT"
@@ -135,10 +134,10 @@
                                  const:division="CC"
                                  const:withAddressBook="1"
                   />
--->
                     TODO: need attendee selector (AB)
                 </span>
               </td>
+-->
             </tr>
             <tr><td colspan="2"> </td></tr>
             <tr bgcolor="#e8e8e0">
@@ -150,16 +149,19 @@
             </tr>
             <tr><td colspan="2"> </td></tr>
             <tr valign="top">
-              <td align="right" width="15%" bgcolor="#E8E8E0">
+<!--              <td align="right" width="15%" bgcolor="#E8E8E0">
                 <span class="aptview_text">
                   <var:string label:value="Search in Anais" />:
                 </span>
+              </td> -->
+              <td colspan="2">
+                  <var:component className="UIxContactSelector"
+                    const:selectorId="participants" />
               </td>
-              <td align="left" bgcolor="#FFFFF0">
+<!--              <td align="left" bgcolor="#FFFFF0">
                 <span class="aptview_text">
                   <!-- use '1' instead of 'YES', otherwise breaks on OSX -->
-<!--
-                  <var:component className="AnaisAttendeeSelector"
+<!--                  <var:component className="AnaisAttendeeSelector"
                                  const:selectorID="participant"
                                  const:division="CC"
                                  const:withCN="1"
@@ -169,10 +171,10 @@
                                  var:cnForUser="cnForUser"
                                  const:withAddressBook="1"
                   />
--->
                     TODO: need attendee selector (AB)
                 </span>
               </td>
+-->
             </tr>
             <tr><td colspan="2"> </td></tr>
             <tr>
diff --git a/UI/Templates/UIxAppointmentView.wox b/UI/Templates/SchedulerUI/UIxAppointmentView.wox
similarity index 100%
rename from UI/Templates/UIxAppointmentView.wox
rename to UI/Templates/SchedulerUI/UIxAppointmentView.wox
diff --git a/UI/Templates/UIxAptTableView.wox b/UI/Templates/SchedulerUI/UIxAptTableView.wox
similarity index 100%
rename from UI/Templates/UIxAptTableView.wox
rename to UI/Templates/SchedulerUI/UIxAptTableView.wox
diff --git a/UI/Templates/UIxCalBackForthNavView.wox b/UI/Templates/SchedulerUI/UIxCalBackForthNavView.wox
similarity index 100%
rename from UI/Templates/UIxCalBackForthNavView.wox
rename to UI/Templates/SchedulerUI/UIxCalBackForthNavView.wox
diff --git a/UI/Templates/SchedulerUI/UIxCalDateLabel.wox b/UI/Templates/SchedulerUI/UIxCalDateLabel.wox
new file mode 100644
index 000000000..d122b5e7e
--- /dev/null
+++ b/UI/Templates/SchedulerUI/UIxCalDateLabel.wox
@@ -0,0 +1,11 @@
+<?xml version='1.0' standalone='yes'?>
+  <span xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:var="http://www.skyrix.com/od/binding"
+    xmlns:const="http://www.skyrix.com/od/constant"
+    xmlns:lbl="OGo:label"
+    xmlns:uix="OGo:uix"
+    xmlns:rsrc="OGo:url"
+    const:class="window_label"
+    >testcoucou2 - <var:string lbl:value="August"/>
+    -
+    <var:string value="label" const:escapeHTML="NO" /></span>
diff --git a/UI/Templates/UIxCalDayChartview.wox b/UI/Templates/SchedulerUI/UIxCalDayChartview.wox
similarity index 98%
rename from UI/Templates/UIxCalDayChartview.wox
rename to UI/Templates/SchedulerUI/UIxCalDayChartview.wox
index b5a7b6b58..6bad19015 100644
--- a/UI/Templates/UIxCalDayChartview.wox
+++ b/UI/Templates/SchedulerUI/UIxCalDayChartview.wox
@@ -46,8 +46,9 @@
                              label:label="today"
               />
             </td>
-            <td align="right" valign="middle" width="80%">
-              <var:component className="AnaisUidSelector" />
+              <td align="right" valign="middle" width="80%">
+                <var:component className="UIxContactSelector"
+                  const:selectorId="uids" />
             </td>
           </tr>
         </table>
diff --git a/UI/Templates/UIxCalDayListview.wox b/UI/Templates/SchedulerUI/UIxCalDayListview.wox
similarity index 98%
rename from UI/Templates/UIxCalDayListview.wox
rename to UI/Templates/SchedulerUI/UIxCalDayListview.wox
index d4c59c4a5..0eea5c51f 100644
--- a/UI/Templates/UIxCalDayListview.wox
+++ b/UI/Templates/SchedulerUI/UIxCalDayListview.wox
@@ -47,7 +47,8 @@
               />
             </td>
             <td align="right" valign="middle" width="80%">
-              <var:component className="AnaisUidSelector" />
+                <var:component className="UIxContactSelector"
+                  const:selectorId="uids" />
             </td>
           </tr>
         </table>
diff --git a/UI/Templates/UIxCalDayOverview.wox b/UI/Templates/SchedulerUI/UIxCalDayOverview.wox
similarity index 99%
rename from UI/Templates/UIxCalDayOverview.wox
rename to UI/Templates/SchedulerUI/UIxCalDayOverview.wox
index 776bb98a6..44d4fa5a5 100644
--- a/UI/Templates/UIxCalDayOverview.wox
+++ b/UI/Templates/SchedulerUI/UIxCalDayOverview.wox
@@ -42,7 +42,8 @@
               />
             </td>
             <td align="right" valign="middle" width="80%">
-              <var:component className="AnaisUidSelector" />
+                <var:component className="UIxContactSelector"
+                  const:selectorId="uids" />
             </td>
           </tr>
         </table>
diff --git a/UI/Templates/UIxCalDayPrintview.wox b/UI/Templates/SchedulerUI/UIxCalDayPrintview.wox
similarity index 100%
rename from UI/Templates/UIxCalDayPrintview.wox
rename to UI/Templates/SchedulerUI/UIxCalDayPrintview.wox
diff --git a/UI/Templates/UIxCalInlineAptView.wox b/UI/Templates/SchedulerUI/UIxCalInlineAptView.wox
similarity index 100%
rename from UI/Templates/UIxCalInlineAptView.wox
rename to UI/Templates/SchedulerUI/UIxCalInlineAptView.wox
diff --git a/UI/Templates/UIxCalInlineMonthOverview.wox b/UI/Templates/SchedulerUI/UIxCalInlineMonthOverview.wox
similarity index 100%
rename from UI/Templates/UIxCalInlineMonthOverview.wox
rename to UI/Templates/SchedulerUI/UIxCalInlineMonthOverview.wox
diff --git a/UI/Templates/UIxCalMonthOverview.wox b/UI/Templates/SchedulerUI/UIxCalMonthOverview.wox
similarity index 97%
rename from UI/Templates/UIxCalMonthOverview.wox
rename to UI/Templates/SchedulerUI/UIxCalMonthOverview.wox
index 24b01d306..150e9b796 100644
--- a/UI/Templates/UIxCalMonthOverview.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMonthOverview.wox
@@ -47,9 +47,11 @@
               />
             </td>
             <td align="right" valign="middle" width="80%">
-              <var:component className="AnaisUidSelector"
+                <var:component className="UIxContactSelector"
+                  const:selectorId="uids" />
+<!--              <var:component className="AnaisUidSelector"
                              calendarUIDs="clientObject.calendarUIDs"
-              />
+              /> -->
             </td>
           </tr>
         </table>
diff --git a/UI/Templates/UIxCalMonthPrintview.wox b/UI/Templates/SchedulerUI/UIxCalMonthPrintview.wox
similarity index 100%
rename from UI/Templates/UIxCalMonthPrintview.wox
rename to UI/Templates/SchedulerUI/UIxCalMonthPrintview.wox
diff --git a/UI/Templates/UIxCalParticipationStatusView.wox b/UI/Templates/SchedulerUI/UIxCalParticipationStatusView.wox
similarity index 100%
rename from UI/Templates/UIxCalParticipationStatusView.wox
rename to UI/Templates/SchedulerUI/UIxCalParticipationStatusView.wox
diff --git a/UI/Templates/UIxCalScheduleOverview.wox b/UI/Templates/SchedulerUI/UIxCalScheduleOverview.wox
similarity index 100%
rename from UI/Templates/UIxCalScheduleOverview.wox
rename to UI/Templates/SchedulerUI/UIxCalScheduleOverview.wox
diff --git a/UI/Templates/UIxCalSelectTab.wox b/UI/Templates/SchedulerUI/UIxCalSelectTab.wox
similarity index 100%
rename from UI/Templates/UIxCalSelectTab.wox
rename to UI/Templates/SchedulerUI/UIxCalSelectTab.wox
diff --git a/UI/Templates/UIxCalWeekChartview.wox b/UI/Templates/SchedulerUI/UIxCalWeekChartview.wox
similarity index 98%
rename from UI/Templates/UIxCalWeekChartview.wox
rename to UI/Templates/SchedulerUI/UIxCalWeekChartview.wox
index 2a58230b5..368ebc790 100644
--- a/UI/Templates/UIxCalWeekChartview.wox
+++ b/UI/Templates/SchedulerUI/UIxCalWeekChartview.wox
@@ -40,9 +40,11 @@
               />
             </td>
             <td align="right" valign="middle" width="80%">
-              <var:component className="AnaisUidSelector"
+                <var:component className="UIxContactSelector"
+                  const:selectorId="uids" />
+<!--              <var:component className="AnaisUidSelector"
                              calendarUIDs="clientObject.calendarUIDs"
-              />
+              /> -->
             </td>
           </tr>
         </table>
diff --git a/UI/Templates/UIxCalWeekColumnsview.wox b/UI/Templates/SchedulerUI/UIxCalWeekColumnsview.wox
similarity index 98%
rename from UI/Templates/UIxCalWeekColumnsview.wox
rename to UI/Templates/SchedulerUI/UIxCalWeekColumnsview.wox
index 1a97f86f1..7be23d8d9 100644
--- a/UI/Templates/UIxCalWeekColumnsview.wox
+++ b/UI/Templates/SchedulerUI/UIxCalWeekColumnsview.wox
@@ -40,9 +40,11 @@
               />
             </td>
             <td align="right" valign="middle" width="80%">
-              <var:component className="AnaisUidSelector"
+                <var:component className="UIxContactSelector"
+                  const:selectorId="uids" />
+<!--              <var:component className="AnaisUidSelector"
                              calendarUIDs="clientObject.calendarUIDs"
-              />
+              /> -->
             </td>
           </tr>
         </table>
diff --git a/UI/Templates/UIxCalWeekListview.wox b/UI/Templates/SchedulerUI/UIxCalWeekListview.wox
similarity index 98%
rename from UI/Templates/UIxCalWeekListview.wox
rename to UI/Templates/SchedulerUI/UIxCalWeekListview.wox
index 3099088f2..2950d646a 100644
--- a/UI/Templates/UIxCalWeekListview.wox
+++ b/UI/Templates/SchedulerUI/UIxCalWeekListview.wox
@@ -46,9 +46,11 @@
               />              
             </td>
             <td align="right" valign="middle" width="80%">
-              <var:component className="AnaisUidSelector"
+                <var:component className="UIxContactSelector"
+                  const:selectorId="uids" />
+<!--              <var:component className="AnaisUidSelector"
                              calendarUIDs="clientObject.calendarUIDs"
-              />
+              /> -->
             </td>
           </tr>
         </table>
diff --git a/UI/Templates/SchedulerUI/UIxCalWeekOverview.wox b/UI/Templates/SchedulerUI/UIxCalWeekOverview.wox
new file mode 100644
index 000000000..3416e8eca
--- /dev/null
+++ b/UI/Templates/SchedulerUI/UIxCalWeekOverview.wox
@@ -0,0 +1,224 @@
+<?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"
+    >
+    <table id="skywintable" class="wintable" cellspacing="0" cellpadding="5" 
+      width="100%">
+      <tr>
+        <td class="wintitle">
+          <table cellpadding="0" cellspacing="0" width="100%">
+            <tr>
+              <td width="5"/>
+              <td class="wintitle">[<var:component className="UIxCalDateLabel"
+                  startDate="startDate"
+                  endDate="endDate"
+                  const:selection="week"
+                  />]</td>
+              <td width="36" align="right" valign="center">
+                <var:component className="UIxWinClose" />
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+
+      <tr>
+        <td id="skywinbodycell" class="wincontent">
+          <table border="0" cellpadding="0" cellspacing="0" width="100%">
+            <tr bgcolor="#e8e8e0">
+              <td align="left">
+                <var:component className="UIxCalBackForthNavView"
+                  methodName="ownMethodName"
+                  prevQueryParameters="prevWeekQueryParameters"
+                  currentQueryParameters="todayQueryParameters"
+                  nextQueryParameters="nextWeekQueryParameters"
+                  label:label="this week"
+                  />
+              </td><!-- 99% -->
+              <td align="right" valign="middle" width="80%">
+                <var:component
+                  className="UIxContactSelector"
+                  const:selectorId="uids" />
+<!--                <var:component className="AnaisUidSelector"
+                  calendarUIDs="clientObject.calendarUIDs"
+                  /> -->
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+
+      <tr>
+        <td id="skywinbodycell" class="wincontent">
+          <table border="0" width="100%" cellpadding="0" cellspacing="0">
+            <tr>
+              <td colspan="2">
+                <var:component className="UIxCalSelectTab"
+                  const:selection="week"
+                  currentDate="selectedDate"
+                  >
+                  <table border="0" cellpadding="4" width="100%" cellspacing="2">
+                    <tr>
+                      <td width="1%" align="left" valign="middle" bgcolor="#e8e8e0">
+                        <table border='0' cellpadding='0' cellspacing='0'>
+                          <tr>
+                            <td><img rsrc:src="icon_view_overview_inactive.gif"
+                                label:title="Overview" label:alt="Overview"
+                                border="0" valign="top" /></td>
+                            <td><a href="weekchartview"
+                                var:queryDictionary="queryParameters"
+                                ><img rsrc:src="icon_view_chart.gif"
+                                  label:title="Chart" label:alt="Chart"
+                                  border="0" valign="top" /></a></td>
+                            <td><a href="weeklistview"
+                                var:queryDictionary="queryParameters"
+                                ><img rsrc:src="icon_view_list.gif"
+                                  label:title="List" label:alt="List"
+                                  border="0" valign="top" /></a></td>
+                            <td>
+                              <a href="weekcolumnsview"
+                                var:queryDictionary="queryParameters"
+                                ><img rsrc:src="icon_view_columns.gif"
+                                  label:title="Columns" label:alt="Columns"
+                                  border="0" valign="top" /></a>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                      <td align="left" bgcolor="#e8e8e0" class="button_auto_env">
+                        <a var:href="ownMethodName"
+                          class="button_auto"
+                          var:queryDictionary="toggleShowRejectedAptsQueryParameters"
+                          label:string="$toggleShowRejectedAptsLabel"
+                          />
+                      </td>
+                      <td align="right" bgcolor="#e8e8e0">
+                        <table border='0' cellpadding='0' cellspacing='1'>
+                          <tr>
+                            <td class="button_auto_env" nowrap="true" valign='middle' 
+                              align='center'>
+                              <!--<a class="button_auto"
+                              href="weekprintview"
+                              var:queryDictionary="queryParameters"
+                              target="SOGoPrintView"
+                              ><var:string label:value="printview" /></a>-->
+                            </td>
+                            <td class="button_auto_env" nowrap="true" valign='middle' 
+                              align='center'>
+                              <a class="button_auto"
+                                href="proposal"
+                                var:queryDictionary="queryParameters"
+                                ><var:string label:value="proposal" /></a>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                    </tr>
+                  </table>
+
+                  <var:week-overview list="appointments"
+                    item="appointment"
+                    weekStart="startDate"
+                    dayIndex="dayIndex"
+                    const:startDateKey="startDate"
+                    const:endDateKey="endDate"
+                    const:titleStyle="weekoverview_title"
+                    hideWeekend="shouldHideWeekend"
+                    contentStyle="contentStyle"
+                    >
+                    <var:week-title>
+                      <table cellpadding="0" width="100%" border="0" cellspacing="0"
+                        var:class="titleStyle">
+                        <tr>
+                          <td align="left" valign="top">
+                            <a href="dayoverview"
+                              var:queryDictionary="currentDayQueryParameters"
+                              class="weekoverview_title_daylink"
+                              ><var:string value="currentDay.dayOfMonth"
+                                const:numberformat="02"
+                                /></a>
+                          </td>
+                          <td align="center" valign="top" width="97%">
+                            <var:string value="currentDayName" /><br />
+                            [<a href="new"
+                              var:queryDictionary="currentDayQueryParameters"
+                              class="weekoverview_title_newlink"
+                              ><var:string label:value="new" /></a>]
+                          </td>
+                        </tr>
+                      </table>
+                    </var:week-title>
+                    <var:if condition="hasDayInfo">
+                      <var:week-info>
+                        <var:if condition="hasHolidayInfo">
+                          <var:string value="holidayInfo" 
+                            const:class="weekoverview_holidayinfo" />
+                        </var:if>
+                        <var:foreach list="allDayApts" item="appointment">
+                          <var:component className="UIxCalInlineAptView"
+                            appointment="appointment"
+                            formatter="aptFormatter"
+                            tooltipFormatter="aptTooltipFormatter"
+                            url="appointmentViewURL"
+                            style="aptStyle"
+                            referenceDate="currentDay"
+                            queryDictionary="currentDayQueryParameters"
+                            canAccess="canAccessApt"
+                            />
+                          <br />
+                        </var:foreach>
+                      </var:week-info>
+                    </var:if>
+                    <var:week>
+                      <var:component className="UIxCalInlineAptView"
+                        appointment="appointment"
+                        formatter="aptFormatter"
+                        tooltipFormatter="aptTooltipFormatter"
+                        url="appointmentViewURL"
+                        style="aptStyle"
+                        referenceDate="currentDay"
+                        canAccess="canAccessApt"
+                        />
+                      <br />
+                    </var:week>
+                  </var:week-overview>
+                </var:component>
+              </td>
+            </tr>
+            <tr bgcolor="#F5F5E9"> <!-- use CSS -->
+              <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"> <!-- use CSS -->
+                <table border="0" width="100%" cellpadding="10" cellspacing="0">
+                  <tr />
+                </table>
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+    </table>
+    <!--
+    <hr />
+    <var:string value="thisWeekQueryParameters" />
+    -->
+    <!--
+    <hr/>
+    
+    Appointments: 
+    <var:component className="UIxAptTableView" appointments="appointments"/>
+    -->
+    <!-- pre><var:string value="appointments" const:insertBR="YES"/></pre -->
+  </var:component>
diff --git a/UI/Templates/UIxCalWeekPrintview.wox b/UI/Templates/SchedulerUI/UIxCalWeekPrintview.wox
similarity index 100%
rename from UI/Templates/UIxCalWeekPrintview.wox
rename to UI/Templates/SchedulerUI/UIxCalWeekPrintview.wox
diff --git a/UI/Templates/UIxCalYearOverview.wox b/UI/Templates/SchedulerUI/UIxCalYearOverview.wox
similarity index 95%
rename from UI/Templates/UIxCalYearOverview.wox
rename to UI/Templates/SchedulerUI/UIxCalYearOverview.wox
index edb104e8e..2c2bfcddb 100644
--- a/UI/Templates/UIxCalYearOverview.wox
+++ b/UI/Templates/SchedulerUI/UIxCalYearOverview.wox
@@ -43,9 +43,12 @@
               />
             </td>
             <td align="right" valign="middle" width="80%">
-              <var:component className="AnaisUidSelector"
+                <var:component
+                  className="UIxContactSelector"
+                  const:selectorId="uids" />
+<!--              <var:component className="AnaisUidSelector"
                              calendarUIDs="clientObject.calendarUIDs"
-              />
+              /> -->
             </td>
           </tr>
         </table>
diff --git a/UI/Templates/UIxDatePicker.wox b/UI/Templates/SchedulerUI/UIxDatePicker.wox
similarity index 91%
rename from UI/Templates/UIxDatePicker.wox
rename to UI/Templates/SchedulerUI/UIxDatePicker.wox
index 0fdad8614..677ecd2a3 100644
--- a/UI/Templates/UIxDatePicker.wox
+++ b/UI/Templates/SchedulerUI/UIxDatePicker.wox
@@ -10,7 +10,8 @@
          var:id="dateID"
          var:value="formattedDateString"
          size="12"
-  /><a var:href="jsPopup"
+  /><a href="#"
+      var:onclick="jsPopup"
     ><img rsrc:src="icon_popupcalendar.gif"
           var:title="label"
           var:alt="label"
@@ -18,4 +19,4 @@
      /></a>
   <script language="JavaScript">
     <var:string value="jsCode" />
  </script>
-</span>
\ No newline at end of file
+</span>
diff --git a/UI/Templates/UIxDatePickerScript.wox b/UI/Templates/SchedulerUI/UIxDatePickerScript.wox
similarity index 100%
rename from UI/Templates/UIxDatePickerScript.wox
rename to UI/Templates/SchedulerUI/UIxDatePickerScript.wox
diff --git a/UI/Templates/UIxFilterList.wox b/UI/Templates/SchedulerUI/UIxFilterList.wox
similarity index 100%
rename from UI/Templates/UIxFilterList.wox
rename to UI/Templates/SchedulerUI/UIxFilterList.wox
diff --git a/UI/Templates/UIxSortButton.wox b/UI/Templates/SchedulerUI/UIxSortButton.wox
similarity index 100%
rename from UI/Templates/UIxSortButton.wox
rename to UI/Templates/SchedulerUI/UIxSortButton.wox
diff --git a/UI/Templates/UIxTimeDateControl.wox b/UI/Templates/SchedulerUI/UIxTimeDateControl.wox
similarity index 100%
rename from UI/Templates/UIxTimeDateControl.wox
rename to UI/Templates/SchedulerUI/UIxTimeDateControl.wox
diff --git a/UI/Templates/UIxTimeSelector.wox b/UI/Templates/SchedulerUI/UIxTimeSelector.wox
similarity index 100%
rename from UI/Templates/UIxTimeSelector.wox
rename to UI/Templates/SchedulerUI/UIxTimeSelector.wox
diff --git a/UI/Templates/UIxCalDateLabel.wox b/UI/Templates/UIxCalDateLabel.wox
deleted file mode 100644
index 4a0c93ae6..000000000
--- a/UI/Templates/UIxCalDateLabel.wox
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0' standalone='yes'?>
-
-<span 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"
-      const:class="window_label"
-><var:string value="label" const:escapeHTML="NO" /></span>
\ No newline at end of file
diff --git a/UI/Templates/UIxCalWeekOverview.wox b/UI/Templates/UIxCalWeekOverview.wox
deleted file mode 100644
index 411078981..000000000
--- a/UI/Templates/UIxCalWeekOverview.wox
+++ /dev/null
@@ -1,222 +0,0 @@
-<?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"
->
-
-  <table id="skywintable" class="wintable" cellspacing="0" cellpadding="5" 
-         width="100%">
-  <tr>
-    <td class="wintitle">
-      <table cellpadding="0" cellspacing="0" width="100%">
-        <tr>
-          <td width="5"/>
-          <td class="wintitle"><var:component className="UIxCalDateLabel"
-                                              startDate="startDate"
-                                              endDate="endDate"
-                                              const:selection="week"
-                               /></td>
-          <td width="36" align="right" valign="center">
-            <var:component className="UIxWinClose" />
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-
-  <tr>
-  <td id="skywinbodycell" class="wincontent">
-    <table border="0" cellpadding="0" cellspacing="0" width="100%">
-    <tr bgcolor="#e8e8e0">
-    <td align="left">
-      <var:component className="UIxCalBackForthNavView"
-                     methodName="ownMethodName"
-                     prevQueryParameters="prevWeekQueryParameters"
-                     currentQueryParameters="todayQueryParameters"
-                     nextQueryParameters="nextWeekQueryParameters"
-                     label:label="this week"
-      />
-    </td><!-- 99% -->
-    <td align="right" valign="middle" width="80%">
-      <var:component className="AnaisUidSelector"
-                     calendarUIDs="clientObject.calendarUIDs"
-      />
-    </td>
-    </tr>
-    </table>
-  </td>
-  </tr>
-
-  <tr>
-  <td id="skywinbodycell" class="wincontent">
-  <table border="0" width="100%" cellpadding="0" cellspacing="0">
-  <tr>
-  <td colspan="2">
-    <var:component className="UIxCalSelectTab"
-                   const:selection="week"
-                   currentDate="selectedDate"
-    >
-        <table border="0" cellpadding="4" width="100%" cellspacing="2">
-          <tr>
-            <td width="1%" align="left" valign="middle" bgcolor="#e8e8e0">
-              <table border='0' cellpadding='0' cellspacing='0'>
-               <tr>
-                  <td><img rsrc:src="icon_view_overview_inactive.gif"
-                           label:title="Overview" label:alt="Overview"
-                           border="0" valign="top" /></td>
-                  <td><a href="weekchartview"
-                         var:queryDictionary="queryParameters"
-                      ><img rsrc:src="icon_view_chart.gif"
-                            label:title="Chart" label:alt="Chart"
-                            border="0" valign="top" /></a></td>
-                  <td><a href="weeklistview"
-                         var:queryDictionary="queryParameters"
-                      ><img rsrc:src="icon_view_list.gif"
-                            label:title="List" label:alt="List"
-                            border="0" valign="top" /></a></td>
-                  <td>
-                    <a href="weekcolumnsview"
-                       var:queryDictionary="queryParameters"
-                    ><img rsrc:src="icon_view_columns.gif"
-                          label:title="Columns" label:alt="Columns"
-                          border="0" valign="top" /></a>
-                  </td>
-               </tr>
-              </table>
-            </td>
-            <td align="left" bgcolor="#e8e8e0" class="button_auto_env">
-              <a var:href="ownMethodName"
-                 class="button_auto"
-                 var:queryDictionary="toggleShowRejectedAptsQueryParameters"
-                 label:string="$toggleShowRejectedAptsLabel"
-              />
-            </td>
-            <td align="right" bgcolor="#e8e8e0">
-              <table border='0' cellpadding='0' cellspacing='1'>
-                <tr>
-                  <td class="button_auto_env" nowrap="true" valign='middle' 
-                      align='center'>
-                    <!--<a class="button_auto"
-                       href="weekprintview"
-                       var:queryDictionary="queryParameters"
-                       target="SOGoPrintView"
-                    ><var:string label:value="printview" /></a>-->
-                  </td>
-                  <td class="button_auto_env" nowrap="true" valign='middle' 
-                      align='center'>
-                    <a class="button_auto"
-                       href="proposal"
-                       var:queryDictionary="queryParameters"
-                    ><var:string label:value="proposal" /></a>
-                  </td>
-                </tr>
-              </table>
-            </td>
-          </tr>
-        </table>
-
-    <var:week-overview list="appointments"
-                       item="appointment"
-                       weekStart="startDate"
-                       dayIndex="dayIndex"
-                       const:startDateKey="startDate"
-                       const:endDateKey="endDate"
-                       const:titleStyle="weekoverview_title"
-                       hideWeekend="shouldHideWeekend"
-                       contentStyle="contentStyle"
-    >
-      <var:week-title>
-        <table cellpadding="0" width="100%" border="0" cellspacing="0"
-               var:class="titleStyle">
-          <tr>
-            <td align="left" valign="top">
-              <a href="dayoverview"
-                 var:queryDictionary="currentDayQueryParameters"
-                 class="weekoverview_title_daylink"
-                 ><var:string value="currentDay.dayOfMonth"
-                              const:numberformat="02"
-                  /></a>
-            </td>
-            <td align="center" valign="top" width="97%">
-              <var:string value="currentDayName" /><br />
-                [<a href="new"
-                    var:queryDictionary="currentDayQueryParameters"
-                    class="weekoverview_title_newlink"
-                 ><var:string label:value="new" /></a>]
-            </td>
-          </tr>
-        </table>
-      </var:week-title>
-      <var:if condition="hasDayInfo">
-        <var:week-info>
-          <var:if condition="hasHolidayInfo">
-            <var:string value="holidayInfo" 
-		        const:class="weekoverview_holidayinfo" />
-          </var:if>
-          <var:foreach list="allDayApts" item="appointment">
-            <var:component className="UIxCalInlineAptView"
-                           appointment="appointment"
-                           formatter="aptFormatter"
-                           tooltipFormatter="aptTooltipFormatter"
-                           url="appointmentViewURL"
-                           style="aptStyle"
-                           referenceDate="currentDay"
-                           queryDictionary="currentDayQueryParameters"
-                           canAccess="canAccessApt"
-            />
-            <br />
-          </var:foreach>
-        </var:week-info>
-      </var:if>
-      <var:week>
-        <var:component className="UIxCalInlineAptView"
-                       appointment="appointment"
-                       formatter="aptFormatter"
-                       tooltipFormatter="aptTooltipFormatter"
-                       url="appointmentViewURL"
-                       style="aptStyle"
-                       referenceDate="currentDay"
-                       canAccess="canAccessApt"
-        />
-        <br />
-      </var:week>
-    </var:week-overview>
-  </var:component>
-  </td>
-  </tr>
-  <tr bgcolor="#F5F5E9"> <!-- use CSS -->
-  <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"> <!-- use CSS -->
-  <table border="0" width="100%" cellpadding="10" cellspacing="0">
-  <tr />
-  </table>
-  </td>
-  </tr>
-  </table>
-  </td>
-  </tr>
-  </table>
-  <!--
-  <hr />
-  <var:string value="thisWeekQueryParameters" />
-  -->
-  <!--
-  <hr/>
-    
-    Appointments: 
-    <var:component className="UIxAptTableView" appointments="appointments"/>
-  -->
-    <!-- pre><var:string value="appointments" const:insertBR="YES"/></pre -->
-</var:component>
diff --git a/UI/Templates/UIxContactsSelectionView.wox b/UI/Templates/UIxContactsSelectionView.wox
deleted file mode 100644
index 6e733f0e7..000000000
--- a/UI/Templates/UIxContactsSelectionView.wox
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version='1.0' standalone='yes'?>
-<html 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"
->
-  <head>
-    <title>
-      <var:string label:value="Addressbook"/>
-    </title>
-    <meta name="description" content="SOGo Web Interface"/>
-    <meta name="author" content="SKYRIX Software AG"/>
-    <meta name="robots" content="stop"/>
-    <link type="text/css" rel="stylesheet" rsrc:href="uix.css"/>
-    <link type="text/css" rel="stylesheet" rsrc:href="calendar.css"/>
-    <link href="mailto:hh@skyrix.com" rev="made"/>
-    <style>
-      table.contacttableview {
-        text-decoration:  none;
-        font-family:      Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif;
-        font-size:        9pt;
-        color:            #000000;
-      }
-      table.contacttableview th {
-        text-align: left;
-      }
-      input.searchfield {
-        font-size:        8pt;
-      }
-    </style>
-  </head>
-  <body>
-    <table id="skywintable"
-           class="wintable"
-           cellspacing="0"
-           cellpadding="5"
-           width="100%"
-    >
-      <tr>
-        <td class="wintitle">
-          <table cellpadding="0" cellspacing="0" width="100%">
-            <tr>
-              <td width="5"/>
-              <td class="wintitle">
-                <!-- localize me -->
-                <span class="window_label"
-                ><var:string label:value="Addressbook"/></span>
-              </td>
-              <td width="36" align="right" valign="center">
-                <var:component className="UIxWinClose"/>
-              </td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-      <tr>
-        <td id="skywinbodycell" class="wincontent">
-         <form name="searchform"
-               var:href="ownMethodName"
-               var:_sort="sortKey"
-               method="GET"
-               var:queryDictionary="context.request.formValues"
-         >
-          <table border="0" width="100%" cellpadding="0" cellspacing="0">
-            <tr>
-              <td colspan="2">
-                  <table border="0" cellpadding="4" width="100%" cellspacing="0">
-                    <tr bgcolor="#e8e8e0">
-                      <td align="left">
-                        <input type="text" name="search" class="searchfield" 
-                               var:value="searchText" />
-                      </td>
-                    </tr>
-                  </table>
-  
-                  <!-- the content -->
-                  <table border="0" width="100%" class="contacttableview">
-                    <tr>
-                      <!-- localize -->
-                      <th>
-                        <var:if condition="sortKey" const:value="sn"
-                                const:negate="YES">
-                          <a var:href="ownMethodName"
-                             _sort="sn"
-                             var:_search="searchText"
-                             var:queryDictionary="context.request.formValues"
-                          ><var:string label:value="Lastname" /></a>
-                        </var:if>
-                        <var:if condition="sortKey" const:value="sn">
-                          <i><var:string label:value="Lastname" /></i>
-                        </var:if>
-                      </th>
-                      <th>
-                        <var:if condition="sortKey" const:value="givenname"
-                                const:negate="YES">
-                          <a var:href="ownMethodName"
-                             _sort="givenname"
-                             var:_search="searchText"
-                             var:queryDictionary="context.request.formValues"
-                          ><var:string label:value="Firstname" /></a>
-                        </var:if>
-                        <var:if condition="sortKey" const:value="givenname">
-                          <i><var:string label:value="Firstname" /></i>
-                        </var:if>
-                      </th>
-                      <th>
-                        <var:if condition="sortKey" const:value="mail"
-                                const:negate="YES">
-                          <a var:href="ownMethodName"
-                             _sort="mail"
-                             var:_search="searchText"
-                             var:queryDictionary="context.request.formValues"
-                          ><var:string label:value="EMail" /></a>
-                        </var:if>
-                        <var:if condition="sortKey" const:value="mail">
-                          <i><var:string label:value="EMail" /></i>
-                        </var:if>
-                      </th>
-                      <th>
-  		            <var:string label:value="Phone" />
-                      </th>
-                      <th>
-  		            <var:string label:value="Location" />
-                      </th>
-                    </tr>
-                    <var:foreach list="contactInfos" item="contact">
-                      <tr>
-                        <td>
-                          <a var:href="jsOnClickCode"
-                             ><var:string value="contact.sn" /></a>
-                        </td>
-                        <td><var:string value="contact.givenname"       /></td>
-                        <td><var:string value="contact.mail"            /></td>
-                        <td><var:string value="contact.telephonenumber" /></td>
-                        <td><var:string value="contact.l"               /></td>
-                      </tr>
-                    </var:foreach>
-                  </table>
-              </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>
-         </form>
-        </td>
-      </tr>
-    </table>
-    <var:if condition="isUIxDebugEnabled">
-      <hr />
-      <small>clientObject: <var:string value="clientObject" /></small>
-    </var:if>
-  </body>
-</html>
\ No newline at end of file
diff --git a/UI/Templates/UIxPageFrame.wox b/UI/Templates/UIxPageFrame.wox
index af6408afb..e81fde1d7 100644
--- a/UI/Templates/UIxPageFrame.wox
+++ b/UI/Templates/UIxPageFrame.wox
@@ -32,14 +32,11 @@
           <script type="text/javascript">
             var UserFolderURL = '<var:string value="userFolderPath" />';
             var ApplicationBaseURL = '<var:string value="applicationPath" />';
-            var ResourcesURL = '/SOGo.woa/WebServerResources'
+            var ResourcesURL = '/SOGo.woa/WebServerResources';
+            var UserLogin = '<var:string value="shortUserNameForDisplay" />';
           </script>
 
           <script type="text/javascript" rsrc:src="prototype.js"> <!-- space required --></script>
-          <script type="text/javascript" rsrc:src="yul/yahoo/yahoo-min.js"> <!-- space required --></script>
-          <script type="text/javascript" rsrc:src="yul/dom/dom-min.js"> <!-- space required --></script>
-          <script type="text/javascript" rsrc:src="yul/event/event-min.js"> <!-- space required --></script>
-          <script type="text/javascript" rsrc:src="yul/dragdrop/dragdrop-min.js"> <!-- space required --></script>
 
           <script type="text/javascript" rsrc:src="generic.js"> <!-- space required --></script>
           <var:if condition="hasProductSpecificJavaScript"