diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 3d780cd5851..583e073d5eb 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -344,7 +344,7 @@ class survey_question(osv.osv):
         'minimum_req_ans': fields.integer('Minimum Required Answer'),
         'req_error_msg': fields.text('Error Message', translate=True),
         'allow_comment': fields.boolean('Allow Comment Field'),
-        'sequence': fields.integer('Sequence'),
+        'sequence': fields.integer('Sequence', select=True),
         'tot_resp': fields.function(_calc_response, string="Total Answer"),
         'survey': fields.related('page_id', 'survey_id', type='many2one', relation='survey', string='Survey'),
         'descriptive_text': fields.text('Descriptive Text', size=255, translate=True),
@@ -626,7 +626,7 @@ class survey_answer(osv.osv):
     _columns = {
         'question_id': fields.many2one('survey.question', 'Question', ondelete='cascade'),
         'answer': fields.char('Answer', size=128, required=1, translate=True),
-        'sequence': fields.integer('Sequence'),
+        'sequence': fields.integer('Sequence', select=True),
         'response': fields.function(_calc_response_avg, string="#Answer", multi='sums'),
         'average': fields.function(_calc_response_avg, string="#Avg", multi='sums'),
         'type': fields.selection([('char', 'Character'), ('date', 'Date'), ('datetime', 'Date & Time'), \
@@ -636,7 +636,6 @@ class survey_answer(osv.osv):
         'in_visible_answer_type': fields.boolean('Is Answer Type Invisible??')
     }
     _defaults = {
-        # 'sequence': 1,
         'type': 'char',
         'in_visible_answer_type': _get_in_visible_answer_type,
     }
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 9cb3ffd75ea..247cfeb7d58 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -49,162 +49,12 @@
                         </group>
                     </group>
                     <field name="page_ids" colspan="4" mode="tree" attrs="{'readonly':[('state','=','close')]}">
-                        <form string="Survey Page" version="7.0">
-                            <sheet>
-                            <label for="title" class="oe_edit_only"/>
-                            <h1>
-                                <field name="title"/>
-                            </h1>
-                            <field name="note" placeholder="Description on the survey page..."/>
-                            <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>
-                                        </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','!=','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','!=','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>
-                                                <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','!=','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>
-                                                        </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>
-                                                <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','!=','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','!=','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>
+                        <tree string="Survey Question">
+                            <field name="sequence" widget="handle"/>
+                            <field name="title"/>
+                            <field name="question_ids"/>
+                        </tree>
+                    </field>
                     <field name="note" placeholder="Survey description..." attrs="{'readonly':[('state','=','close')]}"/>
                 </sheet>
                 <div class="oe_chatter">
@@ -344,157 +194,14 @@
                         <h1>
                             <field name="title"/>
                         </h1>
-                        <group colspan="4">
-                            <field name="survey_id"/>
-                            <field name="sequence"/>
-                        </group>
-                        <group colspan="4">
+                        <group colspan="4" col="1">
                             <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/>
-                                    <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','!=','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','!=','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','!=','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>
-                                            <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','!=','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','!=','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 name="question_ids" nolabel="1" mode="tree">
+                                <tree string="Survey Question">
+                                    <field name="sequence" widget="handle"/>
+                                    <field name="question"/>
+                                    <field name="type"/>
+                                </tree>
                             </field>
                         </group>
                     </sheet>
@@ -508,7 +215,7 @@
             <field name="model">survey.page</field>
             <field name="arch" type="xml">
                 <tree string="Survey Page">
-                    <field name="sequence" string="Seq"/>
+                    <field name="sequence" widget="handle"/>
                     <field name="title"/>
                     <field name="survey_id"/>
                     <field name="question_ids" string="#Questions"/>
@@ -570,134 +277,118 @@
             <field name="arch" type="xml">
                 <form string="Survey Question">
                     <field name="question" colspan="4"/>
-                    <field name="page_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','!=','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','!=','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>
-                            <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','!=','rating_scale')]}">
-                                <separator string="Comment Field" colspan="4"/>
-                                <group colspan="4">
-                                    <field name="is_comment_require"/>
+                    <group colspan="4" col="1">
+                        <group string="Answer" attrs="{'invisible':[('type','not in',['multiple_textboxes_diff_type', 'multiple_choice_only_one_ans', 'multiple_choice_multiple_ans', 'matrix_of_choices_only_one_ans', 'matrix_of_choices_only_multi_ans', 'rating_scale', 'multiple_textboxes', 'numerical_textboxes', 'date', 'date_and_time', 'table'])]}">
+                           <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','not in',['matrix_of_choices_only_multi_ans', 'matrix_of_choices_only_one_ans', 'rating_scale', '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','not in',['table'])]}">
+                                   <field name="no_of_rows"/>
                                 </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>
+                           </group>
+                        </group>
+                        <group string="Comment Field" attrs="{'invisible':[('type','not in',['multiple_choice_only_one_ans', 'multiple_choice_multiple_ans', 'matrix_of_choices_only_multi_ans', 'matrix_of_choices_only_one_ans', 'rating_scale'])]}">
+                            <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>
-                                    <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 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>
-                            <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 attrs="{'invisible':[('type','not in',['matrix_of_choices_only_one_ans', 'rating_scale'])]}">
+                            <field name="comment_column"/>
+                            <group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
+                                <field name="column_name" colspan="2"/>
+                            </group>
+                        </group>
+                        <group string="Validation" attrs="{'invisible':[('type','not in',['single_textbox', 'multiple_textboxes'])]}">
+                            <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>
-                            <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 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>
+                        <group string="Required Answer" attrs="{'invisible':[('type','not in',['multiple_choice_only_one_ans', 'multiple_choice_multiple_ans', 'matrix_of_choices_only_one_ans', 'matrix_of_choices_only_multi_ans', 'rating_scale', 'multiple_textboxes', 'numerical_textboxes', 'date', 'date_and_time', 'single_textbox', 'comment', 'multiple_textboxes_diff_type'])]}">
+                            <field name="is_require_answer"/>
+                            <group col="6" colspan="4" attrs="{'invisible':[('is_require_answer','=',False)]}">
+                                <group colspan="4" attrs="{'invisible':[('type','not in', ['multiple_choice_multiple_ans', 'matrix_of_choices_only_one_ans', 'matrix_of_choices_only_multi_ans', 'rating_scale', 'multiple_textboxes', 'numerical_textboxes', 'date', 'date_and_time', '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':[('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 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':[('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 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','not in',['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','not in',['rating_scale'])]}">
+                                    <field name="rating_allow_one_column_require"/>
                                 </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','!=','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','!=','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>
+                        <group string="Descriptive Text" attrs="{'invisible':[('type','not in',['descriptive_text'])]}">
+                            <field name="descriptive_text" colspan="4" nolabel="1"/>
+                        </group>
+                    </group>
                 </form>
             </field>
         </record>
@@ -707,7 +398,7 @@
             <field name="model">survey.question</field>
             <field name="arch" type="xml">
                 <tree string="Survey Question">
-                    <field name="sequence" string="Seq"/>
+                    <field name="sequence" widget="handle"/>
                     <field name="question"/>
                     <field name="page_id"/>
                     <field name="survey"/>
@@ -748,133 +439,118 @@
             <field name="arch" type="xml">
                 <form string="Survey Question">
                     <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','!=','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','!=','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>
-                            <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','!=','rating_scale')]}">
-                                <separator string="Comment Field" colspan="4"/>
-                                <group colspan="4">
-                                    <field name="is_comment_require"/>
+                    <group col="1" colspan="4">
+                        <group string="Answer" attrs="{'invisible':[('type','not in',['multiple_textboxes_diff_type', 'multiple_choice_only_one_ans', 'multiple_choice_multiple_ans', 'matrix_of_choices_only_one_ans', 'matrix_of_choices_only_multi_ans', 'rating_scale', 'multiple_textboxes', 'numerical_textboxes', 'date', 'date_and_time', 'table'])]}">
+                           <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','not in',['matrix_of_choices_only_multi_ans', 'matrix_of_choices_only_one_ans', 'rating_scale', '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','not in',['table'])]}">
+                                   <field name="no_of_rows"/>
                                 </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>
+                           </group>
+                        </group>
+                        <group string="Comment Field" attrs="{'invisible':[('type','not in',['multiple_choice_only_one_ans', 'multiple_choice_multiple_ans', 'matrix_of_choices_only_multi_ans', 'matrix_of_choices_only_one_ans', 'rating_scale'])]}">
+                            <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>
-                                    <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 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>
-                            <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 attrs="{'invisible':[('type','not in',['matrix_of_choices_only_one_ans', 'rating_scale'])]}">
+                            <field name="comment_column"/>
+                            <group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
+                                <field name="column_name" colspan="2"/>
+                            </group>
+                        </group>
+                        <group string="Validation" attrs="{'invisible':[('type','not in',['single_textbox', 'multiple_textboxes'])]}">
+                            <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>
-                            <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 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>
+                        <group string="Required Answer" attrs="{'invisible':[('type','not in',['multiple_choice_only_one_ans', 'multiple_choice_multiple_ans', 'matrix_of_choices_only_one_ans', 'matrix_of_choices_only_multi_ans', 'rating_scale', 'multiple_textboxes', 'numerical_textboxes', 'date', 'date_and_time', 'single_textbox', 'comment', 'multiple_textboxes_diff_type'])]}">
+                            <field name="is_require_answer"/>
+                            <group col="6" colspan="4" attrs="{'invisible':[('is_require_answer','=',False)]}">
+                                <group colspan="4" attrs="{'invisible':[('type','not in',['multiple_choice_multiple_ans', 'matrix_of_choices_only_one_ans', 'matrix_of_choices_only_multi_ans', 'rating_scale', 'multiple_textboxes', 'numerical_textboxes', 'date', 'date_and_time', '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':[('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 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':[('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 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','not in',['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','not in',['rating_scale'])]}">
+                                    <field name="rating_allow_one_column_require"/>
                                 </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','!=','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','!=','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>
+                        <group string="Descriptive Text" attrs="{'invisible':[('type','not in',['descriptive_text'])]}">
+                            <field name="descriptive_text" colspan="4" nolabel="1"/>
+                        </group>
+                    </group>
                       <group colspan="4">
                           <label string="" colspan="3"/>
                         <button name="survey_save"  string="Ok" type="object" icon="gtk-go-forward"/>
@@ -901,7 +577,7 @@
                     <field name="in_visible_answer_type" invisible="1"/>
                        <group colspan="4" attrs="{'invisible':[('in_visible_answer_type','=',True)]}">
                         <field name="type" colspan="2"/>
-                        <group colspan="4" attrs="{'invisible':[('type','!=','selection')]}">
+                        <group colspan="4" attrs="{'invisible':[('type','not in',['selection'])]}">
                             <separator string="Menu Choices (each choice on separate by lines)" colspan="4"/>
                             <field name="menu_choice" colspan="4" nolabel="1"/>
                         </group>
@@ -916,7 +592,7 @@
             <field name="model">survey.answer</field>
             <field name="arch" type="xml">
                 <tree editable="bottom" string="Survey Answer">
-                    <field name="sequence" string="Seq"/>
+                    <field name="sequence" widget="handle"/>
                     <field name="answer"/>
                     <field name="type"/>
                 </tree>