diff --git a/addons/base_diagram/static/src/css/base_diagram.css b/addons/base_diagram/static/src/css/base_diagram.css
index 19939b8c337..70b575e6e47 100644
--- a/addons/base_diagram/static/src/css/base_diagram.css
+++ b/addons/base_diagram/static/src/css/base_diagram.css
@@ -4,6 +4,10 @@
     -webkit-border-radius: 8px;
 }
 
+.openerp .show_grid {
+	background: url("/base_diagram/static/src/img/grid.jpg") repeat;
+}
+
 .openerp .oe_diagram_pager {
 	text-align: right;
     white-space: nowrap;
diff --git a/addons/base_diagram/static/src/img/grid.jpg b/addons/base_diagram/static/src/img/grid.jpg
new file mode 100644
index 00000000000..5254207b964
Binary files /dev/null and b/addons/base_diagram/static/src/img/grid.jpg differ
diff --git a/addons/base_diagram/static/src/js/diagram.js b/addons/base_diagram/static/src/js/diagram.js
index c5da54b49d2..4f193015fae 100644
--- a/addons/base_diagram/static/src/js/diagram.js
+++ b/addons/base_diagram/static/src/js/diagram.js
@@ -104,7 +104,13 @@ openerp.base_diagram.DiagramView = openerp.base.View.extend({
 		
 		this.do_update_pager();
 		
-		this.$element.find('.oe_diagram_button_new').click(function(){self.add_edit_node()})
+		// New Node,Edge
+		this.$element.find('#new_node.oe_diagram_button_new').click(function(){self.add_edit_node(null, self.node)})
+		this.$element.find('#new_edge.oe_diagram_button_new').click(function(){self.add_edit_node(null, self.connector)})
+		
+		this.$element.find('#toggle_grid').click(function() {
+			self.$element.find('.diagram').toggleClass('show_grid')
+		});
 		
         if(this.id) {
         	self.get_diagram_info();
diff --git a/addons/base_diagram/static/src/xml/base_diagram.xml b/addons/base_diagram/static/src/xml/base_diagram.xml
index 247eba2c301..70209e06aff 100644
--- a/addons/base_diagram/static/src/xml/base_diagram.xml
+++ b/addons/base_diagram/static/src/xml/base_diagram.xml
@@ -3,7 +3,9 @@
     	<div class="oe_diagram_header" t-att-id="element_id + '_header'">
 	    	<h2 class="oe_view_title"><t t-esc="fields_view.arch.attrs.string"/></h2>
 			<div class="oe_diagram_buttons">
-				<button type="button" class="oe_diagram_button_new">New Node</button>
+				<button type="button" id="new_node" class="oe_diagram_button_new">New Node</button>
+				<button type="button" id="new_edge" class="oe_diagram_button_new">New Edge</button>
+				<label>Show Grid:</label><input type="checkbox" id="toggle_grid" checked="checked"/>
 			</div>
 	        <div class="oe_diagram_pager">
 	            <button type="button" data-pager-action="first">First</button>
@@ -15,6 +17,6 @@
 	            <button type="button" data-pager-action="last">Last</button>
 	        </div>
 		</div>
-    	<div id="dia-canvas" class="diagram" style="overflow: auto;"></div>
+    	<div id="dia-canvas" class="diagram show_grid" style="overflow: auto;"></div>
     </t>
 </template>
\ No newline at end of file