diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 9dfbd859d4e..8d7a726f015 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -20,11 +20,9 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Category of Ideas" version="7.0">
-                    <sheet>
-                        <group>
-                            <field name="name"/>
-                        </group>
-                    </sheet>
+                    <group>
+                        <field name="name"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -77,10 +75,10 @@
                 <sheet>
                     <label for="name" class="oe_edit_only"/>
                     <h1><field name="name"/></h1>
-                    <group>
-                        <field name="category_ids" widget="many2many_tags" string="Tags"/>
-                        <field name="description"/>
-                    </group>
+                    <label for="category_ids" class="oe_edit_only"/>
+                    <field name="category_ids" widget="many2many_tags"/>
+                    <label for="description"/><newline/>
+                    <field name="description"/>
                 </sheet>
                 <footer>
                     <field name="message_ids" widget="mail_thread"/>
diff --git a/addons/lunch/lunch.py b/addons/lunch/lunch.py
index c771c42cfe1..8cca4ced465 100644
--- a/addons/lunch/lunch.py
+++ b/addons/lunch/lunch.py
@@ -135,7 +135,7 @@ class lunch_order(osv.osv):
             readonly=True, states={'draft':[('readonly', False)]}, change_default=True),
         'date': fields.date('Date', readonly=True, states={'draft':[('readonly', False)]}),
         'cashmove': fields.many2one('lunch.cashmove', 'Cash Move' , readonly=True),
-        'descript': fields.char('Description Order', readonly=True, size=250, \
+        'descript': fields.char('Comment', readonly=True, size=250, \
             states = {'draft':[('readonly', False)]}),
         'state': fields.selection([('draft', 'New'), ('confirmed', 'Confirmed'), ], \
             'Status', readonly=True, select=True),
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 8efb6566f7c..5e870c085c9 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -109,12 +109,10 @@
             <field name="model">lunch.cashbox</field>
             <field name="arch" type="xml">
                 <form string="Cashboxes" version="7.0">
-                    <sheet>
-                        <group>
-                            <field name="name"/>
-                            <field name="manager"/>
-                        </group>
-                    </sheet>
+                    <group colspan="4">
+                        <field name="name"/>
+                        <field name="manager"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -226,11 +224,9 @@
             <field name="model">lunch.category</field>
             <field name="arch" type="xml">
                 <form string="Category" version="7.0">
-                    <sheet>
-                        <group col="4">
-                            <field name="name"/>
-                        </group>
-                    </sheet>
+                    <group>
+                        <field name="name"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/survey/static/src/css/survey.css b/addons/survey/static/src/css/survey.css
index 6964e4c2f3e..c18f584c9ed 100644
--- a/addons/survey/static/src/css/survey.css
+++ b/addons/survey/static/src/css/survey.css
@@ -12,7 +12,3 @@
 .oe_survey_rate{
     font-size: 14px;
 }
-.oe_kanban_survey {
-    width: 300px;
-}
-
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 1c1c8b6df91..0ebaa2aa586 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -178,7 +178,7 @@ class survey_page(osv.osv):
     _columns = {
         'title': fields.char('Page Title', size=128, required=1),
         'survey_id': fields.many2one('survey', 'Survey', ondelete='cascade'),
-        'question_ids': fields.one2many('survey.question', 'page_id', 'Question'),
+        'question_ids': fields.one2many('survey.question', 'page_id', 'Questions'),
         'sequence': fields.integer('Page Nr'),
         'note': fields.text('Description'),
     }
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 8aeec213648..cfefc8f7dea 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -27,16 +27,14 @@
                 </header>
                 <sheet>
                     <div class="oe_button_box oe_right">
-                        <button name="122" states="open,draft,close,cancel" string="Test Survey" type="action" icon="gtk-new" context="{'active':True,'survey_id': active_id}" attrs="{'invisible':[('id','=',0)]}"/>
-                        <button name="106" states="open,draft,close,cancel" string="Answer Survey" type="action" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>
-                        <button name="106" states="open,draft,close,cancel" string="Edit Survey" type="action" icon="gtk-edit" context="{'active':True,'edit' : True,'survey_id': active_id}" invisible="1"/>
+                        <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel" string="Test Survey" type="action" icon="gtk-new" context="{'active':True,'survey_id': active_id}" attrs="{'invisible':[('id','=',0)]}"/>
+                        <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel" string="Answer Survey" type="action" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>
                     </div>
                     <label for="title" class="oe_edit_only"/>
                     <h1>
                         <field name="title" select="1" class="oe_inline"/>
-                        <label string="(" attrs="{'invisible':[('type','=',False)]}" class="oe_inline"/>
+                        <label string=", " attrs="{'invisible':[('type','=',False)]}" class="oe_inline"/>
                         <field name="type" class="oe_inline"/>
-                        <label string=")" attrs="{'invisible':[('type','=',False)]}" class="oe_inline"/>
                     </h1>
                     <group>
                         <group>
@@ -50,31 +48,29 @@
                         </group>
                      </group>
                      <notebook>
-                        <page string="Survey">
-                            <field name="page_ids" colspan="4" nolabel="1" mode="tree">
+                        <page string="Survey Details">
+                            <field name="note" colspan="4" placeholder="Survey description..."/>
+                            <label for="page_ids"/>
+                            <field name="page_ids" colspan="4" mode="tree">
                                 <form string="Survey Page" version="7.0">
                                     <sheet>
                                     <label for="title" class="oe_edit_only"/>
-                                    <h2>
-                                        <field name="title" select="1" class="oe_inline"/>
-                                        (<field name="sequence" groups="base.group_no_one" class="oe_inline"/>)
-                                    </h2>
-                                    <newline/>
+                                    <h1>
+                                        <field name="title"/>
+                                    </h1>
                                     <group>
-                                        <field name="note" placeholder="Add a description on the survey page" nolabel="1"/>
+                                        <field name="note" placeholder="Description on the survey page..." nolabel="1"/>
                                     </group>
                                     <newline/>
-                                    <group string="Survey Questions">
+                                    <group>
+                                        <label for="question_ids"/>
+                                        <newline/>
                                         <field name="question_ids" nolabel="1">
-                                            <form string="Survey Question" >
+                                            <form string="Survey Question">
                                                 <group>
                                                     <group>
-                                                    <field name="question" select="1"/>
-                                                    <field name="type" on_change="on_change_type(type)"/>
-                                                    </group>
-                                                    <group>
-                                                    <field name="sequence"/>
-                                                    <field name="tot_resp"/>
+                                                        <field name="question"/>
+                                                        <field name="type" on_change="on_change_type(type)"/>
                                                     </group>
                                                 </group>
                                                 <newline/>
@@ -206,7 +202,7 @@
                                             </form>
                                             <tree string="Survey Question">
                                                 <field name="sequence" string="Seq"/>
-                                                <field name="question" colspan="4" select="1"/>
+                                                <field name="question"/>
                                                 <field name="answer_choice_ids"/>
                                             </tree>
                                         </field>
@@ -215,26 +211,21 @@
                                     </form>
                                 </field>
                         </page>
-                        <page string="Other">
-
-                            <separator colspan="4" string="Survey Details"/>
-                            <field name="note" colspan="4" nolabel="1"/>
-                        </page>
                         <page string="Invited User">
-                            <field name="invited_user_ids" nolabel="1" readonly="1"/>
+                            <field name="invited_user_ids" readonly="1"/>
                         </page>
                         <page string="History">
                             <group>
                                 <group>
-                                    <field name="date_open" select="1"/>
+                                    <field name="date_open"/>
                                     <field name="date_close"/>
                                 </group>
                                 <group>
-                                    <field name="tot_start_survey" select="1"/>
-                                    <field name="tot_comp_survey" select="1"/>
+                                    <field name="tot_start_survey"/>
+                                    <field name="tot_comp_survey"/>
                                 </group>
                             </group>
-                            <field name="history" colspan="4" nolabel="1">
+                            <field name="history" colspan="4">
                                 <tree string="History">
                                     <field name="date"/>
                                     <field name="user_id"/>
@@ -244,7 +235,6 @@
                                     <field name="user_id"/>
                                 </form>
                            </field>
-
                         </page>
                     </notebook>
                 </sheet>
@@ -316,7 +306,7 @@
                     <field name="color"/>
                     <templates>
                         <t t-name="kanban-box">
-                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_survey">
+                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card">
                                 <div class="oe_dropdown_toggle oe_dropdown_kanban">
                                     <span class="oe_e">i</span>
                                     <ul class="oe_dropdown_menu">
@@ -376,15 +366,20 @@
             <field name="arch" type="xml">
                 <form string="Survey Page" version="7.0">
                     <sheet>
-                        <group col="4">
-                            <field name="title" select="1"/>
-                            <field name="survey_id" select="1"/>
+                        <label for="title" class="oe_edit_only"/>
+                        <h1>
+                            <field name="title"/>
+                        </h1>
+                        <group colspan="4">
+                            <field name="survey_id"/>
                             <field name="sequence"/>
                         </group>
-                        <group col="4">
-                            <field name="note" nolabel="1" placeholder="Add a description on the survey page"/>
+                        <group colspan="4">
+                            <field name="note" nolabel="1" placeholder="Description on the survey page..."/>
                         </group>
                         <group col="4">
+                            <label for="question_ids"/>
+                            <newline/>
                             <field name="question_ids" nolabel="1">
                             <form string="Survey Question">
                                 <group>
@@ -393,8 +388,8 @@
                                         <field name="type" on_change="on_change_type(type)"/>
                                     </group>
                                     <group>
-                                        <field name="sequence"/>
-                                        <field name="tot_resp"/>
+                                        <field name="sequence" invisible="1"/>
+                                        <field name="tot_resp" invisible="1"/>
                                         <field name="in_visible_rating_weight" invisible="1"/>
                                         <field name="in_visible_menu_choice" invisible="1"/>
                                         <field name="in_visible_answer_type" invisible="1"/>
@@ -500,7 +495,7 @@
                                                         <field name="req_error_msg" colspan="4" nolabel="1"/>
                                                     </group>
                                                     <group colspan="4" attrs="{'invisible':[('type','!=','numerical_textboxes')]}">
-                                                        <group colspan="2" >
+                                                        <group colspan="2">
                                                             <field name="numeric_required_sum"/>
                                                         </group>
                                                         <newline/>
@@ -523,7 +518,7 @@
                             </form>
                             <tree string="Survey Question">
                                 <field name="sequence" string="Seq"/>
-                                <field name="question" colspan="4" select="1"/>
+                                <field name="question"/>
                                 <field name="answer_choice_ids"/>
                             </tree>
                             </field>