diff --git a/calexium_lib/web/CXM_dojo.anubis b/calexium_lib/web/CXM_dojo.anubis
index ab18dac..66e686a 100644
--- a/calexium_lib/web/CXM_dojo.anubis
+++ b/calexium_lib/web/CXM_dojo.anubis
@@ -111,7 +111,7 @@ public define HTML_Off_Form
     literal("</select>")
     ]).
 
-define HTML_Row(HTML_Off_Form)
+define HTML_Off_Form
   input_in_dialog
   (
     InputDial input_data
@@ -119,8 +119,8 @@ define HTML_Row(HTML_Off_Form)
   if input_data is 
   {
     input_dial(id, input, label) then
-      row([], [cell([], sequence([ 
-        literal("<label for=\"" + id + "\"> " + label + "</label>"), 
+      sequence([ 
+        literal("<div id=\"" + id +"_block\"><label for=\"" + id + "\"> " + label + "</label>"), 
         literal("<input dojoType=dijit.form.TextBox " +
         if input is
         {
@@ -128,23 +128,26 @@ define HTML_Row(HTML_Off_Form)
           text then "type=\"text\"",
           password then "type=\"password\""
         } +
-        " name=\""+id+"\" id=\""+id+"\" />")
-      ]))]),
+        " name=\""+id+"\" id=\""+id+"\" /></div>")
+      ]),
     input_date(id, label) then 
-      row([], [cell([], sequence([
-      literal("<label for=\"" + id + "\"> " + label + "</label>"), 
-      literal("<div id=\""+id+"\" type=\"text\" name=\"date1\"
-  					   dojoType=\"dijit.form.DateTextBox\">
-  				</div>"
-  				)
-  				]))]),
-  	input_combo(label, id, name, list_data) then
-  	  row([], [cell([], sequence([
-  	  dojo_combobox(name, id, label, list_data)]))])
+      sequence([
+        literal("<div id=\"" + id +"_block\"><label for=\"" + id + "\"> " + label + "</label>"), 
+        literal("<div id=\""+id+"\" type=\"text\" name=\"date1\"
+    					   dojoType=\"dijit.form.DateTextBox\">
+    				</div></div>"
+    				)
+    	]),
+  	input_combo(label, the_id, name, list_data) then
+  	  sequence([
+    	  literal("<div id=\"" + the_id.id +"_block\">"), 
+    	  dojo_combobox(name, the_id, label, list_data),
+    	  literal("</div>")
+  	  ]) 
   }
 .
 
-define List(HTML_Row(HTML_Off_Form)) 
+define List(HTML_Off_Form)
   inputs_in_dialog
   (
     List(InputDial) inputs_data
@@ -167,30 +170,25 @@ public define HTML_Off_Form
   	  Maybe(String)   do_cancel
   	)
 	=
-	sequence[
+	sequence([
   	div([attr("dojoType", "dijit.Dialog"), id(dialog_id), title(name), attr("execute", execute)],
-  	  table([], 
-  	        empty, 
-  	         append(
-  	          inputs_in_dialog(inputs_data),
-  	          [
-  	            row([], [cell([columns(2), h_center], 
-  	              literal("<button dojoType=dijit.form.Button type=\"submit\" class=\"dialog_ok\">" + ok_label + "</button>" +
-  	              if cancel is
-  	              {
-  	                failure               then "",
-  	                success(cancel_label) then "<button dojoType=dijit.form.Button type=\"cancel\" class=\"dialog_cancel\" onclick=\"" +
-  	                  if do_cancel is
-  	                  {
-  	                    failure then "dijit.byId('"+ dialog_id +"').hide()",
-  	                    success(to_do_cancel) then to_do_cancel 
-  	                  }+ "\">" + cancel_label + "</button>"
-  	              }
-  	            ))]),
-  	          ]),
-  	        empty)),
-  	literal("<br/>"),
-  ]
+  	  sequence([
+  	    sequence(inputs_in_dialog(inputs_data)),
+  	    literal("<button dojoType=dijit.form.Button type=\"submit\" class=\"dialog_ok\">" + ok_label + "</button>" +
+  	       if cancel is
+  	       {
+  	         failure               then "",
+  	         success(cancel_label) then "<button dojoType=dijit.form.Button type=\"cancel\" class=\"dialog_cancel\" onclick=\"" +
+  	           if do_cancel is
+  	           {
+  	             failure then "dijit.byId('"+ dialog_id +"').hide()",
+  	             success(to_do_cancel) then to_do_cancel 
+  	           }+ "\">" + cancel_label + "</button>"
+  	       }),
+  	    literal("<br/>")
+  	  ])
+  	)
+ ])
 .
 
 public define HTML_Off_Form
--
libgit2 0.21.4