diff --git a/addons/edi/static/src/css/edi.css b/addons/edi/static/src/css/edi.css
index 0faabeb32df..a759699b5e6 100644
--- a/addons/edi/static/src/css/edi.css
+++ b/addons/edi/static/src/css/edi.css
@@ -1,13 +1,15 @@
 
 
-td.oe_edi_preview {
+td.oe_edi_view {
     width: 65%;
     vertical-align: top;
+    padding: 10px;
     border-right: 1px solid #D2CFCF;
 }
 
 .oe_edi_sidebar_container {
     width: 35%;
+    padding: 10px;
     vertical-align: top;
 }
 
@@ -21,6 +23,7 @@ div.oe_edi_center {
 
 button.oe_edi_action_print {
     font-size: 1.5em;
+    margin-left: 35%;
 }
 
 /** EDI Sidebar **/
diff --git a/addons/edi/static/src/xml/edi.xml b/addons/edi/static/src/xml/edi.xml
index 4096e04f63a..567e244caeb 100644
--- a/addons/edi/static/src/xml/edi.xml
+++ b/addons/edi/static/src/xml/edi.xml
@@ -1,50 +1,58 @@
 <template>
 <t t-name="EdiEmpty">
-    <div></div>
+    <div style="height:100%;"></div>
 </t>
 <t t-name="EdiView">
-    <table border="0" cellpadding="0" cellspacing="0" width="100%" height="100%" id="oe_app" class="oe-application,oe_forms">
+    <table border="0" cellpadding="0" cellspacing="0" width="100%" height="100%" id="oe_app" class="oe-application oe_forms">
     <tr>
         <td colspan="2" valign="top" id="oe_header" class="header">
             <div> <a href="/" class="company_logo_link"> <div class="company_logo" /> </a> </div>
         </td>
     </tr>
     <tr>
-        <td class="oe_edi_view">
-            <p class="oe_form_paragraph"><t t-raw="widget.center"/></p>
-            <button type="button" class="oe_edi_action_print">View/Print PDF</button>
-        </td>
-        <td class="oe_edi_sidebar_container">
-            <p class="oe_edi_sidebar_title">
-                Import this document
-            </p>
+        <td colspan="2" valign="top" height="100%">
+            <table cellspacing="0" cellpadding="0" border="0" height="100%" width="100%">
+                <tr>
+                    <td class="oe_edi_view">
+                        <p class="oe_form_paragraph"><t t-raw="widget.center"/></p>
+                        <button type="button" class="oe_edi_action_print">View/Print PDF</button>
+                    </td>
+                    <td class="oe_edi_sidebar_container">
+                        <p class="oe_edi_sidebar_title">
+                            Import this document
+                        </p>
 
-            <input type="radio" id="oe_edi_import_openerp" name="oe_edi_import"/>
-            <label for="oe_edi_rd_import_openerp">Import it into an existing OpenERP instance</label>
-            <p class="oe_edi_nested_block">
-                <label for="oe_edi_txt_saas_url">OpenERP instance address:</label>
-                <br/>
-                http://<input type="text" id="oe_edi_txt_server_url"/>
-            </p>
+                        <input type="radio" id="oe_edi_import_openerp" name="oe_edi_import"/>
+                        <label for="oe_edi_import_openerp">Import it into an existing OpenERP instance</label>
+                        <p class="oe_edi_nested_block">
+                            <label for="oe_edi_txt_saas_url">OpenERP instance address:</label>
+                            <br/>
+                            http://<input type="text" id="oe_edi_txt_server_url"/>
+                        </p>
 
-            <input type="radio" id="oe_edi_import_saas" name="oe_edi_import"/>
-            <label for="oe_edi_rd_import_saas_account">Import it in a new OpenERP Online instance:</label>
-            <br/>
-            <br/>
-            <input type="radio" id="oe_edi_import_download" name="oe_edi_import"/>
-            <label for="oe_edi_rd_import_other">Import into another application</label>
-            <br/>
-            <br/>
+                        <input type="radio" id="oe_edi_import_saas" name="oe_edi_import"/>
+                        <label for="oe_edi_import_saas">Import it into a new OpenERP Online instance:</label>
+                        <br/>
+                        <br/>
+                        <input type="radio" id="oe_edi_import_download" name="oe_edi_import"/>
+                        <label for="oe_edi_import_download">Import into another application</label>
+                        <br/>
+                        <br/>
 
-            <button type="button" class="oe_edi_import_button">Continue</button>
+                        <button type="button" class="oe_edi_import_button">Continue</button>
 
-            <div class="oe_edi_right_bottom">
-            </div>
+                        <div class="oe_edi_right_bottom">
+                        </div>
+                    </td>
+                </tr>
+            </table>
         </td>
     </tr>
     <tr>
-        <td colspan="2" id="oe_footer" class="oe_footer">
-            <p class="oe_footer_powered">Powered by <a href="http://www.openerp.com">OpenERP</a>.</p>
+        <td colspan="2">
+            <div id="oe_footer" class="oe_footer">
+                <p class="oe_footer_powered">Powered by <a href="http://www.openerp.com">OpenERP</a></p>
+            </div>
         </td>
     </tr>
     </table>