diff --git a/web_export_view/.DS_Store b/web_export_view/.DS_Store
deleted file mode 100644
index 5008ddfc..00000000
Binary files a/web_export_view/.DS_Store and /dev/null differ
diff --git a/web_export_view/AUTHORS.txt b/web_export_view/AUTHORS.txt
index d7fa7280..76bbca72 100644
--- a/web_export_view/AUTHORS.txt
+++ b/web_export_view/AUTHORS.txt
@@ -4,3 +4,4 @@ Authors
 Simone Orsi <simone.orsi@domsense.com> [simahawk]
 Lorenzo Battistini <lorenzo.battistini@agilebg.com>
 Stefan Rijnhart <stefan@therp.nl>
+Leonardo Pistone <leonardo.pistone@agilebg.com>
diff --git a/web_export_view/__openerp__.py b/web_export_view/__openerp__.py
index 41008b3d..555f9b27 100644
--- a/web_export_view/__openerp__.py
+++ b/web_export_view/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
 #    Copyright (C) 2012-2013 Agile Business Group sagl
 #    (<http://www.agilebg.com>)
@@ -22,32 +22,38 @@
 
 {
     'name': 'Export Current View',
-    'version': '1.0',
+    'version': '1.1',
     'category': 'Web',
     'description': """
 WEB EXPORT VIEW
 ===============
 
-One of the best OpenERP’s features is exporting custom data to CSV/XLS. You can do it by clicking on the export link in the sidebar. The export action allows use to configure what to be exported by selecting fields, etc, and allows you to save your export as a template so that you can export it once again without having to configure it again.
+One of the best OpenERP’s features is exporting custom data to CSV/XLS. You can
+do it by clicking on the export link in the sidebar. The export action allows
+use to configure what to be exported by selecting fields, etc, and allows you
+to save your export as a template so that you can export it once again without
+having to configure it again.
 
-That feature is as great and advanced as limited for an everyday-customer-experience. A lot of customers want simply to export the tree view they are looking to.
+That feature is as great and advanced as limited for an everyday experience.
+A lot of customers want simply to export the tree view they are looking to.
 
-If you miss this feature as us, probably you’ll find an answer into our web_export_view module.
+If you miss this feature as us, probably you’ll find an answer into our
+web_export_view module.
 
-After you installed it, you’ll find an additional link ‘Export current view’ right below the ‘Export’ one. By clicking on it you’ll get a XLS file contains the same data of the tree view you are looking at, headers included.
+After you installed it, you’ll find an additional link ‘Export current view’
+right below the ‘Export’ one. By clicking on it you’ll get a XLS file contains
+the same data of the tree view you are looking at, headers included.
 """,
     'author': 'Agile Business Group',
     'website': 'http://www.agilebg.com',
     'license': 'AGPL-3',
     'depends': ['web'],
-    'external_dependencies' : {
-        'python' : ['xlwt'],
-     },
-    'data': [],
-    'active': False,
+    # 'external_dependencies': {
+    #     'python': ['xlwt'],
+    # },
+    'js': ['static/*/*.js', 'static/*/js/*.js'],
+    'qweb': ['static/xml/web_advanced_export.xml'],
+    'installable': True,
     'auto_install': False,
-    'js': [
-        'static/js/web_advanced_export.js',
-    ],
+    'web_preload': False,
 }
-
diff --git a/web_export_view/controllers.py b/web_export_view/controllers.py
index ba7f4e1d..dc225ee2 100644
--- a/web_export_view/controllers.py
+++ b/web_export_view/controllers.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
 #    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
 #
@@ -23,7 +23,7 @@ try:
 except ImportError:
     import simplejson as json
 
-import web.common.http as openerpweb
+import web.http as openerpweb
 
 from web.controllers.main import ExcelExport
 
@@ -34,13 +34,16 @@ class ExcelExportView(ExcelExport):
     @openerpweb.httprequest
     def index(self, req, data, token):
         data = json.loads(data)
-        model = data.get('model',[])
-        columns_headers = data.get('headers',[])
-        rows = data.get('rows',[])
-
-        context = req.session.eval_context(req.context)
+        model = data.get('model', [])
+        columns_headers = data.get('headers', [])
+        rows = data.get('rows', [])
 
-        return req.make_response(self.from_data(columns_headers, rows),
-            headers=[('Content-Disposition', 'attachment; filename="%s"' % self.filename(model)),
-                     ('Content-Type', self.content_type)],
-            cookies={'fileToken': int(token)})
+        return req.make_response(
+            self.from_data(columns_headers, rows),
+            headers=[
+                ('Content-Disposition', 'attachment; filename="%s"'
+                    % self.filename(model)),
+                ('Content-Type', self.content_type)
+            ],
+            cookies={'fileToken': int(token)}
+        )
diff --git a/web_export_view/static/js/web_advanced_export.js b/web_export_view/static/js/web_advanced_export.js
index 0c26f48b..03e05bdd 100644
--- a/web_export_view/static/js/web_advanced_export.js
+++ b/web_export_view/static/js/web_advanced_export.js
@@ -19,48 +19,25 @@
 //
 //#############################################################################
 
-openerp.web_export_view = function(openerp) {
+openerp.web_export_view = function(instance, m) {
 
-    _t = openerp.web._t;
+    var _t = instance.web._t,
+    QWeb = instance.web.qweb;
 
-    openerp.web.Sidebar = openerp.web.Sidebar.extend({
-
-        add_default_sections: function() {
-            // IMHO sections should be registered objects
-            // as views and retrieved using a specific registry
-            // so that we don't have to override this
-            
-            var self = this,
-            view = this.widget_parent,
-            view_manager = view.widget_parent,
-            action = view_manager.action;
-            if (this.session.uid === 1) {
-                this.add_section(_t('Customize'), 'customize');
-                this.add_items('customize', [{
-                    label: _t("Translate"),
-                    callback: view.on_sidebar_translate,
-                    title: _t("Technical translation")
-                }]);
-            }
-
-            this.add_section(_t('Other Options'), 'other');
-            this.add_items('other', [
-                {
-                    label: _t("Export"),
-                    callback: view.on_sidebar_export
-                },
-                {
-                    label: _t("Export current view"),
-                    callback: this.on_sidebar_export_view
-                }
-            ]);
+    instance.web.Sidebar.include({
+        redraw: function() {
+            var self = this;
+            this._super.apply(this, arguments);
+            self.$el.find('.oe_sidebar').append(QWeb.render('AddExportViewMain', {widget: self}));
+            self.$el.find('.oe_sidebar_export_view_xls').on('click', self.on_sidebar_export_view_xls);
         },
 
-        on_sidebar_export_view: function() {
+        on_sidebar_export_view_xls: function() {
             // Select the first list of the current (form) view
             // or assume the main view is a list view and use that
             var self = this,
-            view = this.widget_parent; // valid for list view
+            view = this.getParent(),
+            columns = view.visible_columns;
             if (view.widget_children) {
                 view.widget_children.every(function(child) {
                     if (child.field && child.field.type == 'one2many') {
@@ -74,7 +51,6 @@ openerp.web_export_view = function(openerp) {
                     return true;
                 });
             }
-            var columns = view.visible_columns;
             export_columns_keys = [];
             export_columns_names = [];
             $.each(columns,function(){
@@ -84,19 +60,22 @@ openerp.web_export_view = function(openerp) {
                     export_columns_names.push(this.string);
                 }
             });
-            rows = view.$element.find('.ui-widget-content tr');
+            rows = view.$el.find('.oe_list_content > tbody > tr');
             export_rows = [];
             $.each(rows,function(){
                 $row = $(this);
                 // find only rows with data
                 if($row.attr('data-id')){
                     export_row = [];
-                    $.each(export_columns_keys,function(){
-                        cell = $row.find('td[data-field="'+this+'"]').get(0);
-                        text = cell.text || cell.textContent || cell.innerHTML || "";
-                        export_row.push(text.trim());
-                    });
-                    export_rows.push(export_row);
+                    checked = $row.find('th input[type=checkbox]').attr("checked");
+                    if (checked === "checked"){
+                        $.each(export_columns_keys,function(){
+                            cell = $row.find('td[data-field="'+this+'"]').get(0);
+                            text = cell.text || cell.textContent || cell.innerHTML || "";
+                            export_row.push(text.trim());
+                        });
+                        export_rows.push(export_row);
+                    }
                 }
             });
             $.blockUI();
@@ -113,4 +92,4 @@ openerp.web_export_view = function(openerp) {
 
     });
 
-}
+};
diff --git a/web_export_view/static/xml/web_advanced_export.xml b/web_export_view/static/xml/web_advanced_export.xml
new file mode 100644
index 00000000..cb4b5004
--- /dev/null
+++ b/web_export_view/static/xml/web_advanced_export.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vim:fdl=1:
+-->
+<templates id="template" xml:space="preserve">
+<t t-name="AddExportViewMain">
+    <div class="oe_form_dropdown_section">
+        <button class="oe_dropdown_toggle oe_dropdown_arrow">Export Current View</button>
+        <ul class="oe_dropdown_menu">
+            <li class="oe_sidebar_export_view_xls"><span>Excel</span></li>
+        </ul>
+    </div>
+</t>
+</templates>