diff --git a/addons/survey/views/survey_templates.xml b/addons/survey/views/survey_templates.xml
index ce18466ea86..971006e8cd3 100644
--- a/addons/survey/views/survey_templates.xml
+++ b/addons/survey/views/survey_templates.xml
@@ -141,24 +141,24 @@
 
     <template id="simple_choice" name="Simple choice">
         <div t-if="question.display_mode == 'dropdown'" class="js_drop row">
-                <div class="col-md-12">
-                    <select class="form-control" t-att-name="prefix">
-                        <option disabled="1" selected="1" value="">Choose...</option>
-                        <t t-foreach='question.labels_ids' t-as='label'>
-                            <option t-att-value='label.id'><t t-esc='label.value'/></option>
-                        </t>
-                        <t t-if='question.comments_allowed and question.comment_count_as_answer'>
-                            <option class="js_other_option" value="-1"><span t-esc="question.comment_children_ids[0].question" /></option>
-                        </t>
-                    </select>
-                </div>
-                <div t-if='question.comments_allowed and question.comment_count_as_answer' class="col-md-6">
-                    <input type="text" class="form-control" t-att-name="'%s_%s' % (prefix, question.comment_children_ids[0].id)" data-oe-survey-othert="1"/>
-                </div>
-                <div t-if='question.comments_allowed and not question.comment_count_as_answer' class="col-md-12 mt16">
-                    <span t-field="question.comment_children_ids[0].question"/>
-                    <input type="text" class="form-control" t-att-name="'%s_%s' % (prefix, question.comment_children_ids[0].id)"/>
-                </div>
+            <div class="col-md-12">
+                <select class="form-control" t-att-name="prefix">
+                    <option disabled="1" selected="1" value="">Choose...</option>
+                    <t t-foreach='question.labels_ids' t-as='label'>
+                        <option t-att-value='label.id'><t t-esc='label.value'/></option>
+                    </t>
+                    <t t-if='question.comments_allowed and question.comment_count_as_answer'>
+                        <option class="js_other_option" value="-1"><span t-esc="question.comment_children_ids[0].question" /></option>
+                    </t>
+                </select>
+            </div>
+            <div t-if='question.comments_allowed and question.comment_count_as_answer' class="col-md-6">
+                <input type="text" class="form-control" t-att-name="'%s_%s' % (prefix, question.comment_children_ids[0].id)" data-oe-survey-othert="1"/>
+            </div>
+            <div t-if='question.comments_allowed and not question.comment_count_as_answer' class="col-md-12 mt16">
+                <span t-field="question.comment_children_ids[0].question"/>
+                <input type="text" class="form-control" t-att-name="'%s_%s' % (prefix, question.comment_children_ids[0].id)"/>
+            </div>
         </div>
         <div t-if="question.display_mode == 'columns' " class="row js_radio">
             <div t-foreach='question.labels_ids' t-as='label' t-attf-class="col-md-#{question.column_nb}">
@@ -247,7 +247,7 @@
                     </div>
                 </div>
             </div>
-         </t>
+        </t>
     </template>
 </data>
 </openerp>
diff --git a/addons/survey/views/survey_views.xml b/addons/survey/views/survey_views.xml
index a2fcbbd75ca..7b8ba4b1385 100644
--- a/addons/survey/views/survey_views.xml
+++ b/addons/survey/views/survey_views.xml
@@ -225,75 +225,52 @@
                    </group>
                </search>
            </field>
-       </record>
+        </record>
 
-       <record model="ir.ui.view" id="view_survey_kanban">
-        <field name="name">event.survey.kanban</field>
-        <field name="model">survey.survey</field>
-        <field name="arch" type="xml">
-            <kanban>
-                <field name="title"/>
-                <field name="date_open"/>
-                <field name="tot_comp_survey"/>
-                <field name="user_input_limit"/>
-                <field name="color"/>
-                <field name="state"/>
-                <field name="auth_required"/>
-                <field name="public_url"/>
-                <templates>
-                    <t t-name="kanban-box">
-                        <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_survey oe_kanban_global_click">
-                            <span class="oe_survey_fill">
-                            </span>
-                            <div class="oe_dropdown_toggle oe_dropdown_kanban" t-if="widget.view.is_action_enabled('edit')">
-                                <span class="oe_e">i</span>
-                                <ul class="oe_dropdown_menu">
-                                    <t t-if="widget.view.is_action_enabled('edit')"><li><a type="open">Edit...</a></li></t>
-                                    <t t-if="widget.view.is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
-                                    <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
-                                </ul>
-                            </div>
-                            <div class="oe_kanban_content">
-                                <span class="oe_kanban_right" t-if="widget.view.is_action_enabled('edit')">
-                                    <a t-if="record.state.raw_value === 'draft'" title="Draft" class="oe_kanban_status"> </a>
-                                    <a t-if="record.state.raw_value === 'open' and record.auth_required.raw_value" title="Open for authentified people" class="oe_kanban_status_green"> </a>
-                                    <a t-if="record.state.raw_value === 'open' and !record.auth_required.raw_value" title="Open to everyone" class="oe_kanban_status_green"> </a>
-                                    <a t-if="record.state.raw_value === 'close'" title="Close" class="oe_kanban_status_red"> </a>
-                                    <a t-if="record.state.raw_value === 'cancel'" title="Cancelled" class="oe_kanban_status_red"> </a>
+        <record model="ir.ui.view" id="view_survey_kanban">
+            <field name="name">event.survey.kanban</field>
+            <field name="model">survey.survey</field>
+            <field name="arch" type="xml">
+                <kanban>
+                    <field name="title"/>
+                    <field name="date_open"/>
+                    <field name="tot_comp_survey"/>
+                    <field name="user_input_limit"/>
+                    <field name="color"/>
+                    <field name="state"/>
+                    <field name="auth_required"/>
+                    <field name="public_url"/>
+                    <templates>
+                            <div t-name="kanban-box" t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_survey oe_kanban_global_click">
+                                <span class="oe_survey_fill">
                                 </span>
-                                <h3 class="oe_kanban_ellipsis"><t t-esc="record.title.raw_value.toString()"></t></h3>
-                                <table class="oe_kanban_survey_list" t-if="widget.view.is_action_enabled('edit')">
-                                    <tr>
-                                        <td>
-                                            <t t-if="record.state.raw_value === 'open'"><a name="action_survey_fill2" type="object">Start survey</a></t>
-                                            <t t-if="record.state.raw_value !== 'open'"><span class="oe_inactive" title="You can only take open surveys">Start survey</span></t>
-                                        </td>
-                                        <td>
-                                            <t t-if="record.state.raw_value === 'open'"><a name="action_send_survey" type="object">Invite people</a></t>
-                                            <t t-if="record.state.raw_value !== 'open'"><span class="oe_inactive" title="You can only collect answers for the open survey">Invite people</span></t>
-                                        </td>
-                                        <td>
-                                            <t t-if="record.tot_comp_survey.raw_value"><a name="%(action_selected_survey_user_input)d" type="action">Get responses (<field name="tot_comp_survey"/><t t-if="record.user_input_limit.raw_value > 0"> / <field name="user_input_limit"/></t>)</a></t>
-                                            <t t-if="!record.tot_comp_survey.raw_value"><span class="oe_inactive" title="There is no answer yet">Get responses (<field name="tot_comp_survey"/><t t-if="record.user_input_limit.raw_value > 0"> / <field name="user_input_limit"/></t>)</span></t>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <a name="action_print_survey" type="object">Print Survey</a>
-                                        </td>
-                                        <td>
-                                            <t t-if="record.tot_comp_survey.raw_value"><a name="print_statistics" type="object">Print Statistics</a></t>
-                                            <t t-if="!record.tot_comp_survey.raw_value"><span class="oe_inactive" title="There is no answer yet">Print Statistics</span></t>
-                                        </td>
-                                    </tr>
-                                </table>
+                                <div class="oe_dropdown_toggle oe_dropdown_kanban" t-if="widget.view.is_action_enabled('edit')">
+                                    <span class="oe_e">i</span>
+                                    <ul class="oe_dropdown_menu">
+                                        <li t-if="widget.view.is_action_enabled('edit')"><a type="open">Edit...</a></li>
+                                        <li t-if="record.state.raw_value === 'open'"><a name="action_send_survey" type="object">Invite People...</a></li>
+                                        <li t-if="record.state.raw_value === 'open'"><a name="action_survey_fill2" type="object">Start Survey...</a></li>
+                                        <li><a name="action_print_survey" type="object">Print Survey...</a></li>
+                                        <li t-if="record.tot_comp_survey.raw_value"><a name="%(action_selected_survey_user_input)d" type="action">View Answers...(<field name="tot_comp_survey"/><t t-if="record.user_input_limit.raw_value > 0"> / <field name="user_input_limit"/></t>)</a></li>
+                                        <li t-if="record.tot_comp_survey.raw_value"><a name="print_statistics" type="object">Print Statistics...</a></li>
+                                        <li t-if="widget.view.is_action_enabled('delete')"><a type="delete">Delete!</a></li>
+                                        <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
+                                    </ul>
+                                </div>
+                                <div class="oe_kanban_content">
+                                    <span class="oe_kanban_right" t-if="widget.view.is_action_enabled('edit')">
+                                        <a t-if="record.state.raw_value === 'draft'" title="Draft" class="oe_kanban_status"> </a>
+                                        <a t-if="record.state.raw_value === 'open'" title="Open" class="oe_kanban_status_green"> </a>
+                                        <a t-if="record.state.raw_value === 'close'" title="Closed" class="oe_kanban_status_red"> </a>
+
+                                    </span>
+                                    <h3 class="oe_kanban_ellipsis"><t t-esc="record.title.raw_value.toString()"></t></h3>
+                                </div>
                             </div>
-                        </div>
-                    </t>
-                </templates>
-            </kanban>
-        </field>
-    </record>
+                        </templates>
+                </kanban>
+            </field>
+        </record>
 
     <record model="ir.actions.act_window" id="action_survey_form">
         <field name="name">Surveys</field>