diff --git a/wise-editor/src/main/webapp/html/editor.html b/wise-editor/src/main/webapp/html/editor.html
index 84c6289b..6e0d17a9 100644
--- a/wise-editor/src/main/webapp/html/editor.html
+++ b/wise-editor/src/main/webapp/html/editor.html
@@ -9,10 +9,10 @@
     <![endif]-->
     <link rel="stylesheet/less" type="text/css" href="../css/editor.less"/>
 
-    <script type='text/javascript' src='../js/mootools-core-1.3.2.js'></script>
-    <script type='text/javascript' src='../js/mootools-more-1.3.2.js'></script>
+    <script type='text/javascript' src='../js/mootools-core.js'></script>
+    <script type='text/javascript' src='../js/mootools-more.js'></script>
     <script type='text/javascript' src='../js/core.js'></script>
-    <script type='text/javascript' src='../js/less-1.1.3.min.js'></script>
+    <script type='text/javascript' src='../js/less.js'></script>
 
     <link rel="icon" href="../images/favicon.ico" type="image/x-icon">
     <link rel="shortcut icon" href="../images/favicon.ico" type="image/x-icon">
@@ -24,7 +24,7 @@
             var options = loadDesignerOptions();
             var designer = buildDesigner(options);
 
-            // Load map from XML ...
+            // Load map from XML file persisted on disk...
             var persistence = mindplot.PersistenceManager.getInstance();
             var mindmap;
             try {
diff --git a/wise-editor/src/main/webapp/html/embedded.html b/wise-editor/src/main/webapp/html/embedded.html
index c31d1510..8143171c 100644
--- a/wise-editor/src/main/webapp/html/embedded.html
+++ b/wise-editor/src/main/webapp/html/embedded.html
@@ -9,10 +9,10 @@
     <![endif]-->
     <link rel="stylesheet/less" type="text/css" href="../css/embedded.less"/>
 
-    <script type='text/javascript' src='../js/mootools-core-1.3.2.js'></script>
-    <script type='text/javascript' src='../js/mootools-more-1.3.2.js'></script>
+    <script type='text/javascript' src='../js/mootools-core.js'></script>
+    <script type='text/javascript' src='../js/mootools-more.js'></script>
     <script type='text/javascript' src='../js/core.js'></script>
-    <script type='text/javascript' src='../js/less-1.1.3.min.js'></script>
+    <script type='text/javascript' src='../js/less.js'></script>
 
     <link rel="icon" href="../images/favicon.ico" type="image/x-icon">
     <link rel="shortcut icon" href="../images/favicon.ico" type="image/x-icon">
@@ -30,7 +30,7 @@
             var options = loadDesignerOptions(confUrl);
             var designer = buildDesigner(options);
 
-            // Load map from XML ...
+            // Load map from XML file persisted on disk...
             var persistence = mindplot.PersistenceManager.getInstance();
             var mindmap;
             try {
diff --git a/wise-editor/src/main/webapp/html/viewmode.html b/wise-editor/src/main/webapp/html/viewmode.html
index c7199ffe..744eb02b 100644
--- a/wise-editor/src/main/webapp/html/viewmode.html
+++ b/wise-editor/src/main/webapp/html/viewmode.html
@@ -2,35 +2,33 @@
 
 <html>
 <head>
-    <title>WiseMapping - View Mode </title>
+    <title>WiseMapping - Editor </title>
     <meta http-equiv="Content-type" content="text/html; charset=UTF-8"/>
     <!--[if lt IE 9]>
     <meta http-equiv="X-UA-Compatible" content="chrome=1">
     <![endif]-->
-    <link rel="stylesheet/less" type="text/css" href="../css/editor.less"/>
+    <link rel="stylesheet/less" type="text/css" href="../css/embedded.less"/>
 
-    <script type='text/javascript' src='../js/mootools-core-1.3.2.js'></script>
-    <script type='text/javascript' src='../js/mootools-more-1.3.2.js'></script>
+    <script type='text/javascript' src='../js/mootools-core.js'></script>
+    <script type='text/javascript' src='../js/mootools-more.js'></script>
     <script type='text/javascript' src='../js/core.js'></script>
-    <script type='text/javascript' src='../js/less-1.1.3.min.js'></script>
+    <script type='text/javascript' src='../js/less.js'></script>
 
     <link rel="icon" href="../images/favicon.ico" type="image/x-icon">
     <link rel="shortcut icon" href="../images/favicon.ico" type="image/x-icon">
 
     <script type="text/javascript">
 
+        var mapId = 'welcome';
         $(document).addEvent('loadcomplete', function(resource) {
 
-            // Configure the map as read only ...
+            // Set readonly option ...
             var options = loadDesignerOptions();
             options.readOnly = true;
-
-            // Load designer ...
             var designer = buildDesigner(options);
 
-            // Load map from XML ...
+            // Load map from XML file persisted on disk...
             var persistence = mindplot.PersistenceManager.getInstance();
-            var mapId = 'welcome';
             var mindmap;
             try {
                 mindmap = persistence.load(mapId);
@@ -46,86 +44,6 @@
 <body>
 
 <div id="header">
-
-    <div id="headerInfo">
-        <div id="headerActions"></div>
-        <div id="headerLogo"></div>
-        <div id="headerMapTitle">Title: <span>Welcome</span></div>
-    </div>
-    <div id="toolbar">
-        <div id="editTab" class="tabContent">
-            <div id="persist" class="buttonContainer">
-                <div id="save" class="buttonOn" title="Save">
-                    <img src="../images/save.png"/>
-                </div>
-                <div id="discard" class="buttonOn" title="Discard">
-                    <img src="../images/discard.png"/>
-                </div>
-            </div>
-            <div id="edit" class="buttonContainer">
-                <div id="undoEdition" class="buttonOn" title="Undo Edition">
-                    <img src="../images/undo.png"/>
-                </div>
-                <div id="redoEdition" class="buttonOn" title="Redo Edition">
-                    <img src="../images/redo.png"/>
-                </div>
-            </div>
-            <div id="zoom" class="buttonContainer">
-                <div id="zoomIn" class="buttonOn" title="Zoom In">
-                    <img src="../images/zoom-in.png"/>
-                </div>
-                <div id="zoomOut" class="buttonOn" title="Zoom Out">
-                    <img src="../images/zoom-out.png"/>
-                </div>
-            </div>
-            <div id="node" class="buttonContainer">
-                <div id="topicShape" class="buttonExtOn" title="Topic Shape">
-                    <img src="../images/topic-shape.png"/>
-                </div>
-                <div id="addTopic" class="buttonOn" title="Add Topic">
-                    <img src="../images/topic-add.png"/>
-                </div>
-                <div id="deleteTopic" class="buttonOn" title="Delete">
-                    <img src="../images/topic-delete.png"/>
-                </div>
-                <div id="topicBorder" class="buttonExtOn" title="Border Color">
-                    <img src="../images/topic-border.png"/>
-                </div>
-                <div id="topicColor" class="buttonExtOn" title="Background Color">
-                    <img src="../images/topic-color.png"/>
-                </div>
-                <div id="topicIcon" class="buttonExtOn" title="Add Icon">
-                    <img src="../images/topic-icon.png"/>
-                </div>
-                <div id="topicNote" class="buttonOn" title="Add Note">
-                    <img src="../images/topic-note.png"/>
-                </div>
-                <div id="topicLink" class="buttonOn" title="Add Link">
-                    <img src="../images/topic-link.png"/>
-                </div>
-                <div id="topicRelation" class="buttonOn" title="Add Relationship">
-                    <img src="../images/topic-relation.png"/>
-                </div>
-            </div>
-            <div id="font" class="buttonContainer">
-                <div id="fontFamily" class="buttonExtOn" title="Font Style">
-                    <img src="../images/font-type.png"/>
-                </div>
-                <div id="fontSize" class="buttonExtOn" title="Font Size">
-                    <img src="../images/font-size.png"/>
-                </div>
-                <div id="fontBold" class="buttonOn" title="Bold Style">
-                    <img src="../images/font-bold.png"/>
-                </div>
-                <div id="fontItalic" class="buttonOn" title="Italic Style">
-                    <img src="../images/font-italic.png"/>
-                </div>
-                <div id="fontColor" class="buttonExtOn" title="Fond Color" style="padding-top:4px">
-                    <img src="../images/font-color.png"/>
-                </div>
-            </div>
-        </div>
-    </div>
     <div id="headerNotifier"></div>
     <div id="footer">
         <div id="footerLogo"></div>
diff --git a/wise-editor/src/main/webapp/index.html b/wise-editor/src/main/webapp/index.html
index 7cdfa41e..319686e2 100644
--- a/wise-editor/src/main/webapp/index.html
+++ b/wise-editor/src/main/webapp/index.html
@@ -1,13 +1,23 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE HTML>
+
 <html>
 <head>
-
+    <title>WiseMapping Editor Sample Gallery </title>
+    <meta http-equiv="Content-type" content="text/html; charset=UTF-8"/>
+    <style>
+        body {
+            font-family: Arial, Tahoma;
+            background: #a9a9a9;
+            padding: 10px 30px;
+        }
+    </style>
 </head>
 <body>
-
-
-    <a href="html/container.html">Embedding the mindmap in a page</a>
-    <a href="html/editor.html">Full page</a>
-    <a href="html/viewmode.html">Read Only version</a>
+      <h1>WiseMapping Editor Sample Gallery </h1>
+<ul>
+    <li><a href="html/container.html">Embedding the mindmap in a page</a></li>
+    <li><a href="html/editor.html">Standard Editor</a></li>
+    <li><a href="html/viewmode.html">Read Only</a></li>
+</ul>
 </body>
 </html>
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
index 8b076974..b2c05a6e 100644
--- a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
@@ -16,10 +16,10 @@
     <title><spring:message code="SITE.TITLE"/> - ${mindmap.title} </title>
 
     <link rel="stylesheet/less" type="text/css" href="../css/editor.less"/>
-    <script type='text/javascript' src='../js/mootools-core-1.3.2.js'></script>
-    <script type='text/javascript' src='../js/mootools-more-1.3.2.js'></script>
+    <script type='text/javascript' src='../js/mootools-core.js'></script>
+    <script type='text/javascript' src='../js/mootools-more.js'></script>
     <script type='text/javascript' src='../js/core.js'></script>
-    <script type='text/javascript' src='../js/less-1.1.3.min.js'></script>
+    <script type='text/javascript' src='../js/less.js'></script>
 
     <link rel="icon" href="../images/favicon.ico" type="image/x-icon">
     <link rel="shortcut icon" href="../images/favicon.ico" type="image/x-icon">
