diff --git a/UI/Templates/SchedulerUI/UIxCalendarProperties.wox b/UI/Templates/SchedulerUI/UIxCalendarProperties.wox
index 20ffa1388..61884a7a7 100644
--- a/UI/Templates/SchedulerUI/UIxCalendarProperties.wox
+++ b/UI/Templates/SchedulerUI/UIxCalendarProperties.wox
@@ -14,31 +14,31 @@
     <input type="hidden" const:name="calendarID" const:id="calendarID"
       var:value="calendarID"/>
     <div id="propertiesView">
-      <span class="line"><label
-	  ><var:string label:value="Name:"
-	    /><span class="content"
-	    ><input type="text" name="calendarName" id="calendarName"
-	      var:disabled="calendarNameIsDisabled"
-	      class="textField"
-	      var:value="calendarName"
-	      /></span></label></span>
-      <span class="line"><label><var:string
-	    label:value="Color:"/><span class="content"
-	    ><button id="colorButton"><!-- space --></button
-	      ><input type="hidden"
-	      name="calendarColor"
-	      id="calendarColor"
-	      var:value="calendarColor"
-	      /></span></label><label id="calendarSync"><var:string
+      <div><span class="label"><var:string label:value="Name:"/></span
+	  ><span class="content"><input type="text"
+	    name="calendarName" id="calendarName"
+	    var:disabled="calendarNameIsDisabled"
+	    class="textField"
+	    var:value="calendarName"
+	    /></span></div>
+      <div><span class="label"><var:string
+	    label:value="Color:"
+	    /></span><span class="content"
+	  ><button id="colorButton"><!-- space --></button
+	    ><input type="hidden"
+	    name="calendarColor"
+	    id="calendarColor"
+	    var:value="calendarColor"
+	    /><var:string
 	    label:value="Tag:"/><input type="text"
 	    name="calendarSyncTag"
 	    id="calendarSyncTag"
 	    class="textField"
 	    var:value="calendarSyncTag"
-	    /></label></span>
-    </div>
-    <div id="buttons">
-      <input type="button"
+	    /></span>
+      </div>
+      <div id="buttons">
+	<input type="button"
 	const:class="button"
 	label:value="Cancel"
 	const:id="cancelButton"
@@ -48,6 +48,6 @@
 	label:value="OK"
 	const:id="okButton"
 	name="okButton"/>
-    </div>
+      </div>
   </form>
 </var:component>
diff --git a/UI/WebServerResources/UIxCalendarProperties.css b/UI/WebServerResources/UIxCalendarProperties.css
index 32df47050..bb6e22618 100644
--- a/UI/WebServerResources/UIxCalendarProperties.css
+++ b/UI/WebServerResources/UIxCalendarProperties.css
@@ -1,24 +1,26 @@
-SPAN.line
-{ display: block;
-  position: relative;
-  line-height: 18px;
-  height: 20px;
-  margin-left: 5px;
-  margin-bottom: 5px;
-  width: 100%; }
-
 DIV#propertiesView
 { overflow: hidden;
-  padding: 10px; }
+  padding: 5px; }
+
+DIV
+{ clear: both; }
+
+SPAN.label
+{ cursor: default;
+  width: 7em;
+  text-align: right;
+  padding-right: 1em;
+  padding-top: .5em;
+  float: left;
+  display: block; }
 
 SPAN.content
-{ position: absolute;
-  top: -.25em;
-  left: 6em;
-  right: 1em; }
+{ display: block;
+  vertical-alignment: middle;
+  float: left; }
 
 LABEL#calendarSync
-{ margin-left: 7em; }
+{ margin-left: 10em; }
 
 BUTTON#colorButton
 { display: none;
@@ -34,7 +36,7 @@ BUTTON#colorButton
 
 DIV#buttons
 { padding: 10px;
-  padding-top: 0px;
+  padding-top: 5px;
   text-align: right; }
 
 INPUT#calendarSyncTag