diff --git a/web/CXM_making_a_web_site.anubis b/web/CXM_making_a_web_site.anubis
index 5a149f9..aab9062 100644
--- a/web/CXM_making_a_web_site.anubis
+++ b/web/CXM_making_a_web_site.anubis
@@ -118,17 +118,17 @@ transmit calexium_lib/web/types/web_action_name.anubis
    The next picture shows the structure we have in mind:
    
    
-                request            +---------+         HTML page (with a hidden state name)
+                request            +---------+         HTML page (with state name in cookie)
                .-------------------| client  |<--------------.
                | .-----------------|         |               |
-               | | previous state  +---------+               |
-               | | name (if any)                             |         
+               | | session         +---------+               |
+               | | in cookie                                 |
                | |                                           |          client side
        ............................................................................
                | |                                           |          server side
                | |                                           |
                | | .-------------------.                     |
-               | | | previous state    |                     |
+               | | | previous session  |                     |
                V V V                   |                     |
        +---------------+             +---------------+     +--------------+
        | compute state |             | server's disk |     | compute page |
@@ -327,65 +327,128 @@ public type WEB_Controller_Result:
     Var(List(WEB_Session_Field)) fields
   ),
   ajax(
-    HTTP_Answer http_answer
-  ),
-  ajax(
-    WEB_Session session,        //modified session
-    HTTP_Answer http_answer     //http answer
-  ),
-  ajax(
-    HTML_Partial_Content  content,
-    String                additional_script
+    Maybe(WEB_Session)    mb_session, //modified session if success else failure
+    HTTP_Answer           http_answer //http answer
   ),
   ajax(
-    WEB_Session           session,        //modified session
+    Maybe(WEB_Session)    mb_session, //modified session if success else failure
     HTML_Partial_Content  content,
     String                additional_script
   ),
   ajax(
-    Printable_tree        content,
-    String                additional_script
-  ),
-  ajax(
-    WEB_Session           session,        //modified session
+    Maybe(WEB_Session)    mb_session, //modified session if success else failure
     Printable_tree        content,
     String                additional_script
   ),
   send_file(
     String                full_path       //full path with file name of the file to send
+  ),
+  renderer_content(
+    Maybe(WEB_Session)    mb_session, //modified session if success else failure
+    String                title,
+    HTML_Partial_Content  content,    
   )
 .
 
 public define WEB_Controller_Result
   ajax
   (
+    HTTP_Answer http_answer
+  )=
+  ajax(failure, http_answer)
+.
+
+public define WEB_Controller_Result
+  ajax
+  (
+    WEB_Session session,        //modified session  
+    HTTP_Answer http_answer
+  )=
+  ajax(success(session), http_answer)
+.
+
+public define WEB_Controller_Result
+  ajax
+  (
     HTML_Partial_Content content
   )=
-  ajax(content, "").
+  ajax(failure, content, "").
 
 public define WEB_Controller_Result
   ajax
   (
+    HTML_Partial_Content  content,
+    String                additional_script
+  )=
+  ajax(failure, content, additional_script).
+  
+public define WEB_Controller_Result
+  ajax
+  (
     WEB_Session           session,        //modified session
     HTML_Partial_Content  content
   )=
-  ajax(session, content, "").
+  ajax(success(session), content, "").
+
+public define WEB_Controller_Result
+  ajax
+  (
+    WEB_Session           session,        //modified session
+    HTML_Partial_Content  content,
+    String                additional_script    
+  )=
+  ajax(success(session), content, additional_script).
   
 public define WEB_Controller_Result
   ajax
   (
     Printable_tree content
   )=
-  ajax(content, "").
+  ajax(failure, content, "").
 
 public define WEB_Controller_Result
   ajax
   (
+    Printable_tree content,
+    String         additional_script    
+  )=
+  ajax(failure, content, additional_script).
+  
+public define WEB_Controller_Result
+  ajax
+  (
     WEB_Session    session,        //modified session  
     Printable_tree content
   )=
-  ajax(session, content, "").
+  ajax(success(session), content, "").
   
+public define WEB_Controller_Result
+  ajax
+  (
+    WEB_Session    session,        //modified session  
+    Printable_tree content,
+    String         additional_script
+  )=
+  ajax(success(session), content, additional_script).
+
+public define WEB_Controller_Result
+  renderer_content(
+    String                title,
+    HTML_Partial_Content  content,    
+  )=
+  renderer_content(failure, title, content)
+.
+
+public define WEB_Controller_Result
+  renderer_content(
+    WEB_Session           session, //modified session if success else failure
+    String                title,
+    HTML_Partial_Content  content,    
+  )=
+  renderer_content(success(session), title, content)
+.
+
+
 public type WEB_Action_Allowed_Protocol:
   http,
   https,
@@ -408,6 +471,14 @@ public type WEB_Controller:
   )
 .
 
+public type WEB_Page_Renderer:
+  web_page_renderer(
+    String                                                                              name,         //renderer name
+    (WEB_Session _session, String title, HTML_Partial_Content  _content) -> HTTP_Answer page_layout   //call back for rendering page
+  )
+.
+
+
 define List(HTTP_header)
   make_session_cookie_headers
   (
@@ -949,17 +1020,7 @@ public define InputAttrs
 public type I18n:
   lang  (String),
   dir   (Reading_Way).
-  
-//public type DIV_Option:
-//  id      (String),
-//  class   (String),
-//  style   (String),
-//  tooltip  (String),
-//  lang    (String), 
-//  dir     (Reading_Way),
-//  attr    (String, String),
-//  event    (HtmlEvents, String).
-// 
+
   
   A list of 'DIV_Option' must be given with each DIV you want to put in your page.
 
@@ -970,24 +1031,24 @@ define String event_name
   if e is
   {
     // Form element events
-    onchange     then "onchange",
-    onsubmit     then "onsubmit",
+    onchange    then "onchange",
+    onsubmit    then "onsubmit",
     onreset     then "onreset",
-    onselect     then "onselect",
-    onblur       then "onblur",
+    onselect    then "onselect",
+    onblur      then "onblur",
     onfocus     then "onfocus",
     // Keyboard events
     onkeydown   then "onkeydown",
-    onkeypress   then "onkeypress",
+    onkeypress  then "onkeypress",
     onkeyup     then "onkeyup",
     // Mouse events
     onclick     then "onclick",
-    ondblclick   then "ondblclick",
-    onmousedown  then "onmousedown",
-    onmousemove  then "onmousemove",
+    ondblclick  then "ondblclick",
+    onmousedown then "onmousedown",
+    onmousemove then "onmousemove",
     onmouseout  then "onmouseout",
-    onmouseover  then "onmouseover",
-    onmouseup    then "onmouseup"
+    onmouseover then "onmouseover",
+    onmouseup   then "onmouseup"
   }.
   
 public type Table_Option:
@@ -1029,13 +1090,13 @@ public type Cell_Option:
    base_line,               // align the content vertically according to base lines
    background_color(RGB), 
    background_image(String url, BackgroundOption), 
-   width(Int),            // sets a minimal width for the cell
+   width(Int),              // sets a minimal width for the cell
    percentage_width(Int), 
-   height(Int),           // sets a minimal height for the cell
-   columns(Int),          // lets the cell span over several columns
-   rows(Int),             // lets the cell span over several rows
+   height(Int),             // sets a minimal height for the cell
+   columns(Int),            // lets the cell span over several columns
+   rows(Int),               // lets the cell span over several rows
    nowrap,                  // do not allow text wrapping within the cell
-   style(String),          // in case nothing above is suitable
+   style(String),           // in case nothing above is suitable
    class(String class_name).
    
    A list of 'Cell_Option'  must be given with each cell and each  row in a table. Options
@@ -1743,10 +1804,7 @@ public type HTML_Off_Form:
    literal               (String),
    sequence              (List(HTML_Off_Form) items), 
    text                  (List(CoreAttrs), String the_text), 
-   preformated           (List(Text_Option), String), 
-   paragraph             (List(Text_Option), List(HTML_Off_Form) content), 
-   image                 (List(CoreAttrs), String url, String alternate), 
-   image                 (List(CoreAttrs), String url, String alternate, Int width, Int height), 
+   preformated          (List(Text_Option), String), 
    table                 (List(Table_Option), HTML_Header_Row(HTML_Off_Form), List(HTML_Row(HTML_Off_Form)), HTML_Footer_Row(HTML_Off_Form)), 
    center                (HTML_Off_Form),
    mail_to               (String email, HTML_Off_Form element), 
@@ -1772,34 +1830,24 @@ public type HTML_Off_Form:
                            WEB_Action_Name action, List((String,String)) extra_ops,
                            List(HTML_In_Form) content),
   in_form               (HTML_Id form_id, HTML_In_Form content),
-  div                   (List(CoreAttrs), List(HTML_Off_Form) content),
   div                   (List(CoreAttrs), List(HTML_Partial_Content) p_content),
-  div_empty             (List(CoreAttrs)),
   iframe                (List(CoreAttrs),
                            List(CSS_Style)  /*styles*/,
                            List(CSS_File)   /*css_files*/,
                            List(JS_File)    /*js_files*/,
                            HTML_Body        /*body*/),
   partial               (HTML_Partial_Content),
-  br,
   progress              (List(CoreAttrs), Int value, Int max),
-  ol                    (List(CoreAttrs), List(HTML_Off_Form) content),  
-  ul                    (List(CoreAttrs), List(HTML_Off_Form) content),
-  li                    (List(CoreAttrs), List(HTML_Off_Form) content),
-  button                (List(CoreAttrs), List(HTML_Off_Form) content),
   i                     (List(CoreAttrs), String text),
-  span                  (List(CoreAttrs), String text),
-  strong                (List(CoreAttrs), List(HTML_Off_Form) content),
-  hr                    (List(CoreAttrs)),
-  h1                    (List(CoreAttrs), List(HTML_Off_Form) content),
-  h2                    (List(CoreAttrs), List(HTML_Off_Form) content),
-  h3                    (List(CoreAttrs), List(HTML_Off_Form) content),
-  h4                    (List(CoreAttrs), List(HTML_Off_Form) content),
-  h5                    (List(CoreAttrs), List(HTML_Off_Form) content),
-  h6                    (List(CoreAttrs), List(HTML_Off_Form) content)  
+  html_tag              (String tag_name, List(CoreAttrs), List(HTML_Off_Form) content),
+  html_void_tag         (String tag_name, List(CoreAttrs))
 .
    
    'HTML_Off_Form' defines all the elements you may put outside any form. 
+   
+public define HTML_Off_Form text(List(CoreAttrs) lto, Int i)  = text(lto, to_decimal(i)).   
+public define HTML_Off_Form text(Int i)                       = text([], i).
+public define HTML_Off_Form text(String s)                    = text([], s).
 
 public define HTML_Off_Form a(A_href _href)                                                     = a([],     _href, _self, []).
 public define HTML_Off_Form a(List(CoreAttrs) attrs, A_href _href)                              = a(attrs,  _href, _self, []).
@@ -1808,38 +1856,149 @@ public define HTML_Off_Form a(List(CoreAttrs) attrs, A_href _href, List(HTML_Off
 public define HTML_Off_Form a(A_href _href, HTML_Off_Form content)                              = a([],     _href, _self, [content]).
 public define HTML_Off_Form a(A_href _href, List(HTML_Off_Form) content)                        = a([],     _href, _self, content).
 
-           
-public define HTML_Off_Form strong(HTML_Off_Form content)       = strong([], [content]).
-public define HTML_Off_Form strong(List(HTML_Off_Form) content) = strong([], content).
-public define HTML_Off_Form strong(List(CoreAttrs) attrs, HTML_Off_Form content) = strong(attrs, [content]).
-
-public define HTML_Off_Form h1(HTML_Off_Form content)       = h1([], [content]).
-public define HTML_Off_Form h1(List(HTML_Off_Form) content) = h1([], content).
-public define HTML_Off_Form h1(List(CoreAttrs) attrs, HTML_Off_Form content) = h1(attrs, [content]).
-
-public define HTML_Off_Form h2(HTML_Off_Form content)       = h2([], [content]).
-public define HTML_Off_Form h2(List(HTML_Off_Form) content) = h2([], content).
-public define HTML_Off_Form h2(List(CoreAttrs) attrs, HTML_Off_Form content) = h2(attrs, [content]).
-
-public define HTML_Off_Form h3(HTML_Off_Form content)       = h3([], [content]).
-public define HTML_Off_Form h3(List(HTML_Off_Form) content) = h3([], content).
-public define HTML_Off_Form h3(List(CoreAttrs) attrs, HTML_Off_Form content) = h3(attrs, [content]).
-
-public define HTML_Off_Form h4(HTML_Off_Form content)       = h4([], [content]).
-public define HTML_Off_Form h4(List(HTML_Off_Form) content) = h4([], content).
-public define HTML_Off_Form h4(List(CoreAttrs) attrs, HTML_Off_Form content) = h4(attrs, [content]).
-
-public define HTML_Off_Form h5(HTML_Off_Form content)       = h5([], [content]).
-public define HTML_Off_Form h5(List(HTML_Off_Form) content) = h5([], content).
-public define HTML_Off_Form h5(List(CoreAttrs) attrs, HTML_Off_Form content) = h5(attrs, [content]).
+  // <article>
+public define HTML_Off_Form article(List(CoreAttrs) attrs, List(HTML_Off_Form) content)  = html_tag("article", attrs, content).
+public define HTML_Off_Form article(List(CoreAttrs) attrs, HTML_Off_Form content)        = html_tag("article", attrs, [content]).
+public define HTML_Off_Form article(List(HTML_Off_Form) content)                         = html_tag("article", [],    content).
+public define HTML_Off_Form article(HTML_Off_Form content)                               = html_tag("article", [],    [content]).
+
+  // <aside>
+public define HTML_Off_Form aside(List(CoreAttrs) attrs, List(HTML_Off_Form) content)  = html_tag("aside", attrs, content).
+public define HTML_Off_Form aside(List(CoreAttrs) attrs, HTML_Off_Form content)        = html_tag("aside", attrs, [content]).
+public define HTML_Off_Form aside(List(HTML_Off_Form) content)                         = html_tag("aside", [],    content).
+public define HTML_Off_Form aside(HTML_Off_Form content)                               = html_tag("aside", [],    [content]).
+
+  // <br>
+public define HTML_Off_Form br                                                          = html_void_tag("br", []).
+public define HTML_Off_Form br(List(CoreAttrs) attrs)                                   = html_void_tag("br", attrs).
+
+  // <button>
+public define HTML_Off_Form button(List(CoreAttrs) attrs, List(HTML_Off_Form) content)  = html_tag("button", attrs, content).
+public define HTML_Off_Form button(List(CoreAttrs) attrs, HTML_Off_Form content)        = html_tag("button", attrs, [content]).
+public define HTML_Off_Form button(List(HTML_Off_Form) content)                         = html_tag("button", [],    content).
+public define HTML_Off_Form button(HTML_Off_Form content)                               = html_tag("button", [],    [content]).
+
+  // <div>
+public define HTML_Off_Form div(List(CoreAttrs) attrs, List(HTML_Off_Form) content)   = html_tag("div", attrs, content).
+public define HTML_Off_Form div(List(CoreAttrs) attrs, HTML_Off_Form content)         = html_tag("div", attrs, [content]).
+public define HTML_Off_Form div(List(HTML_Off_Form) content)                          = html_tag("div", [],    content).
+public define HTML_Off_Form div(HTML_Off_Form content)                                = html_tag("div", [],    [content]).
+public define HTML_Off_Form div(List(CoreAttrs) attrs)                                = html_tag("div", attrs, [empty]).
+
+  // <dd>
+public define HTML_Off_Form dd(List(CoreAttrs) attrs, List(HTML_Off_Form) content)  = html_tag("dd", attrs, content).
+public define HTML_Off_Form dd(List(CoreAttrs) attrs, HTML_Off_Form content)        = html_tag("dd", attrs, [content]).
+public define HTML_Off_Form dd(List(HTML_Off_Form) content)                         = html_tag("dd", [],    content).
+public define HTML_Off_Form dd(HTML_Off_Form content)                               = html_tag("dd", [],    [content]).
+
+  // <dl>
+public define HTML_Off_Form dl(List(CoreAttrs) attrs, List(HTML_Off_Form) content)  = html_tag("dl", attrs, content).
+public define HTML_Off_Form dl(List(CoreAttrs) attrs, HTML_Off_Form content)        = html_tag("dl", attrs, [content]).
+public define HTML_Off_Form dl(List(HTML_Off_Form) content)                         = html_tag("dl", [],    content).
+public define HTML_Off_Form dl(HTML_Off_Form content)                               = html_tag("dl", [],    [content]).
+
+  // <footer>
+public define HTML_Off_Form footer(List(CoreAttrs) attrs, List(HTML_Off_Form) content)  = html_tag("footer", attrs, content).
+public define HTML_Off_Form footer(List(CoreAttrs) attrs, HTML_Off_Form content)        = html_tag("footer", attrs, [content]).
+public define HTML_Off_Form footer(List(HTML_Off_Form) content)                         = html_tag("footer", [],    content).
+public define HTML_Off_Form footer(HTML_Off_Form content)                               = html_tag("footer", [],    [content]).
+
+  // <header>
+public define HTML_Off_Form header(List(CoreAttrs) attrs, List(HTML_Off_Form) content)  = html_tag("header", attrs, content).
+public define HTML_Off_Form header(List(CoreAttrs) attrs, HTML_Off_Form content)        = html_tag("header", attrs, [content]).
+public define HTML_Off_Form header(List(HTML_Off_Form) content)                         = html_tag("header", [],    content).
+public define HTML_Off_Form header(HTML_Off_Form content)                               = html_tag("header", [],    [content]).
+
+  // <h1>
+public define HTML_Off_Form h1(List(CoreAttrs) attrs, List(HTML_Off_Form) content)  = html_tag("h1", attrs, content).
+public define HTML_Off_Form h1(List(CoreAttrs) attrs, HTML_Off_Form content)        = html_tag("h1", attrs, [content]).
+public define HTML_Off_Form h1(List(HTML_Off_Form) content)                         = html_tag("h1", [],    content).
+public define HTML_Off_Form h1(HTML_Off_Form content)                               = html_tag("h1", [],    [content]).
+  // <h2>
+public define HTML_Off_Form h2(List(CoreAttrs) attrs, List(HTML_Off_Form) content)  = html_tag("h2", attrs, content).
+public define HTML_Off_Form h2(List(CoreAttrs) attrs, HTML_Off_Form content)        = html_tag("h2", attrs, [content]).
+public define HTML_Off_Form h2(List(HTML_Off_Form) content)                         = html_tag("h2", [],    content).
+public define HTML_Off_Form h2(HTML_Off_Form content)                               = html_tag("h2", [],    [content]).
+  // <h3>
+public define HTML_Off_Form h3(List(CoreAttrs) attrs, List(HTML_Off_Form) content)  = html_tag("h3", attrs, content).
+public define HTML_Off_Form h3(List(CoreAttrs) attrs, HTML_Off_Form content)        = html_tag("h3", attrs, [content]).
+public define HTML_Off_Form h3(List(HTML_Off_Form) content)                         = html_tag("h3", [],    content).
+public define HTML_Off_Form h3(HTML_Off_Form content)                               = html_tag("h3", [],    [content]).
+  // <h4>
+public define HTML_Off_Form h4(List(CoreAttrs) attrs, List(HTML_Off_Form) content)  = html_tag("h4", attrs, content).
+public define HTML_Off_Form h4(List(CoreAttrs) attrs, HTML_Off_Form content)        = html_tag("h4", attrs, [content]).
+public define HTML_Off_Form h4(List(HTML_Off_Form) content)                         = html_tag("h4", [],    content).
+public define HTML_Off_Form h4(HTML_Off_Form content)                               = html_tag("h4", [],    [content]).
+  // <h5>
+public define HTML_Off_Form h5(List(CoreAttrs) attrs, List(HTML_Off_Form) content)  = html_tag("h5", attrs, content).
+public define HTML_Off_Form h5(List(CoreAttrs) attrs, HTML_Off_Form content)        = html_tag("h5", attrs, [content]).
+public define HTML_Off_Form h5(List(HTML_Off_Form) content)                         = html_tag("h5", [],    content).
+public define HTML_Off_Form h5(HTML_Off_Form content)                               = html_tag("h5", [],    [content]).
+
+  // <h6>
+public define HTML_Off_Form h6(List(CoreAttrs) attrs, List(HTML_Off_Form) content)  = html_tag("h6", attrs, content).
+public define HTML_Off_Form h6(List(CoreAttrs) attrs, HTML_Off_Form content)        = html_tag("h6", attrs, [content]).
+public define HTML_Off_Form h6(List(HTML_Off_Form) content)                         = html_tag("h6", [],    content).
+public define HTML_Off_Form h6(HTML_Off_Form content)                               = html_tag("h6", [],    [content]).
+
+  // <img>
+public define HTML_Off_Form img(List(CoreAttrs) attrs, String src, String alt)      = html_void_tag("img", attrs + [attr("src",src), attr("alt",alt)] ).
+public define HTML_Off_Form img(String src)                                         = img([], src, "").
+public define HTML_Off_Form img(String src, String alt)                             = img([], src, alt).
+public define HTML_Off_Form img(List(CoreAttrs) attrs, String src)                  = img(attrs, src, "").
+public define HTML_Off_Form img(String src, Int width, Int height)                  = img([attr("witdh",to_String(width)), attr("height",to_String(height))], src, src).
+public define HTML_Off_Form img(List(CoreAttrs) attrs, String src, String alt, Int width, Int height) =
+  html_void_tag("img", attrs + [attr("src",src), attr("alt",alt), attr("witdh",to_String(width)), attr("height",to_String(height))]).
+
+  // <li>
+public define HTML_Off_Form li(List(CoreAttrs) attrs, List(HTML_Off_Form) content)  = html_tag("li", attrs, content).
+public define HTML_Off_Form li(List(CoreAttrs) attrs, HTML_Off_Form content)        = html_tag("li", attrs, [content]).
+public define HTML_Off_Form li(List(HTML_Off_Form) content)                         = html_tag("li", [],    content).
+public define HTML_Off_Form li(HTML_Off_Form content)                               = html_tag("li", [],    [content]).
+
+  // <nav>
+public define HTML_Off_Form nav(List(CoreAttrs) attrs, List(HTML_Off_Form) content)  = html_tag("nav", attrs, content).
+public define HTML_Off_Form nav(List(CoreAttrs) attrs, HTML_Off_Form content)        = html_tag("nav", attrs, [content]).
+public define HTML_Off_Form nav(List(HTML_Off_Form) content)                         = html_tag("nav", [],    content).
+public define HTML_Off_Form nav(HTML_Off_Form content)                               = html_tag("nav", [],    [content]).
+
+  // <ol>
+public define HTML_Off_Form ol(List(CoreAttrs) attrs, List(HTML_Off_Form) content)        = html_tag("ol", attrs, content).
+public define HTML_Off_Form ol(List(CoreAttrs) attrs, HTML_Off_Form content)              = html_tag("ol", attrs, [content]).
+public define HTML_Off_Form ol(List(HTML_Off_Form) content)                               = html_tag("ol", [],    content).
+public define HTML_Off_Form ol(HTML_Off_Form content)                                     = html_tag("ol", [],    [content]).
+
+  // <p>
+public define HTML_Off_Form p(List(CoreAttrs) attrs, List(HTML_Off_Form) content)         = html_tag("p", attrs, content).
+public define HTML_Off_Form p(List(CoreAttrs) attrs, HTML_Off_Form content)               = html_tag("p", attrs, [content]).
+public define HTML_Off_Form p(List(HTML_Off_Form) content)                                = html_tag("p", [],    content).
+public define HTML_Off_Form p(HTML_Off_Form content)                                      = html_tag("p", [],    [content]).
+
+  // <section>
+public define HTML_Off_Form section(List(CoreAttrs) attrs, List(HTML_Off_Form) content)  = html_tag("section", attrs, content).
+public define HTML_Off_Form section(List(CoreAttrs) attrs, HTML_Off_Form content)        = html_tag("section", attrs, [content]).
+public define HTML_Off_Form section(List(HTML_Off_Form) content)                         = html_tag("section", [],    content).
+public define HTML_Off_Form section(HTML_Off_Form content)                               = html_tag("section", [],    [content]).
+
+  // <span>
+public define HTML_Off_Form span(List(CoreAttrs) attrs, List(HTML_Off_Form) content)    = html_tag("span", attrs, content).
+public define HTML_Off_Form span(List(CoreAttrs) attrs, HTML_Off_Form content)          = html_tag("span", attrs, [content]).
+public define HTML_Off_Form span(List(HTML_Off_Form) content)                           = html_tag("span", [],    content).
+public define HTML_Off_Form span(HTML_Off_Form content)                                 = html_tag("span", [],    [content]).
+public define HTML_Off_Form span(Int i)                                                 = html_tag("span", [],    [text(to_decimal(i))]).
+
+  // <strong>
+public define HTML_Off_Form strong(List(CoreAttrs) attrs, List(HTML_Off_Form) content)  = html_tag("strong", attrs, content).
+public define HTML_Off_Form strong(List(CoreAttrs) attrs, HTML_Off_Form content)        = html_tag("strong", attrs, [content]).
+public define HTML_Off_Form strong(List(HTML_Off_Form) content)                         = html_tag("strong", [],    content).
+public define HTML_Off_Form strong(HTML_Off_Form content)                               = html_tag("strong", [],    [content]).
+
+  // <ul>
+public define HTML_Off_Form ul(List(CoreAttrs) attrs, List(HTML_Off_Form) content)      = html_tag("ul", attrs, content).
+public define HTML_Off_Form ul(List(CoreAttrs) attrs, HTML_Off_Form content)            = html_tag("ul", attrs, [content]).
+public define HTML_Off_Form ul(List(HTML_Off_Form) content)                             = html_tag("ul", [],    content).
+public define HTML_Off_Form ul(HTML_Off_Form content)                                   = html_tag("ul", [],    [content]).
 
-public define HTML_Off_Form h6(HTML_Off_Form content)       = h6([], [content]).
-public define HTML_Off_Form h6(List(HTML_Off_Form) content) = h6([], content).
-public define HTML_Off_Form h6(List(CoreAttrs) attrs, HTML_Off_Form content) = h6(attrs, [content]).
-
-public define HTML_Off_Form image(String url) = image([], url, url).
-public define HTML_Off_Form image(List(CoreAttrs) attrs, String url) = image(attrs, url, url).
-public define HTML_Off_Form image(String url, Int width, Int height) = image([], url, url, width, height).
 
 public define HTML_Off_Form
   form
@@ -2072,56 +2231,9 @@ public define HTML_Off_Form
        List((String,String))   args
      ) =
    private_download(abs_path,name,extra_ext,success((action_name,args))). 
-   
-public define HTML_Off_Form
-  text
-  (
-    List(CoreAttrs) lto,
-    Int                i
-  )=
-  text(lto, to_decimal(i))
-.
-   
-public define HTML_Off_Form
-  text
-  (
-    Int i
-  )=
-  text([], i)
-.
-   
-public define HTML_Off_Form
-  text
-  (
-    String s
-  )=
-  text([], s)
-.
 
-public define HTML_Off_Form
-  div
-  (
-    HTML_Off_Form element
-  )=
-  div([], [element])
 .
 
-public define HTML_Off_Form
-  div
-  (
-    List(CoreAttrs) attrs,
-    HTML_Off_Form   element
-  )=
-  div(attrs, [element])
-.
-
-public define HTML_Off_Form
-  div
-  (
-    List(HTML_Off_Form)   elements
-  )=
-  div([], elements)
-.
 
 public define HTML_Off_Form
   div
@@ -2148,128 +2260,6 @@ public define HTML_Off_Form
   div([], elements)
 .
 
-public define HTML_Off_Form
-  li
-  (
-    List(HTML_Off_Form)   elements
-  )=
-  li([], elements)
-.
-
-public define HTML_Off_Form
-  li
-  (
-    List(CoreAttrs) attrs,
-    HTML_Off_Form   element
-  )=
-  li(attrs, [element])
-.
-
-public define HTML_Off_Form
-  li
-  (
-    HTML_Off_Form   element
-  )=
-  li([], [element])
-.
-
-public define HTML_Off_Form
-  ul
-  (
-    List(HTML_Off_Form)   elements
-  )=
-  ul([], elements)
-.
-
-public define HTML_Off_Form
-  ul
-  (
-    List(CoreAttrs) attrs,
-    HTML_Off_Form   element
-  )=
-  ul(attrs, [element])
-.
-
-public define HTML_Off_Form
-  ul
-  (
-    HTML_Off_Form   element
-  )=
-  ul([], [element])
-.
-
-public define HTML_Off_Form
-  ol
-  (
-    List(HTML_Off_Form)   elements
-  )=
-  ol([], elements)
-.
-
-public define HTML_Off_Form
-  ol
-  (
-    List(CoreAttrs) attrs,
-    HTML_Off_Form   element
-  )=
-  ol(attrs, [element])
-.
-
-public define HTML_Off_Form
-  ol
-  (
-    HTML_Off_Form   element
-  )=
-  ol([], [element])
-.
-
-public define HTML_Off_Form
-  paragraph
-  (
-    List(HTML_Off_Form)   elements
-  )=
-  paragraph([], elements)
-.
-
-public define HTML_Off_Form
-  paragraph
-  (
-    List(Text_Option) attrs,
-    HTML_Off_Form   element
-  )=
-  paragraph(attrs, [element])
-.
-
-public define HTML_Off_Form
-  paragraph
-  (
-    HTML_Off_Form   element
-  )=
-  paragraph([], [element])
-.
-
-public define HTML_Off_Form
-  span
-  (
-    String s
-  )=
-  span([], s)
-.
-
-public define HTML_Off_Form
-  span
-  (
-    Int i
-  )=
-  span([], to_decimal(i))
-.
-
-public define HTML_Off_Form
-  hr 
-  =
-  hr([])
-.
-
 public define HTML_In_Form
   hr 
   =
@@ -2300,31 +2290,6 @@ public define HTML_In_Form
   )=
   button([], [element])
 .
-
-public define HTML_Off_Form
-  button
-  (
-    List(HTML_Off_Form)   elements
-  )=
-  button([], elements)
-.
-
-public define HTML_Off_Form
-  button
-  (
-    List(CoreAttrs) attrs,
-    HTML_Off_Form   element
-  )=
-  button(attrs, [element])
-.
-
-public define HTML_Off_Form
-  button
-  (
-    HTML_Off_Form   element
-  )=
-  button([], [element])
-.
    - Cell a gap between two other cells : 
    
 public define HTML_Cell(HTML_Off_Form)
@@ -2750,12 +2715,6 @@ public define String
    doctype_w3c_header
      =
    "<!DOCTYPE html>\n". //html 5
-
-// No longer used in HTML 5
-//public define String
-//   html_header
-//   =
-//   "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n".
    
    
    *** [1] States. 
@@ -3030,12 +2989,6 @@ define Int
    
    
    
-      *** [3.1] Prefixing web arguments names.
-   
-   CR 2008-07-08 Prefixing Removed
-   
-   
-   
       *** [3.2] Separating web arguments. 
    
    When a new request arrives, we need to separate the web arguments, that is to say:
@@ -3305,7 +3258,6 @@ public define Web_Site
        List(MIME)                  known_mime_types,
        (String action_name,
         List(Web_arg) args) -> One before_send_file
-       //Bool using_state_cookies
      ) = 
       init(unique); 
 
@@ -3452,6 +3404,27 @@ define HTTP_Answer
   )
 .
 
+define WEB_Page_Renderer 
+  default_page_renderer =
+  web_page_renderer("AWS_DEFAULT_PAGE",
+    ( WEB_Session           _session,
+      String                _title,
+      HTML_Partial_Content  _content
+    ) |->
+    html_page
+    (
+      http_ok,         
+      [ title(_title), ]// title of web site
+      ,  
+      body                      // body of page
+      (
+        [], //body options empty
+        (HTML_Off_Form)partial(_content)
+      )
+    )
+  )
+.
+
 define WEB_Controller_Result
   apply_action
   (
@@ -3535,6 +3508,47 @@ define Maybe(WEB_Controller)
   }
 .
 
+define WEB_Page_Renderer
+  get_page_renderer
+  (
+    String                  renderer_name,
+    List(WEB_Page_Renderer) renderers,
+  )=
+  if renderers is
+  {
+    []      then
+      println("Can't find page_renderer ["+renderer_name+"], use the default");
+      default_page_renderer,
+    [h . t] then
+      if h.name = renderer_name then
+        //println("Controller ["+controller_name+"] found");
+        h
+      else
+        get_page_renderer(renderer_name, t)
+  }
+.
+
+define WEB_Page_Renderer
+  get_page_renderer
+  (
+    WEB_Session             _session,
+    WEB_Page_Renderer       _current_page_renderer,
+    List(WEB_Page_Renderer) renderers,
+  )=
+  //get the renderer page name to use from the session "AWS_PAGE_RENDERER"
+  if get_String(_session.fields, "AWS_PAGE_RENDERER") is
+  {
+    failure                 then println("No renderer defined, use the default"); default_page_renderer,
+    success(renderer_name)  then
+      //check if the renderer_page already in cache
+      if renderer_name = _current_page_renderer.name then
+        _current_page_renderer
+      else
+        //if not in cache, use the selector function
+        get_page_renderer(renderer_name, renderers)
+  }
+.
+
 public define JsonValue to_html_ajax_content(Printable_tree        content_HTML, String additional_script).
 public define JsonValue to_html_ajax_content(HTML_Partial_Content  content_HTML, CommonInfo cinfo, String additional_script).
   
@@ -3543,6 +3557,8 @@ define (Maybe(WEB_Session), HTTP_Answer)
   (
     WEB_Controller        controller,
     List(WEB_Controller)  controllers,
+    WEB_Page_Renderer     _current_page_renderer,
+    List(WEB_Page_Renderer) page_renderers,
     CommonInfo            cinfo,
     WEB_Session           _session,
     Maybe(String)         _mb_action_name,
@@ -3566,7 +3582,7 @@ define (Maybe(WEB_Session), HTTP_Answer)
       if get_controller(get_String(*new_session.web_request.lwa, "aws_controller", "root"), controllers) is
       {
         failure                   then (failure, error_page(http_not_found, "Initial Session Controller not found", new_session)),
-        success(new_controller)   then apply_controller_action(new_controller, controllers, cinfo, new_session, failure, initial_session),
+        success(new_controller)   then apply_controller_action(new_controller, controllers, _current_page_renderer, page_renderers, cinfo, new_session, failure, initial_session),
       },      
     success(action_name)  then
       println("ACTION_NAME ["+action_name+"]");
@@ -3578,7 +3594,7 @@ define (Maybe(WEB_Session), HTTP_Answer)
           if get_controller(get_String(*new_session.web_request.lwa, "aws_controller", "root"), controllers) is
           {
             failure                   then (failure, error_page(http_not_found, "Redirect Controller not found", new_session)),
-            success(new_controller)   then apply_controller_action(new_controller, controllers, cinfo, new_session, failure, initial_session),
+            success(new_controller)   then apply_controller_action(new_controller, controllers, _current_page_renderer, page_renderers, cinfo, new_session, failure, initial_session),
           },
           
         redirect(new_session, r_controller_name, r_action_name)         then
@@ -3586,7 +3602,7 @@ define (Maybe(WEB_Session), HTTP_Answer)
           {
             failure                   then (failure, error_page(http_not_found, "Redirect Controller "+r_controller_name+" not found", new_session)),
             success(new_controller)   then
-              apply_controller_action(new_controller, controllers, cinfo, new_session, success(r_action_name), initial_session),
+              apply_controller_action(new_controller, controllers, _current_page_renderer, page_renderers, cinfo, new_session, success(r_action_name), initial_session),
           },
           
         redirect_to_previous             then
@@ -3595,7 +3611,7 @@ define (Maybe(WEB_Session), HTTP_Answer)
             failure                   then (failure, error_page(http_not_found, "Redirect to previous Controller not found", _session)),
             success(new_controller)   then 
               since _session is web_session(lang, entries, _, previous),
-              apply_controller_action(new_controller, controllers, cinfo, web_session(lang, entries, previous, previous), failure, initial_session),
+              apply_controller_action(new_controller, controllers, _current_page_renderer, page_renderers, cinfo, web_session(lang, entries, previous, previous), failure, initial_session),
           },
         redirect_to_previous(entries) then
           if get_controller(get_String(*_session.previous_web_request.lwa, "aws_controller", "root"), controllers) is
@@ -3603,21 +3619,27 @@ define (Maybe(WEB_Session), HTTP_Answer)
             failure                   then (failure, error_page(http_not_found, "Redirect to previous Controller not found", _session)),
             success(new_controller)   then 
               since _session is web_session(lang, _, _, previous),
-              apply_controller_action(new_controller, controllers, cinfo, web_session(lang, entries, previous, previous), failure, initial_session),
+              apply_controller_action(new_controller, controllers, _current_page_renderer, page_renderers, cinfo, web_session(lang, entries, previous, previous), failure, initial_session),
           },          
-        ajax(answer)                              then (failure, answer),
+        //ajax(answer)                              then (failure, answer),
         //ajax with modified session that must be saved
-        ajax(session, answer)                     then  (success(session), answer),
+        ajax(session, answer)                     then  (session, answer),
         
-        ajax(content, additional_script)          then  (failure,          json(http_ok, to_html_ajax_content(content, cinfo, additional_script))),
-        ajax(session, content, additional_script) then  (success(session), json(http_ok, to_html_ajax_content(content, cinfo, additional_script))),
-        ajax(content, additional_script)          then  (failure,          json(http_ok, to_html_ajax_content(content, additional_script))),
-        ajax(session, content, additional_script) then  (success(session), json(http_ok, to_html_ajax_content(content, additional_script))),
-        send_file(file_path)                      then  (failure,          send_file(file_path))
+        //ajax(content, additional_script)          then  (failure,          json(http_ok, to_html_ajax_content(content, cinfo, additional_script))),
+        ajax(session, content, additional_script) then  (session, json(http_ok, to_html_ajax_content(content, cinfo, additional_script))),
+        //ajax(content, additional_script)          then  (failure,          json(http_ok, to_html_ajax_content(content, additional_script))),
+        ajax(session, content, additional_script) then  (session, json(http_ok, to_html_ajax_content(content, additional_script))),
+        send_file(file_path)                      then  (failure,          send_file(file_path)),
+        renderer_content(session, title, content) then  
+          with the_session = if session is {failure then _session, success(__session) then __session},
+          with page_renderer = get_page_renderer(the_session, _current_page_renderer, page_renderers),
+          (session, page_renderer.page_layout(the_session, title, content))
       }
   }
 .
 
+
+
 public define Web_Site
   make_web_site_controller_description
   (
@@ -3632,11 +3654,12 @@ public define Web_Site
        (WEB_Session,
         HTTP_Info,
         Var(List(Web_arg)),
-        Bool is_https) -> WEB_Session    expired_session, 
-       Var(List(WEB_Controller))                web_controllers,
-       Maybe(WEB_Session) -> List(HTTP_header)  additional_headers, 
-       Int                         timeout,
-       Redirections                redirections, 
+        Bool is_https) -> WEB_Session    expired_session,
+    Var(List(WEB_Controller))               web_controllers,
+    Var(List(WEB_Page_Renderer))            web_page_renderers,    
+    Maybe(WEB_Session) -> List(HTTP_header) additional_headers, 
+    Int                         timeout,
+    Redirections                redirections, 
        String                      charset, 
        List(String)                journal_extensions,
        List(String)                journal_headers, 
@@ -3660,7 +3683,8 @@ public define Web_Site
       //
       // construct tool functions
       // TODO 'make_separate_web_args_function' must retrieve state_cookies before parsing web_args if using_state_cookies is true
-   with save_session = make_save_session_function(timeout, state_directory),    
+   with save_session = make_save_session_function(timeout, state_directory),
+   with current_page_renderer = var((WEB_Page_Renderer)default_page_renderer),
  //   retrieve_session = make_retrieve_session_function(state_directory, website_name), 
  //separate_web_args = make_separate_web_args_function(state_directory, retrieve_state), 
       //apply_action = make_apply_action_function(actions),
@@ -3683,11 +3707,11 @@ public define Web_Site
     with current_session = if retrieve_session(http_info, state_directory, website_name) is
     {
         not_found                     then
-          //println("previous state not found");
+          println("previous state not found");
           initial_session(http_info, var(_lwa), is_https), 
 
         out_of_date(previous_session) then 
-          //println("previous out_of_date");
+          println("previous out_of_date");
           expired_session(previous_session, http_info, var(_lwa), is_https), 
 
         still_valid(previous_session) then 
@@ -3704,7 +3728,7 @@ public define Web_Site
           (failure, error_page(http_not_found, "Controller not found", current_session)),
 
         success(new_controller)   then 
-          apply_controller_action(new_controller, *web_controllers, cinfo, current_session, failure, initial_session),
+          apply_controller_action(new_controller, *web_controllers, *current_page_renderer, *web_page_renderers, cinfo, current_session, failure, initial_session),
       }
       is (mb_new_session, http_answer),
       
@@ -5823,12 +5847,12 @@ define Printable_tree
          format(cinfo,ic_v,any_text(opts,t),format_element,is_https, action_count, head_tags), 
        preformated(o,s)             then 
          format(cinfo,ic_v,any_preformated(o,s),format_element,is_https, action_count, head_tags), 
-       paragraph(opts,t)            then 
-         format(cinfo,ic_v,any_paragraph(opts,t),format_element,is_https, action_count, head_tags), 
-       image(opts,url,alt)          then 
-         format(cinfo,ic_v,any_image(opts,url,alt),format_element,is_https, action_count, head_tags), 
-       image(opts,url,alt,w,h)      then 
-         format(cinfo,ic_v,any_image(opts,url,alt,w,h),format_element,is_https, action_count, head_tags), 
+//       paragraph(opts,t)            then 
+//         format(cinfo,ic_v,any_paragraph(opts,t),format_element,is_https, action_count, head_tags), 
+//       image(opts,url,alt)          then 
+//         format(cinfo,ic_v,any_image(opts,url,alt),format_element,is_https, action_count, head_tags), 
+//       image(opts,url,alt,w,h)      then 
+//         format(cinfo,ic_v,any_image(opts,url,alt,w,h),format_element,is_https, action_count, head_tags), 
        table(opts,header_row, rows, footer_row) then 
          format(cinfo,ic_v,any_table(opts,header_row, rows, footer_row),format_element,is_https, action_count, head_tags), 
        center(e)                    then 
@@ -5890,14 +5914,14 @@ define Printable_tree
        in_form(fn, content)             then                
           if fn is html_Id(id) then
             format(cinfo,id,ic_v, content,is_https, action_count, head_tags), 
-       div(options, e)              then
-          format(cinfo, ic_v, any_div(options, e), format_element, is_https, action_count, head_tags),
+//       div(options, e)              then
+//          format(cinfo, ic_v, any_div(options, e), format_element, is_https, action_count, head_tags),
        div(options, p_content)      then
         with html_elements = map((HTML_Partial_Content pc) |-> since pc is partial_content(tags, html_elem), head_tags <- *head_tags +tags; html_elem, p_content),
             
           format(cinfo, ic_v, any_div(options, html_elements), format_element, is_https, action_count, head_tags),    
-       div_empty(options)           then
-          format(cinfo, ic_v, any_div_empty(options), format_element, is_https, action_count, head_tags),    
+//       div_empty(options)           then
+//          format(cinfo, ic_v, any_div_empty(options), format_element, is_https, action_count, head_tags),    
        iframe(options, css_styles, css_files, js_files, body) then 
           if body is body(body_options,elem) then
           [ "<iframe", format_attrs(options), ">\n",
@@ -5917,30 +5941,27 @@ define Printable_tree
         if p_content is partial_content(tags, html_elements) then
           head_tags <- *head_tags + tags;          
           format(cinfo, ic_v, html_elements, is_https, action_count, head_tags),
-       br                               then ["<br>"],
+//       br                               then ["<br>"],
        progress(options, value, max)    then ["<progress max=\"",value,"\" value=\"",max,"\"",format_attrs(options),"></progress>"],
-       ol(opts, t)            then 
-         format(cinfo,ic_v,any_ol(opts,t),format_element,is_https, action_count, head_tags), 
-       ul(opts, t)            then 
-         format(cinfo,ic_v,any_ul(opts,t),format_element,is_https, action_count, head_tags), 
-       li(opts, t)            then 
-         format(cinfo,ic_v,any_li(opts,t),format_element,is_https, action_count, head_tags), 
-       button(options, e)     then
-          format(cinfo, ic_v, any_button(options, e), format_element, is_https, action_count, head_tags),
+//       ol(opts, t)            then 
+//         format(cinfo,ic_v,any_ol(opts,t),format_element,is_https, action_count, head_tags), 
+//       ul(opts, t)            then 
+//         format(cinfo,ic_v,any_ul(opts,t),format_element,is_https, action_count, head_tags), 
+//       li(opts, t)            then 
+//         format(cinfo,ic_v,any_li(opts,t),format_element,is_https, action_count, head_tags), 
+//       button(options, e)     then
+//          format(cinfo, ic_v, any_button(options, e), format_element, is_https, action_count, head_tags),
        i(opts, t)             then 
          format(cinfo,ic_v,any_i(opts,t),format_element,is_https, action_count, head_tags),
-       span(opts,t)           then 
-         format(cinfo,ic_v,any_span(opts,t),format_element,is_https, action_count, head_tags),
-       strong(opts, l)        then ["<strong", format_attrs(opts), ">",flat(map(format_element,l)),"</strong>\n"],
+//       span(opts,t)           then 
+//         format(cinfo,ic_v,any_span(opts,t),format_element,is_https, action_count, head_tags),
+
          
-       hr(opts)               then 
-         format(cinfo,ic_v,any_hr(opts),format_element,is_https, action_count, head_tags),
-       h1(opts, l)           then ["<h1", format_attrs(opts), ">",flat(map(format_element,l)),"</h1>\n"],
-       h2(opts, l)           then ["<h2", format_attrs(opts), ">",flat(map(format_element,l)),"</h2>\n"],
-       h3(opts, l)           then ["<h3", format_attrs(opts), ">",flat(map(format_element,l)),"</h3>\n"],
-       h4(opts, l)           then ["<h4", format_attrs(opts), ">",flat(map(format_element,l)),"</h4>\n"],
-       h5(opts, l)           then ["<h5", format_attrs(opts), ">",flat(map(format_element,l)),"</h5>\n"],
-       h6(opts, l)           then ["<h6", format_attrs(opts), ">",flat(map(format_element,l)),"</h6>\n"],
+//       hr(opts)               then 
+//         format(cinfo,ic_v,any_hr(opts),format_element,is_https, action_count, head_tags),
+//       nav(opts, l)          then ["<nav", format_attrs(opts), ">",flat(map(format_element,l)),"</nav>\n"],
+       html_tag(tag_name, opts, l)    then ["<",tag_name, format_attrs(opts), ">",flat(map(format_element,l)),"</",tag_name,">\n"],
+       html_void_tag(tag_name, opts)  then ["<",tag_name, format_attrs(opts), ">"],       
      }.
 
       *** [5.10] Formating meta-tags. 
diff --git a/web/CXM_page_message.anubis b/web/CXM_page_message.anubis
index 76ae222..271aabc 100644
--- a/web/CXM_page_message.anubis
+++ b/web/CXM_page_message.anubis
@@ -169,3 +169,22 @@ public define HTML_Off_Form
     String txt
   ) =
   display_info_line("informations", html_class, txt, left).
+
+public define HTML_Off_Form
+  show_page_message
+  (
+    Page_Message page_message
+  )=
+  if page_message is
+  {
+    no_message                  then empty, 
+    info(txt)                   then display_main_info_line("msg_infos",    txt),
+    info_translate(txt)         then display_main_info_line("msg_infos",    txt),
+    ok(txt)                     then display_main_info_line("msg_success",  txt),
+    ok_translate(txt)           then display_main_info_line("msg_success",  txt),
+    warning(txt)                then display_main_info_line("msg_warning",  txt),
+    warning_translate(txt)      then display_main_info_line("msg_warning",  txt),              
+    error(txt, align)           then display_main_info_line("msg_error",txt, align),
+    error_translate(txt, align) then display_main_info_line("msg_error",txt, align),
+  }
+.
diff --git a/web/jQuery/CXM_jquery_button.anubis b/web/jQuery/CXM_jquery_button.anubis
index 8984636..e453d70 100644
--- a/web/jQuery/CXM_jquery_button.anubis
+++ b/web/jQuery/CXM_jquery_button.anubis
@@ -239,10 +239,10 @@ public define HTML_Off_Form
   button([id(button_id), class("jq_img_btn")],
                         if orientation is
                         {
-                          top     then table([class("jq_img_btn_table")],[ row( cell(image(img_url))), row( cell(text(label_text))) ]),
-                          bottom  then table([class("jq_img_btn_table")],[ row( cell(text(label_text))), row( cell(image(img_url))) ]),
-                          left    then table([class("jq_img_btn_table")],[ row( [cell(image(img_url)), cell(text(label_text)) ]) ]),
-                          right   then table([class("jq_img_btn_table")],[ row( [cell(text(label_text)), cell(image(img_url)) ]) ]),
+                          top     then table([class("jq_img_btn_table")],[ row( cell(img(img_url))), row( cell(text(label_text))) ]),
+                          bottom  then table([class("jq_img_btn_table")],[ row( cell(text(label_text))), row( cell(img(img_url))) ]),
+                          left    then table([class("jq_img_btn_table")],[ row( [cell(img(img_url)), cell(text(label_text)) ]) ]),
+                          right   then table([class("jq_img_btn_table")],[ row( [cell(text(label_text)), cell(img(img_url)) ]) ]),
                         }).
 
 
diff --git a/web/jQuery/CXM_jquery_dialog.anubis b/web/jQuery/CXM_jquery_dialog.anubis
index c2f584c..b7f47d5 100644
--- a/web/jQuery/CXM_jquery_dialog.anubis
+++ b/web/jQuery/CXM_jquery_dialog.anubis
@@ -72,7 +72,7 @@ $( \"#"+dlg_id+"\" ).dialog({
     ajax(_url)      then
       with url = format_web_action_name(_url),
       //println("jq_dialog_create : \njs_str ->"+js_str+"\nurl ->"+url);
-        partial_content( [js], div_empty([id(dlg_id), attr("ajax_url",url)]))
+        partial_content( [js], div([id(dlg_id), attr("ajax_url",url)]))
   }.
 
 public define HTML_Partial_Content
diff --git a/web/widgets/left_menu.anubis b/web/widgets/left_menu.anubis
index fe85e5b..a7f155c 100644
--- a/web/widgets/left_menu.anubis
+++ b/web/widgets/left_menu.anubis
@@ -30,6 +30,13 @@ public type Left_Menu:
     List(Left_Menu_Entry) entries,
     String  selected).
 
+public type Plugin_Left_Menu:
+  plugin_left_menu(
+    String    name,   //plug in name
+    Left_Menu left_menu
+  )
+.
+
 public define Left_Menu_Entry
   left_menu_entry
   (
@@ -103,9 +110,9 @@ define List(HTML_Off_Form)
         if h is
         {
           left_menu_entry(_menu_id, _classes, _action, _text, _extra) then 
-            (HTML_Off_Form)paragraph([class("item "+_menu_id+"_icon"+if _menu_id=selected then " selected" else ""+ " "+join(" ", _classes))],actioner(same,same, link(_T(_text)),_action,_extra)),
+            p([class("item "+_menu_id+"_icon"+if _menu_id=selected then " selected" else ""+ " "+join(" ", _classes))],actioner(same,same, link(_T(_text)),_action,_extra)),
           title(_title_id, _classes, _text)  then
-            (HTML_Off_Form)paragraph([class("menu_title"), class("item "+_title_id+"_icon"+if _title_id=selected then " selected" else ""+ " "+join(" ", _classes))], text([],_T(_text)))
+            p([class("menu_title"), class("item "+_title_id+"_icon"+if _title_id=selected then " selected" else ""+ " "+join(" ", _classes))], text([],_T(_text)))
         },
       make_left_menu(_T, t, selected, [ entry . so_far])
   }.
diff --git a/web/widgets/menu.anubis b/web/widgets/menu.anubis
index b1ee908..9565e39 100644
--- a/web/widgets/menu.anubis
+++ b/web/widgets/menu.anubis
@@ -159,7 +159,7 @@ define List(HTML_Off_Form)
                               //format the icon if need
                               to_HTML(_icon),
                               //format the text if need
-                              if _text = "" then empty else span(_T(_text)), /*link(help_string(_text, _T))*/
+                              if _text = "" then empty else span(text(_T(_text))), /*link(help_string(_text, _T))*/
                               //span(1),
                             ])),
 
diff --git a/web/widgets/specialized_elements.anubis b/web/widgets/specialized_elements.anubis
index d640b70..c37daa7 100644
--- a/web/widgets/specialized_elements.anubis
+++ b/web/widgets/specialized_elements.anubis
@@ -19,7 +19,7 @@ public define HTML_Off_Form
   else
       with _attrs = [data("phone-number", phone_number), event(onclick, "hk_phone_call(this)"), class("phone_click") . attrs],
   div([
-    image(_attrs, "/icons/16x16/phone.png"),
+    img(_attrs, "/icons/16x16/phone.png"),
     if image_only then empty else
       text(_attrs, phone_number)
   ])
@@ -50,7 +50,7 @@ public define HTML_Off_Form
   else
     with _attrs = [data("email", email_str), event(onclick, "hk_send_email(this)"), class("email_click") . attrs],
   div([
-    image(_attrs, "/icons/16x16/email.png"),
+    img(_attrs, "/icons/16x16/email.png"),
     text(_attrs, email_str)
   ])
 .
--
libgit2 0.21.4