diff --git a/wise-editor/src/main/webapp/c/export.htm b/wise-editor/src/main/webapp/c/export.htm
index c0017ee0..033bea14 100644
--- a/wise-editor/src/main/webapp/c/export.htm
+++ b/wise-editor/src/main/webapp/c/export.htm
@@ -109,8 +109,6 @@
 
         // Finally, submit map ...
         form.submit();
-
-
         MooDialog.Request.active.close();
     });
 
diff --git a/wise-editor/src/main/webapp/js/editor.js b/wise-editor/src/main/webapp/js/editor.js
index dc6d7c48..a784e3b5 100644
--- a/wise-editor/src/main/webapp/js/editor.js
+++ b/wise-editor/src/main/webapp/js/editor.js
@@ -26,13 +26,13 @@ function buildDesigner(options) {
     // Register load events ...
     designer = new mindplot.Designer(options, container);
     designer.addEvent('loadSuccess', function() {
-        window.waitDialog.close.delay(1000,window.waitDialog);
+        window.waitDialog.close.delay(1000, window.waitDialog);
         window.waitDialog = null;
     });
 
     window.onerror = function(e) {
         if (window.waitDialog) {
-            window.waitDialog.close.delay(1000,window.waitDialog);
+            window.waitDialog.close.delay(1000, window.waitDialog);
             window.waitDialog = null;
         }
         errorDialog.show();
@@ -56,7 +56,7 @@ function buildDesigner(options) {
 
     // Register toolbar event ...
     if ($('toolbar')) {
-        var menu = new mindplot.widget.Menu(designer, 'toolbar', "");
+        var menu = new mindplot.widget.Menu(designer, 'toolbar', options.mapId, "");
 
         //  If a node has focus, focus can be move to another node using the keys.
         designer._cleanScreen = function() {
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 dcc4a52e..e75a997e 100644
--- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml
+++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml
@@ -39,12 +39,13 @@
         <sec:http-basic/>
     </sec:http>
 
-    <sec:http use-expressions="true">
+    <sec:http use-expressions="true" access-denied-page="/c/login.htm">
         <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' authentication-failure-url="/c/login.htm?login_error=2"
+        <sec:form-login login-page="/c/login.htm"
+                        default-target-url='/c/mymaps.htm'
+                        always-use-default-target='true'
+                        authentication-failure-url="/c/login.htm?login_error=2"
                         login-processing-url="/j_spring_security_check"/>
-        <sec:remember-me key="_spring_security_remember_me" user-service-ref="userDetailsService"/>
         <sec:logout logout-url="/c/logout.htm" invalidate-session="true" logout-success-url="/c/login.htm"/>
     </sec:http>
 
@@ -62,4 +63,5 @@
         <property name="userManager" ref="userManager"/>
         <property name="adminUser" value="${admin.user}"/>
     </bean>
+
 </beans>
\ No newline at end of file