diff --git a/UI/Templates/ContactsUI/UIxContactEditor.wox b/UI/Templates/ContactsUI/UIxContactEditor.wox
index 23723abb1..5d46965c3 100644
--- a/UI/Templates/ContactsUI/UIxContactEditor.wox
+++ b/UI/Templates/ContactsUI/UIxContactEditor.wox
@@ -353,12 +353,12 @@
           label:value="Cancel"
           name="cancel"
           onclick="window.close(); return false;" />
-        <input
+<!--        <input
           type="submit"
           class="button"
           label:value="PouetPouet"
           name="pouet"
-          onclick="showCoords(this); return false;" />
+          onclick="showCoords(this); return false;" /> -->
         <input type="hidden" id="jsaction" />
       </div>
     </form>
diff --git a/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox b/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox
index f5096c98f..b15efbc9f 100644
--- a/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox
+++ b/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox
@@ -26,61 +26,86 @@
 
       <div>
         <label><var:string label:value="Title" />
-        <input type="text" name="summary" id="summary"
-          class="textField"
-          var:value="title"
-          /></label>
+          <input type="text" name="summary" id="summary"
+            class="textField"
+            var:value="title"
+            /></label>
         <label><var:string label:value="Location" />
-        <input type="text" name="location" id="location"
-          class="textField"
-          var:value="location"
-          /></label>
+          <input type="text" name="location" id="location"
+            class="textField"
+            var:value="location"
+            /></label>
         <label id="isPrivate"><input class="checkBox"
             type="checkbox" var:selection="isPrivate"
             var:checked="isPrivate"
             /><var:string label:value="is private" /></label>
-        <label><var:string label:value="Start time" />
-          <var:component className="UIxTimeDateControl"
+        <span class="checkBoxList"><var:string label:value="Start time" />
+          <span class="content"><var:component className="UIxTimeDateControl"
             const:controlID="startTime"
             var:date="aptStartDate"
             const:dayStartHour="8"
             const:dayEndHour="18"
-            /></label>
+            /></span></span>
         <a class="button" href="#" onclick="return toggleDetails();" id="detailsButton"
           ><var:string label:value="Show Details" /></a>
-        <label><var:string label:value="End time" />
-          <var:component className="UIxTimeDateControl"
+        <span class="checkBoxList"><var:string label:value="End time" />
+          <span class="content"><var:component className="UIxTimeDateControl"
             const:controlID="endTime"
             date="aptEndDate"
             const:dayStartHour="8"
             const:dayEndHour="18"
-            /></label>
+            /></span></span>
       </div>
-
+      
       <div id="details">
-        <label><var:string label:value="Cycle" />
-          <var:popup list="cycles" item="item"
-            label:string="$cycleLabel"
-            selection="cycle"
-            const:onChange="toggleCycleVisibility(this, 'cycleSelectionFirstLevel', 0);"
+        <label id="conflictsLabel"><input type="checkbox"
+            class="checkBox"
+            var:selection="checkForConflicts"
+            var:checked="checkForConflicts"
+            /><var:string label:value="check for conflicts"
             /></label>
+        <span class="checkBoxList"><var:string label:value="Participants" />
+          <span class="content" style="display: block; height: 10em;"><var:component className="UIxContactSelector"
+            const:selectorId="participants"
+            contacts="participants"
+            /></span></span>
 
-        <label><var:string label:value="Cycle End"/>
-          <span class="cycleSelectionFirstLevel"
-            ><var:popup list="cycleEnds" item="item"
-              label:string="$item" value="item"
-              selection="cycleEnd"
-              const:onChange="toggleCycleVisibility(this, 'cycleSelectionSecondLevel', 'cycle_end_never');"
-              const:id="cycle_end_mode_selection"
-              /><span class="cycleSelectionSecondLevel"
-              ><var:component className="UIxTimeDateControl"
-                date="cycleUntilDate"
-                label="foo"
-                const:controlID="cycleUntilDate"
-                const:displayTimeControl="NO"
-                /></span
-              ></span></label>
-
+        <label><var:string label:value="Cycle"
+            />
+          <span class="content"
+            ><var:popup list="cycles" item="item"
+              label:string="$cycleLabel"
+              selection="cycle"
+            const:onChange="toggleCycleVisibility(this, 'cycleSelectionFirstLevel', 0);"
+              /><span id="cycleSelectionFirstLevel"
+              ><var:popup list="cycleEnds" item="item"
+                label:string="$item" value="item"
+                selection="cycleEnd"
+                const:onChange="toggleCycleVisibility(this, 'cycleSelectionSecondLevel', 'cycle_end_never');"
+                const:id="cycle_end_mode_selection"
+                /><span id="cycleSelectionSecondLevel"
+                ><var:component className="UIxTimeDateControl"
+                  date="cycleUntilDate"
+                  label="foo"
+                  const:controlID="cycleUntilDate"
+                  const:displayTimeControl="NO"
+                  /></span
+                ></span
+              ></span
+            ></label>
+        
+        <span class="checkBoxList" style="height: 10em;"
+          ><var:string label:value="Categories"
+            /><span class="content"><var:checkbox-list list="categoryItems"
+              item="item"
+              suffix="itemCategoryText"
+              selections="categories"
+              /></span></span>
+        
+        <label><var:string label:value="Priority" />
+        <var:popup list="priorities" item="item"
+          string="itemPriorityText" selection="priority" /></label>
+        
         <label><var:string label:value="Comment"
             /><textarea name="comment" var:value="comment" /></label>
       </div>
@@ -105,35 +130,6 @@
         </var:if>
       </div>
 
-
-      <!--
-      <div class="appointmentLabel"><var:string label:value="Categories" /></div>
-      <span class="checkBoxList"
-        ><var:checkbox-list list="categoryItems"
-          item="item"
-              suffix="itemCategoryText"
-              selections="categories"
-              /></span>
-        </div>
-
-        <div>
-          <div class="appointmentLabel"><var:string label:value="Participants" /></div>
-          <label id="conflictsLabel"><input type="checkbox"
-              class="checkBox"
-              var:selection="checkForConflicts"
-              var:checked="checkForConflicts"
-              /><var:string label:value="check for conflicts" /></label
-            ><var:component className="UIxContactSelector"
-            const:selectorId="participants"
-            contacts="participants"
-            />
-
-          <div class="appointmentLabel"><var:string label:value="Priority" /></div>
-          <var:popup list="priorities" item="item"
-            string="itemPriorityText" selection="priority" />
-        </div>
-      </div> -->
-
       <input type="hidden" name="ical" var:value="iCalString" />
       <input type="hidden" id="jsaction" />
     </form>
diff --git a/UI/Templates/SchedulerUI/UIxAppointmentView.wox b/UI/Templates/SchedulerUI/UIxAppointmentView.wox
index 501bccaed..292bc05aa 100644
--- a/UI/Templates/SchedulerUI/UIxAppointmentView.wox
+++ b/UI/Templates/SchedulerUI/UIxAppointmentView.wox
@@ -78,7 +78,7 @@
                   <var:string label:value="Title" />:
                 </td>
                 <td align="left" bgcolor="#FFFFF0" class="aptview_text">
-                  <var:string value="appointment.summary" />
+                  <var:string value="appointment.summary" const:escapeHTML="NO" />
                 </td>
               </tr>
               <tr valign="top">
@@ -86,7 +86,7 @@
                   <var:string label:value="Location" />:
                 </td>
                 <td align="left" bgcolor="#FFFFF0" class="aptview_text">
-                  <var:string value="appointment.location" />
+                  <var:string value="appointment.location" const:escapeHTML="NO" />
                 </td>
               </tr>
               <tr valign="top">
@@ -94,7 +94,7 @@
                   <var:string label:value="Priority" />:
                 </td>
                 <td align="left" bgcolor="#FFFFF0" class="aptview_text">
-                  <var:string label:value="$appointment.priorityLabelKey" />
+                  <var:string label:value="$priorityLabelKey" />
                 </td>
               </tr>
             </var:if>
@@ -162,7 +162,7 @@
                       <var:string label:value="Categories" />:
                     </td>
                     <td align="left" bgcolor="#FFFFF0" class="aptview_text">
-                      <var:string value="categoriesAsString" />
+                      <var:string value="categoriesAsString"  const:escapeHTML="NO" />
                     </td>
                   </tr>
                   <!-- Resources removed for v0.8
@@ -190,7 +190,7 @@
                       <var:string label:value="Organizer" />:
                     </td>
                     <td align="left" bgcolor="#FFFFF0" class="aptview_text">
-                      <var:string value="appointment.organizer.cnForDisplay" />
+                      <var:string value="eventOrganizer" />
                     </td>
                   </tr>
                   <tr valign="top">
@@ -202,7 +202,8 @@
                       <var:string label:value="Comment" />:
                     </td>
                     <td align="left" bgcolor="#FFFFF0" class="aptview_text">
-                      <var:string value="appointment.comment" const:insertBR="1" />
+                      <var:string value="appointment.comment" const:insertBR="1"
+                        const:escapeHTML="NO" />
                     </td>
                   </tr>
                 </var:if>
diff --git a/UI/Templates/SchedulerUI/UIxCalAptListView.wox b/UI/Templates/SchedulerUI/UIxCalAptListView.wox
index cab3b9103..52623f26f 100644
--- a/UI/Templates/SchedulerUI/UIxCalAptListView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalAptListView.wox
@@ -42,7 +42,7 @@
 
     <var:foreach list="fetchCoreInfos" item="currentAppointment"
       ><tr class="tableview appointmentRow"
-        var:id="currentAppointment.uid"
+        var:id="currentAppointment.c_name"
         onclick="return onAppointmentClick(event);"
         ondblclick="return editDoubleClickedEvent(this);"
         oncontextmenu="return onAppointmentContextMenu(event, this);"
diff --git a/UI/WebServerResources/UIxAppointmentEditor.css b/UI/WebServerResources/UIxAppointmentEditor.css
index 1d0403816..b4f82bb14 100644
--- a/UI/WebServerResources/UIxAppointmentEditor.css
+++ b/UI/WebServerResources/UIxAppointmentEditor.css
@@ -52,23 +52,23 @@ UL.contactList LI._selected
 { background: #4b6983;
   color: #fff; }
 
-DIV#participants
-{ margin-left: 10em;
-  padding: .2em; }
-
-LABEL
+LABEL, SPAN.checkBoxList
 { display: block;
   position: relative;
   height: 2em;
+  margin-left: .5em;
   margin-top: .5em;
   width: 100%; }
 
-INPUT#summary, INPUT#location, SPAN.timeDateControl,
-SPAN.cycleSelectionFirstLevel
+SPAN.checkBoxList SPAN.content LABEL
+{ display: inline; }
+
+INPUT#summary, INPUT#location,
+SPAN.content
 { position: absolute;
   top: 0px;
   left: 10em;
-  right: 0em; }
+  right: 0px; }
 
 DIV#details TEXTAREA
 { position: absolute;
@@ -84,7 +84,7 @@ DIV#details SELECT
   top: 0px;
   left: 10em; }
 
-LABEL#isPrivate
+LABEL#isPrivate, LABEL#conflictsLabel
 { position: absolute;
   z-index: 1;
   right: 1em;
@@ -99,12 +99,12 @@ SPAN.contactSelectorButtons
 { vertical-align: top;
   line-height: 2em; }
 
-/* LABEL#conflictsLabel
-{ float: right;
-  margin-top: .5em;
-  margin-left: 0em;
-  margin-right: 14em; }
- */
-SPAN.cycleSelectionFirstLevel,
-SPAN.cycleSelectionSecondLevel
-{ visibility: hidden; }
+SPAN#cycleSelectionFirstLevel,
+SPAN#cycleSelectionSecondLevel
+{ visibility: hidden;
+  margin-left: 1em; }
+
+DIV#details SPAN.content SELECT,
+SPAN#cycleSelectionSecondLevel SPAN.timeDateControl
+{ position: static;
+  margin: 0px; }
diff --git a/UI/WebServerResources/UIxAppointmentEditor.js b/UI/WebServerResources/UIxAppointmentEditor.js
index 12325390f..ea34b80f7 100644
--- a/UI/WebServerResources/UIxAppointmentEditor.js
+++ b/UI/WebServerResources/UIxAppointmentEditor.js
@@ -101,8 +101,8 @@ function validateAptEditor() {
 
 function submitMeeting(thisForm) {
   var action = document.getElementById('jsaction');
-//   action.setAttribute("name", "save:method");
-//   action.setAttribute("value", "save");
+  action.setAttribute("name", "save:method");
+  action.setAttribute("value", "save");
 
   window.opener.log ("form: " + thisForm);
 
@@ -136,9 +136,22 @@ function toggleDetails() {
   return false;
 }
 
-function toggleCycleVisibility(node, className, hiddenValue) {
-  var containers = document.getElementsByClassName(className);
+function toggleCycleVisibility(node, nodeName, hiddenValue) {
+  var spanNode = $(nodeName);
   var newVisibility = ((node.value == hiddenValue) ? null : 'visible;');
-  for (var i = 0; i < containers.length; i++)
-    containers[i].style.visibility = newVisibility;
+  spanNode.style.visibility = newVisibility;
+
+  if (nodeName == 'cycleSelectionFirstLevel') {
+    var otherSpanNode = $('cycleSelectionSecondLevel');
+    if (!newVisibility)
+      {
+        otherSpanNode.superVisibility = otherSpanNode.style.visibility;
+        otherSpanNode.style.visibility = null;
+      }
+    else
+      {
+        otherSpanNode.style.visibility = otherSpanNode.superVisibility;
+        otherSpanNode.superVisibility = null;
+      }
+  }
 }