diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index da4b6c2284d..929fba96de0 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -241,45 +241,45 @@
         <field name="arch" type="xml">
             <form string="Documents" version="7.0">
                 <sheet>
-                    <group col="4">
-                        <field name="name"/>
-                        <field name="parent_id"/>
-                        <field name="user_id"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    <group>
+                        <label for="name" string="Attachment Name"/>
+                        <h1>
+                            <field name="name" />
+                        </h1>
                     </group>
-                    <notebook colspan="4">
-                    <page string="Attachment">
+                    <group>
+                        <label for="datas" string="File Content"/>
+                        <h2>
+                            <field name="datas" filename="datas_fname"/>
+                        </h2>
+                    </group>
+                    <group>
                         <group>
-                            <group string="Data">
-                                <field name="type"/>
-                                <newline />
-                                <field name="datas" filename="datas_fname" attrs="{'invisible':[('type','=','url')]}"/>
-                                <field name="datas_fname" attrs="{'invisible':[('type','=','url')]}"/>
-                                <field name="url" widget="url" attrs="{'invisible':[('type','=','binary')]}"/>
-                            </group>
-                            <group>
-                                <field name="res_id" invisible="True"/>
-                                <field name="res_model" readonly="True" invisible="True" attrs="{'invisible': [('res_id','=',0)]}"/>
-                                <field name="res_name" readonly="1" attrs="{'invisible': [('res_id','=',0)]}"/>
-                                <separator string="Related to" colspan="2"/>
-                                <field name="partner_id"/>
-                            </group>
-                            <group groups="base.group_no_one" string="Created">
-                                <field name="create_uid" readonly="1"/>
-                                <field name="create_date" readonly="1"/>
-                            </group>
-                            <group groups="base.group_no_one" string="Modified">
-                                <field name="write_uid" readonly="1"/>
-                                <field name="write_date" readonly="1"/>
-                            </group>
+                            <field name="user_id"/>
+                            <field name="parent_id"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            <field name="index_content"/>
                         </group>
-                    </page>
-                    <page string="Indexed Content - experimental" groups="base.group_no_one">
-                        <field name="index_content"/>
-                    </page>
-                    <page string="Notes">
-                        <field name="description"/>
-                    </page>
+                        <group>
+                            <field name="res_id" invisible="True"/>
+                            <field name="res_model" readonly="True" invisible="True" attrs="{'invisible': [('res_id','=',0)]}"/>
+                            <field name="res_name" readonly="1" attrs="{'invisible': [('res_id','=',0)]}"/>
+                            <field name="partner_id"/>
+                        </group>
+                    </group>
+                    <notebook>
+                        <page string="History">
+                            <group>
+                                <group groups="base.group_no_one" string="Created">
+                                    <field name="create_uid" readonly="1"/>
+                                    <field name="create_date" readonly="1"/>
+                                </group>
+                                <group groups="base.group_no_one" string="Modified">
+                                    <field name="write_uid" readonly="1"/>
+                                    <field name="write_date" readonly="1"/>
+                                </group>
+                            </group>
+                        </page>
                     </notebook>
                 </sheet>
             </form>
diff --git a/addons/document_ftp/wizard/ftp_browse_view.xml b/addons/document_ftp/wizard/ftp_browse_view.xml
index 8ed31ee2323..4aa86f77612 100644
--- a/addons/document_ftp/wizard/ftp_browse_view.xml
+++ b/addons/document_ftp/wizard/ftp_browse_view.xml
@@ -9,9 +9,7 @@
                 <form string="Browse Document" version="7.0">
                     <header>
                         <button name="browse_ftp" string="_Browse" type="object" icon="gtk-ok"/>
-                        <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
                     </header>
-                    <separator string="Browse Document"/>
                     <group>
                         <field name="url" widget="url"/>
                     </group>
diff --git a/addons/document_ftp/wizard/ftp_configuration_view.xml b/addons/document_ftp/wizard/ftp_configuration_view.xml
index 10c8463b02c..e1a87b82358 100644
--- a/addons/document_ftp/wizard/ftp_configuration_view.xml
+++ b/addons/document_ftp/wizard/ftp_configuration_view.xml
@@ -20,7 +20,9 @@
             <group string="res_config_contents" position="replace">
             	<separator string="Configure FTP Server" />
             	<label string="Indicate the network address on which your OpenERP server should be reachable for end-users. This depends on your network topology and configuration, and will only affect the links displayed to the users. The format is HOST:PORT and the default host (localhost) is only suitable for access from the server machine itself.."/>
-                <field name="host"/>
+                <group>
+                    <field name="host"/>
+                </group>
             </group>
            <xpath expr="//button[@name='action_skip']" position="replace"/>
           </data>