diff --git a/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindImporter.java b/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindImporter.java
index eff29d66..8ae02098 100755
--- a/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindImporter.java
+++ b/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindImporter.java
@@ -135,9 +135,7 @@ public class FreemindImporter
             nodesMap.put(freeNode.getID(), wiseTopic);
 
             convertChildNodes(freeNode, wiseTopic, 1);
-
-            // @Todo: Pablo, tenemos que ver como arreglamos esto. No estoy seteando a los hijos la posicion.
-            //addRelationships(mindmapMap);
+            addRelationships(mindmapMap);
 
             JAXBUtils.saveMap(mindmapMap, baos, "com.wisemapping.xml.mindmap");
 
@@ -233,14 +231,10 @@ public class FreemindImporter
                 }
                 wiseChild.setOrder(norder);
 
-
-                // @Todo: This is required in the old layout. Pablo, we need to discuss this.
-                if (depth == 1) {
-                    // Convert node position
-                    int childrenCount = freeChilden.size();
-                    final String position = convertPosition(wiseParent, freeChild, depth, norder, childrenCount);
-                    wiseChild.setPosition(position);
-                }
+                // Convert node position
+                int childrenCount = freeChilden.size();
+                final String position = convertPosition(wiseParent, freeChild, depth, norder, childrenCount);
+                wiseChild.setPosition(position);
 
                 // Convert the rest of the node properties ...
                 convertNodeProperties(freeChild, wiseChild);
diff --git a/wise-webapp/src/test/data/freemind/basic.mmr b/wise-webapp/src/test/data/freemind/basic.mmr
index 6197beec..00c4d5b3 100644
--- a/wise-webapp/src/test/data/freemind/basic.mmr
+++ b/wise-webapp/src/test/data/freemind/basic.mmr
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="0.9.0"><node wCOORDS="0,0" TEXT="This is the root node" ID="ID_0"><node wORDER="0" wCOORDS="200,0" TEXT="Child Level 1 Right 1" POSITION="right" ID="ID_1"/><node wORDER="0" wCOORDS="-200,0" TEXT="Child Level 1 Left 1" POSITION="left" ID="ID_2"><node wORDER="0" TEXT="Child Level 2 Left 11" ID="ID_3"/><node wORDER="1" TEXT="Child Level 2 Left 12" ID="ID_4"/></node><node wORDER="4" wCOORDS="200,100" TEXT="Child Level 1 Right 2" POSITION="right" ID="ID_5"/><node wORDER="4" wCOORDS="-200,100" TEXT="Child Level 1 Left  2" POSITION="left" ID="ID_6"><node wORDER="0" TEXT="Child Level 2 Left 21 " ID="ID_7"/><node wORDER="1" TEXT="Child Level 2 Left 22" ID="ID_8"/></node></node></map>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="0.9.0"><node wCOORDS="0,0" TEXT="This is the root node" ID="ID_0"><node wORDER="0" wCOORDS="200,0" TEXT="Child Level 1 Right 1" POSITION="right" ID="ID_1"/><node wORDER="0" wCOORDS="-200,0" TEXT="Child Level 1 Left 1" POSITION="left" ID="ID_2"><node wORDER="0" wCOORDS="-290,-25" TEXT="Child Level 2 Left 11" POSITION="left" ID="ID_3"/><node wORDER="1" wCOORDS="-290,0" TEXT="Child Level 2 Left 12" POSITION="left" ID="ID_4"/></node><node wORDER="4" wCOORDS="200,100" TEXT="Child Level 1 Right 2" POSITION="right" ID="ID_5"/><node wORDER="4" wCOORDS="-200,100" TEXT="Child Level 1 Left  2" POSITION="left" ID="ID_6"><node wORDER="0" wCOORDS="-290,75" TEXT="Child Level 2 Left 21 " POSITION="left" ID="ID_7"/><node wORDER="1" wCOORDS="-290,100" TEXT="Child Level 2 Left 22" POSITION="left" ID="ID_8"/></node></node></map>
\ No newline at end of file
diff --git a/wise-webapp/src/test/data/freemind/basic.wxml b/wise-webapp/src/test/data/freemind/basic.wxml
index 48ba0ca3..583599f9 100644
--- a/wise-webapp/src/test/data/freemind/basic.wxml
+++ b/wise-webapp/src/test/data/freemind/basic.wxml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="pela" name="basic"><topic id="0" central="true" position="0,0" shape="rounded rectagle" text="This is the root node"><topic id="1" position="200,0" order="0" shape="line" text="Child Level 1 Right 1"/><topic id="2" position="-200,0" order="0" shape="line" text="Child Level 1 Left 1"><topic id="3" order="0" shape="line" text="Child Level 2 Left 11"/><topic id="4" order="1" shape="line" text="Child Level 2 Left 12"/></topic><topic id="5" position="200,100" order="4" shape="line" text="Child Level 1 Right 2"/><topic id="6" position="-200,100" order="4" shape="line" text="Child Level 1 Left  2"><topic id="7" order="0" shape="line" text="Child Level 2 Left 21 "/><topic id="8" order="1" shape="line" text="Child Level 2 Left 22"/></topic></topic></map>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="pela" name="basic"><topic id="0" central="true" position="0,0" shape="rounded rectagle" text="This is the root node"><topic id="1" position="200,0" order="0" shape="line" text="Child Level 1 Right 1"/><topic id="2" position="-200,0" order="0" shape="line" text="Child Level 1 Left 1"><topic id="3" position="-290,-25" order="0" shape="line" text="Child Level 2 Left 11"/><topic id="4" position="-290,0" order="1" shape="line" text="Child Level 2 Left 12"/></topic><topic id="5" position="200,100" order="4" shape="line" text="Child Level 1 Right 2"/><topic id="6" position="-200,100" order="4" shape="line" text="Child Level 1 Left  2"><topic id="7" position="-290,75" order="0" shape="line" text="Child Level 2 Left 21 "/><topic id="8" position="-290,100" order="1" shape="line" text="Child Level 2 Left 22"/></topic></topic></map>
\ No newline at end of file
diff --git a/wise-webapp/src/test/data/freemind/fonts.mmr b/wise-webapp/src/test/data/freemind/fonts.mmr
index 8ce674e5..71f8c15f 100644
--- a/wise-webapp/src/test/data/freemind/fonts.mmr
+++ b/wise-webapp/src/test/data/freemind/fonts.mmr
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="0.9.0"><node wCOORDS="0,0" TEXT="Fonts" ID="ID_0"><node wORDER="0" wCOORDS="200,0" TEXT="Styles" POSITION="right" ID="ID_1"><node wORDER="0" TEXT="Bold" ID="ID_2"><font SIZE="12" NAME="Arial" BOLD="true"/></node><node wORDER="1" TEXT="Italic" ID="ID_3"><font SIZE="12" NAME="Arial" ITALIC="true"/></node></node><node wORDER="0" wCOORDS="-200,0" TEXT="Sizes" POSITION="left" ID="ID_4"><node wORDER="0" TEXT="Normal----" ID="ID_5"><font SIZE="8" NAME="Arial"/></node><node wORDER="1" TEXT="Normal---" ID="ID_6"><font SIZE="9" NAME="Arial"/></node><node wORDER="2" TEXT="Normal--" ID="ID_7"><font SIZE="10" NAME="Arial"/></node><node wORDER="3" TEXT="Normal-" ID="ID_8"><font SIZE="11" NAME="Arial"/></node><node wORDER="4" TEXT="Normal" ID="ID_9"/><node wORDER="5" TEXT="Nomal+" ID="ID_10"><font SIZE="13" NAME="Arial"/></node><node wORDER="6" TEXT="Normal++" ID="ID_11"><font SIZE="14" NAME="Arial"/></node><node wORDER="7" TEXT="Normal+++" ID="ID_12"><font SIZE="15" NAME="Arial"/></node><node wORDER="8" TEXT="Normal++++" ID="ID_13"><font SIZE="16" NAME="Arial"/></node></node></node></map>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="0.9.0"><node wCOORDS="0,0" TEXT="Fonts" ID="ID_0"><node wORDER="0" wCOORDS="200,0" TEXT="Styles" POSITION="right" ID="ID_1"><node wORDER="0" wCOORDS="290,-25" TEXT="Bold" POSITION="right" ID="ID_2"><font SIZE="12" NAME="Arial" BOLD="true"/></node><node wORDER="1" wCOORDS="290,0" TEXT="Italic" POSITION="right" ID="ID_3"><font SIZE="12" NAME="Arial" ITALIC="true"/></node></node><node wORDER="0" wCOORDS="-200,0" TEXT="Sizes" POSITION="left" ID="ID_4"><node wORDER="0" wCOORDS="-290,-100" TEXT="Normal----" POSITION="left" ID="ID_5"><font SIZE="8" NAME="Arial"/></node><node wORDER="1" wCOORDS="-290,-75" TEXT="Normal---" POSITION="left" ID="ID_6"><font SIZE="9" NAME="Arial"/></node><node wORDER="2" wCOORDS="-290,-50" TEXT="Normal--" POSITION="left" ID="ID_7"><font SIZE="10" NAME="Arial"/></node><node wORDER="3" wCOORDS="-290,-25" TEXT="Normal-" POSITION="left" ID="ID_8"><font SIZE="11" NAME="Arial"/></node><node wORDER="4" wCOORDS="-290,0" TEXT="Normal" POSITION="left" ID="ID_9"/><node wORDER="5" wCOORDS="-290,25" TEXT="Nomal+" POSITION="left" ID="ID_10"><font SIZE="13" NAME="Arial"/></node><node wORDER="6" wCOORDS="-290,50" TEXT="Normal++" POSITION="left" ID="ID_11"><font SIZE="14" NAME="Arial"/></node><node wORDER="7" wCOORDS="-290,75" TEXT="Normal+++" POSITION="left" ID="ID_12"><font SIZE="15" NAME="Arial"/></node><node wORDER="8" wCOORDS="-290,100" TEXT="Normal++++" POSITION="left" ID="ID_13"><font SIZE="16" NAME="Arial"/></node></node></node></map>
\ No newline at end of file
diff --git a/wise-webapp/src/test/data/freemind/fonts.wxml b/wise-webapp/src/test/data/freemind/fonts.wxml
index cbf0aeaa..cc1b4161 100644
--- a/wise-webapp/src/test/data/freemind/fonts.wxml
+++ b/wise-webapp/src/test/data/freemind/fonts.wxml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="pela" name="basic"><topic id="0" central="true" position="0,0" shape="rounded rectagle" text="Fonts"><topic id="1" position="200,0" order="0" shape="line" text="Styles"><topic id="2" order="0" fontStyle="Arial;12;;bold;;" shape="line" text="Bold"/><topic id="3" order="1" fontStyle="Arial;12;;;italic;" shape="line" text="Italic"/></topic><topic id="4" position="-200,0" order="0" shape="line" text="Sizes"><topic id="5" order="0" fontStyle="Arial;8;;;;" shape="line" text="Normal----"/><topic id="6" order="1" fontStyle="Arial;9;;;;" shape="line" text="Normal---"/><topic id="7" order="2" fontStyle="Arial;10;;;;" shape="line" text="Normal--"/><topic id="8" order="3" fontStyle="Arial;11;;;;" shape="line" text="Normal-"/><topic id="9" order="4" shape="line" text="Normal"/><topic id="10" order="5" fontStyle="Arial;13;;;;" shape="line" text="Nomal+"/><topic id="11" order="6" fontStyle="Arial;14;;;;" shape="line" text="Normal++"/><topic id="12" order="7" fontStyle="Arial;15;;;;" shape="line" text="Normal+++"/><topic id="13" order="8" fontStyle="Arial;16;;;;" shape="line" text="Normal++++"/></topic></topic></map>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="pela" name="basic"><topic id="0" central="true" position="0,0" shape="rounded rectagle" text="Fonts"><topic id="1" position="200,0" order="0" shape="line" text="Styles"><topic id="2" position="290,-25" order="0" fontStyle="Arial;12;;bold;;" shape="line" text="Bold"/><topic id="3" position="290,0" order="1" fontStyle="Arial;12;;;italic;" shape="line" text="Italic"/></topic><topic id="4" position="-200,0" order="0" shape="line" text="Sizes"><topic id="5" position="-290,-100" order="0" fontStyle="Arial;8;;;;" shape="line" text="Normal----"/><topic id="6" position="-290,-75" order="1" fontStyle="Arial;9;;;;" shape="line" text="Normal---"/><topic id="7" position="-290,-50" order="2" fontStyle="Arial;10;;;;" shape="line" text="Normal--"/><topic id="8" position="-290,-25" order="3" fontStyle="Arial;11;;;;" shape="line" text="Normal-"/><topic id="9" position="-290,0" order="4" shape="line" text="Normal"/><topic id="10" position="-290,25" order="5" fontStyle="Arial;13;;;;" shape="line" text="Nomal+"/><topic id="11" position="-290,50" order="6" fontStyle="Arial;14;;;;" shape="line" text="Normal++"/><topic id="12" position="-290,75" order="7" fontStyle="Arial;15;;;;" shape="line" text="Normal+++"/><topic id="13" position="-290,100" order="8" fontStyle="Arial;16;;;;" shape="line" text="Normal++++"/></topic></topic></map>
\ No newline at end of file
diff --git a/wise-webapp/src/test/data/freemind/icons.mmr b/wise-webapp/src/test/data/freemind/icons.mmr
index d0006f9b..4a5df9e2 100644
--- a/wise-webapp/src/test/data/freemind/icons.mmr
+++ b/wise-webapp/src/test/data/freemind/icons.mmr
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="0.9.0"><node wCOORDS="0,0" TEXT="This is the root node" ID="ID_0"><node wORDER="7" wCOORDS="200,-200" TEXT="Simbols" POSITION="right" ID="ID_1"><node wORDER="0" TEXT="Warning" ID="ID_2"><icon BUILTIN="messagebox_warning"/></node><node wORDER="1" TEXT="No Ok" ID="ID_3"><icon BUILTIN="button_cancel"/></node><node wORDER="2" TEXT="Ok" ID="ID_4"><icon BUILTIN="button_ok"/></node><node wORDER="3" TEXT="Info" ID="ID_5"><icon BUILTIN="info"/></node><node wORDER="4" TEXT="No Entry" ID="ID_6"><icon BUILTIN="closed"/></node><node wORDER="5" TEXT="Stop" ID="ID_7"><icon BUILTIN="stop-sign"/></node><node wORDER="6" TEXT="Lamp" ID="ID_8"><icon BUILTIN="idea"/></node><node wORDER="7" TEXT="! Simbol" ID="ID_9"/><node wORDER="8" TEXT="Question Mark" ID="ID_10"><icon BUILTIN="help"/></node></node><node wORDER="7" wCOORDS="-200,-200" TEXT="Numbers" POSITION="left" ID="ID_11" FOLDED="true"><node wORDER="0" TEXT="1" ID="ID_12"><icon BUILTIN="full-1"/></node><node wORDER="1" TEXT="2" ID="ID_13"><icon BUILTIN="full-2"/></node><node wORDER="2" TEXT="3" ID="ID_14"><icon BUILTIN="full-3"/></node><node wORDER="3" TEXT="4" ID="ID_15"><icon BUILTIN="full-4"/></node><node wORDER="4" TEXT="5" ID="ID_16"><icon BUILTIN="full-5"/></node><node wORDER="5" TEXT="6" ID="ID_17"><icon BUILTIN="full-6"/></node><node wORDER="6" TEXT="7" ID="ID_18"/><node wORDER="7" TEXT="8" ID="ID_19"/><node wORDER="8" TEXT="9" ID="ID_20"/><node wORDER="9" TEXT="0" ID="ID_21"><icon BUILTIN="full-0"/></node></node><node wORDER="3" wCOORDS="200,-100" TEXT="Trafic" POSITION="right" ID="ID_22"><node wORDER="0" TEXT="Read" ID="ID_23"/><node wORDER="1" TEXT="Green" ID="ID_24"/><node wORDER="2" TEXT="Yellow" ID="ID_25"/></node><node wORDER="3" wCOORDS="-200,-100" TEXT="Arrow" POSITION="left" ID="ID_26" FOLDED="true"><node wORDER="0" TEXT="Back" ID="ID_27"><icon BUILTIN="back"/></node><node wORDER="1" TEXT="Forward" ID="ID_28"><icon BUILTIN="forward"/></node><node wORDER="2" TEXT="Up" ID="ID_29"><icon BUILTIN="up"/></node><node wORDER="3" TEXT="Down" ID="ID_30"><icon BUILTIN="down"/></node></node><node wORDER="0" wCOORDS="200,0" TEXT="Smiles" POSITION="right" ID="ID_31" FOLDED="true"><node wORDER="0" TEXT="Smile" ID="ID_32"><icon BUILTIN="ksmiletris"/></node><node wORDER="1" TEXT="No Mind" ID="ID_33"><icon BUILTIN="smiley-neutral"/></node><node wORDER="2" TEXT="Surprise" ID="ID_34"><icon BUILTIN="smiley-oh"/></node><node wORDER="3" TEXT="Sad" ID="ID_35"/><node wORDER="4" TEXT="Angry" ID="ID_36"/></node><node wORDER="0" wCOORDS="-200,0" TEXT="People" POSITION="left" ID="ID_37" FOLDED="true"><node wORDER="0" TEXT="Family" ID="ID_38"/><node wORDER="1" TEXT="Female1" ID="ID_39"><icon BUILTIN="female1"/></node><node wORDER="2" TEXT="Female2" ID="ID_40"><icon BUILTIN="female2"/></node><node wORDER="3" TEXT="Male1" ID="ID_41"><icon BUILTIN="male1"/></node><node wORDER="4" TEXT="Male2" ID="ID_42"><icon BUILTIN="male2"/></node><node wORDER="5" TEXT="Females" ID="ID_43"/><node wORDER="6" TEXT="Group" ID="ID_44"><icon BUILTIN="group"/></node></node><node wORDER="4" wCOORDS="200,100" TEXT="Flags" POSITION="right" ID="ID_45" FOLDED="true"><node wORDER="0" TEXT="Black" ID="ID_46"/><node wORDER="1" TEXT="Blue" ID="ID_47"><icon BUILTIN="flag-blue"/></node><node wORDER="2" TEXT="Green" ID="ID_48"><icon BUILTIN="flag-green"/></node><node wORDER="3" TEXT="Orange" ID="ID_49"><icon BUILTIN="flag-orange"/></node><node wORDER="4" TEXT="Pink" ID="ID_50"><icon BUILTIN="flag-pink"/></node><node wORDER="5" TEXT="Red" ID="ID_51"/><node wORDER="6" TEXT="Yellow" ID="ID_52"><icon BUILTIN="flag-yellow"/></node></node><node wORDER="4" wCOORDS="-200,100" TEXT="Time" POSITION="left" ID="ID_53" FOLDED="true"><node wORDER="0" TEXT="Calendar" ID="ID_54"><icon BUILTIN="calendar"/></node><node wORDER="1" TEXT="Digial Clock" ID="ID_55"><icon BUILTIN="clock"/></node><node wORDER="2" TEXT="Hourglass" ID="ID_56"><icon BUILTIN="hourglass"/></node></node><node wORDER="8" wCOORDS="200,200" TEXT="Suff" POSITION="right" ID="ID_57"><node wORDER="0" TEXT="Broken" ID="ID_58"/><node wORDER="1" TEXT="WiseIcon" ID="ID_59"/><node wORDER="2" TEXT="ICQ/Flower" ID="ID_60"><icon BUILTIN="licq"/></node><node wORDER="3" TEXT="Linux/Pinguin" ID="ID_61"><icon BUILTIN="penguin"/></node><node wORDER="4" TEXT="Star" ID="ID_62"><icon BUILTIN="bookmark"/></node><node wORDER="5" TEXT="Reminder" ID="ID_63"><icon BUILTIN="bell"/></node><node wORDER="6" TEXT="Zoom" ID="ID_64"><icon BUILTIN="xmag"/></node><node wORDER="7" TEXT="Magic" ID="ID_65"><icon BUILTIN="wizard"/></node><node wORDER="8" TEXT="Music" ID="ID_66"><icon BUILTIN="knotify"/></node><node wORDER="9" TEXT="Pen" ID="ID_67"><icon BUILTIN="pencil"/></node><node wORDER="10" TEXT="Key" ID="ID_68"><icon BUILTIN="password"/></node><node wORDER="11" TEXT="House" ID="ID_69"><icon BUILTIN="gohome"/></node><node wORDER="12" TEXT="Phone" ID="ID_70"><icon BUILTIN="kaddressbook"/></node><node wORDER="13" TEXT="Do not Forget" ID="ID_71"/><node wORDER="14" TEXT="Bomb" ID="ID_72"><icon BUILTIN="clanbomber"/></node><node wORDER="15" TEXT="Clip" ID="ID_73"><icon BUILTIN="attach"/></node></node><node wORDER="8" wCOORDS="-200,200" TEXT="Mail" POSITION="left" ID="ID_74"><node wORDER="0" TEXT="Envelop" ID="ID_75"><icon BUILTIN="Mail"/></node><node wORDER="1" TEXT="E-Mail" ID="ID_76"/><node wORDER="2" TEXT="List" ID="ID_77"><icon BUILTIN="list"/></node><node wORDER="3" TEXT="Refine" ID="ID_78"><icon BUILTIN="edit"/></node><node wORDER="4" TEXT="Mailbox" ID="ID_79"><icon BUILTIN="korn"/></node></node></node></map>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="0.9.0"><node wCOORDS="0,0" TEXT="This is the root node" ID="ID_0"><node wORDER="7" wCOORDS="200,-200" TEXT="Simbols" POSITION="right" ID="ID_1"><node wORDER="0" wCOORDS="290,-300" TEXT="Warning" POSITION="right" ID="ID_2"><icon BUILTIN="messagebox_warning"/></node><node wORDER="1" wCOORDS="290,-275" TEXT="No Ok" POSITION="right" ID="ID_3"><icon BUILTIN="button_cancel"/></node><node wORDER="2" wCOORDS="290,-250" TEXT="Ok" POSITION="right" ID="ID_4"><icon BUILTIN="button_ok"/></node><node wORDER="3" wCOORDS="290,-225" TEXT="Info" POSITION="right" ID="ID_5"><icon BUILTIN="info"/></node><node wORDER="4" wCOORDS="290,-200" TEXT="No Entry" POSITION="right" ID="ID_6"><icon BUILTIN="closed"/></node><node wORDER="5" wCOORDS="290,-175" TEXT="Stop" POSITION="right" ID="ID_7"><icon BUILTIN="stop-sign"/></node><node wORDER="6" wCOORDS="290,-150" TEXT="Lamp" POSITION="right" ID="ID_8"><icon BUILTIN="idea"/></node><node wORDER="7" wCOORDS="290,-125" TEXT="! Simbol" POSITION="right" ID="ID_9"/><node wORDER="8" wCOORDS="290,-100" TEXT="Question Mark" POSITION="right" ID="ID_10"><icon BUILTIN="help"/></node></node><node wORDER="7" wCOORDS="-200,-200" TEXT="Numbers" POSITION="left" ID="ID_11" FOLDED="true"><node wORDER="0" wCOORDS="-290,-325" TEXT="1" POSITION="left" ID="ID_12"><icon BUILTIN="full-1"/></node><node wORDER="1" wCOORDS="-290,-300" TEXT="2" POSITION="left" ID="ID_13"><icon BUILTIN="full-2"/></node><node wORDER="2" wCOORDS="-290,-275" TEXT="3" POSITION="left" ID="ID_14"><icon BUILTIN="full-3"/></node><node wORDER="3" wCOORDS="-290,-250" TEXT="4" POSITION="left" ID="ID_15"><icon BUILTIN="full-4"/></node><node wORDER="4" wCOORDS="-290,-225" TEXT="5" POSITION="left" ID="ID_16"><icon BUILTIN="full-5"/></node><node wORDER="5" wCOORDS="-290,-200" TEXT="6" POSITION="left" ID="ID_17"><icon BUILTIN="full-6"/></node><node wORDER="6" wCOORDS="-290,-175" TEXT="7" POSITION="left" ID="ID_18"/><node wORDER="7" wCOORDS="-290,-150" TEXT="8" POSITION="left" ID="ID_19"/><node wORDER="8" wCOORDS="-290,-125" TEXT="9" POSITION="left" ID="ID_20"/><node wORDER="9" wCOORDS="-290,-100" TEXT="0" POSITION="left" ID="ID_21"><icon BUILTIN="full-0"/></node></node><node wORDER="3" wCOORDS="200,-100" TEXT="Trafic" POSITION="right" ID="ID_22"><node wORDER="0" wCOORDS="290,-125" TEXT="Read" POSITION="right" ID="ID_23"/><node wORDER="1" wCOORDS="290,-100" TEXT="Green" POSITION="right" ID="ID_24"/><node wORDER="2" wCOORDS="290,-75" TEXT="Yellow" POSITION="right" ID="ID_25"/></node><node wORDER="3" wCOORDS="-200,-100" TEXT="Arrow" POSITION="left" ID="ID_26" FOLDED="true"><node wORDER="0" wCOORDS="-290,-150" TEXT="Back" POSITION="left" ID="ID_27"><icon BUILTIN="back"/></node><node wORDER="1" wCOORDS="-290,-125" TEXT="Forward" POSITION="left" ID="ID_28"><icon BUILTIN="forward"/></node><node wORDER="2" wCOORDS="-290,-100" TEXT="Up" POSITION="left" ID="ID_29"><icon BUILTIN="up"/></node><node wORDER="3" wCOORDS="-290,-75" TEXT="Down" POSITION="left" ID="ID_30"><icon BUILTIN="down"/></node></node><node wORDER="0" wCOORDS="200,0" TEXT="Smiles" POSITION="right" ID="ID_31" FOLDED="true"><node wORDER="0" wCOORDS="290,-50" TEXT="Smile" POSITION="right" ID="ID_32"><icon BUILTIN="ksmiletris"/></node><node wORDER="1" wCOORDS="290,-25" TEXT="No Mind" POSITION="right" ID="ID_33"><icon BUILTIN="smiley-neutral"/></node><node wORDER="2" wCOORDS="290,0" TEXT="Surprise" POSITION="right" ID="ID_34"><icon BUILTIN="smiley-oh"/></node><node wORDER="3" wCOORDS="290,25" TEXT="Sad" POSITION="right" ID="ID_35"/><node wORDER="4" wCOORDS="290,50" TEXT="Angry" POSITION="right" ID="ID_36"/></node><node wORDER="0" wCOORDS="-200,0" TEXT="People" POSITION="left" ID="ID_37" FOLDED="true"><node wORDER="0" wCOORDS="-290,-75" TEXT="Family" POSITION="left" ID="ID_38"/><node wORDER="1" wCOORDS="-290,-50" TEXT="Female1" POSITION="left" ID="ID_39"><icon BUILTIN="female1"/></node><node wORDER="2" wCOORDS="-290,-25" TEXT="Female2" POSITION="left" ID="ID_40"><icon BUILTIN="female2"/></node><node wORDER="3" wCOORDS="-290,0" TEXT="Male1" POSITION="left" ID="ID_41"><icon BUILTIN="male1"/></node><node wORDER="4" wCOORDS="-290,25" TEXT="Male2" POSITION="left" ID="ID_42"><icon BUILTIN="male2"/></node><node wORDER="5" wCOORDS="-290,50" TEXT="Females" POSITION="left" ID="ID_43"/><node wORDER="6" wCOORDS="-290,75" TEXT="Group" POSITION="left" ID="ID_44"><icon BUILTIN="group"/></node></node><node wORDER="4" wCOORDS="200,100" TEXT="Flags" POSITION="right" ID="ID_45" FOLDED="true"><node wORDER="0" wCOORDS="290,25" TEXT="Black" POSITION="right" ID="ID_46"/><node wORDER="1" wCOORDS="290,50" TEXT="Blue" POSITION="right" ID="ID_47"><icon BUILTIN="flag-blue"/></node><node wORDER="2" wCOORDS="290,75" TEXT="Green" POSITION="right" ID="ID_48"><icon BUILTIN="flag-green"/></node><node wORDER="3" wCOORDS="290,100" TEXT="Orange" POSITION="right" ID="ID_49"><icon BUILTIN="flag-orange"/></node><node wORDER="4" wCOORDS="290,125" TEXT="Pink" POSITION="right" ID="ID_50"><icon BUILTIN="flag-pink"/></node><node wORDER="5" wCOORDS="290,150" TEXT="Red" POSITION="right" ID="ID_51"/><node wORDER="6" wCOORDS="290,175" TEXT="Yellow" POSITION="right" ID="ID_52"><icon BUILTIN="flag-yellow"/></node></node><node wORDER="4" wCOORDS="-200,100" TEXT="Time" POSITION="left" ID="ID_53" FOLDED="true"><node wORDER="0" wCOORDS="-290,75" TEXT="Calendar" POSITION="left" ID="ID_54"><icon BUILTIN="calendar"/></node><node wORDER="1" wCOORDS="-290,100" TEXT="Digial Clock" POSITION="left" ID="ID_55"><icon BUILTIN="clock"/></node><node wORDER="2" wCOORDS="-290,125" TEXT="Hourglass" POSITION="left" ID="ID_56"><icon BUILTIN="hourglass"/></node></node><node wORDER="8" wCOORDS="200,200" TEXT="Suff" POSITION="right" ID="ID_57"><node wORDER="0" wCOORDS="290,0" TEXT="Broken" POSITION="right" ID="ID_58"/><node wORDER="1" wCOORDS="290,25" TEXT="WiseIcon" POSITION="right" ID="ID_59"/><node wORDER="2" wCOORDS="290,50" TEXT="ICQ/Flower" POSITION="right" ID="ID_60"><icon BUILTIN="licq"/></node><node wORDER="3" wCOORDS="290,75" TEXT="Linux/Pinguin" POSITION="right" ID="ID_61"><icon BUILTIN="penguin"/></node><node wORDER="4" wCOORDS="290,100" TEXT="Star" POSITION="right" ID="ID_62"><icon BUILTIN="bookmark"/></node><node wORDER="5" wCOORDS="290,125" TEXT="Reminder" POSITION="right" ID="ID_63"><icon BUILTIN="bell"/></node><node wORDER="6" wCOORDS="290,150" TEXT="Zoom" POSITION="right" ID="ID_64"><icon BUILTIN="xmag"/></node><node wORDER="7" wCOORDS="290,175" TEXT="Magic" POSITION="right" ID="ID_65"><icon BUILTIN="wizard"/></node><node wORDER="8" wCOORDS="290,200" TEXT="Music" POSITION="right" ID="ID_66"><icon BUILTIN="knotify"/></node><node wORDER="9" wCOORDS="290,225" TEXT="Pen" POSITION="right" ID="ID_67"><icon BUILTIN="pencil"/></node><node wORDER="10" wCOORDS="290,250" TEXT="Key" POSITION="right" ID="ID_68"><icon BUILTIN="password"/></node><node wORDER="11" wCOORDS="290,275" TEXT="House" POSITION="right" ID="ID_69"><icon BUILTIN="gohome"/></node><node wORDER="12" wCOORDS="290,300" TEXT="Phone" POSITION="right" ID="ID_70"><icon BUILTIN="kaddressbook"/></node><node wORDER="13" wCOORDS="290,325" TEXT="Do not Forget" POSITION="right" ID="ID_71"/><node wORDER="14" wCOORDS="290,350" TEXT="Bomb" POSITION="right" ID="ID_72"><icon BUILTIN="clanbomber"/></node><node wORDER="15" wCOORDS="290,375" TEXT="Clip" POSITION="right" ID="ID_73"><icon BUILTIN="attach"/></node></node><node wORDER="8" wCOORDS="-200,200" TEXT="Mail" POSITION="left" ID="ID_74"><node wORDER="0" wCOORDS="-290,150" TEXT="Envelop" POSITION="left" ID="ID_75"><icon BUILTIN="Mail"/></node><node wORDER="1" wCOORDS="-290,175" TEXT="E-Mail" POSITION="left" ID="ID_76"/><node wORDER="2" wCOORDS="-290,200" TEXT="List" POSITION="left" ID="ID_77"><icon BUILTIN="list"/></node><node wORDER="3" wCOORDS="-290,225" TEXT="Refine" POSITION="left" ID="ID_78"><icon BUILTIN="edit"/></node><node wORDER="4" wCOORDS="-290,250" TEXT="Mailbox" POSITION="left" ID="ID_79"><icon BUILTIN="korn"/></node></node></node></map>
\ No newline at end of file
diff --git a/wise-webapp/src/test/data/freemind/icons.wxml b/wise-webapp/src/test/data/freemind/icons.wxml
index 3c30ee22..449372e1 100644
--- a/wise-webapp/src/test/data/freemind/icons.wxml
+++ b/wise-webapp/src/test/data/freemind/icons.wxml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="pela" name="basic"><topic id="0" central="true" position="0,0" shape="rounded rectagle" text="This is the root node"><topic id="1" position="200,-200" order="7" shape="line" text="Simbols"><topic id="2" order="0" shape="line" text="Warning"><icon id="sign_warning"/></topic><topic id="3" order="1" shape="line" text="No Ok"><icon id="tick_cross"/></topic><topic id="4" order="2" shape="line" text="Ok"><icon id="tick_tick"/></topic><topic id="5" order="3" shape="line" text="Info"><icon id="sign_info"/></topic><topic id="6" order="4" shape="line" text="No Entry"><icon id="onoff_delete"/></topic><topic id="7" order="5" shape="line" text="Stop"><icon id="sign_stop"/></topic><topic id="8" order="6" shape="line" text="Lamp"><icon id="bulb_light_on"/></topic><topic id="9" order="7" shape="line" text="! Simbol"/><topic id="10" order="8" shape="line" text="Question Mark"><icon id="sign_help"/></topic></topic><topic shrink="true" id="11" position="-200,-200" order="7" shape="line" text="Numbers"><topic id="12" order="0" shape="line" text="1"><icon id="bullet_blue"/></topic><topic id="13" order="1" shape="line" text="2"><icon id="bullet_green"/></topic><topic id="14" order="2" shape="line" text="3"><icon id="bullet_orange"/></topic><topic id="15" order="3" shape="line" text="4"><icon id="bullet_red"/></topic><topic id="16" order="4" shape="line" text="5"><icon id="bullet_pink"/></topic><topic id="17" order="5" shape="line" text="6"><icon id="bullet_purple"/></topic><topic id="18" order="6" shape="line" text="7"/><topic id="19" order="7" shape="line" text="8"/><topic id="20" order="8" shape="line" text="9"/><topic id="21" order="9" shape="line" text="0"><icon id="bullet_black"/></topic></topic><topic id="22" position="200,-100" order="3" shape="line" text="Trafic"><topic id="23" order="0" shape="line" text="Read"/><topic id="24" order="1" shape="line" text="Green"/><topic id="25" order="2" shape="line" text="Yellow"/></topic><topic shrink="true" id="26" position="-200,-100" order="3" shape="line" text="Arrow"><topic id="27" order="0" shape="line" text="Back"><icon id="arrow_right"/></topic><topic id="28" order="1" shape="line" text="Forward"><icon id="arrow_left"/></topic><topic id="29" order="2" shape="line" text="Up"><icon id="arrow_up"/></topic><topic id="30" order="3" shape="line" text="Down"><icon id="arrow_down"/></topic></topic><topic shrink="true" id="31" position="200,0" order="0" shape="line" text="Smiles"><topic id="32" order="0" shape="line" text="Smile"><icon id="face_smile"/></topic><topic id="33" order="1" shape="line" text="No Mind"><icon id="face_plain"/></topic><topic id="34" order="2" shape="line" text="Surprise"><icon id="face_surprise"/></topic><topic id="35" order="3" shape="line" text="Sad"/><topic id="36" order="4" shape="line" text="Angry"/></topic><topic shrink="true" id="37" position="-200,0" order="0" shape="line" text="People"><topic id="38" order="0" shape="line" text="Family"/><topic id="39" order="1" shape="line" text="Female1"><icon id="people_female1"/></topic><topic id="40" order="2" shape="line" text="Female2"><icon id="people_female2"/></topic><topic id="41" order="3" shape="line" text="Male1"><icon id="people_male1"/></topic><topic id="42" order="4" shape="line" text="Male2"><icon id="people_male2"/></topic><topic id="43" order="5" shape="line" text="Females"/><topic id="44" order="6" shape="line" text="Group"><icon id="people_group"/></topic></topic><topic shrink="true" id="45" position="200,100" order="4" shape="line" text="Flags"><topic id="46" order="0" shape="line" text="Black"/><topic id="47" order="1" shape="line" text="Blue"><icon id="flag_blue"/></topic><topic id="48" order="2" shape="line" text="Green"><icon id="flag_green"/></topic><topic id="49" order="3" shape="line" text="Orange"><icon id="flag_orange"/></topic><topic id="50" order="4" shape="line" text="Pink"><icon id="flag_pink"/></topic><topic id="51" order="5" shape="line" text="Red"/><topic id="52" order="6" shape="line" text="Yellow"><icon id="flag_yellow"/></topic></topic><topic shrink="true" id="53" position="-200,100" order="4" shape="line" text="Time"><topic id="54" order="0" shape="line" text="Calendar"><icon id="time_calendar"/></topic><topic id="55" order="1" shape="line" text="Digial Clock"><icon id="onoff_clock"/></topic><topic id="56" order="2" shape="line" text="Hourglass"><icon id="time_hourglass"/></topic></topic><topic id="57" position="200,200" order="8" shape="line" text="Suff"><topic id="58" order="0" shape="line" text="Broken"/><topic id="59" order="1" shape="line" text="WiseIcon"/><topic id="60" order="2" shape="line" text="ICQ/Flower"><icon id="onoff_status_online"/></topic><topic id="61" order="3" shape="line" text="Linux/Pinguin"><icon id="soft_penguin"/></topic><topic id="62" order="4" shape="line" text="Star"><icon id="object_star"/></topic><topic id="63" order="5" shape="line" text="Reminder"><icon id="object_bell"/></topic><topic id="64" order="6" shape="line" text="Zoom"><icon id="object_magnifier"/></topic><topic id="65" order="7" shape="line" text="Magic"><icon id="object_wizard"/></topic><topic id="66" order="8" shape="line" text="Music"><icon id="object_music"/></topic><topic id="67" order="9" shape="line" text="Pen"><icon id="object_pencil"/></topic><topic id="68" order="10" shape="line" text="Key"><icon id="object_key"/></topic><topic id="69" order="11" shape="line" text="House"><icon id="object_house"/></topic><topic id="70" order="12" shape="line" text="Phone"><icon id="object_phone"/></topic><topic id="71" order="13" shape="line" text="Do not Forget"/><topic id="72" order="14" shape="line" text="Bomb"><icon id="object_clanbomber"/></topic><topic id="73" order="15" shape="line" text="Clip"><icon id="object_clip"/></topic></topic><topic id="74" position="-200,200" order="8" shape="line" text="Mail"><topic id="75" order="0" shape="line" text="Envelop"><icon id="mail_envelop"/></topic><topic id="76" order="1" shape="line" text="E-Mail"/><topic id="77" order="2" shape="line" text="List"><icon id="mail_list"/></topic><topic id="78" order="3" shape="line" text="Refine"><icon id="mail_edit"/></topic><topic id="79" order="4" shape="line" text="Mailbox"><icon id="mail_mailbox"/></topic></topic></topic></map>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="pela" name="basic"><topic id="0" central="true" position="0,0" shape="rounded rectagle" text="This is the root node"><topic id="1" position="200,-200" order="7" shape="line" text="Simbols"><topic id="2" position="290,-300" order="0" shape="line" text="Warning"><icon id="sign_warning"/></topic><topic id="3" position="290,-275" order="1" shape="line" text="No Ok"><icon id="tick_cross"/></topic><topic id="4" position="290,-250" order="2" shape="line" text="Ok"><icon id="tick_tick"/></topic><topic id="5" position="290,-225" order="3" shape="line" text="Info"><icon id="sign_info"/></topic><topic id="6" position="290,-200" order="4" shape="line" text="No Entry"><icon id="onoff_delete"/></topic><topic id="7" position="290,-175" order="5" shape="line" text="Stop"><icon id="sign_stop"/></topic><topic id="8" position="290,-150" order="6" shape="line" text="Lamp"><icon id="bulb_light_on"/></topic><topic id="9" position="290,-125" order="7" shape="line" text="! Simbol"/><topic id="10" position="290,-100" order="8" shape="line" text="Question Mark"><icon id="sign_help"/></topic></topic><topic shrink="true" id="11" position="-200,-200" order="7" shape="line" text="Numbers"><topic id="12" position="-290,-325" order="0" shape="line" text="1"><icon id="bullet_blue"/></topic><topic id="13" position="-290,-300" order="1" shape="line" text="2"><icon id="bullet_green"/></topic><topic id="14" position="-290,-275" order="2" shape="line" text="3"><icon id="bullet_orange"/></topic><topic id="15" position="-290,-250" order="3" shape="line" text="4"><icon id="bullet_red"/></topic><topic id="16" position="-290,-225" order="4" shape="line" text="5"><icon id="bullet_pink"/></topic><topic id="17" position="-290,-200" order="5" shape="line" text="6"><icon id="bullet_purple"/></topic><topic id="18" position="-290,-175" order="6" shape="line" text="7"/><topic id="19" position="-290,-150" order="7" shape="line" text="8"/><topic id="20" position="-290,-125" order="8" shape="line" text="9"/><topic id="21" position="-290,-100" order="9" shape="line" text="0"><icon id="bullet_black"/></topic></topic><topic id="22" position="200,-100" order="3" shape="line" text="Trafic"><topic id="23" position="290,-125" order="0" shape="line" text="Read"/><topic id="24" position="290,-100" order="1" shape="line" text="Green"/><topic id="25" position="290,-75" order="2" shape="line" text="Yellow"/></topic><topic shrink="true" id="26" position="-200,-100" order="3" shape="line" text="Arrow"><topic id="27" position="-290,-150" order="0" shape="line" text="Back"><icon id="arrow_right"/></topic><topic id="28" position="-290,-125" order="1" shape="line" text="Forward"><icon id="arrow_left"/></topic><topic id="29" position="-290,-100" order="2" shape="line" text="Up"><icon id="arrow_up"/></topic><topic id="30" position="-290,-75" order="3" shape="line" text="Down"><icon id="arrow_down"/></topic></topic><topic shrink="true" id="31" position="200,0" order="0" shape="line" text="Smiles"><topic id="32" position="290,-50" order="0" shape="line" text="Smile"><icon id="face_smile"/></topic><topic id="33" position="290,-25" order="1" shape="line" text="No Mind"><icon id="face_plain"/></topic><topic id="34" position="290,0" order="2" shape="line" text="Surprise"><icon id="face_surprise"/></topic><topic id="35" position="290,25" order="3" shape="line" text="Sad"/><topic id="36" position="290,50" order="4" shape="line" text="Angry"/></topic><topic shrink="true" id="37" position="-200,0" order="0" shape="line" text="People"><topic id="38" position="-290,-75" order="0" shape="line" text="Family"/><topic id="39" position="-290,-50" order="1" shape="line" text="Female1"><icon id="people_female1"/></topic><topic id="40" position="-290,-25" order="2" shape="line" text="Female2"><icon id="people_female2"/></topic><topic id="41" position="-290,0" order="3" shape="line" text="Male1"><icon id="people_male1"/></topic><topic id="42" position="-290,25" order="4" shape="line" text="Male2"><icon id="people_male2"/></topic><topic id="43" position="-290,50" order="5" shape="line" text="Females"/><topic id="44" position="-290,75" order="6" shape="line" text="Group"><icon id="people_group"/></topic></topic><topic shrink="true" id="45" position="200,100" order="4" shape="line" text="Flags"><topic id="46" position="290,25" order="0" shape="line" text="Black"/><topic id="47" position="290,50" order="1" shape="line" text="Blue"><icon id="flag_blue"/></topic><topic id="48" position="290,75" order="2" shape="line" text="Green"><icon id="flag_green"/></topic><topic id="49" position="290,100" order="3" shape="line" text="Orange"><icon id="flag_orange"/></topic><topic id="50" position="290,125" order="4" shape="line" text="Pink"><icon id="flag_pink"/></topic><topic id="51" position="290,150" order="5" shape="line" text="Red"/><topic id="52" position="290,175" order="6" shape="line" text="Yellow"><icon id="flag_yellow"/></topic></topic><topic shrink="true" id="53" position="-200,100" order="4" shape="line" text="Time"><topic id="54" position="-290,75" order="0" shape="line" text="Calendar"><icon id="time_calendar"/></topic><topic id="55" position="-290,100" order="1" shape="line" text="Digial Clock"><icon id="time_clock"/></topic><topic id="56" position="-290,125" order="2" shape="line" text="Hourglass"><icon id="time_hourglass"/></topic></topic><topic id="57" position="200,200" order="8" shape="line" text="Suff"><topic id="58" position="290,0" order="0" shape="line" text="Broken"/><topic id="59" position="290,25" order="1" shape="line" text="WiseIcon"/><topic id="60" position="290,50" order="2" shape="line" text="ICQ/Flower"><icon id="onoff_status_online"/></topic><topic id="61" position="290,75" order="3" shape="line" text="Linux/Pinguin"><icon id="soft_penguin"/></topic><topic id="62" position="290,100" order="4" shape="line" text="Star"><icon id="object_star"/></topic><topic id="63" position="290,125" order="5" shape="line" text="Reminder"><icon id="object_bell"/></topic><topic id="64" position="290,150" order="6" shape="line" text="Zoom"><icon id="object_magnifier"/></topic><topic id="65" position="290,175" order="7" shape="line" text="Magic"><icon id="object_wizard"/></topic><topic id="66" position="290,200" order="8" shape="line" text="Music"><icon id="object_music"/></topic><topic id="67" position="290,225" order="9" shape="line" text="Pen"><icon id="object_pencil"/></topic><topic id="68" position="290,250" order="10" shape="line" text="Key"><icon id="object_key"/></topic><topic id="69" position="290,275" order="11" shape="line" text="House"><icon id="object_house"/></topic><topic id="70" position="290,300" order="12" shape="line" text="Phone"><icon id="object_phone"/></topic><topic id="71" position="290,325" order="13" shape="line" text="Do not Forget"/><topic id="72" position="290,350" order="14" shape="line" text="Bomb"><icon id="object_clanbomber"/></topic><topic id="73" position="290,375" order="15" shape="line" text="Clip"><icon id="object_clip"/></topic></topic><topic id="74" position="-200,200" order="8" shape="line" text="Mail"><topic id="75" position="-290,150" order="0" shape="line" text="Envelop"><icon id="mail_envelop"/></topic><topic id="76" position="-290,175" order="1" shape="line" text="E-Mail"/><topic id="77" position="-290,200" order="2" shape="line" text="List"><icon id="mail_list"/></topic><topic id="78" position="-290,225" order="3" shape="line" text="Refine"><icon id="mail_edit"/></topic><topic id="79" position="-290,250" order="4" shape="line" text="Mailbox"><icon id="mail_mailbox"/></topic></topic></topic></map>
\ No newline at end of file
diff --git a/wise-webapp/src/test/data/freemind/links.mmr b/wise-webapp/src/test/data/freemind/links.mmr
index 385eeff8..e0216c6c 100644
--- a/wise-webapp/src/test/data/freemind/links.mmr
+++ b/wise-webapp/src/test/data/freemind/links.mmr
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="0.9.0"><node wCOORDS="0,0" TEXT="Node Links" LINK="http://www.google.com" ID="ID_0"><icon BUILTIN="closed"/><node wORDER="0" wCOORDS="200,0" TEXT="Link Topic" POSITION="right" LINK="http://www.bing.com" ID="ID_1" FOLDED="true"><icon BUILTIN="info"/><node wORDER="0" TEXT="Link Topic Topic" LINK="http://bing.com" ID="ID_2"><icon BUILTIN="messagebox_warning"/></node></node></node></map>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="0.9.0"><node wCOORDS="0,0" TEXT="Node Links" LINK="http://www.google.com" ID="ID_0"><icon BUILTIN="closed"/><node wORDER="0" wCOORDS="200,0" TEXT="Link Topic" POSITION="right" LINK="http://www.bing.com" ID="ID_1" FOLDED="true"><icon BUILTIN="info"/><node wORDER="0" wCOORDS="290,-25" TEXT="Link Topic Topic" POSITION="right" LINK="http://bing.com" ID="ID_2"><icon BUILTIN="messagebox_warning"/></node></node></node></map>
\ No newline at end of file
diff --git a/wise-webapp/src/test/data/freemind/links.wxml b/wise-webapp/src/test/data/freemind/links.wxml
index c30563d9..2263b382 100644
--- a/wise-webapp/src/test/data/freemind/links.wxml
+++ b/wise-webapp/src/test/data/freemind/links.wxml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="pela" name="basic"><topic id="0" central="true" position="0,0" shape="rounded rectagle" text="Node Links"><icon id="onoff_delete"/><link url="http://www.google.com"/><topic shrink="true" id="1" position="200,0" order="0" shape="line" text="Link Topic"><icon id="sign_info"/><link url="http://www.bing.com"/><topic id="2" order="0" shape="line" text="Link Topic Topic"><icon id="sign_warning"/><link url="http://bing.com"/></topic></topic></topic></map>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="pela" name="basic"><topic id="0" central="true" position="0,0" shape="rounded rectagle" text="Node Links"><icon id="onoff_delete"/><link url="http://www.google.com"/><topic shrink="true" id="1" position="200,0" order="0" shape="line" text="Link Topic"><icon id="sign_info"/><link url="http://www.bing.com"/><topic id="2" position="290,-25" order="0" shape="line" text="Link Topic Topic"><icon id="sign_warning"/><link url="http://bing.com"/></topic></topic></topic></map>
\ No newline at end of file
diff --git a/wise-webapp/src/test/data/freemind/node-styles.mmr b/wise-webapp/src/test/data/freemind/node-styles.mmr
index 97375d32..260f95fe 100644
--- a/wise-webapp/src/test/data/freemind/node-styles.mmr
+++ b/wise-webapp/src/test/data/freemind/node-styles.mmr
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="0.9.0"><node wCOORDS="0,0" TEXT="Shapes" ID="ID_0"><node wORDER="0" wCOORDS="200,0" TEXT="Node Styles" POSITION="right" ID="ID_1"><node wORDER="0" TEXT="Fork" ID="ID_2"><edge COLOR="#808080"/></node><node wORDER="1" TEXT="Bubble" STYLE="bubble" ID="ID_3"><edge COLOR="#808080"/></node><node wORDER="2" TEXT="As parent" ID="ID_4"><edge COLOR="#808080"/></node><node wORDER="3" TEXT="Combined" ID="ID_5"><edge COLOR="#808080"/></node></node><node wORDER="0" wCOORDS="-200,0" TEXT="Node Background Color" POSITION="left" ID="ID_6" BACKGROUND_COLOR="#f20707"><node wORDER="0" TEXT="Fork" ID="ID_7" BACKGROUND_COLOR="#0000cc"><edge COLOR="#808080"/></node><node wORDER="1" TEXT="Bubble" STYLE="bubble" ID="ID_8" BACKGROUND_COLOR="#ccffcc"><edge COLOR="#808080"/></node><node wORDER="2" TEXT="As parent" ID="ID_9" BACKGROUND_COLOR="#00ffff"><edge COLOR="#808080"/></node><node wORDER="3" TEXT="Combined" ID="ID_10" BACKGROUND_COLOR="#990099"><edge COLOR="#808080"/></node></node><node wORDER="4" wCOORDS="-200,100" TEXT="Node Text Color" POSITION="left" ID="ID_11" BACKGROUND_COLOR="#f20707"><node wORDER="0" TEXT="Fork" ID="ID_12" COLOR="#ffff00" BACKGROUND_COLOR="#0000cc"><edge COLOR="#808080"/></node><node wORDER="1" TEXT="Bubble" STYLE="bubble" ID="ID_13" COLOR="#ff6666" BACKGROUND_COLOR="#ccffcc"><edge COLOR="#808080"/></node><node wORDER="2" TEXT="As parent" ID="ID_14" COLOR="#009999" BACKGROUND_COLOR="#00ffff"><edge COLOR="#808080"/></node><node wORDER="3" TEXT="Combined" ID="ID_15" COLOR="#009999" BACKGROUND_COLOR="#990099"><edge COLOR="#808080"/></node></node></node></map>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="0.9.0"><node wCOORDS="0,0" TEXT="Shapes" ID="ID_0"><node wORDER="0" wCOORDS="200,0" TEXT="Node Styles" POSITION="right" ID="ID_1"><node wORDER="0" wCOORDS="290,-50" TEXT="Fork" POSITION="right" ID="ID_2"><edge COLOR="#808080"/></node><node wORDER="1" wCOORDS="290,-25" TEXT="Bubble" STYLE="bubble" POSITION="right" ID="ID_3"><edge COLOR="#808080"/></node><node wORDER="2" wCOORDS="290,0" TEXT="As parent" POSITION="right" ID="ID_4"><edge COLOR="#808080"/></node><node wORDER="3" wCOORDS="290,25" TEXT="Combined" POSITION="right" ID="ID_5"><edge COLOR="#808080"/></node></node><node wORDER="0" wCOORDS="-200,0" TEXT="Node Background Color" POSITION="left" ID="ID_6" BACKGROUND_COLOR="#f20707"><node wORDER="0" wCOORDS="-290,-50" TEXT="Fork" POSITION="left" ID="ID_7" BACKGROUND_COLOR="#0000cc"><edge COLOR="#808080"/></node><node wORDER="1" wCOORDS="-290,-25" TEXT="Bubble" STYLE="bubble" POSITION="left" ID="ID_8" BACKGROUND_COLOR="#ccffcc"><edge COLOR="#808080"/></node><node wORDER="2" wCOORDS="-290,0" TEXT="As parent" POSITION="left" ID="ID_9" BACKGROUND_COLOR="#00ffff"><edge COLOR="#808080"/></node><node wORDER="3" wCOORDS="-290,25" TEXT="Combined" POSITION="left" ID="ID_10" BACKGROUND_COLOR="#990099"><edge COLOR="#808080"/></node></node><node wORDER="4" wCOORDS="-200,100" TEXT="Node Text Color" POSITION="left" ID="ID_11" BACKGROUND_COLOR="#f20707"><node wORDER="0" wCOORDS="-290,50" TEXT="Fork" POSITION="left" ID="ID_12" COLOR="#ffff00" BACKGROUND_COLOR="#0000cc"><edge COLOR="#808080"/></node><node wORDER="1" wCOORDS="-290,75" TEXT="Bubble" STYLE="bubble" POSITION="left" ID="ID_13" COLOR="#ff6666" BACKGROUND_COLOR="#ccffcc"><edge COLOR="#808080"/></node><node wORDER="2" wCOORDS="-290,100" TEXT="As parent" POSITION="left" ID="ID_14" COLOR="#009999" BACKGROUND_COLOR="#00ffff"><edge COLOR="#808080"/></node><node wORDER="3" wCOORDS="-290,125" TEXT="Combined" POSITION="left" ID="ID_15" COLOR="#009999" BACKGROUND_COLOR="#990099"><edge COLOR="#808080"/></node></node></node></map>
\ No newline at end of file
diff --git a/wise-webapp/src/test/data/freemind/node-styles.wxml b/wise-webapp/src/test/data/freemind/node-styles.wxml
index afe84e96..eeb09506 100644
--- a/wise-webapp/src/test/data/freemind/node-styles.wxml
+++ b/wise-webapp/src/test/data/freemind/node-styles.wxml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="pela" name="basic"><topic id="0" central="true" position="0,0" shape="rounded rectagle" text="Shapes"><topic id="1" position="200,0" order="0" shape="line" text="Node Styles"><topic id="2" order="0" brColor="#808080" shape="line" text="Fork"/><topic id="3" order="1" brColor="#808080" shape="rounded rectagle" text="Bubble"/><topic id="4" order="2" brColor="#808080" shape="line" text="As parent"/><topic id="5" order="3" brColor="#808080" shape="line" text="Combined"/></topic><topic id="6" position="-200,0" order="0" bgColor="#f20707" shape="line" text="Node Background Color"><topic id="7" order="0" brColor="#808080" bgColor="#0000cc" shape="line" text="Fork"/><topic id="8" order="1" brColor="#808080" bgColor="#ccffcc" shape="rounded rectagle" text="Bubble"/><topic id="9" order="2" brColor="#808080" bgColor="#00ffff" shape="line" text="As parent"/><topic id="10" order="3" brColor="#808080" bgColor="#990099" shape="line" text="Combined"/></topic><topic id="11" position="-200,100" order="4" bgColor="#f20707" shape="line" text="Node Text Color"><topic id="12" order="0" brColor="#808080" bgColor="#0000cc" fontStyle=";;#ffff00;;;" shape="line" text="Fork"/><topic id="13" order="1" brColor="#808080" bgColor="#ccffcc" fontStyle=";;#ff6666;;;" shape="rounded rectagle" text="Bubble"/><topic id="14" order="2" brColor="#808080" bgColor="#00ffff" fontStyle=";;#009999;;;" shape="line" text="As parent"/><topic id="15" order="3" brColor="#808080" bgColor="#990099" fontStyle=";;#009999;;;" shape="line" text="Combined"/></topic></topic></map>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="pela" name="basic"><topic id="0" central="true" position="0,0" shape="rounded rectagle" text="Shapes"><topic id="1" position="200,0" order="0" shape="line" text="Node Styles"><topic id="2" position="290,-50" order="0" brColor="#808080" shape="line" text="Fork"/><topic id="3" position="290,-25" order="1" brColor="#808080" shape="rounded rectagle" text="Bubble"/><topic id="4" position="290,0" order="2" brColor="#808080" shape="line" text="As parent"/><topic id="5" position="290,25" order="3" brColor="#808080" shape="line" text="Combined"/></topic><topic id="6" position="-200,0" order="0" bgColor="#f20707" shape="line" text="Node Background Color"><topic id="7" position="-290,-50" order="0" brColor="#808080" bgColor="#0000cc" shape="line" text="Fork"/><topic id="8" position="-290,-25" order="1" brColor="#808080" bgColor="#ccffcc" shape="rounded rectagle" text="Bubble"/><topic id="9" position="-290,0" order="2" brColor="#808080" bgColor="#00ffff" shape="line" text="As parent"/><topic id="10" position="-290,25" order="3" brColor="#808080" bgColor="#990099" shape="line" text="Combined"/></topic><topic id="11" position="-200,100" order="4" bgColor="#f20707" shape="line" text="Node Text Color"><topic id="12" position="-290,50" order="0" brColor="#808080" bgColor="#0000cc" fontStyle=";;#ffff00;;;" shape="line" text="Fork"/><topic id="13" position="-290,75" order="1" brColor="#808080" bgColor="#ccffcc" fontStyle=";;#ff6666;;;" shape="rounded rectagle" text="Bubble"/><topic id="14" position="-290,100" order="2" brColor="#808080" bgColor="#00ffff" fontStyle=";;#009999;;;" shape="line" text="As parent"/><topic id="15" position="-290,125" order="3" brColor="#808080" bgColor="#990099" fontStyle=";;#009999;;;" shape="line" text="Combined"/></topic></topic></map>
\ No newline at end of file
diff --git a/wise-webapp/src/test/data/freemind/relationships.mmr b/wise-webapp/src/test/data/freemind/relationships.mmr
index 94b67877..36175480 100644
--- a/wise-webapp/src/test/data/freemind/relationships.mmr
+++ b/wise-webapp/src/test/data/freemind/relationships.mmr
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="0.9.0"><node wCOORDS="0,0" TEXT="eeeeeeeeeee" ID="ID_0" COLOR="#000000"><font SIZE="10" NAME="Arial"/><hook NAME="accessories/plugins/NodeNote.properties"><text>
-                </text></hook><node wORDER="7" wCOORDS="200,-200" TEXT="interne" POSITION="right" ID="ID_1" COLOR="#cc0000"><font SIZE="12" NAME="Arial" ITALIC="true" BOLD="true"/><node wORDER="0" TEXT="faiblesses" ID="ID_2" COLOR="#330033"><font SIZE="12" NAME="Arial" ITALIC="true" BOLD="true"/></node></node><node wORDER="3" wCOORDS="200,-100" TEXT="www.luxuo.com" POSITION="right" LINK="www.luxuo.com" ID="ID_3"/><node wORDER="0" wCOORDS="200,0" TEXT="" POSITION="right" ID="ID_4"/><node wORDER="4" wCOORDS="200,100" TEXT="forces" POSITION="right" ID="ID_5" COLOR="#003333"><font SIZE="12" NAME="Arial" ITALIC="true" BOLD="true"/></node><node wORDER="8" wCOORDS="200,200" TEXT="" POSITION="right" ID="ID_6"><hook NAME="accessories/plugins/NodeNote.properties"><text>%5El%3A%5El%3A%5El
-                    </text></hook></node><node wORDER="12" wCOORDS="200,300" TEXT="" POSITION="right" ID="ID_7"><node wORDER="0" TEXT="externe" ID="ID_8" COLOR="#000066"><font SIZE="12" NAME="Arial" ITALIC="true" BOLD="true"/><node wORDER="0" TEXT="opportunit?s" ID="ID_9" COLOR="#ff3300"><font SIZE="12" NAME="Arial" ITALIC="true" BOLD="true"/></node><node wORDER="1" TEXT="menaces" ID="ID_10" COLOR="#333300"><font SIZE="12" NAME="Arial" ITALIC="true" BOLD="true"/></node></node></node></node></map>
\ No newline at end of file
+                </text></hook><node wORDER="7" wCOORDS="200,-200" TEXT="interne" POSITION="right" ID="ID_1" COLOR="#cc0000"><font SIZE="12" NAME="Arial" ITALIC="true" BOLD="true"/><node wORDER="0" wCOORDS="290,-225" TEXT="faiblesses" POSITION="right" ID="ID_2" COLOR="#330033"><font SIZE="12" NAME="Arial" ITALIC="true" BOLD="true"/></node></node><node wORDER="3" wCOORDS="200,-100" TEXT="www.luxuo.com" POSITION="right" LINK="www.luxuo.com" ID="ID_3"><arrowlink ENDARROW="Default" DESTINATION="ID_6"/></node><node wORDER="0" wCOORDS="200,0" TEXT="" POSITION="right" ID="ID_4"/><node wORDER="4" wCOORDS="200,100" TEXT="forces" POSITION="right" ID="ID_5" COLOR="#003333"><font SIZE="12" NAME="Arial" ITALIC="true" BOLD="true"/></node><node wORDER="8" wCOORDS="200,200" TEXT="" POSITION="right" ID="ID_6"><hook NAME="accessories/plugins/NodeNote.properties"><text>%5El%3A%5El%3A%5El
+                    </text></hook></node><node wORDER="12" wCOORDS="200,300" TEXT="" POSITION="right" ID="ID_7"><node wORDER="0" wCOORDS="290,275" TEXT="externe" POSITION="right" ID="ID_8" COLOR="#000066"><font SIZE="12" NAME="Arial" ITALIC="true" BOLD="true"/><node wORDER="0" wCOORDS="380,250" TEXT="opportunit?s" POSITION="right" ID="ID_9" COLOR="#ff3300"><font SIZE="12" NAME="Arial" ITALIC="true" BOLD="true"/></node><node wORDER="1" wCOORDS="380,275" TEXT="menaces" POSITION="right" ID="ID_10" COLOR="#333300"><font SIZE="12" NAME="Arial" ITALIC="true" BOLD="true"/><arrowlink ENDARROW="Default" DESTINATION="ID_0"/></node></node><arrowlink ENDARROW="Default" DESTINATION="ID_5"/></node></node></map>
\ No newline at end of file
diff --git a/wise-webapp/src/test/data/freemind/relationships.wxml b/wise-webapp/src/test/data/freemind/relationships.wxml
index 8f66a2ad..75158507 100644
--- a/wise-webapp/src/test/data/freemind/relationships.wxml
+++ b/wise-webapp/src/test/data/freemind/relationships.wxml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="pela" name="basic"><topic id="0" central="true" position="0,0" fontStyle="Arial;10;#000000;;;" shape="rounded rectagle" text="eeeeeeeeeee"><note text="%0A                "/><topic id="1" position="200,-200" order="7" fontStyle="Arial;12;#cc0000;bold;italic;" shape="line" text="interne"><topic id="2" order="0" fontStyle="Arial;12;#330033;bold;italic;" shape="line" text="faiblesses"/></topic><topic id="3" position="200,-100" order="3" shape="line" text="www.luxuo.com"><link url="www.luxuo.com"/></topic><topic id="4" position="200,0" order="0" shape="line" text=""/><topic id="5" position="200,100" order="4" fontStyle="Arial;12;#003333;bold;italic;" shape="line" text="forces"/><topic id="6" position="200,200" order="8" shape="line" text=""><note text="%5El%3A%5El%3A%5El%0A                    "/></topic><topic id="7" position="200,300" order="12" shape="line" text=""><topic id="8" order="0" fontStyle="Arial;12;#000066;bold;italic;" shape="line" text="externe"><topic id="9" order="0" fontStyle="Arial;12;#ff3300;bold;italic;" shape="line" text="opportunit?s"/><topic id="10" order="1" fontStyle="Arial;12;#333300;bold;italic;" shape="line" text="menaces"/></topic></topic></topic></map>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="pela" name="basic"><topic id="0" central="true" position="0,0" fontStyle="Arial;10;#000000;;;" shape="rounded rectagle" text="eeeeeeeeeee"><note text="%0A                "/><topic id="1" position="200,-200" order="7" fontStyle="Arial;12;#cc0000;bold;italic;" shape="line" text="interne"><topic id="2" position="290,-225" order="0" fontStyle="Arial;12;#330033;bold;italic;" shape="line" text="faiblesses"/></topic><topic id="3" position="200,-100" order="3" shape="line" text="www.luxuo.com"><link url="www.luxuo.com"/></topic><topic id="4" position="200,0" order="0" shape="line" text=""/><topic id="5" position="200,100" order="4" fontStyle="Arial;12;#003333;bold;italic;" shape="line" text="forces"/><topic id="6" position="200,200" order="8" shape="line" text=""><note text="%5El%3A%5El%3A%5El%0A                    "/></topic><topic id="7" position="200,300" order="12" shape="line" text=""><topic id="8" position="290,275" order="0" fontStyle="Arial;12;#000066;bold;italic;" shape="line" text="externe"><topic id="9" position="380,250" order="0" fontStyle="Arial;12;#ff3300;bold;italic;" shape="line" text="opportunit?s"/><topic id="10" position="380,275" order="1" fontStyle="Arial;12;#333300;bold;italic;" shape="line" text="menaces"/></topic></topic></topic><relationship startArrow="false" endArrow="true" destCtrlPoint="108,0" srcCtrlPoint="108,0" lineType="3" destTopicId="6" srcTopicId="3" id="11"/><relationship startArrow="false" endArrow="true" destCtrlPoint="63,0" srcCtrlPoint="63,0" lineType="3" destTopicId="5" srcTopicId="7" id="12"/><relationship startArrow="false" endArrow="true" destCtrlPoint="211,0" srcCtrlPoint="211,0" lineType="3" destTopicId="0" srcTopicId="10" id="13"/></map>
\ No newline at end of file