diff --git a/UI/Templates/SchedulerUI/UIxCalendarSelector.wox b/UI/Templates/SchedulerUI/UIxCalendarSelector.wox
index e31f8f07a..33e935c7b 100644
--- a/UI/Templates/SchedulerUI/UIxCalendarSelector.wox
+++ b/UI/Templates/SchedulerUI/UIxCalendarSelector.wox
@@ -47,6 +47,5 @@ div.colorBox.calendarFolder<var:string value="currentCalendar.folder" />
         </var:foreach>
       </ul>
     </div>
-
   </div>
 </container>
diff --git a/UI/Templates/SchedulerUI/UIxComponentEditor.wox b/UI/Templates/SchedulerUI/UIxComponentEditor.wox
index 85a723411..092988caa 100644
--- a/UI/Templates/SchedulerUI/UIxComponentEditor.wox
+++ b/UI/Templates/SchedulerUI/UIxComponentEditor.wox
@@ -329,10 +329,10 @@
 	    var:value="reminderReference"/>
 
     <div id="windowButtons">
+      <var:if condition="userIsAttendee"><a id="okButton" href="#" class="button actionButton"
+        ><span><var:string label:value="OK"/></span></a></var:if>
       <a id="cancelButton" href="#" class="button"
-        ><var:string label:value="Cancel"/></a>
-      <var:if condition="userIsAttendee"><a id="okButton" href="#" class="button"
-        ><var:string label:value="OK"/></a></var:if>
+        ><span><var:string label:value="Cancel"/></span></a>
     </div>
   </div>
   </var:if>