diff -r cb88ced8aadf -r 366e1f8d93bb src/main/webapp/templates-hidden/wizard-all.html
--- a/src/main/webapp/templates-hidden/wizard-all.html	Tue Mar 06 14:07:04 2012 +0100
+++ b/src/main/webapp/templates-hidden/wizard-all.html	Thu Apr 12 10:52:42 2012 +0200
@@ -5,55 +5,40 @@
   <wizard:wizard_top> <div> <wizard:bind/> </div> </wizard:wizard_top>
   <wizard:screen_top> <div> <wizard:bind/> </div> </wizard:screen_top>
   <wizard:errors>
-    <div>
-      <ul>
-        <wizard:item><li><wizard:bind/></li></wizard:item>
-      </ul>
-    </div>
+    <div> <ul> <wizard:item><li><wizard:bind/></li></wizard:item> </ul> </div>
   </wizard:errors>
-  <div>
+  <fieldset>
+    <legend></legend>
     <wizard:fields>
-      <table>
-        <tr lift:bind="wizard:line" class="row">
-          <td class="form-name">
-            <wizard:label>
-              <label wizard:for="">
-                <wizard:bind></wizard:bind>
-              </label>
-            </wizard:label>
-            <wizard:help>
-              <span>
-                <wizard:bind></wizard:bind>
-              </span>
-            </wizard:help>
-            <wizard:field_errors>
+      <div lift:bind="wizard:line" class="control-group">
+        <wizard:label>
+          <label wizard:for="" class="control-label"> <wizard:bind></wizard:bind> </label>
+        </wizard:label>
+        <div class="controls">
+          <wizard:form></wizard:form>
+          <wizard:help>
+            <span class="help-inline"> <wizard:bind></wizard:bind> </span>
+          </wizard:help>
+          <wizard:field_errors>
+            <span class="help-inline">
               <ul>
                 <wizard:error>
                   <li><wizard:bind></wizard:bind></li>
                 </wizard:error> 
               </ul>
-            </wizard:field_errors>
-          </td>
-          <td class="form-value">
-            <wizard:form></wizard:form>
-          </td>
-        </tr>
-      </table>
+            </span>
+          </wizard:field_errors>
+        </div>
+      </div>
     </wizard:fields>
-  </div>
-  <div>
-    <table>
-      <tr> 
-        <td><wizard:prev></wizard:prev></td>
-        <td><wizard:cancel></wizard:cancel></td>
-        <td><wizard:next></wizard:next></td>
-      </tr>
-    </table>
-  </div>
-  <wizard:screen_bottom>
-    <div><wizard:bind></wizard:bind></div>
-  </wizard:screen_bottom>
-  <wizard:wizard_bottom>
-    <div><wizard:bind></wizard:bind></div>
-  </wizard:wizard_bottom>
+    <div class="form-horizontal">
+      <div class="form-actions">
+        <wizard:prev></wizard:prev>
+        <wizard:next></wizard:next>
+        <wizard:cancel></wizard:cancel>
+      </div>
+    </div>
+  </fieldset>
+  <wizard:screen_bottom> <div><wizard:bind></wizard:bind></div> </wizard:screen_bottom>
+  <wizard:wizard_bottom> <div><wizard:bind></wizard:bind></div> </wizard:wizard_bottom>
 </div>