diff --git a/addons/idea/idea.py b/addons/idea/idea.py
index cc2c11bdd8a..3be4dd2e28d 100644
--- a/addons/idea/idea.py
+++ b/addons/idea/idea.py
@@ -49,7 +49,7 @@ class idea_idea(osv.osv):
         'create_uid': fields.many2one('res.users', 'Creator', required=True, readonly=True),
         'name': fields.char('Idea Summary', size=64, required=True, readonly=True, oldname='title', states={'draft':[('readonly',False)]}),
         'description': fields.text('Description', help='Content of the idea', readonly=True, states={'draft':[('readonly',False)]}),
-        'category_ids': fields.many2many('idea.category', 'Tags', readonly=True, states={'draft':[('readonly',False)]}),
+        'category_ids': fields.many2many('idea.category', string='Tags', readonly=True, states={'draft':[('readonly',False)]}),
         'state': fields.selection([('draft', 'New'),
             ('open', 'Accepted'),
             ('cancel', 'Refused'),
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 9cee10c3cbb..8d7a726f015 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -72,11 +72,14 @@
                     <button name="idea_cancel" string="Refuse" states="open"  class="oe_highlight"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,close"/>
                 </header>
+                <sheet>
                     <label for="name" class="oe_edit_only"/>
                     <h1><field name="name"/></h1>
-                    <label for="category_ids"/>
-                    <h2><field name="category_ids"/></h2>
+                    <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"/>
                 </footer>
diff --git a/addons/lunch/lunch.py b/addons/lunch/lunch.py
index 3b06ea5ce32..8cca4ced465 100644
--- a/addons/lunch/lunch.py
+++ b/addons/lunch/lunch.py
@@ -134,8 +134,8 @@ class lunch_order(osv.osv):
         'product': fields.many2one('lunch.product', 'Product', required=True, \
             readonly=True, states={'draft':[('readonly', False)]}, change_default=True),
         'date': fields.date('Date', readonly=True, states={'draft':[('readonly', False)]}),
-        'cashmove': fields.many2one('lunch.cashmove', 'CashMove' , readonly=True),
-        'descript': fields.char('Description Order', readonly=True, size=250, \
+        'cashmove': fields.many2one('lunch.cashmove', 'Cash Move' , readonly=True),
+        '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 55a59f76762..5e870c085c9 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -30,14 +30,18 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirmed"/>
                 </header>
                 <sheet string="Order">
-                    <group col="4">
-                        <field name="user_id"/>
-                        <field name="date"/>
-                        <field name="product" on_change="onchange_product(product)"/>
-                        <field name="category"/>
-                        <field name="descript"/>
-                        <field name="price"/>
-                        <field name="cashmove"/>
+                    <group>
+                        <group>
+                            <field name="product" on_change="onchange_product(product)"/>
+                            <field name="descript"/>
+                            <field name="price"/>
+                            <field name="category"/>
+                        </group>
+                        <group>
+                            <field name="user_id"/>
+                            <field name="cashmove"/>
+                            <field name="date"/>
+                        </group>
                     </group>
                 </sheet>
                 </form>
@@ -105,8 +109,10 @@
             <field name="model">lunch.cashbox</field>
             <field name="arch" type="xml">
                 <form string="Cashboxes" version="7.0">
-                    <field name="name"/>
-                    <field name="manager"/>
+                    <group colspan="4">
+                        <field name="name"/>
+                        <field name="manager"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -145,14 +151,16 @@
             <field name="model">lunch.cashmove</field>
             <field name="arch" type="xml">
                 <form string="CashMove" version="7.0">
-                    <group col="4">
-                        <field name="name"/>
-                        <field name="user_cashmove"/>
-                        <field name="amount"/>
-                        <field name="box"/>
-                        <field name="create_date"/>
-                        <field name="active"/>
-                    </group>
+                    <sheet>
+                        <group col="4">
+                            <field name="name"/>
+                            <field name="user_cashmove"/>
+                            <field name="amount"/>
+                            <field name="box"/>
+                            <field name="create_date"/>
+                            <field name="active"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -216,8 +224,9 @@
             <field name="model">lunch.category</field>
             <field name="arch" type="xml">
                 <form string="Category" version="7.0">
-                    <separator string="Category Related to Products" colspan="4"/>
-                    <field name="name"/>
+                    <group>
+                        <field name="name"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -250,18 +259,19 @@
             <field name="model">lunch.product</field>
             <field name="arch" type="xml">
                 <form string="Products" version="7.0">
-                     <group col="6">
-                          <field name="name"/>
-                          <field name="category_id"/>
-                          <field name="price" />
-                     </group>
-                     <notebook colspan="4">
-                         <page string="General Information">
-                              <field name="active"/>
-                              <separator string="Description" colspan="4" />
-                              <field name="description" nolabel="1" colspan="4" />
-                          </page>
-                     </notebook>
+                    <sheet>
+                        <group>
+                            <group>
+                                <field name="name"/>
+                                <field name="category_id"/>
+                                <field name="price" />
+                            </group>
+                            <group>
+                                <field name="active"/>
+                            </group>
+                            <field name="description" placeholder="Add a description" nolabel="1" colspan="4"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/survey/static/src/css/survey.css b/addons/survey/static/src/css/survey.css
index 0102dc1ade6..c18f584c9ed 100644
--- a/addons/survey/static/src/css/survey.css
+++ b/addons/survey/static/src/css/survey.css
@@ -1,20 +1,3 @@
-.oe_module_survey{
-    font-size: 12px;
-    border-style:dotted;
-    border-radius: 15px;
-    text-align: left;
-    height:145px;
-    width:220px;
-}
-
-.oe_survey_title{
-    font-size: 15px;
-    height: auto;
-    font-size: 16px;
-    font-weight:bold;
-    width: 205px;
-}
-
 .oe_survey_responsible{
     height: auto;
     width: 200px;
@@ -26,12 +9,6 @@
     width: 200px;
     font-size: 14px;
 }
-
-.oe_survey_fill{
-	align:right;
-	padding: 1px 165px;
-}
-
 .oe_survey_rate{
     font-size: 14px;
 }
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 40f13b226f8..0ebaa2aa586 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -68,6 +68,7 @@ class survey(osv.osv):
         'users': fields.many2many('res.users', 'survey_users_rel', 'sid', 'uid', 'Users'),
         'send_response': fields.boolean('Email Notification on Answer'),
         'type': fields.many2one('survey.type', 'Type'),
+        'color': fields.integer('Color Index'),
         'invited_user_ids': fields.many2many('res.users', 'survey_invited_user_rel', 'sid', 'uid', 'Invited User'),
     }
     _defaults = {
@@ -177,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 01e7de66a3e..cfefc8f7dea 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -26,189 +26,206 @@
                     <field name="state" widget="statusbar" statusbar_visible="open,close"/>
                 </header>
                 <sheet>
-                    <group col="6" colspan="6">
-                    <field name="title"/>
-                        <field name="responsible_id"/>
-                        <field name="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')]}"/>
-                        <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
-                            string="Edit Survey" type="action" icon="gtk-edit" context="{'active':True,'edit' : True,'survey_id': active_id}"/>
-                    </group>
-                    <notebook>
-                        <page string="Survey">
-                            <field name="page_ids" colspan="4" nolabel="1" mode="tree">
-                                <form string="Survey Page">
-                                    <field name="title"/>
-                                    <field name="sequence" groups="base.group_no_one"/>
-                                    <separator string="Description" colspan="4"/>
-                                    <field name="note" colspan="4" nolabel="1"/>
-                                    <field name="question_ids" height="200" width="200" colspan="4" nolabel="1">
-                                        <form string="Survey Question" >
-                                            <group col="6" colspan="6" height="600" width="200">
-                                            <field name="question" colspan="4"/>
-                                            <field name="sequence"/>
-                                            <field name="tot_resp"/>
-                                            <field name="type" on_change="on_change_type(type)"/>
-                                            <field name="in_visible_rating_weight" invisible="1"/>
-                                            <field name="in_visible_menu_choice" invisible="1"/>
-                                            <field name="in_visible_answer_type" invisible="1"/>
-                                            <notebook colspan="4">
-                                                <page string="Options">
-                                                    <group attrs="{'invisible':[('type','!=','multiple_textboxes_diff_type'),('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}">
-                                                      <separator string="Answer" colspan="4"/>
-                                                       <group colspan="4" attrs="{'invisible':[('type','=','table')]}">
-                                                           <field name="answer_choice_ids" nolabel="1" colspan="4" context="{'in_visible_answer_type': in_visible_answer_type}"/>
-                                                       </group>
-                                                       <group colspan="4" attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','table')]}">
-                                                           <field name="column_heading_ids" colspan="4" nolabel="1" context="{'in_visible_rating_weight':in_visible_rating_weight,'in_visible_menu_choice':in_visible_menu_choice}"/>
-                                                            <group colspan="4" attrs="{'invisible':[('type','!=','table')]}">
-                                                               <field name="no_of_rows"/>
-                                                            </group>
-                                                       </group>
+                    <div class="oe_button_box oe_right">
+                        <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"/>
+                        <field name="type" class="oe_inline"/>
+                    </h1>
+                    <group>
+                        <group>
+                            <field name="id" invisible="1"/>
+                            <field name="responsible_id" class="oe_inline"/>
+                            <field name="send_response"/>
+                        </group>
+                        <group>
+                            <field name="max_response_limit" attrs="{'readonly':[('state','in',('open','close'))]}"/>
+                            <field name="response_user" attrs="{'readonly':[('state','in',('open','close'))]}"/>
+                        </group>
+                     </group>
+                     <notebook>
+                        <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"/>
+                                    <h1>
+                                        <field name="title"/>
+                                    </h1>
+                                    <group>
+                                        <field name="note" placeholder="Description on the survey page..." nolabel="1"/>
+                                    </group>
+                                    <newline/>
+                                    <group>
+                                        <label for="question_ids"/>
+                                        <newline/>
+                                        <field name="question_ids" nolabel="1">
+                                            <form string="Survey Question">
+                                                <group>
+                                                    <group>
+                                                        <field name="question"/>
+                                                        <field name="type" on_change="on_change_type(type)"/>
                                                     </group>
-                                                    <newline/>
-                                                    <group  attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'), ('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale')]}">
-                                                        <separator string="Comment Field" colspan="4"/>
-                                                        <group colspan="4">
-                                                            <field name="is_comment_require"/>
-                                                        </group>
-                                                        <group attrs="{'invisible':[('is_comment_require','=',False)]}">
-                                                            <group col="4" colspan="4">
-                                                                <field name="comment_field_type" colspan="1"/>
-                                                                <group colspan="2" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
-                                                                    <field colspan="2" name="comment_label" />
+                                                </group>
+                                                <newline/>
+                                                <group>
+                                                <field name="in_visible_rating_weight" invisible="1"/>
+                                                <field name="in_visible_menu_choice" invisible="1"/>
+                                                <field name="in_visible_answer_type" invisible="1"/>
+                                                <notebook colspan="4">
+                                                    <page string="Options">
+                                                        <group attrs="{'invisible':[('type','!=','multiple_textboxes_diff_type'),('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}" string="Answer">
+                                                           <group colspan="4" attrs="{'invisible':[('type','=','table')]}">
+                                                               <field name="answer_choice_ids" nolabel="1" colspan="4" context="{'in_visible_answer_type': in_visible_answer_type}"/>
+                                                           </group>
+                                                           <group colspan="4" attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','table')]}">
+                                                               <field name="column_heading_ids" colspan="4" nolabel="1" context="{'in_visible_rating_weight':in_visible_rating_weight,'in_visible_menu_choice':in_visible_menu_choice}"/>
+                                                                <group colspan="4" attrs="{'invisible':[('type','!=','table')]}">
+                                                                   <field name="no_of_rows"/>
                                                                 </group>
-                                                            </group>
-                                                            <group col="6" colspan="4" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
-                                                                <field name="comment_valid_type" colspan="2"/>
-                                                                <group colspan="2" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'), ('comment_valid_type','!=','must_be_whole_number')]}">
-                                                                    <field name="comment_minimum_no" string="Between"/>
-                                                                    <field name="comment_maximum_no" string="and"/>
-                                                                </group>
-                                                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_decimal_number')]}">
-                                                                    <field name="comment_minimum_float" string="Between"/>
-                                                                    <field name="comment_maximum_float" string="and"/>
-                                                                </group>
-                                                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_date')]}">
-                                                                    <field name="comment_minimum_date" string="Between"/>
-                                                                    <field name="comment_maximum_date" string="and"/>
-                                                                </group>
-                                                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'),('comment_valid_type','!=','must_be_decimal_number'),('comment_valid_type','!=','must_be_whole_number'),('comment_valid_type','!=','must_be_date'),('comment_valid_type','!=','must_be_email_address')]}">
-                                                                    <label string="When the comment is an invalid format, display this error message" colspan="4"/>
-                                                                    <field name="comment_valid_err_msg" nolabel="1" colspan="4"/>
-                                                                </group>
-                                                            </group>
+                                                           </group>
                                                         </group>
-                                                    </group>
-                                                    <newline/>
-                                                    <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_one_ans'),('type','!=','rating_scale')]}">
-                                                        <field name="comment_column"/>
-                                                        <group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
-                                                            <field name="column_name" colspan="2"/>
-                                                        </group>
-                                                    </group>
-                                                    <newline/>
-                                                    <group attrs="{'invisible':[('type','!=','single_textbox'), ('type','!=','multiple_textboxes')]}">
-                                                        <separator string="Validation" colspan="4"/>
-                                                        <group colspan="4">
-                                                            <field name="is_validation_require"/>
-                                                        </group>
-                                                        <group col="6" colspan="4" attrs="{'invisible':[('is_validation_require','=',False)]}">
-                                                            <field name="validation_type" colspan="2"/>
-                                                            <group colspan="2" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'), ('validation_type','!=','must_be_whole_number')]}">
-                                                                <field name="validation_minimum_no" string="Between"/>
-                                                                <field name="validation_maximum_no" string="and"/>
-                                                            </group>
-                                                            <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_decimal_number')]}">
-                                                                <field name="validation_minimum_float" string="Between"/>
-                                                                <field name="validation_maximum_float" string="and"/>
-                                                            </group>
-                                                            <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_date')]}">
-                                                                <field name="validation_minimum_date" string="Between"/>
-                                                                <field name="validation_maximum_date" string="and"/>
-                                                            </group>
-                                                        </group>
-                                                        <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'),('validation_type','!=','must_be_decimal_number'),('validation_type','!=','must_be_whole_number'),('validation_type','!=','must_be_date'),('validation_type','!=','must_be_email_address')]}">
-                                                            <label string="When the comment is an invalid format, display this error message" colspan="4"/>
-                                                            <field name="validation_valid_err_msg" nolabel="1" colspan="4"/>
-                                                        </group>
-                                                    </group>
-                                                    <newline/>
-                                                    <group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','single_textbox'),('type','!=','comment'),('type','!=','multiple_textboxes_diff_type')]}">
-                                                        <separator string="Required Answer" colspan="4"/>
                                                         <newline/>
-                                                        <field name="is_require_answer"/>
-                                                        <group col="6" colspan="4" attrs="{'invisible':[('is_require_answer','=',False)]}">
-                                                            <group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','multiple_textboxes_diff_type')]}">
-                                                                <field name="required_type"/>
-                                                                <group colspan="2" attrs="{'invisible':[('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly')]}">
-                                                                    <field name="req_ans" />
-                                                                </group>
-                                                                <group colspan="4" attrs="{'invisible':[('required_type','!=','a range')]}">
-                                                                    <field name="minimum_req_ans"/>
-                                                                    <field name="maximum_req_ans"/>
-                                                                </group>
+                                                        <group  attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'), ('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale')]}">
+                                                            <separator string="Comment Field" colspan="4"/>
+                                                            <group colspan="4">
+                                                                <field name="is_comment_require"/>
                                                             </group>
-                                                            <group colspan="4" attrs="{'invisible':[('required_type','!=','all'),('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly'),('required_type','!=','a range'),('is_require_answer','!=',True)]}">
-                                                                <label string="When the question is not answered, display this error message:"/>
-                                                                <field name="req_error_msg" colspan="4" nolabel="1"/>
-                                                            </group>
-                                                            <group colspan="4" attrs="{'invisible':[('type','!=','numerical_textboxes')]}">
-                                                                <group colspan="2" >
-                                                                    <field name="numeric_required_sum"/>
+                                                            <group attrs="{'invisible':[('is_comment_require','=',False)]}">
+                                                                <group col="4" colspan="4">
+                                                                    <field name="comment_field_type" colspan="1"/>
+                                                                    <group colspan="2" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
+                                                                        <field colspan="2" name="comment_label" />
+                                                                    </group>
+                                                                </group>
+                                                                <group col="6" colspan="4" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
+                                                                    <field name="comment_valid_type" colspan="2"/>
+                                                                    <group colspan="2" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'), ('comment_valid_type','!=','must_be_whole_number')]}">
+                                                                        <field name="comment_minimum_no" string="Between"/>
+                                                                        <field name="comment_maximum_no" string="and"/>
+                                                                    </group>
+                                                                    <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_decimal_number')]}">
+                                                                        <field name="comment_minimum_float" string="Between"/>
+                                                                        <field name="comment_maximum_float" string="and"/>
+                                                                    </group>
+                                                                    <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_date')]}">
+                                                                        <field name="comment_minimum_date" string="Between"/>
+                                                                        <field name="comment_maximum_date" string="and"/>
+                                                                    </group>
+                                                                    <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'),('comment_valid_type','!=','must_be_decimal_number'),('comment_valid_type','!=','must_be_whole_number'),('comment_valid_type','!=','must_be_date'),('comment_valid_type','!=','must_be_email_address')]}">
+                                                                        <label string="When the comment is an invalid format, display this error message" colspan="4"/>
+                                                                        <field name="comment_valid_err_msg" nolabel="1" colspan="4"/>
+                                                                    </group>
                                                                 </group>
-                                                                <newline/>
-                                                                <label string="When the choices do not add up correctly, display this error message"/>
-                                                                <field name="numeric_required_sum_err_msg" colspan="4" nolabel="1"/>
-                                                            </group>
-                                                            <group colspan="4" attrs="{'invisible':[('type','!=','rating_scale')]}">
-                                                                <field name="rating_allow_one_column_require"/>
                                                             </group>
                                                         </group>
-                                                    </group>
-                                                    <newline/>
-                                                    <group attrs="{'invisible':[('type','!=','descriptive_text')]}">
-                                                        <separator string="Descriptive Text" colspan="4"/>
-                                                        <field name="descriptive_text" colspan="4" nolabel="1"/>
-                                                    </group>
-                                                </page>
-                                            </notebook>
-                                            </group>
-                                        </form>
-                                        <tree string="Survey Question">
-                                            <field name="sequence" string="Seq"/>
-                                            <field name="question" colspan="4"/>
-                                            <field name="answer_choice_ids"/>
-                                        </tree>
-                                    </field>
-                                </form>
-                            </field>
-                        </page>
-                        <page string="Other">
-                            <group colspan="6" col='4'>
-                                <field name="max_response_limit"
-                                    attrs="{'readonly':[('state','in',('open','close'))]}"/>
-                                <field name="response_user"
-                                    attrs="{'readonly':[('state','in',('open','close'))]}"/>
-                                <field name="type"/>
-                                <field name="send_response"/>
-                            </group>
-                            <separator colspan="4" string="Survey Details"/>
-                            <field name="note" colspan="4" nolabel="1"/>
+                                                        <newline/>
+                                                        <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_one_ans'),('type','!=','rating_scale')]}">
+                                                            <field name="comment_column"/>
+                                                            <group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
+                                                                <field name="column_name" colspan="2"/>
+                                                            </group>
+                                                        </group>
+                                                        <newline/>
+                                                        <group attrs="{'invisible':[('type','!=','single_textbox'), ('type','!=','multiple_textboxes')]}">
+                                                            <separator string="Validation" colspan="4"/>
+                                                            <group colspan="4">
+                                                                <field name="is_validation_require"/>
+                                                            </group>
+                                                            <group col="6" colspan="4" attrs="{'invisible':[('is_validation_require','=',False)]}">
+                                                                <field name="validation_type" colspan="2"/>
+                                                                <group colspan="2" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'), ('validation_type','!=','must_be_whole_number')]}">
+                                                                    <field name="validation_minimum_no" string="Between"/>
+                                                                    <field name="validation_maximum_no" string="and"/>
+                                                                </group>
+                                                                <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_decimal_number')]}">
+                                                                    <field name="validation_minimum_float" string="Between"/>
+                                                                    <field name="validation_maximum_float" string="and"/>
+                                                                </group>
+                                                                <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_date')]}">
+                                                                    <field name="validation_minimum_date" string="Between"/>
+                                                                    <field name="validation_maximum_date" string="and"/>
+                                                                </group>
+                                                            </group>
+                                                            <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'),('validation_type','!=','must_be_decimal_number'),('validation_type','!=','must_be_whole_number'),('validation_type','!=','must_be_date'),('validation_type','!=','must_be_email_address')]}">
+                                                                <label string="When the comment is an invalid format, display this error message" colspan="4"/>
+                                                                <field name="validation_valid_err_msg" nolabel="1" colspan="4"/>
+                                                            </group>
+                                                        </group>
+                                                        <newline/>
+                                                        <group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','single_textbox'),('type','!=','comment'),('type','!=','multiple_textboxes_diff_type')]}">
+                                                            <separator string="Required Answer" colspan="4"/>
+                                                            <newline/>
+                                                            <field name="is_require_answer"/>
+                                                            <group col="6" colspan="4" attrs="{'invisible':[('is_require_answer','=',False)]}">
+                                                                <group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','multiple_textboxes_diff_type')]}">
+                                                                    <field name="required_type"/>
+                                                                    <group colspan="2" attrs="{'invisible':[('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly')]}">
+                                                                        <field name="req_ans" />
+                                                                    </group>
+                                                                    <group colspan="4" attrs="{'invisible':[('required_type','!=','a range')]}">
+                                                                        <field name="minimum_req_ans"/>
+                                                                        <field name="maximum_req_ans"/>
+                                                                    </group>
+                                                                </group>
+                                                                <group colspan="4" attrs="{'invisible':[('required_type','!=','all'),('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly'),('required_type','!=','a range'),('is_require_answer','!=',True)]}">
+                                                                    <label string="When the question is not answered, display this error message:"/>
+                                                                    <field name="req_error_msg" colspan="4" nolabel="1"/>
+                                                                </group>
+                                                                <group colspan="4" attrs="{'invisible':[('type','!=','numerical_textboxes')]}">
+                                                                    <group colspan="2" >
+                                                                        <field name="numeric_required_sum"/>
+                                                                    </group>
+                                                                    <newline/>
+                                                                    <label string="When the choices do not add up correctly, display this error message"/>
+                                                                    <field name="numeric_required_sum_err_msg" colspan="4" nolabel="1"/>
+                                                                </group>
+                                                                <group colspan="4" attrs="{'invisible':[('type','!=','rating_scale')]}">
+                                                                    <field name="rating_allow_one_column_require"/>
+                                                                </group>
+                                                            </group>
+                                                        </group>
+                                                        <newline/>
+                                                        <group attrs="{'invisible':[('type','!=','descriptive_text')]}">
+                                                            <separator string="Descriptive Text" colspan="4"/>
+                                                            <field name="descriptive_text" colspan="4" nolabel="1"/>
+                                                        </group>
+                                                    </page>
+                                                </notebook>
+                                                </group>
+                                            </form>
+                                            <tree string="Survey Question">
+                                                <field name="sequence" string="Seq"/>
+                                                <field name="question"/>
+                                                <field name="answer_choice_ids"/>
+                                            </tree>
+                                        </field>
+                                    </group>
+                                    </sheet>
+                                    </form>
+                                </field>
                         </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">
-                            <field name="date_open"/>
-                            <field name="date_close"/>
-                            <field name="tot_start_survey"/>
-                            <field name="tot_comp_survey"/>
-                            <field name="history" colspan="4" nolabel="1">
+                            <group>
+                                <group>
+                                    <field name="date_open"/>
+                                    <field name="date_close"/>
+                                </group>
+                                <group>
+                                    <field name="tot_start_survey"/>
+                                    <field name="tot_comp_survey"/>
+                                </group>
+                            </group>
+                            <field name="history" colspan="4">
                                 <tree string="History">
                                     <field name="date"/>
                                     <field name="user_id"/>
@@ -217,8 +234,8 @@
                                     <field name="date"/>
                                     <field name="user_id"/>
                                 </form>
-                               </field>
-                           </page>
+                           </field>
+                        </page>
                     </notebook>
                 </sheet>
                 </form>
@@ -286,32 +303,37 @@
                 <kanban>
                     <field name="title"/>
                     <field name="date_open"/>
+                    <field name="color"/>
                     <templates>
                         <t t-name="kanban-box">
-                          <div class="oe_module_survey">
-                            <a class="oe_module_icon">
-                               <div class="oe_survey_title"><t t-esc="record.title.raw_value.toString()"/></div><br/>
-                               <div class="oe_survey_responsible">
-                                   <t t-if="record.responsible_id.raw_value">By: <field name="responsible_id"/></t>
-                               </div><br/>
-                               <div class="oe_survey_start_date">
-                                  Open From:
-                                   <t t-if="record.date_open.raw_value">
-                                       <t t-esc="record.date_open.raw_value.getDate()"/>
-                                       <t t-esc="record.date_open.raw_value.toString('MMM')"/>, 
-                                       <t t-esc="record.date_open.raw_value.getFullYear()"/>
-                                   </t>
-                               </div><br/>
-                               <div class="oe_survey_rate">
-                                   Rate:
-    							<div class="oe_survey_fill" >
-                                   <button type="object" name="fill_survey" class="">
-                                       <span>Fill</span>
-                                   </button>
-                               </div>                                   
-                               </div>
-                            </a>
-                          </div>  
+                            <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">
+                                        <li><a type="edit">Edit...</a></li>
+                                        <li><a type="delete">Delete</a></li>
+                                        <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
+                                    </ul>
+                                </div>
+                                <div class="oe_kanban_content">
+                                    <h3 class="oe_kanban_ellipsis"><t t-esc="record.title.raw_value.toString()"><field name="title"/></t></h3>
+                                    <div class="oe_survey_responsible">
+                                       <t t-if="record.responsible_id.raw_value">By: <field name="responsible_id"/></t>
+                                   </div><br/>
+                                   <div class="oe_survey_start_date">
+                                       <t t-if="record.date_open.raw_value">
+                                           Opened at
+                                           <t t-esc="record.date_open.raw_value.getDate()"/>
+                                           <t t-esc="record.date_open.raw_value.toString('MMM')"/>,
+                                           <t t-esc="record.date_open.raw_value.getFullYear()"/>
+                                       </t>
+                                   </div><br/>
+                                   <div class="oe_survey_rate">
+                                       Rate:
+                                        <a name="fill_survey" type="object">Fill</a>
+                                   </div>
+                                </div>
+                            </div>
                         </t>
                     </templates>
                 </kanban>
@@ -344,149 +366,163 @@
             <field name="arch" type="xml">
                 <form string="Survey Page" version="7.0">
                     <sheet>
-                        <field name="title" colspan="4"/>
-                        <field name="survey_id"/>
-                        <field name="sequence"/>
-                        <separator string="Description" colspan="4"/>
-                        <field name="note" colspan="4" nolabel="1"/>
-                        <field name="question_ids" colspan="4" nolabel="1">
-                        <form string="Survey Question">
-                            <field name="question" colspan="4"/>
+                        <label for="title" class="oe_edit_only"/>
+                        <h1>
+                            <field name="title"/>
+                        </h1>
+                        <group colspan="4">
+                            <field name="survey_id"/>
                             <field name="sequence"/>
-                            <field name="tot_resp"/>
-                            <field name="type" on_change="on_change_type(type)"/>
-                            <field name="in_visible_rating_weight" invisible="1"/>
-                            <field name="in_visible_menu_choice" invisible="1"/>
-                            <field name="in_visible_answer_type" invisible="1"/>
-                            <notebook colspan="4">
-                                <page string="Options">
-                                    <group attrs="{'invisible':[('type','!=','multiple_textboxes_diff_type'),('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}">
-                                      <separator string="Answer" colspan="4"/>
-                                       <group colspan="4" attrs="{'invisible':[('type','=','table')]}">
-                                           <field name="answer_choice_ids" nolabel="1" colspan="4" context="{'in_visible_answer_type': in_visible_answer_type}"/>
-                                       </group>
-                                       <group colspan="4" attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','table')]}">
-                                           <field name="column_heading_ids" colspan="4" nolabel="1" context="{'in_visible_rating_weight':in_visible_rating_weight,'in_visible_menu_choice':in_visible_menu_choice}"/>
-                                            <group colspan="4" attrs="{'invisible':[('type','!=','table')]}">
-                                               <field name="no_of_rows"/>
-                                            </group>
-                                       </group>
+                        </group>
+                        <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>
+                                    <group>
+                                        <field name="question" select="1"/>
+                                        <field name="type" on_change="on_change_type(type)"/>
+                                    </group>
+                                    <group>
+                                        <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"/>
                                     </group>
                                     <newline/>
-                                    <group  attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'), ('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale')]}">
-                                        <separator string="Comment Field" colspan="4"/>
-                                        <group colspan="4">
-                                            <field name="is_comment_require"/>
-                                        </group>
-                                        <group attrs="{'invisible':[('is_comment_require','=',False)]}">
-                                            <group col="4" colspan="4">
-                                                <field name="comment_field_type" colspan="1"/>
-                                                <group colspan="2" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
-                                                    <field colspan="2" name="comment_label" />
+                                    <notebook colspan="4">
+                                        <page string="Options">
+                                            <group attrs="{'invisible':[('type','!=','multiple_textboxes_diff_type'),('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}" string="Answer" col="4">
+                                               <group attrs="{'invisible':[('type','=','table')]}">
+                                                   <field name="answer_choice_ids" nolabel="1" context="{'in_visible_answer_type': in_visible_answer_type}"/>
+                                               </group>
+                                               <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','table')]}">
+                                                   <field name="column_heading_ids" nolabel="1" context="{'in_visible_rating_weight':in_visible_rating_weight,'in_visible_menu_choice':in_visible_menu_choice}"/>
+                                                    <group attrs="{'invisible':[('type','!=','table')]}">
+                                                       <field name="no_of_rows"/>
+                                                    </group>
+                                               </group>
+                                            </group>
+                                            <newline/>
+                                            <group  attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'), ('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale')]}" string="Comment Field" col="4">
+                                                <group>
+                                                    <field name="is_comment_require"/>
+                                                </group>
+                                                <group attrs="{'invisible':[('is_comment_require','=',False)]}">
+                                                    <group>
+                                                        <field name="comment_field_type" colspan="1"/>
+                                                        <group attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
+                                                            <field name="comment_label" />
+                                                        </group>
+                                                    </group>
+                                                    <group col="6" colspan="4" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
+                                                        <field name="comment_valid_type" colspan="2"/>
+                                                        <group colspan="2" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'), ('comment_valid_type','!=','must_be_whole_number')]}">
+                                                            <field name="comment_minimum_no" string="Between"/>
+                                                            <field name="comment_maximum_no" string="and"/>
+                                                        </group>
+                                                        <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_decimal_number')]}">
+                                                            <field name="comment_minimum_float" string="Between"/>
+                                                            <field name="comment_maximum_float" string="and"/>
+                                                        </group>
+                                                        <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_date')]}">
+                                                            <field name="comment_minimum_date" string="Between"/>
+                                                            <field name="comment_maximum_date" string="and"/>
+                                                        </group>
+                                                        <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'),('comment_valid_type','!=','must_be_decimal_number'),('comment_valid_type','!=','must_be_whole_number'),('comment_valid_type','!=','must_be_date'),('comment_valid_type','!=','must_be_email_address')]}">
+                                                            <label string="When the comment is an invalid format, display this error message" colspan="4"/>
+                                                            <field name="comment_valid_err_msg" nolabel="1" colspan="4"/>
+                                                        </group>
+                                                    </group>
                                                 </group>
                                             </group>
-                                            <group col="6" colspan="4" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
-                                                <field name="comment_valid_type" colspan="2"/>
-                                                <group colspan="2" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'), ('comment_valid_type','!=','must_be_whole_number')]}">
-                                                    <field name="comment_minimum_no" string="Between"/>
-                                                    <field name="comment_maximum_no" string="and"/>
+                                            <newline/>
+                                            <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_one_ans'),('type','!=','rating_scale')]}">
+                                                <field name="comment_column"/>
+                                                <group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
+                                                    <field name="column_name" colspan="2"/>
                                                 </group>
-                                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_decimal_number')]}">
-                                                    <field name="comment_minimum_float" string="Between"/>
-                                                    <field name="comment_maximum_float" string="and"/>
+                                            </group>
+                                            <newline/>
+                                            <group attrs="{'invisible':[('type','!=','single_textbox'), ('type','!=','multiple_textboxes')]}">
+                                                <separator string="Validation" colspan="4"/>
+                                                <group colspan="4">
+                                                    <field name="is_validation_require"/>
                                                 </group>
-                                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_date')]}">
-                                                    <field name="comment_minimum_date" string="Between"/>
-                                                    <field name="comment_maximum_date" string="and"/>
+                                                <group col="6" colspan="4" attrs="{'invisible':[('is_validation_require','=',False)]}">
+                                                    <field name="validation_type" colspan="2"/>
+                                                    <group colspan="2" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'), ('validation_type','!=','must_be_whole_number')]}">
+                                                        <field name="validation_minimum_no" string="Between"/>
+                                                        <field name="validation_maximum_no" string="and"/>
+                                                    </group>
+                                                    <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_decimal_number')]}">
+                                                        <field name="validation_minimum_float" string="Between"/>
+                                                        <field name="validation_maximum_float" string="and"/>
+                                                    </group>
+                                                    <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_date')]}">
+                                                        <field name="validation_minimum_date" string="Between"/>
+                                                        <field name="validation_maximum_date" string="and"/>
+                                                    </group>
                                                 </group>
-                                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'),('comment_valid_type','!=','must_be_decimal_number'),('comment_valid_type','!=','must_be_whole_number'),('comment_valid_type','!=','must_be_date'),('comment_valid_type','!=','must_be_email_address')]}">
+                                                <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'),('validation_type','!=','must_be_decimal_number'),('validation_type','!=','must_be_whole_number'),('validation_type','!=','must_be_date'),('validation_type','!=','must_be_email_address')]}">
                                                     <label string="When the comment is an invalid format, display this error message" colspan="4"/>
-                                                    <field name="comment_valid_err_msg" nolabel="1" colspan="4"/>
+                                                    <field name="validation_valid_err_msg" nolabel="1" colspan="4"/>
                                                 </group>
                                             </group>
-                                        </group>
-                                    </group>
-                                    <newline/>
-                                    <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_one_ans'),('type','!=','rating_scale')]}">
-                                        <field name="comment_column"/>
-                                        <group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
-                                            <field name="column_name" colspan="2"/>
-                                        </group>
-                                    </group>
-                                    <newline/>
-                                    <group attrs="{'invisible':[('type','!=','single_textbox'), ('type','!=','multiple_textboxes')]}">
-                                        <separator string="Validation" colspan="4"/>
-                                        <group colspan="4">
-                                            <field name="is_validation_require"/>
-                                        </group>
-                                        <group col="6" colspan="4" attrs="{'invisible':[('is_validation_require','=',False)]}">
-                                            <field name="validation_type" colspan="2"/>
-                                            <group colspan="2" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'), ('validation_type','!=','must_be_whole_number')]}">
-                                                <field name="validation_minimum_no" string="Between"/>
-                                                <field name="validation_maximum_no" string="and"/>
-                                            </group>
-                                            <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_decimal_number')]}">
-                                                <field name="validation_minimum_float" string="Between"/>
-                                                <field name="validation_maximum_float" string="and"/>
-                                            </group>
-                                            <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_date')]}">
-                                                <field name="validation_minimum_date" string="Between"/>
-                                                <field name="validation_maximum_date" string="and"/>
-                                            </group>
-                                        </group>
-                                        <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'),('validation_type','!=','must_be_decimal_number'),('validation_type','!=','must_be_whole_number'),('validation_type','!=','must_be_date'),('validation_type','!=','must_be_email_address')]}">
-                                            <label string="When the comment is an invalid format, display this error message" colspan="4"/>
-                                            <field name="validation_valid_err_msg" nolabel="1" colspan="4"/>
-                                        </group>
-                                    </group>
-                                    <newline/>
-                                    <group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','single_textbox'),('type','!=','comment'),('type','!=','multiple_textboxes_diff_type')]}">
-                                        <separator string="Required Answer" colspan="4"/>
-                                        <newline/>
-                                        <field name="is_require_answer"/>
-                                        <group col="6" colspan="4" attrs="{'invisible':[('is_require_answer','=',False)]}">
-                                            <group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','multiple_textboxes_diff_type')]}">
-                                                <field name="required_type"/>
-                                                <group colspan="2" attrs="{'invisible':[('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly')]}">
-                                                    <field name="req_ans" />
-                                                </group>
-                                                <group colspan="4" attrs="{'invisible':[('required_type','!=','a range')]}">
-                                                    <field name="minimum_req_ans"/>
-                                                    <field name="maximum_req_ans"/>
-                                                </group>
-                                            </group>
-                                            <group colspan="4" attrs="{'invisible':[('required_type','!=','all'),('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly'),('required_type','!=','a range'),('is_require_answer','!=',True)]}">
-                                                <label string="When the question is not answered, display this error message:"/>
-                                                <field name="req_error_msg" colspan="4" nolabel="1"/>
-                                            </group>
-                                            <group colspan="4" attrs="{'invisible':[('type','!=','numerical_textboxes')]}">
-                                                <group colspan="2" >
-                                                    <field name="numeric_required_sum"/>
-                                                </group>
+                                            <newline/>
+                                            <group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','single_textbox'),('type','!=','comment'),('type','!=','multiple_textboxes_diff_type')]}">
+                                                <separator string="Required Answer" colspan="4"/>
                                                 <newline/>
-                                                <label string="When the choices do not add up correctly, display this error message"/>
-                                                <field name="numeric_required_sum_err_msg" colspan="4" nolabel="1"/>
+                                                <field name="is_require_answer"/>
+                                                <group col="6" colspan="4" attrs="{'invisible':[('is_require_answer','=',False)]}">
+                                                    <group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','multiple_textboxes_diff_type')]}">
+                                                        <field name="required_type"/>
+                                                        <group colspan="2" attrs="{'invisible':[('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly')]}">
+                                                            <field name="req_ans" />
+                                                        </group>
+                                                        <group colspan="4" attrs="{'invisible':[('required_type','!=','a range')]}">
+                                                            <field name="minimum_req_ans"/>
+                                                            <field name="maximum_req_ans"/>
+                                                        </group>
+                                                    </group>
+                                                    <group colspan="4" attrs="{'invisible':[('required_type','!=','all'),('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly'),('required_type','!=','a range'),('is_require_answer','!=',True)]}">
+                                                        <label string="When the question is not answered, display this error message:"/>
+                                                        <field name="req_error_msg" colspan="4" nolabel="1"/>
+                                                    </group>
+                                                    <group colspan="4" attrs="{'invisible':[('type','!=','numerical_textboxes')]}">
+                                                        <group colspan="2">
+                                                            <field name="numeric_required_sum"/>
+                                                        </group>
+                                                        <newline/>
+                                                        <label string="When the choices do not add up correctly, display this error message"/>
+                                                        <field name="numeric_required_sum_err_msg" colspan="4" nolabel="1"/>
+                                                    </group>
+                                                    <group colspan="4" attrs="{'invisible':[('type','!=','rating_scale')]}">
+                                                        <field name="rating_allow_one_column_require"/>
+                                                    </group>
+                                                </group>
                                             </group>
-                                            <group colspan="4" attrs="{'invisible':[('type','!=','rating_scale')]}">
-                                                <field name="rating_allow_one_column_require"/>
+                                            <newline/>
+                                            <group attrs="{'invisible':[('type','!=','descriptive_text')]}">
+                                                <separator string="Descriptive Text" colspan="4"/>
+                                                <field name="descriptive_text" colspan="4" nolabel="1"/>
                                             </group>
-                                        </group>
-                                    </group>
-                                    <newline/>
-                                    <group attrs="{'invisible':[('type','!=','descriptive_text')]}">
-                                        <separator string="Descriptive Text" colspan="4"/>
-                                        <field name="descriptive_text" colspan="4" nolabel="1"/>
-                                    </group>
-                                </page>
-                            </notebook>
-    
-                        </form>
-                        <tree string="Survey Question">
-                            <field name="sequence" string="Seq"/>
-                            <field name="question" colspan="4"/>
-                            <field name="answer_choice_ids"/>
-                        </tree>
-                        </field>
+                                        </page>
+                                    </notebook>
+                                </group>
+                            </form>
+                            <tree string="Survey Question">
+                                <field name="sequence" string="Seq"/>
+                                <field name="question"/>
+                                <field name="answer_choice_ids"/>
+                            </tree>
+                            </field>
+                        </group>
                     </sheet>
                 </form>
             </field>
diff --git a/addons/survey/wizard/survey_browse_answer.xml b/addons/survey/wizard/survey_browse_answer.xml
index 29cdd4ad5fb..20c028068bb 100644
--- a/addons/survey/wizard/survey_browse_answer.xml
+++ b/addons/survey/wizard/survey_browse_answer.xml
@@ -18,7 +18,6 @@
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group col="4">
-                        <separator colspan="4"  string =  "Select Survey and Related Answer"/>
                         <field name="survey_id"/>
                         <field name="response_id" domain="[('survey_id','=', survey_id)]"/>
                     </group>
diff --git a/addons/survey/wizard/survey_selection.xml b/addons/survey/wizard/survey_selection.xml
index 7dc736d3008..15b4af6756f 100644
--- a/addons/survey/wizard/survey_selection.xml
+++ b/addons/survey/wizard/survey_selection.xml
@@ -16,10 +16,10 @@
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
-                    <group string="Select Survey">
+                    <group>
                         <field name="survey_id" on_change="on_change_survey(survey_id)"/>
                     </group>
-                    <field name="note" attrs="{'readonly': [('survey_id','=',False)]}"/>
+                    <field name="note" placeholder="Add Description" attrs="{'readonly': [('survey_id','=',False)]}"/>
                 </form>
             </field>
         </record>