diff --git a/addons/survey/__openerp__.py b/addons/survey/__openerp__.py
index fd34141b1ca..72b11b0d78b 100644
--- a/addons/survey/__openerp__.py
+++ b/addons/survey/__openerp__.py
@@ -36,7 +36,7 @@ sent mails with personal token for the invitation of the survey.
     'summary': 'Create surveys, collect answers and print statistics',
     'author': 'OpenERP SA',
     'website': 'https://www.openerp.com/apps/survey/',
-    'depends': ['email_template', 'mail', 'website', 'web_kanban_gauge', 'web_graph', 'marketing'],
+    'depends': ['email_template', 'mail', 'website', 'marketing'],
     'data': [
         'security/survey_security.xml',
         'security/ir.model.access.csv',
diff --git a/addons/survey/views/survey_templates.xml b/addons/survey/views/survey_templates.xml
index e12f22cd249..feb36580474 100644
--- a/addons/survey/views/survey_templates.xml
+++ b/addons/survey/views/survey_templates.xml
@@ -1,27 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 <data>
-    <!-- List of all the surveys -->
-    <template id="list" name="Survey List">
-        <t t-call="website.layout">
-            <div class="wrap">
-                <div class="container">
-                    <h1>Open surveys</h1>
-                    <div class="table-responsive">
-                        <table class="table table-hover">
-                            <tr><th>Title</th></tr>
-                            <t t-foreach="surveys" t-as="survey">
-                                <tr>
-                                    <td><a t-att-href="survey.public_url" t-field="survey.title" /></td>
-                                </tr>
-                            </t>
-                        </table>
-                    </div>
-                </div>
-            </div>
-        </t>
-    </template>
-
     <!-- "Thank you" message when the survey is completed -->
     <template id="sfinished" name="Survey Finished">
         <t t-call="website.layout">
@@ -58,6 +37,9 @@
             <div class="wrap">
                 <div class="oe_structure" />
                 <div class="container">
+                    <div groups="base.group_website_publisher" t-ignore="true" class="text-right">
+                        <a href="/web#action=survey.action_survey_form" class="btn btn-default">Go back to surveys</a>
+                    </div>
                     <div class='jumbotron mt32'>
                         <h1 t-field='survey.title' />
                         <div t-field='survey.description' />
@@ -80,6 +62,9 @@
             <div class="wrap">
                 <div class="oe_structure"/>
                 <div class="container">
+                    <div groups="base.group_website_publisher" t-ignore="true" class="text-right">
+                        <a href="/web#action=survey.action_survey_form" class="btn btn-default">Go back to surveys</a>
+                    </div>
                     <t t-call="survey.page" />
                 </div>
                 <div class="oe_structure"/>
diff --git a/addons/survey/views/survey_views.xml b/addons/survey/views/survey_views.xml
index 81ad2aa33d6..3246b19b08b 100644
--- a/addons/survey/views/survey_views.xml
+++ b/addons/survey/views/survey_views.xml
@@ -193,7 +193,7 @@
                                 <h4 class="oe_center"><field name="title" /></h4>
                                 <div><ul>
                                     <li>
-                                        <a type="edit">Design</a>
+                                        <a name="action_test_survey" type="object">Design</a>
                                     </li>
                                     <li>
                                         <t t-if="record.designed.raw_value"><a type="object" name="action_test_survey">Test</a></t>