Index: deformdemo/test.py
===================================================================
--- deformdemo/test.py	(revision 10147)
+++ deformdemo/test.py	(working copy)
@@ -1160,10 +1160,8 @@
         browser.wait_for_page_to_load("30000")
         browser.click('deformField1-seqAdd')
         browser.click('deformField1-seqAdd')
-        browser.click(
-          '//html/body/div/div/div/form/fieldset/ul/li/div/li/div/ul/li/input')
-        browser.click(
-          '//html/body/div/div/div/form/fieldset/ul/li/div/li[2]/div/ul/li[2]/input[1]')
+        browser.click(dom='document.forms[0].elements[5]')
+        browser.click(dom='document.forms[0].elements[11]')
         browser.click("submit")
         browser.wait_for_page_to_load("30000")
         self.failIf(browser.is_element_present('css=.errorMsgLbl'))
Index: deform/static/css/form.css
===================================================================
--- deform/static/css/form.css	(revision 10147)
+++ deform/static/css/form.css	(working copy)
@@ -28,6 +28,32 @@
         clear: left;
 /* 	clear:both; */
 }
+
+form fieldset ul > li > ul > li{
+	display:block;
+	margin:0;
+	padding:0px;
+    clear: left;
+/* 	clear:both; */
+}
+
+.inline{
+	margin: 0px;
+	padding: 0px;
+}
+
+.inline > li{
+	clear: none;
+	display: inline-block;
+	zoom: 1;
+	width: auto;
+	overflow: hidden;
+}
+
+form li label{
+	font-size: 85%;
+}
+
 form li:after, form li div:after{
 	content:".";
 	display:block;
Index: deform/templates/checkbox_choice.pt
===================================================================
--- deform/templates/checkbox_choice.pt	(revision 10147)
+++ deform/templates/checkbox_choice.pt	(working copy)
@@ -1,6 +1,5 @@
-<div>
+<input type="hidden" name="__start__" value="${field.name}:sequence"/>
   <ul class="deformSet">
-    <input type="hidden" name="__start__" value="${field.name}:sequence"/>
     <tal:loop tal:repeat="choice field.widget.values">
       <tal:def tal:define="(value, title) choice">
         <li class="deformSet-item">
@@ -14,7 +13,6 @@
         </li>
       </tal:def>
     </tal:loop>
-    <input type="hidden" name="__end__" value="${field.name}:sequence"/>
   </ul>
-</div>
+<input type="hidden" name="__end__" value="${field.name}:sequence"/>
 
Index: deform/templates/checked_input.pt
===================================================================
--- deform/templates/checked_input.pt	(revision 10147)
+++ deform/templates/checked_input.pt	(working copy)
@@ -1,23 +1,21 @@
-<div>
-
-  <input type="hidden" name="__start__" value="${field.name}:mapping"/>
-
-  <div>
+<input type="hidden" name="__start__" value="${field.name}:mapping"/>
+<ul>
+  <li>
     <label for="${field.oid}">${subject}</label>
     <input type="text" name="value" value="${cstruct}"
            tal:attributes="size field.widget.size; 
                            class field.widget.css_class"
            id="${field.oid}"/>
-  </div>
+  </li>
 
-  <div>
+  <li>
     <label for="${field.oid}-confirm">${confirm_subject}</label>
     <input type="text" name="confirm" value="${confirm}"
            tal:attributes="size field.widget.size; class
                            field.widget.css_class"
            id="${field.oid}-confirm"/>
-  </div>
-
+  </li>
+</ul>
   <script tal:condition="field.widget.mask" type="text/javascript">
     deform.addCallback(
         '${field.oid}',
@@ -31,7 +29,4 @@
     
   </script>
 
-  <input type="hidden" name="__end__" value="${field.name}:mapping"/>
-
-</div>
-
+<input type="hidden" name="__end__" value="${field.name}:mapping"/>
Index: deform/templates/checked_password.pt
===================================================================
--- deform/templates/checked_password.pt	(revision 10147)
+++ deform/templates/checked_password.pt	(working copy)
@@ -1,16 +1,16 @@
-<div>
-  <input type="hidden" name="__start__" value="${field.name}:mapping"/>
-  <div>
+<input type="hidden" name="__start__" value="${field.name}:mapping"/>
+<ul>
+  <li>
     <label for="${field.oid}">Password</label>
     <input type="password" name="value" value="${cstruct}"
            tal:attributes="size field.widget.size" id="${field.oid}"/>
-  </div>
-  <div>
+  </li>
+  <li>
     <label for="${field.oid}-confirm">Confirm Password</label>
     <input type="password" name="confirm" value="${confirm}"
            tal:attributes="size field.widget.size;
                            class field.widget.css_class" 
            id="${field.oid}-confirm"/>
-  </div>
-  <input type="hidden" name="__end__" value="${field.name}:mapping"/>
-</div>
+  </li>
+</ul>
+<input type="hidden" name="__end__" value="${field.name}:mapping"/>
Index: deform/templates/radio_choice.pt
===================================================================
--- deform/templates/radio_choice.pt	(revision 10147)
+++ deform/templates/radio_choice.pt	(working copy)
@@ -1,5 +1,4 @@
-<div>
-  <ul class="deformSet"> 
+<ul class="deformSet"> 
     <input type="hidden" name="__start__" value="${field.name}:rename"/>
     <tal:loop tal:repeat="choice field.widget.values">
       <tal:def tal:define="(value, title) choice">
@@ -15,6 +14,5 @@
       </tal:def>
     </tal:loop>
     <input type="hidden" name="__end__"/>
-  </ul>
-</div>
+</ul>
 
Index: deform/templates/dateparts.pt
===================================================================
--- deform/templates/dateparts.pt	(revision 10147)
+++ deform/templates/dateparts.pt	(working copy)
@@ -1,21 +1,25 @@
-<div>
-  <input type="hidden" name="__start__" value="${field.name}:mapping"/>
-  <label for="${field.oid}">Year</label>
-  <input type="text" name="year" value="${year}" 
-         tal:attributes="size field.widget.size;
-                         class field.widget.css_class" 
-         id="${field.oid}"/>
-  <label for="${field.oid}-month">Month</label>
-  <input type="text" name="month" value="${month}" 
-         tal:attributes="size field.widget.size;
-                         class field.widget.css_class"
-         id="${field.oid}-month"/>
-  <label for="${field.oid}-day">Day</label>
-  <input type="text" name="day" value="${day}" 
-         tal:attributes="size field.widget.size;
-                         class field.widget.css_class"
-         id="${field.oid}-day"/>
-  <input type="hidden" name="__end__" value="${field.name}:mapping"/>
-</div>
-
-
+<input type="hidden" name="__start__" value="${field.name}:mapping"/>
+<ul class="inline">
+  <li>
+	  <label for="${field.oid}">Year</label>
+	  <input type="text" name="year" value="${year}" 
+	         tal:attributes="size field.widget.size;
+	                         class field.widget.css_class" 
+	         id="${field.oid}"/>
+  </li>
+  <li>
+	  <label for="${field.oid}-month">Month</label>
+	  <input type="text" name="month" value="${month}" 
+	         tal:attributes="size field.widget.size;
+	                         class field.widget.css_class"
+	         id="${field.oid}-month"/>
+  </li>
+  <li>
+	  <label for="${field.oid}-day">Day</label>
+	  <input type="text" name="day" value="${day}" 
+	         tal:attributes="size field.widget.size;
+	                         class field.widget.css_class"
+	         id="${field.oid}-day"/>
+  </li>
+</ul>
+<input type="hidden" name="__end__" value="${field.name}:mapping"/>