diff --git a/UI/Templates/SchedulerUI/UIxComponentEditor.wox b/UI/Templates/SchedulerUI/UIxComponentEditor.wox
index 32c44a2ba..fb97c9a1d 100644
--- a/UI/Templates/SchedulerUI/UIxComponentEditor.wox
+++ b/UI/Templates/SchedulerUI/UIxComponentEditor.wox
@@ -323,12 +323,10 @@
 	    var:value="reminderReference"/>
 
     <div id="windowButtons">
-      <span class="content">
-        <a id="cancelButton" href="#" class="button"
-          ><var:string label:value="Cancel"/></a>
-        <a id="okButton" href="#" class="button"
-          ><var:string label:value="OK"/></a>
-      </span>
+      <a id="cancelButton" href="#" class="button"
+        ><var:string label:value="Cancel"/></a>
+      <a id="okButton" href="#" class="button"
+        ><var:string label:value="OK"/></a>
     </div>
   </div>
   </var:if>
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index 7512b1745..8ffd87ce9 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -1044,7 +1044,10 @@ function newBaseEventDIV(eventRep, event, eventText) {
     textDiv.addClassName("text");
     textDiv.update(eventText.replace(/(\\r)?\\n/g, "<BR/>"));
 
-    if (event[2] != null) {
+    if (event[2] == null) {
+        eventDiv.observe("selectstart", listRowMouseDownHandler);
+    }
+    else {
         // Status field is defined -- user can read event
         eventDiv.observe("mousedown", listRowMouseDownHandler);
         eventDiv.observe("click", onCalendarSelectEvent);
diff --git a/UI/WebServerResources/UIxComponentEditor.css b/UI/WebServerResources/UIxComponentEditor.css
index 1ed3b289d..2f09b17fb 100644
--- a/UI/WebServerResources/UIxComponentEditor.css
+++ b/UI/WebServerResources/UIxComponentEditor.css
@@ -60,18 +60,17 @@ LABEL.titleNoSpace
 }
 
 DIV#windowButtons
-{
-  width: 100%;
-  position: absolute;
-  bottom: 4em;
-}
+{ position: absolute;
+  bottom: 2em;
+  left: auto;
+  right: 2em; }
 
 LABEL.calendarName
 { text-align: right;
   margin-top: 10px;
   margin-bottom: 10px;
   width: 97%;
-} 
+}
 
 DIV#attendeesMenu
 { overflow: auto; }
@@ -83,6 +82,7 @@ DIV.fakeTextArea
   border-style: inset; 
   padding: 2px;
   height: 100%;
+  white-space: pre-wrap;
 }
 
 DIV#descriptionDiv {
@@ -90,4 +90,4 @@ DIV#descriptionDiv {
 }
 SPAN.fixedHeight {
   height: 60px;
-}
+}
\ No newline at end of file