diff --git a/calexium_lib/web/CXM_making_a_web_site.anubis b/calexium_lib/web/CXM_making_a_web_site.anubis
index 9003367..047b354 100644
--- a/calexium_lib/web/CXM_making_a_web_site.anubis
+++ b/calexium_lib/web/CXM_making_a_web_site.anubis
@@ -892,7 +892,9 @@ public type HTML_In_Form:
    selector_c            (String name, Int32 size, List((String,String)) choices), 
    selector_c            (String name, Int32 size, List((String,String)) choices, String selected),
    radio_button          (String label_text, String label, String name, String value, Bool checked), 
+   radio_button_r        (String label_text, String label, String name, String value, Bool checked), 
    check_box             (String label_text, String label, String name, Bool checked),
+   check_box_r           (String label_text, String label, String name, Bool checked),
    div                   (List(DIV_Option), HTML_In_Form content),
    div_empty             (List(DIV_Option)),
    hidden                (String name, String value).
@@ -3527,9 +3529,15 @@ define Printable_tree
        radio_button(label_text,label,n,v,c)         then  
          [ "<label for=\"",label,"\">",label_text,"</label>",
            "<input type=radio name=o",n," id=",label," value=\"",v,"\"",(if c then " checked" else ""),">"],
+       radio_button_r(label_text,label,n,v,c)         then  
+         [ "<input type=radio name=o",n," id=",label," value=\"",v,"\"",(if c then " checked" else ""),">",
+         	 "<label for=\"",label,"\">",label_text,"</label>"],
        check_box(label_text, label,n,c)              then 
          [ if length(label_text) > 0 then "<label for=\""+label+"\">"+label_text+"</label>" else "",
            "<input type=checkbox name=o",n," id=\"",label,"\""+(if c then " checked " else ""),">"]
+       check_box_r(label_text, label,n,c)              then 
+         [ "<input type=checkbox name=o",n," id=\"",label,"\""+(if c then " checked " else ""),">",
+         	 if length(label_text) > 0 then "<label for=\""+label+"\">"+label_text+"</label>" else "" ]
        div(options, e)              then
         format(cinfo,sn,ic_v,any_div(options, e),format_element,is_https),    
        div_empty(options)           then
@@ -3597,7 +3605,9 @@ define Bool
    selector_c(n,s,c)          then false, 
    selector_c(n,s,c,p)        then false,  
    radio_button(_,_,n,v,c)    then false,
+   radio_button_r(_,_,n,v,c)  then false,
    check_box(_,_,n,c)         then false,
+   check_box_r(_,_,n,c)       then false,
    div(o,c)                   then false,
    div_empty(o)               then false,
    hidden(_,_)                then false
--
libgit2 0.21.4