diff --git a/addons/survey/__openerp__.py b/addons/survey/__openerp__.py
index 837645b1260..e6dffb9bd6a 100644
--- a/addons/survey/__openerp__.py
+++ b/addons/survey/__openerp__.py
@@ -53,11 +53,11 @@ Partners are also sent mails with user name and password for the invitation of t
         'test/survey_question_type.yml',
         'test/survey_report.yml',
     ],
-    'css': ['static/src/css/survey.css'],
     'installable': True,
     'auto_install': False,
     'certificate' : '001131639736864143245',
-    'images': ['images/survey_answers.jpeg','images/survey_pages.jpeg','images/surveys.jpeg'],
-    'css' : ['static/css/survey.css'],
+    'images': ['images/survey_answers.jpeg','images/survey_pages.jpeg','images/surveys.jpeg'],   
+    'css': ['static/src/css/survey.css','static/css/survey.css'],
+    'js' : ['static/src/js/survey.js'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/survey/static/css/survey.css b/addons/survey/static/css/survey.css
deleted file mode 100644
index 812bbe32fa4..00000000000
--- a/addons/survey/static/css/survey.css
+++ /dev/null
@@ -1,15 +0,0 @@
-.oe_survey_title {
-    font-weight: bold;
-    font-size: 22px;
-    margin: 8px 0px 8px 0px;
-    color: #5B5B5B;
-}
-
-.oe_survey_title_height{
-    height: 33px;
-    border-top: 1px #EBEBEB solid;
-}
-
-.oe_survey_title_page {
-    font-size: 14px;
-}
diff --git a/addons/survey/static/src/css/survey.css b/addons/survey/static/src/css/survey.css
index 72cd1d6e106..812bbe32fa4 100644
--- a/addons/survey/static/src/css/survey.css
+++ b/addons/survey/static/src/css/survey.css
@@ -7,6 +7,7 @@
 
 .oe_survey_title_height{
     height: 33px;
+    border-top: 1px #EBEBEB solid;
 }
 
 .oe_survey_title_page {
diff --git a/addons/survey/wizard/survey_answer.xml b/addons/survey/wizard/survey_answer.xml
index 51fed46832b..4671c182096 100644
--- a/addons/survey/wizard/survey_answer.xml
+++ b/addons/survey/wizard/survey_answer.xml
@@ -6,6 +6,7 @@
             Survey Question Wizard
          -->
         <record id="view_survey_question_message" model="ir.ui.view">           
+            <field name="name">Survey Answer</field>
             <field name="model">survey.question.wiz</field>
             <field name="type">form</field>
             <field name="arch" type="xml">