diff --git a/addons/web_diagram/static/src/css/base_diagram.css b/addons/web_diagram/static/src/css/base_diagram.css
index 9604823d040..5fb883721be 100644
--- a/addons/web_diagram/static/src/css/base_diagram.css
+++ b/addons/web_diagram/static/src/css/base_diagram.css
@@ -10,6 +10,32 @@
 .openerp .clear{
     clear:both;
 }
+.openerp .diagram{
+    margin:0;
+    padding:0;
+    width:100%;
+    height:500px;
+    /* resize:vertical; doesn't work because raphael catches the resize event...*/
+    min-height:100%;
+    background-color:white;
+    border-style:solid;
+    border-width:1px;
+    border-color:#DCDCDC;
+    overflow:hidden;
+}
+
+/* prevent accidental selection of the text in the svg nodes */
+.openerp .diagram *{
+    -webkit-touch-callout: none;
+    -webkit-user-select: none;
+    -khtml-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    -o-user-select: none;
+    user-select: none;
+};
+
+/*
 .openerp .diagram{
     margin:0;
     padding:0;
@@ -25,9 +51,10 @@
     border-top-color:#DCDCDC;
     overflow:hidden;
 
-}
+}*/
+/*
 #widget-19_view_diagram {
     position:relative;
-}
+}*/
 
 
diff --git a/addons/web_diagram/static/src/js/diagram.js b/addons/web_diagram/static/src/js/diagram.js
index 0731c3a991b..2c6bb29d8ff 100644
--- a/addons/web_diagram/static/src/js/diagram.js
+++ b/addons/web_diagram/static/src/js/diagram.js
@@ -118,6 +118,8 @@ openerp.web.DiagramView = openerp.web.View.extend({
         console.log(result);
         var res_nodes  = result['nodes'];
         var res_edges  = result['conn'];
+        this.parent_field = result.parent_field;
+
         var id_to_node = {}
 
 
@@ -133,7 +135,7 @@ openerp.web.DiagramView = openerp.web.View.extend({
                         "edge_spacing"  : 100,                 
                         "edge_label_font_size" : 10              };
 
-        $('#dia-canvas *').remove();    // remove previous diagram
+        $('#dia-canvas').empty();    // remove previous diagram
 
         var r  = new Raphael(document.getElementById("dia-canvas"), '100%','100%');
 
@@ -167,7 +169,7 @@ openerp.web.DiagramView = openerp.web.View.extend({
         };
 
         CuteEdge.creation_callback = function(node_start, node_end){
-            return {label:_t("new transition")};  
+            return {label:_t("")};  
         };
         CuteEdge.new_edge_callback = function(cuteedge){
             self.add_connector( cuteedge.get_start().id,