diff --git a/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_questions.html.erb b/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_questions.html.erb
index bd61bc2f..5b44ac47 100644
--- a/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_questions.html.erb
+++ b/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_questions.html.erb
@@ -7,7 +7,7 @@
       {{if _id}}
         <input id="${_id[0]}" name="${_id[1]}" type="hidden" value="${_id[2]}">
       {{/if}}
-      <h4><b></b> Q<span>${_length}</span> <i class="icon-caret-up"></i> <span class="questions-title">${_title_translations[3].en}</span></h4>
+      <h4><b></b> Q<span>${_length}</span> <i class="icon-caret-up"></i> <span class="questions-title">${_title_translations[3].<%= I18n.locale.to_s %>}</span></h4>
     </div>
     <div class="attributes-body">
       <div class="control-group">
@@ -15,12 +15,21 @@
         <div class="controls">
           <div class="input-append">
             <div class="tab-content">
-              <div class="tab-pane fade active in" id="${_title_translations[2]+'_en'}">
-                <input class="span4 q-title" id="${_title_translations[0]+'_en'}" name="${_title_translations[1]+'[en]'}" type="text" value="${_title_translations[3].en}" />
-              </div>
-              <div class="tab-pane fade" id="${_title_translations[2]+'_zh_tw'}">
-                <input class="span4 q-title" id="${_title_translations[0]+'_zh_tw'}" name="${_title_translations[1]+'[zh_tw]'}" type="text" value="${_title_translations[3].zh_tw}" />
-              </div>
+              <% if I18n.locale == :en %>
+                <div class="tab-pane fade active in" id="${_title_translations[2]+'_en'}">
+                  <input class="span4 q-title" id="${_title_translations[0]+'_en'}" name="${_title_translations[1]+'[en]'}" type="text" value="${_title_translations[3].en}" />
+                </div>
+                <div class="tab-pane fade" id="${_title_translations[2]+'_zh_tw'}">
+                  <input class="span4 q-title" id="${_title_translations[0]+'_zh_tw'}" name="${_title_translations[1]+'[zh_tw]'}" type="text" value="${_title_translations[3].zh_tw}" />
+                </div>
+              <% else %>
+                <div class="tab-pane fade active in" id="${_title_translations[2]+'_zh_tw'}">
+                  <input class="span4 q-title" id="${_title_translations[0]+'_zh_tw'}" name="${_title_translations[1]+'[zh_tw]'}" type="text" value="${_title_translations[3].zh_tw}" />
+                </div>
+                <div class="tab-pane fade" id="${_title_translations[2]+'_en'}">
+                  <input class="span4 q-title" id="${_title_translations[0]+'_en'}" name="${_title_translations[1]+'[en]'}" type="text" value="${_title_translations[3].en}" />
+                </div>
+              <% end %>
             </div>
             <div class="btn-group" data-toggle="buttons-radio">
               <% if I18n.locale == :zh_tw %>
@@ -47,12 +56,21 @@
                 <a class="btn" href="${'#'+_description_translations[2]+'_zh_tw'}" data-toggle="tab"><%= I18nVariable.from_locale('zh_tw') %></a>
               <% end %>
             </div>
-            <div class="tab-pane fade active in" id="${_description_translations[2]+'_en'}">
-              <textarea class="resizable" id="${_description_translations[0]+'_en'}" name="${_description_translations[1]+'[en]'}" rows="3">${_description_translations[3].en}</textarea>
-            </div>
-            <div class="tab-pane fade" id="${_description_translations[2]+'_zh_tw'}">
-              <textarea class="resizable" id="${_description_translations[0]+'_zh_tw'}" name="${_description_translations[1]+'[zh_tw]'}" rows="3">${_description_translations[3].zh_tw}</textarea>
-            </div>
+            <% if I18n.locale == :en %>
+              <div class="tab-pane fade active in" id="${_description_translations[2]+'_en'}">
+                <textarea class="resizable" id="${_description_translations[0]+'_en'}" name="${_description_translations[1]+'[en]'}" rows="3">${_description_translations[3].en}</textarea>
+              </div>
+              <div class="tab-pane fade" id="${_description_translations[2]+'_zh_tw'}">
+                <textarea class="resizable" id="${_description_translations[0]+'_zh_tw'}" name="${_description_translations[1]+'[zh_tw]'}" rows="3">${_description_translations[3].zh_tw}</textarea>
+              </div>
+            <% else %>
+               <div class="tab-pane fade active in" id="${_description_translations[2]+'_zh_tw'}">
+                <textarea class="resizable" id="${_description_translations[0]+'_zh_tw'}" name="${_description_translations[1]+'[zh_tw]'}" rows="3">${_description_translations[3].zh_tw}</textarea>
+              </div>
+              <div class="tab-pane fade" id="${_description_translations[2]+'_en'}">
+                <textarea class="resizable" id="${_description_translations[0]+'_en'}" name="${_description_translations[1]+'[en]'}" rows="3">${_description_translations[3].en}</textarea>
+              </div>
+            <% end %>
           </div>
         </div>
       </div>