diff --git a/calexium_lib/web/CXM_dojo.anubis b/calexium_lib/web/CXM_dojo.anubis
index 40dd306..cbcde44 100644
--- a/calexium_lib/web/CXM_dojo.anubis
+++ b/calexium_lib/web/CXM_dojo.anubis
@@ -280,6 +280,18 @@ public define HTML_Off_Form
         attr("splitter", if splitter then "true" else "false") . attributes ],
       content).
 
+public define HTML_In_Form
+  dojo_ContentPane
+  (
+      List(CoreAttrs)       attributes,
+      BorderContainerRegion region,
+      Bool                  splitter,
+      HTML_In_Form         content
+  )  =
+  div([ attr("dojoType", "dijit.layout.ContentPane"), 
+        attr("region", to_String(region)), 
+        attr("splitter", if splitter then "true" else "false") . attributes ],
+      content).
       
 public define HTML_Off_Form
   dojo_TabContainer
@@ -351,6 +363,29 @@ public define HTML_Off_Form
       "<span dojoType=\"dijit.Tooltip\" connectId=\"" + html_id.id + "\">" + tip + "</span>"
   }).
 
+public define HTML_In_Form
+  dojo_button 
+  	(
+  	  HtmlId        html_id,
+  	  String        name,
+  	  String        iconclass,
+  	  Maybe(String) tip_msg,
+  	  String        execute,
+  	)=
+	literal("
+  <button dojoType=\"dijit.form.Button\" id=\"" + html_id.id + "\" iconClass=\"" + iconclass + "\" >" 
+  + name
+  + "<script type=\"dojo/method\" event=\"onClick\">"
+  + execute
+  + "</script>"
+  + "</button>" +
+  if tip_msg is 
+  {
+    failure then "",
+    success(tip) then 
+      "<span dojoType=\"dijit.Tooltip\" connectId=\"" + html_id.id + "\">" + tip + "</span>"
+  }).
+
 
 public define HTML_Off_Form
   dojo_declaration
@@ -363,12 +398,12 @@ public define HTML_Off_Form
       content).
  
 
- public define HTML_In_Form
+public define HTML_In_Form
   dojo_declaration
   	(
       String          name,
       List(CoreAttrs) attributes,
-      HTML_In_Form   content
+      HTML_In_Form    content
     )=
   div([attr("dojoType", "dijit.Declaration"), attr("widgetClass", name) . attributes ],
       content).
@@ -377,9 +412,9 @@ public define HTML_In_Form
   dojo_editor
   	(
       List(CoreAttrs)  attributes,
-      HtmlId                html_id,
-      WebArgName            input_name,
-      HTML_In_Form          text,
+      HtmlId           html_id,
+      WebArgName       input_name,
+      HTML_In_Form     text,
     )=/*
    text_area([input_attrs([
      attr("dojoType", "dijit.Editor"), attr("style", "overflow:auto") .
@@ -409,7 +444,7 @@ public define HTML_In_Form
         "<span dojoType=\"dijit.Tooltip\" connectId=\"" + html_id.id + "\">" + tip + "</span>"
     }).
 
-public define MF_FormField
+public define HTML_In_Form
   dojo_checkbox
   (
     List(InputAttrs)  attributes,
@@ -418,11 +453,10 @@ public define MF_FormField
     String        label,
     WebArgValue   val,
     Bool          checked,
-    Mandatory     mandatory,
   )=
-    checkboxr([attr("dojoType", "dijit.form.CheckBox") . attributes] , label, id, name, val, checked, mandatory).
+    check_box_r([attr("dojoType", "dijit.form.CheckBox") . attributes] , label, id, name, val, checked).
 
-public define MF_FormField
+public define HTML_In_Form
   dojo_combobox
   (
     List(InputAttrs)            attributes,
@@ -430,7 +464,7 @@ public define MF_FormField
     HtmlId                      id,
     String                      label,
     List((WebArgValue,String))  list_data,
-    Maybe(InitialValue)         selected,
+    InitialValue                selected,
   )=
    // selector_c([attr("dojoType", "dijit.form.ComboBox") . attributes], label, id, name, 1, list_data, selected, non_mandatory).
-  selector_c([], label, id, name, 1, list_data, selected, non_mandatory).
+  selector_c([], label, id, name, 1, list_data, selected).
--
libgit2 0.21.4