diff --git a/src/fr/devinsy/kiss4web/demo/website/charter/charter.html b/src/fr/devinsy/kiss4web/demo/website/charter/charter.html
index 9db4b5d..8cda721 100644
--- a/src/fr/devinsy/kiss4web/demo/website/charter/charter.html
+++ b/src/fr/devinsy/kiss4web/demo/website/charter/charter.html
@@ -24,7 +24,19 @@
 	                <li><a id="menu_welcome" href="/">Home</a></li>
                     <li><a id="menu_rawhello" href="/raw_hello.xhtml" target="_">Raw Hello</a></li>
 	                <li><a id="menu_dispatcher" href="/dispatcher/index.xhtml">Dispatcher</a></li>
+                    <li><a href="/dispatcher/index.xhtml#xhtml_url">&#160;&#160;XHTML URL</a></li>
+                    <li><a href="/dispatcher/index.xhtml#root_url">&#160;&#160;Root URL</a></li>
+                    <li><a href="/dispatcher/index.xhtml#short_url_rewriter">&#160;&#160;Short URL Rewriter</a></li>
+                    <li><a href="/dispatcher/index.xhtml#long_url_rewriter">&#160;&#160;Long URL Rewriter</a></li>
+                    <li><a href="/dispatcher/index.xhtml#static_stuff_url">&#160;&#160;Static Stuff URL</a></li>
 	                <li><a id="menu_xidyn" href="/xidyn/index.xhtml">Xidyn</a></li>
+                    <li><a href="/xidyn/index.xhtml#instanciate_page">&#160;&#160;Instanciate page</a></li>
+                    <li><a href="/xidyn/index.xhtml#set_content_tag">&#160;&#160;Set content tag</a></li>
+                    <li><a href="/xidyn/index.xhtml#set_attribute_tag">&#160;&#160;Set attribute tag</a></li>
+                    <li><a href="/xidyn/index.xhtml#repeat_tag_w">&#160;&#160;Repeat tag (w. index)</a></li>
+                    <li><a href="/xidyn/index.xhtml#repeat_tag_wo">&#160;&#160;Repeat tag (w/o index)</a></li>
+                    <li><a href="/xidyn/index.xhtml#fill_table">&#160;&#160;Fill Table</a></li>
+                    <li><a href="/xidyn/index.xhtml#iteration_strategies">&#160;&#160;Iteration strategies</a></li>
 	            </ul>
 		    </div>
 		</div>
diff --git a/src/fr/devinsy/kiss4web/demo/website/charter/kiss4web-demo.css b/src/fr/devinsy/kiss4web/demo/website/charter/kiss4web-demo.css
index 4325a54..4dfd035 100644
--- a/src/fr/devinsy/kiss4web/demo/website/charter/kiss4web-demo.css
+++ b/src/fr/devinsy/kiss4web/demo/website/charter/kiss4web-demo.css
@@ -84,13 +84,13 @@ ul, ol
 /***** CHARTER MENU *****/
 #charter #body_container #menu_container
 {
-    padding: 30px 20px 0 0;
+    padding: 30px 10px 0 0;
 }
 
 .submenu
 {
     margin: 10px 10px 10px 10px;
-    width: 140px;
+    width: 160px;
     background-color: #ECECEC;
     border-radius: 5px;
     padding: 10px;
@@ -134,7 +134,7 @@ ul, ol
 #charter #body_container #content_container
 {
     margin: 10px auto 20px auto;
-    width: 760px;
+    width: 750px;
     border: 0px none lightgreen;
 }
 
diff --git a/src/fr/devinsy/kiss4web/demo/website/dispatcher/index.html b/src/fr/devinsy/kiss4web/demo/website/dispatcher/index.html
index 69c17b7..4ee8483 100644
--- a/src/fr/devinsy/kiss4web/demo/website/dispatcher/index.html
+++ b/src/fr/devinsy/kiss4web/demo/website/dispatcher/index.html
@@ -71,32 +71,32 @@
     </p>
 
     
-    <h2>XHTML URL</h2>
+    <h2 id="xhtml_url">XHTML URL</h2>
     <p>
         Example of XHTML link: <a id="xhtml_url_link" href="/dispatcher/XHTML_URL_link.xhtml?alpha=1&amp;amp;bravo">/dispatcher/XHTML_URL_link.xhtml?alpha=1&amp;bravo</a>
     </p>
 
-    <h2>Root URL</h2>
+    <h2 id="root_url">Root URL</h2>
     <p>
         Example of Root link: <a id="root_url_link" href="/">&#160;/&#160;</a>
     </p>
 
-    <h2>Folder</h2>
+    <h2 id="folder_url">Folder URL</h2>
     <p>
         Example of Folder link: <a id="folder_url_link" href="/dispatcher/foldertest/">/dispatcher/foldertest/</a>
     </p>
     
-    <h2>Short URL Rewriter and catch</h2>
+    <h2 id="short_ulr_rewriter">Short URL Rewriter and catch</h2>
     <p>
         Example of Short URL link: <a id="short_url_link" href="/dispatcher/index-123-green-low.xhtml">/dispatcher/index-123-green-low.xhtml</a>
     </p>
     
-    <h2>Long URL Rewriter and catch</h2>
+    <h2 id="long_url_rewriter">Long URL Rewriter and catch</h2>
     <p>
         Example of Long URL link: <a id="long_url_link" href="/dispatcher/index-/123/green/low.xhtml">/dispatcher/index-/123/green/low.xhtml"</a>
     </p>
     
-    <h2>Static Stuff URL</h2>
+    <h2 id="static_stuff_url">Static Stuff URL</h2>
     <p>
         A servlet engine is able to return static files (image…). There is two places where put a static file:
         <ul>
diff --git a/src/fr/devinsy/kiss4web/demo/website/xidyn/index.html b/src/fr/devinsy/kiss4web/demo/website/xidyn/index.html
index f6cb2fc..031fef6 100644
--- a/src/fr/devinsy/kiss4web/demo/website/xidyn/index.html
+++ b/src/fr/devinsy/kiss4web/demo/website/xidyn/index.html
@@ -23,8 +23,8 @@
     <p>
         Kiss4web offers a <b>simple solution</b>: use the id of HTML tag to modify them.
     </p>
-        
-    <h2>Instanciate page</h2>
+     
+    <h2 id="instanciate_page">Instanciate page</h2>
     <p>
         A page is defined by:
         <ul>
@@ -62,22 +62,22 @@
 		</table>
 	</p>
 
-	<h2>Set content tag</h2>
+	<h2 id="set_content_tag">Set content tag</h2>
     <p id="demo1">n/a</p>
 
-    <h2>Set attribute tag</h2>
+    <h2 id="set_attribute_tag">Set attribute tag</h2>
     <p id="demo2">n/a</p>
     
-    <h2>Repeat tag (without line index)</h2>
+    <h2 id="repeat_tag_w">Repeat tag (without line index)</h2>
     <p id="demo3.1">n/a</p>
     
-    <h2>Repeat tag (with line index)</h2>
+    <h2 id="repeat_tag_wo">Repeat tag (with line index)</h2>
     <p id="demo3.2">n/a</p>
     
-    <h2>Fill table</h2>
+    <h2 id="fill_table">Fill table</h2>
     <p id="demo4">n/a</p>
     
-    <h2>Iteration strategies</h2>
+    <h2 id="iteration_strategies">Iteration strategies</h2>
     <p id="demo5">n/a</p>
     <p id="demo5.1">n/a</p>
     <p id="demo5.2">n/a</p>