diff --git a/core-js/src/main/javascript/LoadingDialog.js b/core-js/src/main/javascript/LoadingDialog.js
new file mode 100644
index 00000000..87197090
--- /dev/null
+++ b/core-js/src/main/javascript/LoadingDialog.js
@@ -0,0 +1,56 @@
+/*
+ *    Copyright [2011] [wisemapping]
+ *
+ *   Licensed under WiseMapping Public License, Version 1.0 (the "License").
+ *   It is basically the Apache License, Version 2.0 (the "License") plus the
+ *   "powered by wisemapping" text requirement on every single page;
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the license at
+ *
+ *       http://www.wisemapping.org/license
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+
+core.LoadingDiaglog = new Class({
+    Extends:MooDialog,
+    initialize : function() {
+        this.parent({
+            closeButton:false,
+            useEscKey:false
+        });
+        var panel = this._buildPanel();
+        this.setContent(panel);
+    },
+
+    _buildPanel : function () {
+
+        var result = new Element('div');
+        var content = new Element('p', {text:"sample"});
+
+
+        result.addEvent('keydown', function(event) {
+            event.stopPropagation();
+        });
+
+//        waitDialog.activate(true, $("waitDialog"));
+//        $(window).addEvent("error", function(event) {
+//
+//            // Show error dialog ...
+//            waitDialog.changeContent($("errorDialog"), false);
+//            return false;
+//        });
+
+        content.inject(result);
+        return result;
+    },
+
+    show : function() {
+        this.open();
+    }
+
+});
diff --git a/core-js/src/main/javascript/Utils.js b/core-js/src/main/javascript/Utils.js
index 49e53258..005483d7 100644
--- a/core-js/src/main/javascript/Utils.js
+++ b/core-js/src/main/javascript/Utils.js
@@ -20,28 +20,6 @@ core.Utils = {
 
 };
 
-/**
- * http://kevlindev.com/tutorials/javascript/inheritance/index.htm
- * A function used to extend one class with another
- *
- * @param {Object} subClass
- *         The inheriting class, or subclass
- * @param {Object} baseClass
- *         The class from which to inherit
- */
-objects = {};
-objects.extend = function(subClass, baseClass) {
-    function inheritance() {
-    }
-
-    inheritance.prototype = baseClass.prototype;
-
-    subClass.prototype = new inheritance();
-    subClass.prototype.constructor = subClass;
-    subClass.baseConstructor = baseClass;
-    subClass.superClass = baseClass.prototype;
-};
-
 Math.sign = function(value) {
     return (value >= 0) ? 1 : -1;
 };
diff --git a/mindplot/src/main/javascript/commands/DragTopicCommand.js b/mindplot/src/main/javascript/commands/DragTopicCommand.js
index a8ad74f8..6029c2bf 100644
--- a/mindplot/src/main/javascript/commands/DragTopicCommand.js
+++ b/mindplot/src/main/javascript/commands/DragTopicCommand.js
@@ -59,8 +59,6 @@ mindplot.commands.DragTopicCommand = new Class({
         } else {
             $assert("Illegal commnad state exception.");
         }
-        this._order = origOrder;
-        this._position = origPosition;
 
         // Finally, connect topic ...
         if ($defined(this._parentId)) {
@@ -74,6 +72,11 @@ mindplot.commands.DragTopicCommand = new Class({
             this._parentId = origParentTopic.getId();
         }
 
+       // Store for undo ...
+        this._order = origOrder;
+        this._position = origPosition;
+
+
     },
 
     undoExecute: function(commandContext) {
diff --git a/wise-doc/src/main/webapp/nicons/discard.png b/wise-doc/src/main/webapp/nicons/discard.png
new file mode 100644
index 00000000..63cec6ed
Binary files /dev/null and b/wise-doc/src/main/webapp/nicons/discard.png differ
diff --git a/wise-doc/src/main/webapp/nicons/favicon.ico b/wise-doc/src/main/webapp/nicons/favicon.ico
new file mode 100644
index 00000000..f25eeaf4
Binary files /dev/null and b/wise-doc/src/main/webapp/nicons/favicon.ico differ
diff --git a/wise-doc/src/main/webapp/nicons/logo-medium.png b/wise-doc/src/main/webapp/nicons/logo-medium.png
new file mode 100644
index 00000000..fca901db
Binary files /dev/null and b/wise-doc/src/main/webapp/nicons/logo-medium.png differ
diff --git a/wise-doc/src/main/webapp/nicons/rebota.gif b/wise-doc/src/main/webapp/nicons/rebota.gif
new file mode 100644
index 00000000..dbf2a4fa
Binary files /dev/null and b/wise-doc/src/main/webapp/nicons/rebota.gif differ
diff --git a/wise-doc/src/main/webapp/nicons/shape-line.png b/wise-doc/src/main/webapp/nicons/shape-line.png
new file mode 100644
index 00000000..89f5a5bc
Binary files /dev/null and b/wise-doc/src/main/webapp/nicons/shape-line.png differ
diff --git a/wise-webapp/src/main/webapp/WEB-INF/app.properties b/wise-webapp/src/main/webapp/WEB-INF/app.properties
index bf303077..62882278 100755
--- a/wise-webapp/src/main/webapp/WEB-INF/app.properties
+++ b/wise-webapp/src/main/webapp/WEB-INF/app.properties
@@ -1,17 +1,17 @@
 # MySQL 5.X configuration properties
 
-database.url=jdbc:mysql://localhost/wisemapping
-database.driver=com.mysql.jdbc.Driver
-database.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
-database.username=wisemapping
-database.password=password
+#database.url=jdbc:mysql://localhost/wisemapping
+#database.driver=com.mysql.jdbc.Driver
+#database.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
+#database.username=wisemapping
+#database.password=password
 
 # HSQL Configuration properties
-#database.url=jdbc:hsqldb:file:target/db/wisemapping
-#database.driver=org.hsqldb.jdbcDriver
-#database.hibernate.dialect=org.hibernate.dialect.HSQLDialect
-#database.username=sa
-#database.password=
+database.url=jdbc:hsqldb:file:target/db/wisemapping
+database.driver=org.hsqldb.jdbcDriver
+database.hibernate.dialect=org.hibernate.dialect.HSQLDialect
+database.username=sa
+database.password=
 
 
 # Enable/Disable user confirmation by e-mail. If it's enabled, mail must be configured.
diff --git a/wise-webapp/src/main/webapp/css/print.css b/wise-webapp/src/main/webapp/css/print.css
index c316bd0e..7a629d36 100644
--- a/wise-webapp/src/main/webapp/css/print.css
+++ b/wise-webapp/src/main/webapp/css/print.css
@@ -1,4 +1,3 @@
-@import "../css/widget/lightbox.css";
 @import "../css/common.css";
 
 div#printHeader {
diff --git a/wise-webapp/src/main/webapp/images/wisemapping.swf b/wise-webapp/src/main/webapp/images/wisemapping.swf
deleted file mode 100644
index e69de29b..00000000