diff --git a/UI/Contacts/UIxContactView.m b/UI/Contacts/UIxContactView.m
index 5434ecc38..1c0e55dd6 100644
--- a/UI/Contacts/UIxContactView.m
+++ b/UI/Contacts/UIxContactView.m
@@ -73,10 +73,10 @@
         value = [NSString stringWithFormat: @"<a href=\"%@:%@\">%@</a>", url, value, value];
 
       if (label)
-        [cardString appendFormat: @"%@&nbsp;%@<br />\n",
+        [cardString appendFormat: @"<dt>%@</dt><dd>%@</dd>\n",
                     [self labelForKey: label], value];
       else
-        [cardString appendFormat: @"%@<br />\n", value];
+        [cardString appendFormat: @"<dt></dt><dd>%@</dd>\n", value];
     }
 
   return cardString;
@@ -196,14 +196,14 @@
 	      mailTo = [NSString stringWithFormat: @"<a href=\"mailto:%@\""
 				 @" onclick=\"return openMailTo('%@ <%@>');\">"
 				 @"%@</a>", email, fn, email, email];
-              [secondaryEmails addObject: [self _cardStringWithLabel: @"Additional Email:"
+              [secondaryEmails addObject: [self _cardStringWithLabel: nil
                                        value: mailTo]];
 	    }
 	}
     }
   else
     {
-      [secondaryEmails addObject: [self _cardStringWithLabel: @"Additional Email:"
+      [secondaryEmails addObject: [self _cardStringWithLabel: nil
                                         value: mailTo]];
     }
 
@@ -575,7 +575,7 @@
   data = [NSMutableString string];
   [data appendString: city];
   if ([city length] > 0 && [prov length] > 0)
-    [data appendString: @", "];
+    [data appendString: @" "];
   [data appendString: prov];
 
   return [self _cardStringWithLabel: nil value: data];
@@ -592,7 +592,7 @@
   data = [NSMutableString string];
   [data appendString: postalCode];
   if ([postalCode length] > 0 && [country length] > 0)
-    [data appendFormat: @", ", country];
+    [data appendFormat: @" ", country];
   [data appendString: country];
 
   return [self _cardStringWithLabel: nil value: data];
diff --git a/UI/Templates/ContactsUI/UIxContactView.wox b/UI/Templates/ContactsUI/UIxContactView.wox
index e00482085..9f216b09b 100644
--- a/UI/Templates/ContactsUI/UIxContactView.wox
+++ b/UI/Templates/ContactsUI/UIxContactView.wox
@@ -8,72 +8,80 @@
     xmlns:uix="OGo:uix">
     
     <var:if condition="hasPhoto"
-          ><span class="photoFrame"><img var:src="photoURL" class="contactPhoto"
-            /></span></var:if>
+          ><span class="photoFrame"><img var:src="photoURL" class="contactPhoto"/></span></var:if>
 
-    <h3 class="contactCardTitle"><var:string value="fullName" /></h3
-      
-      ><div id="leftContactColumn" class="contactColumn"
-      ><div id="primaryInfos"
-        ><h4><var:string label:value="Contact" /></h4
-          ><var:string value="displayName" escapeHTML="NO"
+    <h3 class="contactCardTitle"><var:string value="fullName" /></h3>
+    <div id="leftContactColumn" class="contactColumn">
+      <div id="primaryInfos">
+        <h4><var:string label:value="Contact" /></h4>
+        <dl class="dl-horizontal">
+          <var:string value="displayName" escapeHTML="NO"
           /><var:string value="nickName" escapeHTML="NO"
           /><var:string value="primaryEmail" escapeHTML="NO"
           /><var:foreach list="secondaryEmails" item="currentEmail">
-             <var:string value="currentEmail" escapeHTML="NO"/> 
-            </var:foreach>
-            <var:string value="screenName" escapeHTML="NO"
+             <var:string value="currentEmail" escapeHTML="NO"/>
+          </var:foreach
+          ><var:string value="screenName" escapeHTML="NO"
           /><var:string value="preferredAddress" escapeHTML="NO"
           /><var:string value="categories" escapeHTML="NO"
-          /></div
-        >
-        <var:if condition="hasHomeInfos"
-        ><div id="homeInfos"
-          ><h4><var:string label:value="Home" /></h4
-            ><var:string value="homeStreetAddress" escapeHTML="NO"
-            /><var:string value="homeExtendedAddress" escapeHTML="NO"
-            /><var:string value="homePobox" escapeHTML="NO"
-            /><var:string value="homeCityAndProv" escapeHTML="NO"
-            /><var:string value="homePostalCodeAndCountry" escapeHTML="NO"
-            /><var:string value="homeUrl" escapeHTML="NO"
-            /></div
-          ></var:if
-        
-        ><var:if condition="hasOtherInfos"
-        ><div id="otherInfos"
-          ><h4><var:string label:value="Other Infos" /></h4
-            ><var:string value="bday" escapeHTML="NO"
-            /><var:string value="tz" escapeHTML="NO"
-            /><var:string value="note" escapeHTML="NO"
-            /></div
-          ></var:if
-        ></div
+          />
+        </dl>
+      </div>
       
-      ><div id="rightContactColumn" class="contactColumn"
-      ><var:if condition="hasTelephones"
-        ><div id="phoneInfos"
-          ><h4><var:string label:value="Telephone" /></h4
-            ><var:string value="workPhone" escapeHTML="NO"
-            /><var:string value="homePhone" escapeHTML="NO"
-            /><var:string value="fax" escapeHTML="NO"
-            /><var:string value="mobile" escapeHTML="NO"
-            /><var:string value="pager" escapeHTML="NO"
-            /></div
-          ></var:if
+      <var:if condition="hasHomeInfos"
+      ><div id="homeInfos">
+        <h4><var:string label:value="Home" /></h4>
+        <dl class="dl-horizontal">
+          <var:string value="homeStreetAddress" escapeHTML="NO"
+          /><var:string value="homeExtendedAddress" escapeHTML="NO"
+          /><var:string value="homePobox" escapeHTML="NO"
+          /><var:string value="homeCityAndProv" escapeHTML="NO"
+          /><var:string value="homePostalCodeAndCountry" escapeHTML="NO"
+          /><var:string value="homeUrl" escapeHTML="NO"
+          />
+        </dl>
+      </div></var:if
+
+      ><var:if condition="hasOtherInfos"
+      ><div id="otherInfos">
+        <h4><var:string label:value="Other Infos" /></h4>
+        <dl class="dl-horizontal">
+          <var:string value="bday" escapeHTML="NO"
+          /><var:string value="tz" escapeHTML="NO"
+          /><var:string value="note" escapeHTML="NO"
+          />
+        </dl>
+      </div></var:if
+    ></div>
+   <div id="rightContactColumn" class="contactColumn">
+     <var:if condition="hasTelephones"
+     ><div id="phoneInfos">
+       <h4><var:string label:value="Telephone" /></h4>
+        <dl class="dl-horizontal">
+          <var:string value="workPhone" escapeHTML="NO"
+          /><var:string value="homePhone" escapeHTML="NO"
+          /><var:string value="fax" escapeHTML="NO"
+          /><var:string value="mobile" escapeHTML="NO"
+          /><var:string value="pager" escapeHTML="NO"
+          />
+        </dl>
+      </div></var:if
         
-        ><var:if condition="hasWorkInfos"
-        ><div id="workInfos"
-          ><h4><var:string label:value="Work" /></h4
-            ><var:string value="workTitle" escapeHTML="NO"
-            /><var:string value="workService" escapeHTML="NO"
-            /><var:string value="workCompany" escapeHTML="NO"
-            /><var:string value="workPobox" escapeHTML="NO"
-            /><var:string value="workStreetAddress" escapeHTML="NO"
-            /><var:string value="workExtendedAddress" escapeHTML="NO"
-            /><var:string value="workCityAndProv" escapeHTML="NO"
-            /><var:string value="workPostalCodeAndCountry" escapeHTML="NO"
-            /><var:string value="workUrl" escapeHTML="NO"
-            /></div
-          ></var:if
-        ></div
-      ></container>
+      ><var:if condition="hasWorkInfos"
+      ><div id="workInfos">
+        <h4><var:string label:value="Work" /></h4>
+        <dl class="dl-horizontal">
+          <var:string value="workTitle" escapeHTML="NO"
+          /><var:string value="workService" escapeHTML="NO"
+          /><var:string value="workCompany" escapeHTML="NO"
+          /><var:string value="workPobox" escapeHTML="NO"
+          /><var:string value="workStreetAddress" escapeHTML="NO"
+          /><var:string value="workExtendedAddress" escapeHTML="NO"
+          /><var:string value="workCityAndProv" escapeHTML="NO"
+          /><var:string value="workPostalCodeAndCountry" escapeHTML="NO"
+          /><var:string value="workUrl" escapeHTML="NO"
+          />
+        </dl>
+      </div></var:if
+    ></div
+  ></container>
diff --git a/UI/Templates/ContactsUI/UIxListView.wox b/UI/Templates/ContactsUI/UIxListView.wox
index c0a7a8552..6cffadb6c 100644
--- a/UI/Templates/ContactsUI/UIxListView.wox
+++ b/UI/Templates/ContactsUI/UIxListView.wox
@@ -11,18 +11,24 @@
     const:popup="YES"
     >
     <h3 class="contactCardTitle"><var:string value="listName" /></h3>
-    <var:if condition="hasNickname">
-      <h4><var:string value="listNickname" /></h4>
-    </var:if>
-    <var:if condition="hasDescription">
-      <div class="listDescription"><var:string value="listDescription" /></div>
-    </var:if>
-    <ul class="listComponents">
-      <var:foreach list="components" item="item">
-        <li><var:string var:value="itemName"/> 
-          <var:if condition="itemHasEmail"><a var:href="itemHref" var:onclick="itemOnclick">
+    <div class="contactColumn">
+    <dl class="dl-horizontal">
+      <dt><var:if condition="hasNickname"><var:string value="listNickname" /></var:if></dt>
+      <dd><var:if condition="hasDescription"><var:string value="listDescription" /></var:if></dd>
+    </dl>
+    <h4><var:string label:value="Members" /></h4>
+    <dl class="dl-horizontal">
+      <dt></dt>
+      <dd>
+        <ul class="listComponents">
+          <var:foreach list="components" item="item">
+            <li><var:string var:value="itemName"/> 
+            <var:if condition="itemHasEmail"><a var:href="itemHref" var:onclick="itemOnclick">
             &lt;<var:string var:value="itemEmail"/>&gt;</a></var:if>
-        </li>
-      </var:foreach>
-    </ul>
+            </li>
+          </var:foreach
+        ></ul>
+      </dd>
+    </dl>
+    </div>
   </var:component>
diff --git a/UI/Templates/SchedulerUI/UIxCalendarProperties.wox b/UI/Templates/SchedulerUI/UIxCalendarProperties.wox
index c62854e2f..285ffe274 100644
--- a/UI/Templates/SchedulerUI/UIxCalendarProperties.wox
+++ b/UI/Templates/SchedulerUI/UIxCalendarProperties.wox
@@ -118,11 +118,13 @@
             ><input type="checkbox" const:class="checkBox" 
               id="notifyUserOnPersonalModifications" var:checked="notifyUserOnPersonalModifications"
               /><var:string label:value="When I modify my calendar, send a mail to:"
-              /></label><span class="content"><input type="text"
-              name="notifiedUserOnPersonalModifications" id="notifiedUserOnPersonalModifications"
-              class="textField"
-              var:value="notifiedUserOnPersonalModifications"
-              /></span></div>
+              /></label></div>
+        <div><span class="label"
+            ><entity name="nbsp"/></span><span class="content">
+             <input type="text" name="notifiedUserOnPersonalModifications" id="notifiedUserOnPersonalModifications"
+                    class="textField"
+                    var:value="notifiedUserOnPersonalModifications"
+             /></span></div>
       </fieldset>
 
     </div>
diff --git a/UI/WebServerResources/ContactsUI.css b/UI/WebServerResources/ContactsUI.css
index 122e3ebf2..c2298cadc 100644
--- a/UI/WebServerResources/ContactsUI.css
+++ b/UI/WebServerResources/ContactsUI.css
@@ -279,6 +279,38 @@ DIV.contactColumn H4
   width: 100%;
   padding: .1em .2em; }
 
+dt, dd {
+  line-height: 14px;
+}
+
+dt {
+  color: #666;
+  line-height: 13px;
+}
+dd {
+  margin-left: 9px;
+}
+.dl-horizontal dt {
+  float: left;
+  width: 100px;
+  overflow: hidden;
+  clear: left;
+  text-align: right;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.dl-horizontal dd {
+  margin-left: 110px;
+}
+
+.dl-horizontal ul {
+  list-style-type: none;
+  margin: 0px;
+  padding-left: 0px;
+}
+.dl-horizontal li {
+  margin-left: 0;
+}
 SPAN.photoFrame
 { cursor: pointer;
   float: left;
diff --git a/UI/WebServerResources/SchedulerUI.css b/UI/WebServerResources/SchedulerUI.css
index 5b9bef6a7..e6bc2d6c3 100644
--- a/UI/WebServerResources/SchedulerUI.css
+++ b/UI/WebServerResources/SchedulerUI.css
@@ -1293,8 +1293,10 @@ DIV.event > DIV.eventInside
   padding: 1px;
   top: 0px;
   bottom: 0px;
-  left: 0px;
-  right: 0px; }
+  left: 2px;
+  right: 1px;
+  -webkit-border-radius: 2px;
+  border-radius: 2px; }
 
 DIV.eventInside SPAN.location
 { font-size: smaller; }
diff --git a/UI/WebServerResources/UIxCalendarProperties.css b/UI/WebServerResources/UIxCalendarProperties.css
index 41558c37e..dbb7b6f9f 100644
--- a/UI/WebServerResources/UIxCalendarProperties.css
+++ b/UI/WebServerResources/UIxCalendarProperties.css
@@ -13,19 +13,20 @@ FIELDSET DIV
 
 SPAN.label
 { cursor: default;
-  width: 60px;
+  width: 55px;
   text-align: right;
   line-height: 2em;
   float: left;
   display: block; }
 
 INPUT.checkBox
-{ margin-left: 35px; }
+{ margin-left: 38px;
+  margin-right: 6px; }
 
 SPAN.content
-{ display: block;
-  line-height: 1.5em;
-  vertical-align: middle; }
+{ line-height: 1.5em;
+  vertical-align: middle;
+  margin-left: 4px; }
 
 SPAN.content INPUT.textField
 { width: 160px; }