diff --git a/mindplot/src/main/javascript/widget/LinkEditor.js b/mindplot/src/main/javascript/widget/LinkEditor.js
index c320f5fc..28a22d54 100644
--- a/mindplot/src/main/javascript/widget/LinkEditor.js
+++ b/mindplot/src/main/javascript/widget/LinkEditor.js
@@ -99,7 +99,7 @@ mindplot.widget.LinkEditor = new Class({
         });
         openButton.inject(form);
         openButton.addEvent('click',function(){
-            window.open(input.value,"_blank", "status=1,width=700,height=450,resize=1");
+            window.open(input.value,"_blank", "status=1,width=700,height=450,resizable=1");
         });
 
 
diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java b/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java
index df1b8da1..974a67da 100644
--- a/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java
+++ b/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java
@@ -173,7 +173,7 @@ public class MindmapController extends BaseController {
         return lockInfo.getTimestamp();
     }
 
-    @RequestMapping(method = RequestMethod.GET, value = "/maps/{id}/document/xml",consumes = {"text/plain"}, produces = {"application/xml"})
+    @RequestMapping(method = RequestMethod.GET, value = { "/maps/{id}/document/xml","/maps/{id}/document/xml-pub"},consumes = {"text/plain"}, produces = {"application/xml"})
     @ResponseBody
     public byte[] retrieveDocument(@PathVariable int id, @NotNull HttpServletResponse response) throws WiseMappingException, IOException {
         // I should not return byte, but there is some encoding issue here. Further research needed.
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 bd7d7756..a33c9491 100644
--- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml
+++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml
@@ -24,10 +24,9 @@
 
     <sec:http pattern="/c/maps/*/embed" security="none"/>
     <sec:http pattern="/c/maps/*/try" security="none"/>
-    <!--<sec:http pattern="/c/maps/*/print" security="none"/>-->
     <sec:http pattern="/c/maps/*/public" security="none"/>
     <sec:http pattern="/c/GCFInstall" security="none"/>
-    <!--<sec:http pattern="/c/restful/maps/*/document/xml " security="none"/>-->
+    <sec:http pattern="/c/restful/maps/*/document/xml-pub" security="none"/>
 
     <sec:http pattern="/c/publicview.htm" security="none"/>
     <sec:http pattern="/c/embeddedview.htm" security="none"/>
diff --git a/wise-webapp/src/main/webapp/jsp/init.jsp b/wise-webapp/src/main/webapp/jsp/init.jsp
index 91b72cbb..376f6a22 100644
--- a/wise-webapp/src/main/webapp/jsp/init.jsp
+++ b/wise-webapp/src/main/webapp/jsp/init.jsp
@@ -2,3 +2,6 @@
 <%@taglib prefix="spring" uri="http://www.springframework.org/tags" %>
 <%@taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 <%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%
+    request.setAttribute("principal", com.wisemapping.security.Utils.getUser());
+%>
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
index d2368c26..06f54625 100644
--- a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
@@ -45,7 +45,7 @@
                 );
             </c:if>
             <c:if test="${memoryPersistence || readOnlyMode}">
-                    options.persistenceManager = new mindplot.LocalStorageManager("c/restful/maps/{id}/document/xml");
+                    options.persistenceManager = new mindplot.LocalStorageManager("c/restful/maps/{id}/document/xml${principal!=null?'':'-pub'}");
             </c:if>
 
                 var userOptions = ${mindmap.properties};
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapEditorToolbar.jsf b/wise-webapp/src/main/webapp/jsp/mindmapEditorToolbar.jsf
index b5e6a338..f944097e 100644
--- a/wise-webapp/src/main/webapp/jsp/mindmapEditorToolbar.jsf
+++ b/wise-webapp/src/main/webapp/jsp/mindmapEditorToolbar.jsf
@@ -2,17 +2,14 @@
 
 <div id="toolbar">
     <div id="persist" class="buttonContainer">
-        <c:if test="${!readOnlyMode}">
+        <c:if test="${!readOnlyMode && !memoryPersistence}">
             <div id="save" class="buttonOn">
                 <img src="images/save.png"/>
             </div>
-            <%--<div id="discard" class="buttonOn">--%>
-            <%--<img src="images/discard.png"/>--%>
-            <%--</div>--%>
+            <div id="print" class="buttonOn">
+                <img src="images/print.png"/>
+            </div>
         </c:if>
-        <div id="print" class="buttonOn">
-            <img src="images/print.png"/>
-        </div>
     </div>
     <c:if test="${!readOnlyMode}">
         <div id="edit" class="buttonContainer">
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapEmbed.jsp b/wise-webapp/src/main/webapp/jsp/mindmapEmbed.jsp
index b30125cf..ac311dd6 100644
--- a/wise-webapp/src/main/webapp/jsp/mindmapEmbed.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapEmbed.jsp
@@ -45,7 +45,7 @@
             options.readOnly = true;
 
             // Configure persistence ...
-            options.persistenceManager = new mindplot.LocalStorageManager("c/restful/maps/{id}/document/xml");
+            options.persistenceManager = new mindplot.LocalStorageManager("c/restful/maps/{id}/document/xml${principal!=null?'':'-pub'}");
 
             // Build designer ...
             var designer = buildDesigner(options);
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp b/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp
index 2de53b11..b8a31272 100644
--- a/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp
@@ -77,7 +77,7 @@
             options.readOnly = true;
 
             // Configure loader ...
-            options.persistenceManager = new mindplot.LocalStorageManager("c/restful/maps/{id}/document/xml.xml");
+            options.persistenceManager = new mindplot.LocalStorageManager("c/restful/maps/{id}/document/xml${principal!=null?'':'-pub'}");
 
             // Build designer ...
             var designer = buildDesigner(options);