diff --git a/bi_view_editor/__openerp__.py b/bi_view_editor/__openerp__.py
index ad4a43425..40ab1473f 100644
--- a/bi_view_editor/__openerp__.py
+++ b/bi_view_editor/__openerp__.py
@@ -13,7 +13,7 @@
     'version': '9.0.1.0.0',
     'depends': [
         'base',
-        'web',
+        'web'
     ],
     'data': [
         'security/ir.model.access.csv',
diff --git a/bi_view_editor/static/src/css/bve.css b/bi_view_editor/static/src/css/bve.css
index e4bb40be7..0b71d1e27 100644
--- a/bi_view_editor/static/src/css/bve.css
+++ b/bi_view_editor/static/src/css/bve.css
@@ -7,7 +7,7 @@
     width: 100%;
     height: 50px;
     background-color: #7c7bad;
-    color: #fff;
+    color: #000;
 }
 
 .oe_form_field_bi_editor .footer {
@@ -123,6 +123,7 @@
     border: none;
     background-image: none;
 	padding: 0;
+	cursor: pointer;
 }
 
 .oe_form_field_bi_editor .body .right .field-list tbody tr:hover {
diff --git a/bi_view_editor/static/src/js/bve.js b/bi_view_editor/static/src/js/bve.js
index 0e48ffbf9..f0ba2f8e1 100644
--- a/bi_view_editor/static/src/js/bve.js
+++ b/bi_view_editor/static/src/js/bve.js
@@ -1,4 +1,3 @@
-
 openerp.bi_view_editor = function (instance, local) {
 
     instance.bi_view_editor.BVEEditor = instance.web.form.AbstractField.extend({
@@ -146,6 +145,7 @@ openerp.bi_view_editor = function (instance, local) {
                 var index = self.activeModelMenus.indexOf(item.find(".class").data('model-data').id);
                 if(index != -1 && !self.get("effective_readonly")) {
                     model.call("get_fields", [self.activeModelMenus[index]], { context: new instance.web.CompoundContext() }).then(function(result) {
+                        console.log(result);
                         var item = self.$el.find(".class-list #bve-class-" + result[0].model_id);
                         for (var o = 0; o < result.length; o++) {
 							if(self.$el.find(".field-list tbody [name=label-" + result[o].id + "]").length > 0) continue;
@@ -196,7 +196,7 @@ openerp.bi_view_editor = function (instance, local) {
             var delete_button = "";
             var disabled = " disabled=\"disabled\" ";
             if (!this.get("effective_readonly")) { 
-                delete_button = "<button id=\"delete-" + data.id + "\" class=\"delete-button oe_i\">d</button>";
+                delete_button = "<span id=\"delete-" + data.id + "\" class=\"delete-button fa fa-trash-o\"/>";
                 disabled = "";
             }
 
@@ -365,7 +365,7 @@ openerp.bi_view_editor = function (instance, local) {
                     self.internal_set_value(JSON.stringify(self.get_fields()));
                     //self.load_classes(data);
                 } else if (result.length > 1) {
-                    var pop = new instance.bi_view_editor.JoinNodePopup(self);
+                    var pop = new local.JoinNodePopup(self);
                     pop.display_popup(result, self.get_model_data(), self.add_field_and_join_node.bind(self), data);
                 } else {
                     // first field and table only.
@@ -430,7 +430,8 @@ openerp.bi_view_editor = function (instance, local) {
             var dialog = new instance.web.Dialog(this, {
                         dialogClass: 'oe_act_window',
                         title: "Choose Join Node",
-            }, this.$el).open();
+                        $content: this.$el
+            }).open();
 
             joinnodes.find('a').click(function() {
                 callback(callback_data, choices[$(this).data('idx')]);