diff --git a/addons/base/static/src/css/data_export.css b/addons/base/static/src/css/data_export.css
index 7b4b9707b39..9a53d07d365 100644
--- a/addons/base/static/src/css/data_export.css
+++ b/addons/base/static/src/css/data_export.css
@@ -1,3 +1,6 @@
+.openerp .oe-export {
+    width: 100%;
+}
 .openerp .oe_export_row tr{
     background-color: #FFFFFF;
     font-size: 0.8em;
@@ -20,11 +23,6 @@
     background-color: #F3F3F3;
 }
 
-.openerp .oe_export_fields_selector_export {
-    width: 100%;
-    height: 400px;
-}
-
 .openerp .oe_export_fields_selector_left {
     width: 50%;
 }
@@ -35,9 +33,15 @@
     height: 400px;
     border: solid #999999 1px;
 }
+.openerp div#left_field_panel table {
+    width: 100%;
+}
 
 .openerp .oe_export_fields_selector_center {
-    width: 102px;
+    text-align: center;
+}
+.openerp .oe_export_fields_selector_center button {
+    white-space: nowrap;
 }
 
 .openerp .oe_export_fields_selector_right {
@@ -45,7 +49,7 @@
     height: 400px;
 }
 
-.openerp .oe_export_fields_selector_export select{
+.openerp .oe_export_fields_selector_right select{
     width: 100%;
     height: 100%;
 }
@@ -78,8 +82,3 @@
     border: none;
     display: block;
 }
-
-.openerp .oe_export_button_export {
-	border: 1px solid #006;
-	background-color: #F3F3F3;
-}
diff --git a/addons/base/static/src/js/data_export.js b/addons/base/static/src/js/data_export.js
index b2372f275fa..74a67d59ab2 100644
--- a/addons/base/static/src/js/data_export.js
+++ b/addons/base/static/src/js/data_export.js
@@ -1,15 +1,15 @@
 openerp.base.data_export = function(openerp) {
 openerp.base.DataExport = openerp.base.Dialog.extend({
+    template: 'ExportTreeView',
+    dialog_title: 'Export Data',
     init: function(parent, dataset) {
         this._super(parent);
         this.dataset = dataset;
     },
     start: function() {
         var self = this;
-        self._super(false);
-        self.template = 'ExportTreeView';
-        self.dialog_title = "Export Data";
-        self.open({
+        this._super.apply(this, arguments);
+        this.open({
             modal: true,
             width: '55%',
             height: 'auto',
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 0c17e70cfc7..28591276ed1 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -1223,78 +1223,52 @@
     <a id="exportview" href="javascript: void(0)" style="text-decoration: none;color: #3D3D3D;">Export</a>
 </t>
 <t t-name="ExportTreeView">
-    <table class="view" style="background-color: #F3F3F3;">
+    <table class="oe-export" style="background-color: #F3F3F3;">
         <tr>
-            <td align="left">
+            <td colspan="3">
                 This wizard will export all data that matches the current search criteria to a CSV file.
                 You can export all data or only the fields that can be reimported after modification.
             </td>
         </tr>
         <tr>
-            <td>
-                <table>
-                    <tr>
-                        <td class="label"><label>Export Type:</label></td>
-                        <td>
-                            <select id="import_compat" name="import_compat">
-                                <option value="1">Import Compatible Export</option>
-                                <option value="0">Export all Data</option>
-                            </select>
-                        </td>
-                        <td class="label"><label>Export Format</label></td>
-                        <td>
-                            <select id="export_format" name="export_format">
-                                <option value="csv">CSV</option>
-                                <option value="xls">Excel</option>
-                            </select>
-                        </td>
+            <td colspan="3">
+                <label for="import_compat">Export Type:</label>
+                <select id="import_compat" name="import_compat">
+                    <option value="1">Import Compatible Export</option>
+                    <option value="0">Export all Data</option>
+                </select>
 
-                    </tr>
-                </table>
+                <label for="export_format">Export Format</label>
+                <select id="export_format" name="export_format">
+                    <option value="csv">CSV</option>
+                    <option value="xls">Excel</option>
+                </select>
             </td>
         </tr>
 
         <tr>
-            <td>
-                <table class="oe_export_fields_selector_export">
-                    <tr>
-                        <th class="oe_view_title" valign="bottom">Available fields</th>
-                        <th class="oe_view_title"></th>
-                        <th class="oe_view_title">Fields to export
-                        <a style="color: blue; text-decoration: none;" href="#" id="export_new_list">Save fields list</a>
-                        <div id="savenewlist"></div>
-                        <div id="ExistsExportList"></div>
-                        </th>
-                    </tr>
-                    <tr>
-                        <td class="oe_export_fields_selector_left">
-                            <div id="left_field_panel">
-                            </div>
-                        </td>
-                        <td>
-                            <table class="oe_export_fields_selector_center">
-                                <tr>
-                                    <td align="center">
-                                        <button id="add_field" class="oe_export_button_export">Add</button>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td align="center">
-                                        <button id="remove_field" class="oe_export_button_export">Remove</button>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td align="center">
-                                        <button id="remove_all_field" class="oe_export_button_export">Remove All</button>
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                        <td class="oe_export_fields_selector_right">
-                            <select name="fields_list" id="fields_list" multiple="multiple"></select>
-                        </td>
-                    </tr>
-                </table>
+            <th>Available fields</th>
+            <th/>
+            <th>
+                Fields to export
+                <a style="color: blue; text-decoration: none;" href="#" id="export_new_list">Save fields list</a>
+                <div id="savenewlist"></div>
+                <div id="ExistsExportList"></div>
+            </th>
+        </tr>
+        <tr style="height: 400px;">
+            <td class="oe_export_fields_selector_left">
+                <div id="left_field_panel">
+                </div>
+            </td>
+            <td class="oe_export_fields_selector_center">
+                <button id="add_field">Add</button>
+                <button id="remove_field">Remove</button>
+                <button id="remove_all_field">Remove All</button>
+            </td>
+            <td class="oe_export_fields_selector_right">
+                <select name="fields_list" id="fields_list"
+                        multiple="multiple"></select>
             </td>
         </tr>
     </table>