diff --git a/wise-webapp/src/license.txt b/license.txt
similarity index 100%
rename from wise-webapp/src/license.txt
rename to license.txt
diff --git a/mindplot/src/main/javascript/widget/Menu.js b/mindplot/src/main/javascript/widget/Menu.js
index 3752575d..ee3261c7 100644
--- a/mindplot/src/main/javascript/widget/Menu.js
+++ b/mindplot/src/main/javascript/widget/Menu.js
@@ -209,8 +209,9 @@ mindplot.widget.Menu = new Class({
 
 
         this._addButton('print', false, false, function() {
-            printMap();
+            window.open('c/print.htm?mapId=' + mapId)
         });
+
         this._registerTooltip('print', "Print");
 
         this._addButton('zoomIn', false, false, function() {
diff --git a/wise-editor/src/main/webapp/css/embedded.less b/wise-editor/src/main/webapp/css/embedded.less
index 507d6d4a..98c761c4 100644
--- a/wise-editor/src/main/webapp/css/embedded.less
+++ b/wise-editor/src/main/webapp/css/embedded.less
@@ -23,10 +23,81 @@ div#footer {
 }
 
 div#footerLogo {
-    height: 65px;
-    width: 80px;
+    width: 114px;
+    height: 56px;
     position: absolute;
-    background: url(../images/logo-small.png) no-repeat right top;
+    display: list-item;
+    list-style-image: url(../images/logo-xsmall.png);
+    list-style-position: inside;
     right: 10px;
-    top: -50px;
-}
\ No newline at end of file
+    top: -30px;
+}
+
+div#zoomIn {
+    background: url(../images/zoom-in.png) no-repeat left top;
+    margin-top: 10px;
+    margin-left: 10px;
+}
+
+#zoomOut {
+    background: url(../images/zoom-out.png) no-repeat left top;;
+    margin-top: 10px;
+    margin-left: 5px;
+}
+
+
+.button {
+    width: 20px;
+    height: 20px;
+    float: left;
+    cursor: pointer;
+    white-space: nowrap;
+    margin: 1px;
+}
+
+.button:hover {
+    float: left;
+    cursor: pointer;
+    border: 1px solid black;
+    border-top-color: white;
+    border-left-color: white;
+    margin: 0;
+}
+
+div#mapDetails {
+    float: right;
+    padding-top: 10px;
+    margin-right: 130px;
+
+}
+
+div#mapDetails .title {
+    font-weight: bold;
+    margin-left: 10px;
+    margin-right: 3px;
+}
+
+div#infoPanel {
+    border: 2px black solid;
+    position: absolute;
+    background: gray;
+    width: 100px;
+    height: 300px;
+    z-index: 100;
+    padding: 5px;
+    border-radius: 8px;
+    top: 150px;
+    right: 10px;
+    text-align: center;
+}
+
+div#infoPanel .textNode {
+    background-color: #E0E5EF;
+    height: 20px;
+    width: 80px;
+    border: 3px #023BB9 solid;
+    padding: 4px;
+    cursor: move
+}
+
+
diff --git a/wise-webapp/pom.xml b/wise-webapp/pom.xml
index d8c6c918..68eecd27 100644
--- a/wise-webapp/pom.xml
+++ b/wise-webapp/pom.xml
@@ -467,6 +467,15 @@
                     <stopPort>9999</stopPort>
                     <war>${project.build.directory}/wisemapping.war</war>
                     <reload>automatic</reload>
+                    <webAppConfig>
+                        <overrideDescriptor>webdefault.xml</overrideDescriptor>
+                    </webAppConfig>
+                    <systemProperties>
+                        <systemProperty>
+                            <name>org.mortbay.util.FileResource.checkAliases</name>
+                            <value>false</value>
+                        </systemProperty>
+                    </systemProperties>
                     <!--<scanIntervalSeconds>10</scanIntervalSeconds>-->
                 </configuration>
                 <executions>
diff --git a/wise-webapp/src/main/java/com/wisemapping/controller/MindmapEditorController.java b/wise-webapp/src/main/java/com/wisemapping/controller/MindmapEditorController.java
index 95a35c19..106d775f 100644
--- a/wise-webapp/src/main/java/com/wisemapping/controller/MindmapEditorController.java
+++ b/wise-webapp/src/main/java/com/wisemapping/controller/MindmapEditorController.java
@@ -58,8 +58,6 @@ public class MindmapEditorController extends BaseMultiActionController {
             view.addObject("editorTryMode", false);
             final boolean showHelp = isWelcomeMap(mindmap);
             view.addObject("showHelp", showHelp);
-            final String xmlMap = mindmap.getXmlAsJsLiteral();
-            view.addObject(MAP_XML_PARAM, xmlMap);
             view.addObject("user", Utils.getUser());
         }
         return view;
diff --git a/wise-webapp/src/main/java/com/wisemapping/model/MindMap.java b/wise-webapp/src/main/java/com/wisemapping/model/MindMap.java
index 3212eb19..93a8c278 100644
--- a/wise-webapp/src/main/java/com/wisemapping/model/MindMap.java
+++ b/wise-webapp/src/main/java/com/wisemapping/model/MindMap.java
@@ -225,7 +225,7 @@ public class MindMap {
         result.append("<map version=\"tango\">");
         result.append("<topic central=\"true\" text=\"");
         result.append(title);
-        result.append("\"/></result>");
+        result.append("\"/></map>");
         return result.toString();
     }
 
diff --git a/wise-webapp/src/main/java/com/wisemapping/ncontroller/MindmapController.java b/wise-webapp/src/main/java/com/wisemapping/ncontroller/MindmapController.java
index cefa7e2b..18f32c1d 100644
--- a/wise-webapp/src/main/java/com/wisemapping/ncontroller/MindmapController.java
+++ b/wise-webapp/src/main/java/com/wisemapping/ncontroller/MindmapController.java
@@ -33,14 +33,8 @@ public class MindmapController {
         return new ModelAndView("mindmapExport", "mindmap", modelObject);
     }
 
-    @RequestMapping(value = "edit")
-    public ModelAndView edit(@RequestParam(required = true) long mapId) {
-        final MindMapBean modelObject = findMindmapBean(mapId);
-        return new ModelAndView("mindmapEditor", "wisemapsList", modelObject);
-    }
-
     @RequestMapping(value = "collaborator")
-    public ModelAndView collaborator(@RequestParam(required = true) long mapId) {
+    public ModelAndView showCollaborator(@RequestParam(required = true) long mapId) {
         final MindMapBean modelObject = findMindmapBean(mapId);
         return new ModelAndView("mindmapCollaborator", "mindmap", modelObject);
     }
@@ -52,13 +46,21 @@ public class MindmapController {
     }
 
     @RequestMapping(value = "detail")
-    public ModelAndView detail(@RequestParam(required = true) long mapId) {
+    public ModelAndView showDetails(@RequestParam(required = true) long mapId) {
         final MindMapBean modelObject = findMindmapBean(mapId);
         final ModelAndView view = new ModelAndView("mindmapDetail", "wisemapDetail", modelObject);
         view.addObject("user", Utils.getUser());
         return view;
     }
 
+    @RequestMapping(value = "print")
+    public ModelAndView showPrintPage(@RequestParam(required = true) long mapId) {
+        final MindMap mindmap = findMindmap(mapId);
+        final ModelAndView view = new ModelAndView("mindmapPrint", "mindmap", mindmap);
+        view.addObject("user", Utils.getUser());
+        return view;
+    }
+
     @RequestMapping(value = "changeStatus")
     public ModelAndView changeStatus(@RequestParam(required = true) long mapId) throws WiseMappingException {
         final MindMap mindmap = findMindmap(mapId);
@@ -68,14 +70,6 @@ public class MindmapController {
         return new ModelAndView("mindmapDetail", "wisemapDetail", new MindMapBean(mindmap));
     }
 
-    @RequestMapping(value = "editMindmap")
-    public ModelAndView editMindmap(@RequestParam(required = true) long mapId) throws WiseMappingException {
-        final MindMapBean mindmap = findMindmapBean(mapId);
-        final ModelAndView view = new ModelAndView("editMindmap", "mindmap", mindmap);
-        view.addObject("user", Utils.getUser());
-        return view;
-    }
-
     @RequestMapping(value = "mymaps")
     public ModelAndView list(@NotNull HttpServletRequest request) {
         final HttpSession session = request.getSession(false);
diff --git a/wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties b/wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties
index df59bb32..307fc8ac 100644
--- a/wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties
+++ b/wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties
@@ -330,4 +330,5 @@ INSTALL_CFG_CLICK_HERE=To install Google Chrome Frame Plugin click here
 
 INVALID_EMAIL_ERROR = The e-mail was not verified
 BROWSER_NOT_SUPPOERTED= Current Browser is not supported.
-CHECK_BROWSERS= You can check supported browser at
\ No newline at end of file
+CHECK_BROWSERS= You can check supported browser at
+NO_PRODUCTION_DATABASE_CONFIGURED=Note: Although HSQLDB is bundled with WiseMapping by default during the installation, we do not recommend this database for production use. Please consider using MySQL 5.5 instead. You can find more information how to configure MySQL
\ No newline at end of file
diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml
index 035ad00a..60e8564c 100644
--- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml
+++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml
@@ -43,7 +43,7 @@
         <sec:intercept-url pattern="/c/*.htm" access="isFullyAuthenticated()"/>
         <sec:form-login login-page="/c/login.htm"
                         default-target-url='/c/mymaps.htm'
-                        always-use-default-target='true'
+                        always-use-default-target='false'
                         authentication-failure-url="/c/login.htm?login_error=2"
                         login-processing-url="/j_spring_security_check"/>
         <sec:remember-me key="wisemapping-hashed-key"/>
diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml
index a11f4af7..2369b033 100644
--- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml
+++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml
@@ -13,10 +13,9 @@
         <property name="paramName" value="actionId"/>
     </bean>
 
-
-    <!--<bean id="localeResolver"
-          class="org.springframework.web.servlet.i18n.AcceptHeaderLocaleResolver">
-    </bean>-->
+    <!--<bean id="localeResolver"-->
+          <!--class="org.springframework.web.servlet.i18n.AcceptHeaderLocaleResolver">-->
+    <!--</bean>-->
 
     <bean id="homeResolver" class="org.springframework.web.servlet.mvc.multiaction.PropertiesMethodNameResolver">
         <property name="mappings">
diff --git a/wise-webapp/src/main/webapp/css/embedded.less b/wise-webapp/src/main/webapp/css/embedded.less
new file mode 120000
index 00000000..f71cb6bf
--- /dev/null
+++ b/wise-webapp/src/main/webapp/css/embedded.less
@@ -0,0 +1 @@
+../../../../../wise-editor/src/main/webapp/css/embedded.less
\ No newline at end of file
diff --git a/wise-webapp/src/main/webapp/css/print.css b/wise-webapp/src/main/webapp/css/print.css
deleted file mode 100644
index 58c7f6c9..00000000
--- a/wise-webapp/src/main/webapp/css/print.css
+++ /dev/null
@@ -1,23 +0,0 @@
-@import "../css/common.css";
-
-div#printHeader {
-    background-color: black;
-    height: 55px;
-    color: white;
-}
-
-div#printFooter {
-    height: 60px;
-    width: 100%;
-    background: #E5E5E5;
-    border-top: 1px solid #bbb4d6;
-}
-
-div#printLogo {
-    height: 80px;
-    width: 170px;
-    float: right;
-    margin: 1px;
-    background: url(../images/logo-medium.png) no-repeat right top;
-}
-
diff --git a/wise-webapp/src/main/webapp/css/viewmode.css b/wise-webapp/src/main/webapp/css/viewmode.css
deleted file mode 100644
index ef5a90eb..00000000
--- a/wise-webapp/src/main/webapp/css/viewmode.css
+++ /dev/null
@@ -1,117 +0,0 @@
-html {
-    overflow: hidden;
-}
-
-#waitDialog {
-    position: absolute;
-    top: 10px;
-    left: 10px;
-    height: 100px;
-}
-
-#loadingContainer {
-    position: relative;
-    top: 80px;
-    height: 120px;
-    background: #FEFEFE;
-    opacity: .99;
-    padding: 15px;
-    width: 100%;
-    border: 1px solid;
-    border-color: #a9a9a9;
-
-}
-
-#loadingContainer .loadingText {
-    position: relative;
-    top: 50%;
-    margin-top: -35px;
-    font-size: 30px;
-    font-weight: bold;
-    vertical-align: text-bottom;
-    height: 30px;
-    float: left;
-}
-
-#loadingContainer .loadingIcon {
-    position: relative;
-    background: url(../images/ajax-loader2.gif) no-repeat;
-    top: 25px;
-    height: 100px;
-    width: 70px;
-    float: left;
-    clear: both;
-}
-
-/* ------------- Footer Styles -------------------------*/
-div#    <div id="footer"></div>
- {
-    position: absolute;
-    height: 35px;
-    width: 100%;
-    bottom: 0;
-    left: 0;
-    border-top: 1px solid black;
-    background: #E5E5E5;
-    font-family: Arial;
-}
-
-div#logo {
-    height: 65px;
-    width: 80px;
-    position: absolute;
-    background: url(../images/logo-small.png) no-repeat right top;
-    right: 10px;
-    top: -10px;
-}
-
-.button {
-    width: 20px;
-    height: 20px;
-    float: left;
-    cursor: pointer;
-    white-space: nowrap;
-    margin: 1px;
-}
-
-.button:hover {
-    float: left;
-    cursor: pointer;
-    border: 1px solid black;
-    border-top-color: white;
-    border-left-color: white;
-    margin: 0;
-
-}
-
-div#zoomIn {
-    background: url(../images/zoom-in.png) no-repeat left top;
-    margin-top: 10px;
-    margin-left: 10px;
-}
-
-#zoomOut {
-    background: url(../images/zoom-out.png) no-repeat left top;;
-    margin-top: 10px;
-    margin-left: 5px;
-}
-
-div#mindplot {
-    position: relative;
-    top: 0;
-    left: 0;
-    width: 100%;
-}
-
-div#mapDetails {
-    float: right;
-    padding-top: 10px;
-    margin-right: 100px;
-
-}
-
-div#mapDetails .title {
-    font-weight: bold;
-    margin-left: 10px;
-    margin-right: 3px;
-}
\ No newline at end of file
diff --git a/wise-webapp/src/main/webapp/images/logo-xsmall.png b/wise-webapp/src/main/webapp/images/logo-xsmall.png
new file mode 100644
index 00000000..98ee18df
Binary files /dev/null and b/wise-webapp/src/main/webapp/images/logo-xsmall.png differ
diff --git a/wise-webapp/src/main/webapp/jsp/login.jsp b/wise-webapp/src/main/webapp/jsp/login.jsp
index 374b261c..3aefba29 100644
--- a/wise-webapp/src/main/webapp/jsp/login.jsp
+++ b/wise-webapp/src/main/webapp/jsp/login.jsp
@@ -39,7 +39,7 @@
                 </c:if>
                 <tr>
                     <td class="formLabel">
-                        <spring:message code="EMAIL"/>:
+                        <label for="email"><spring:message code="EMAIL"/>:</label>
                     </td>
                     <td>
                         <input type='text' tabindex="1" id="email" name='j_username'/>
@@ -47,7 +47,7 @@
                 </tr>
                 <tr>
                     <td class="formLabel">
-                        <spring:message code="PASSWORD"/>:
+                        <label for="password"><spring:message code="PASSWORD"/>:</label>
                     </td>
                     <td>
                         <input type='password' tabindex="2" id="password" name='j_password'/>
@@ -58,7 +58,7 @@
                         <input type="checkbox" id="rememberme" name="_spring_security_remember_me"/>
                     </td>
                     <td>
-                        <spring:message code="REMEMBER_ME"/>
+                        <label for="rememberme"><spring:message code="REMEMBER_ME"/>:</label>
                     </td>
                 </tr>
                 <tr>
@@ -79,9 +79,7 @@
 </div>
 
 <div id="register">
-    <b>
-        <spring:message code="NOT_READY_A_USER"/>
-    </b>
+    <b><spring:message code="NOT_READY_A_USER"/></b>
     <spring:message code="NOT_READY_A_USER_MESSAGE"/>
     <a href="userRegistration.htm">
         <spring:message code="JOIN_NOW"/>
@@ -89,12 +87,9 @@
 </div>
 
 <c:if test="${isHsql== 'true'}">
-
-
     <div style="padding:10px;background-color: #E0EFFF; border-radius: 5px 5px 5px 5px;border-style:solid;border-color:gray">
-        <img src="../images/info.png" style="margin:0 4px">Note: Although HSQLDB is bundled with WiseMapping by
-        default during the installation, we do not recommend this database for production use. Please consider using
-        MySQL 5.5 instead. You can find more information how to configure MySQL <a
+        <img src="../images/info.png" style="margin:0 4px" alt="info">
+        <spring:message code="NO_PRODUCTION_DATABASE_CONFIGURED"/>&nbsp;<a
             href="http://www.wisemapping.org/documentation/configu">here</a>.
     </div>
 </c:if>
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
index 82e60502..d4652375 100644
--- a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
@@ -2,7 +2,8 @@
 
 <%--@elvariable id="mindmap" type="com.wisemapping.model.MindMap"--%>
 <%--@elvariable id="editorTryMode" type="java.lang.Boolean"--%>
-<%--@elvariable id="user" type="com.wisemapping.model.User"--%>
+<%--@elvariable id="editorTryMode" type="java.lang.String"--%>
+<%--@elvariable id="mapXml" type="com.wisemapping.model.User"--%>
 
 <%@ include file="/jsp/init.jsp" %>
 <c:url value="mymaps.htm" var="shareMap">
@@ -32,7 +33,7 @@
 
         $(document).addEvent('loadcomplete', function(resource) {
             var mapId = '${mindmap.id}';
-            var mapXml = '${mapXml}';
+            var mapXml = '${mindmap.xmlAsJsLiteral}';
 
             // Configure designer options ...
             var options = loadDesignerOptions();
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapExport.jsp b/wise-webapp/src/main/webapp/jsp/mindmapExport.jsp
index 1abf5e56..0532510a 100644
--- a/wise-webapp/src/main/webapp/jsp/mindmapExport.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapExport.jsp
@@ -13,37 +13,43 @@
             <tr>
                 <td>
                     <input type="radio" id="svg" name="exportFormat" value="SVG"/>
-                    <b>
-                        <spring:message code="SVG_EXPORT_FORMAT"/>
-                    </b>
+                    <label for="svg">
+                        <b>
+                            <spring:message code="SVG_EXPORT_FORMAT"/>
+                        </b>
 
-                    <p>
-                        <spring:message code="SVG_EXPORT_FORMAT_DETAILS"/>
-                    </p>
+                        <p>
+                            <spring:message code="SVG_EXPORT_FORMAT_DETAILS"/>
+                        </p>
+                    </label>
                 </td>
             </tr>
             <tr>
                 <td>
                     <input type="radio" name="exportFormat" value="PDF" id="pdf"/>
-                    <b>
-                        <spring:message code="PDF_EXPORT_FORMAT"/>
-                    </b>
+                    <label for="pdf">
+                        <b>
+                            <spring:message code="PDF_EXPORT_FORMAT"/>
+                        </b>
 
-                    <p>
-                        <spring:message code="PDF_EXPORT_FORMAT_DETAILS"/>
-                    </p>
+                        <p>
+                            <spring:message code="PDF_EXPORT_FORMAT_DETAILS"/>
+                        </p>
+                    </label>
                 </td>
             </tr>
             <tr>
                 <td>
                     <input type="radio" id="freemind" name="exportFormat" value="FREEMIND" checked="checked"/>
-                    <b>
-                        <spring:message code="FREEMIND_EXPORT_FORMAT"/>
-                    </b>
+                    <label for="freemind">
+                        <b>
+                            <spring:message code="FREEMIND_EXPORT_FORMAT"/>
+                        </b>
 
-                    <p>
-                        <spring:message code="FREEMIND_EXPORT_FORMAT_DETAILS"/>
-                    </p>
+                        <p>
+                            <spring:message code="FREEMIND_EXPORT_FORMAT_DETAILS"/>
+                        </p>
+                    </label>
                 </td>
             </tr>
             <tr>
@@ -55,17 +61,18 @@
                     <option>PNG</option>
                     <option>JPEG</option>
                 </select>
-
-                    <p>
-                        <spring:message code="IMG_EXPORT_FORMAT_DETAILS"/>
-                    </p>
+                    <label for="img">
+                        <p>
+                            <spring:message code="IMG_EXPORT_FORMAT_DETAILS"/>
+                        </p>
+                    </label>
                 </td>
             </tr>
             <tr>
                 <td style="text-align:center;margin-top:10px;">
                     <input type="button" id="ok" value="<spring:message code="OK"/>" class="btn-primary">
                     <input type="button" id="cancel" value="<spring:message code="CANCEL"/>" class="btn-secondary"
-                           onclick="">
+                           onclick="MooDialog.Request.active.close()">
                 </td>
             </tr>
             </tbody>
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp
index 13ca74b1..b269512f 100644
--- a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp
@@ -79,7 +79,7 @@
 
         <div class="leftMenu">
             <div class="button">
-                <a href="newMap.htm" rel="moodalbox 500px 190px" title="<spring:message code="NEW_MAP_MSG"/>">
+                <a href="newMap.htm" title="<spring:message code="NEW_MAP_MSG"/>">
                     <spring:message code="NEW_MINDMAP"/>
                 </a>
             </div>
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp b/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp
index 8a4db9e9..dcfc7f8c 100644
--- a/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp
@@ -1,7 +1,15 @@
+<!DOCTYPE HTML>
+
+<%--@elvariable id="mindmap" type="com.wisemapping.model.MindMap"--%>
+<%--@elvariable id="editorTryMode" type="java.lang.Boolean"--%>
+<%--@elvariable id="editorTryMode" type="java.lang.String"--%>
+<%--@elvariable id="mapXml" type="com.wisemapping.model.User"--%>
+
 <%@ page import="java.text.DateFormat" %>
 <%@ page import="java.text.SimpleDateFormat" %>
 <%@ page import="java.util.Calendar" %>
 
+
 <%@ include file="/jsp/init.jsp" %>
 
 <%
@@ -10,82 +18,119 @@
     DateFormat dateFormat = SimpleDateFormat.getDateTimeInstance(DateFormat.DEFAULT, DateFormat.DEFAULT, request.getLocale());
     String todayString = dateFormat.format(calendar.getTime());
 %>
-<!DOCTYPE HTML>
 <html>
 <head>
+    <base href="../"/>
+    <title><spring:message code="SITE.TITLE"/> - ${mindmap.title} </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]-->
-    <title><spring:message code="SITE.TITLE"/> - ${mindmap.title} </title>
-    <meta http-equiv="Content-type" content="text/html; charset=UTF-8"/>
-    <meta http-equiv="Content-type" content="text/html; charset=UTF-8"/>
-    <link rel="icon" href="../images/favicon.ico" type="image/x-icon">
-    <link rel="shortcut icon" href="../images/favicon.ico" type="image/x-icon">
+
+    <link rel="stylesheet" type="text/css" href="css/embedded.less"/>
+    <style type="text/css" media="print">
+        @page {
+            size: A4 landscape;
+        }
+
+        body {
+            overflow: visible
+        }
+
+        #embFooter {
+            display: none;
+        }
+
+        #footerLogo {
+            display: block;
+        }
+
+        div#printLogo {
+            width: 114px;
+            height: 56px;
+            position: absolute;
+            display: list-item;
+            list-style-image: url(../images/logo-xsmall.png);
+            list-style-position: inside;
+            right: 10px;
+            bottom: -30px;
+        }
+
+        div#infoPanel {
+            display: none;
+        }
+    </style>
+
+    <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>
 
 
-    <link rel="stylesheet" type="text/css" href="../css/print.css"/>
-
-    <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>
-
+    <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 = '${mindmap.id}';
-        var mapXml = '${mapXml}';
-        var mindReady = false;
+        var mapXml = '${mindmap.xmlAsJsLiteral}';
         $(document).addEvent('loadcomplete', function(resource) {
-            mindReady = resource == 'mind' ? true : mindReady;
-            if (mindReady) {
 
-                var editorProperties = {zoom:0.85,saveOnLoad:true,collab:'standalone',readOnly:true};
-                designer = buildDesigner(editorProperties);
+            // Configure designer options ...
+            var options = loadDesignerOptions();
+            options.size.height = options.size.height + 50;
 
-                var domDocument = core.Utils.createDocumentFromText(mapXml);
-                var serializer = mindplot.persistence.XMLSerializerFactory.getSerializerFromDocument(domDocument);
-                var mindmap = serializer.loadFromDom(domDocument, mapId);
+            options.persistenceManager = new mindplot.RESTPersistenceManager("service/maps/");
+            var userOptions = ${mindmap.properties};
+            options.zoom = userOptions.zoom;
 
-                // Now, load the map ...
-                designer.loadMap(mindmap);
+            // Set map id ...
+            options.mapId = mapId;
 
-                $('zoomIn').addEvent('click', function() {
-                    designer.zoomIn();
-                });
+            // Print is read only ...
+            options.readOnly = true;
 
-                $('zoomOut').addEvent('click', function() {
-                    designer.zoomOut();
-                });
-            }
+            // Build designer ...
+            var designer = buildDesigner(options);
+
+            // Load map from XML ...
+            var domDocument = core.Utils.createDocumentFromText(mapXml);
+            var persistence = mindplot.PersistenceManager.getInstance();
+            var mindmap = persistence.loadFromDom(mapId, domDocument);
+            designer.loadMap(mindmap);
+
+            $('zoomIn').addEvent('click', function() {
+                designer.zoomIn();
+            });
+
+            $('zoomOut').addEvent('click', function() {
+                designer.zoomOut();
+            });
         });
     </script>
 </head>
-<body onload="setTimeout('print()', 5)">
+<body>
 
-<div id="waitDialog" style="display:none">
-    <div id="waitingContainer">
-        <div class="loadingIcon"></div>
-        <div class="loadingText">
-            Loading ...
-        </div>
-    </div>
-</div>
-
-<div id="errorDialog" style="display:none">
-    <div id="errorContainer">
-        <div class="loadingIcon"></div>
-        <div class="loadingText">
-            Unexpected error loading your map :(
-        </div>
-    </div>
-</div>
-
-<div id="printHeader">
-    <div id="printLogo"></div>
-    <div id="headerTitle">${mindmap.title}<span id="headerSubTitle">&nbsp;(<%=todayString%>)</span></div>
-</div>
-<center>
+<div id="mapContainer">
+    <%--<div id="infoPanel">--%>
+        <%--<div id="dragImageNode" style="cursor: move">--%>
+    <%--</div>--%>
     <div id="mindplot"></div>
-</center>
+    <div id="printLogo"></div>
+
+    <div id="embFooter">
+        <a href="${pageContext.request.contextPath}/c/home.htm" target="new">
+            <div id="footerLogo"></div>
+        </a>
+
+        <div id="zoomIn" class="button"></div>
+        <div id="zoomOut" class="button"></div>
+
+        <div id="mapDetails">
+            <span class="title"><spring:message code="CREATOR"/>:</span><span>${mindmap.creator}</span>
+            <span class="title"><spring:message code="DESCRIPTION"/>:</span><span>${mindmap.title}</span>
+        </div>
+    </div>
+</div>
 <script type="text/javascript" src="../js/editor.js"></script>
 </body>
 </html>
diff --git a/wise-webapp/src/main/webapp/jsp/userRegistration.jsp b/wise-webapp/src/main/webapp/jsp/userRegistration.jsp
index a6873fa0..56833fc4 100644
--- a/wise-webapp/src/main/webapp/jsp/userRegistration.jsp
+++ b/wise-webapp/src/main/webapp/jsp/userRegistration.jsp
@@ -2,15 +2,13 @@
 
 
 <div id="userRegistrationContent">
-    <div id="userRegistration">
+    <div id="userRegistration" class="sb">
         <h1>
             <spring:message code="USER_REGISTRATION"/>
         </h1>
 
         <h2>
-            <spring:message code="REGISTRATION_TITLE_MSG"/>
-            <br/><br/>
-            <spring:message code="FIELD_REQUIRED_MSG"/>
+            <spring:message code="REGISTRATION_TITLE_MSG"/> <spring:message code="FIELD_REQUIRED_MSG"/>
         </h2>
         <form:form method="post" commandName="user">
             <table>
@@ -18,7 +16,7 @@
                 <tr>
                     <td class="formLabel">
                         <span class="fieldRequired">*</span>
-                        <spring:message code="EMAIL"/>:
+                        <label for="email"><spring:message code="EMAIL"/>:</label>
                     </td>
                     <td>
                         <form:input path="email" id="email"/>
@@ -28,7 +26,7 @@
                 <tr>
                     <td class="formLabel">
                         <span class="fieldRequired">*</span>
-                        <spring:message code="USERNAME"/>:
+                        <label for="username"> <spring:message code="USERNAME"/>:</label>
                     </td>
                     <td>
                         <form:input path="username" id="username"/>
@@ -38,7 +36,7 @@
                 <tr>
                     <td class="formLabel">
                         <span class="fieldRequired">*</span>
-                        <spring:message code="FIRSTNAME"/>:
+                        <label for="firstname"><spring:message code="FIRSTNAME"/>:</label>
                     </td>
                     <td>
                         <form:input path="firstname" id="firstname"/>
@@ -48,7 +46,7 @@
                 <tr>
                     <td class="formLabel">
                         <span class="fieldRequired">*</span>
-                        <spring:message code="LASTNAME"/>:
+                        <label for="lastname"><spring:message code="LASTNAME"/>:</label>
                     </td>
                     <td>
                         <form:input path="lastname" id="lastname"/>
@@ -58,7 +56,7 @@
                 <tr>
                     <td class="formLabel">
                         <span class="fieldRequired">*</span>
-                        <spring:message code="PASSWORD"/>:
+                        <label for="password"><spring:message code="PASSWORD"/>:</label>
                     </td>
                     <td>
                         <form:password path="password" id="password"/>
@@ -68,7 +66,7 @@
                 <tr>
                     <td class="formLabel">
                         <span class="fieldRequired">*</span>
-                        <spring:message code="RETYPE_PASSWORD"/>:
+                        <label for="retypePassword"><spring:message code="RETYPE_PASSWORD"/>:</label>
                     </td>
                     <td>
                         <form:password path="retypePassword" id="retypePassword"/>
@@ -81,7 +79,7 @@
                         </td>
                         <td>
                             <form:errors path="captcha" cssClass="errorMsg"/>
-                            ${requestScope.captchaHtml}
+                                ${requestScope.captchaHtml}
                         </td>
                     </tr>
                 </c:if>
diff --git a/wise-webapp/webdefault.xml b/wise-webapp/webdefault.xml
new file mode 100644
index 00000000..a7b4a6b6
--- /dev/null
+++ b/wise-webapp/webdefault.xml
@@ -0,0 +1,15 @@
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+         version="2.4">
+
+
+    <servlet>
+        <servlet-name>default</servlet-name>
+        <servlet-class>org.eclipse.jetty.servlet.DefaultServlet</servlet-class>
+        <init-param>
+            <param-name>aliases</param-name>
+            <param-value>true</param-value>
+        </init-param>
+    </servlet>
+</web-app>
\ No newline at end of file