diff --git a/UI/WebServerResources/UIxAttendeesEditor.css b/UI/WebServerResources/UIxAttendeesEditor.css
index db0d0499f..054a95150 100644
--- a/UI/WebServerResources/UIxAttendeesEditor.css
+++ b/UI/WebServerResources/UIxAttendeesEditor.css
@@ -20,6 +20,13 @@ DIV#freeBusyView
   -moz-border-top-colors: #9c9a94 #000;
   -moz-border-left-colors: #9c9a94 #000; }
 
+TABLE#freeBusy
+{ border-collapse: collapse;
+  table-layout: auto; }
+
+TABLE#freeBusy THEAD TH
+{ white-space: nowrap; }
+
 TABLE#freeBusy TD,
 TABLE#freeBusy TH
 { padding: 0px;
@@ -56,14 +63,14 @@ TABLE#freeBusy TR.freeBusyHeader2 TH,
 TABLE#freeBusy TR.freeBusyHeader3 TH
 { text-align: left;
   color: #777;
-  background: #fff;
-  border-collapse: collapse; }
+  background: #fff; }
 
 TABLE#freeBusy TR.freeBusyHeader2 TH
-{ width: 6em; }
+{ padding-right: 2em; }
 
 TABLE#freeBusy TR.freeBusyHeader3 TH
-{ border-bottom: 1px solid #cecbff; }
+{ border-left: 1px solid #fff;
+  border-bottom: 1px solid #cecbff; }
 
 TABLE#freeBusy TR.attendeeModel
 { display: none; }
@@ -84,6 +91,7 @@ TABLE#freeBusy TD.noFreeBusy
 SPAN.freeBusyZoneElement
 { display: block;
   float: left;
+  clear: right;
   width: 25%;
   margin: 0px;
   padding: 0px;
diff --git a/UI/WebServerResources/UIxAttendeesEditor.js b/UI/WebServerResources/UIxAttendeesEditor.js
index f7f17be00..0f0547d66 100644
--- a/UI/WebServerResources/UIxAttendeesEditor.js
+++ b/UI/WebServerResources/UIxAttendeesEditor.js
@@ -268,9 +268,9 @@ function setSlot(tds, nbr, status) {
     var td = tds[i];
     var spans = $(td).childNodesWithTag("span");
     if (status == '2')
-      spans[spannbr].addClassName("maybe-busy");
+      $(spans[spannbr]).addClassName("maybe-busy");
     else
-      spans[spannbr].addClassName("busy");
+      $(spans[spannbr]).addClassName("busy");
   }
 }
 
@@ -282,7 +282,7 @@ function updateFreeBusyData(http) {
       var tds = node.parentNode.parentNode.cells;
       for (var i = 0; i < slots.length; i++) {
         if (slots[i] != '0')
-          setSlot(tds, i, slots[i]);
+	  setSlot(tds, i, slots[i]);
       }
     }
     document.contactFreeBusyAjaxRequest = null;
@@ -502,14 +502,14 @@ function prepareAttendees() {
       for (var i = 0; i < attendeesNames.length; i++) {
 	 var tr = body.insertRow(i);
 	 var td = document.createElement("td");
-	 td.addClassName("attendees");
+	 $(td).addClassName("attendees");
 	 var input = document.createElement("input");
 	 var value = "";
 	 if (attendeesNames[i].length > 0)
 	    value += attendeesNames[i] + " ";
 	 value += "<" + attendeesEmails[i] + ">";
 	 input.value = value;
-	 input.addClassName("textField");
+	 $(input).addClassName("textField");
 	 input.setAttribute("modified", "0");
 	 tr.appendChild(td);
 	 td.appendChild(input);