diff --git a/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox b/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox
index 20d863831..89d56650b 100644
--- a/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox
+++ b/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox
@@ -22,19 +22,19 @@
     </ul>
   </div>
 
-  <label><span id="allDay" class="content"><input class="checkBox"
-        type="checkbox" var:selection="isAllDay"
-        var:checked="isAllDay"
-        /><var:string label:value="All day Event"
-        /></span></label>
-  <label><span id="isOpque" class="content"
+  <label><span class="content"
 	><var:string label:value="Show Time as"
         /> <var:popup list="transparencyList" item="item"
           const:name="transparencyList"
 	  const:id="transparencyList"
           string="itemTransparencyText"
 	  var:selection="transparency"
-          /></span></label>
+          />
+  <span class="allDay"><input class="checkBox"
+        type="checkbox" var:selection="isAllDay"
+        var:checked="isAllDay"
+        /> <var:string label:value="All day Event"
+        /></span></span></label>
   <span class="checkBoxList"><var:string label:value="Start:" />
     <span class="content"><var:component className="UIxTimeDateControl"
         const:controlID="startTime"
diff --git a/UI/Templates/SchedulerUI/UIxComponentEditor.wox b/UI/Templates/SchedulerUI/UIxComponentEditor.wox
index 3c7434889..2f49ec9bc 100644
--- a/UI/Templates/SchedulerUI/UIxComponentEditor.wox
+++ b/UI/Templates/SchedulerUI/UIxComponentEditor.wox
@@ -44,7 +44,7 @@
         <span class="content"><var:popup list="categoryList" item="item"
             label:noSelectionString="category_NONE"
             string="itemCategoryText" selection="category"
-            /><var:string label:value="Calendar:" />
+            /> <var:string label:value="Calendar:" />
           <var:popup const:id="calendarList"
 	    var:disabled="isChildOccurence"
 	    list="calendarList" item="item"
diff --git a/UI/WebServerResources/UIxComponentEditor.css b/UI/WebServerResources/UIxComponentEditor.css
index a2ea2aa17..188f2f6a2 100644
--- a/UI/WebServerResources/UIxComponentEditor.css
+++ b/UI/WebServerResources/UIxComponentEditor.css
@@ -2,4 +2,7 @@ SELECT#calendarList
 { width: 16em; }
 
 #attendeesLabel
-{ display: none; }
\ No newline at end of file
+{ display: none; }
+
+SPAN.timeDateControl A.button
+{ border: 0; }