diff --git a/app/views/poll/_new_single.html.erb b/app/views/poll/_new_single.html.erb
index a71d466ba..e5cbd49ef 100644
--- a/app/views/poll/_new_single.html.erb
+++ b/app/views/poll/_new_single.html.erb
@@ -3,7 +3,7 @@
       <div class="ur_editor_title">
         <label for="ur_question_title"  class="questionLabel mt8">问题：&nbsp;&nbsp;</label>
         <input type="hidden" name="question_type" value="3"/>
-        <textarea maxlength="250" id="poll_questions_title_new" class="questionTitle w590" contenteditable="true" type="text" name="poll_questions_title"  placeholder="请输入单行主观题" oninput="autoHeight('#poll_questions_title_new',30)"></textarea>
+        <textarea maxlength="250" id="poll_questions_title_new" class="questionTitle w590" contenteditable="true" type="text" name="poll_questions_title"  placeholder="请输入主观题" oninput="autoHeight('#poll_questions_title_new',30)"></textarea>
         <label>
           <input name="is_necessary" value="true" checked type="checkbox">
           必答
diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb
index edf3e25f1..acfc3c4d4 100644
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@@ -549,26 +549,26 @@ function insert_MCQ(quest_type,quest_num,quest_id){
   <div class="testQuestion">
     <span class="fl mt10 mr18">题型</span>
     <ul class="tabs_list fl">
-      <li class="tab_item02 ">
+      <li class="tab_item02 mr95">
         <a title="<%=  l(:label_MC) %>" class="tab_icon icon_radio" onclick="add_MC();">
           <%=  l(:label_MC) %>
         </a>
       </li>
-      <li class="tab_item02 " >
+      <li class="tab_item02 mr95" >
         <a title="<%=  l(:label_MCQ) %>" class=" tab_icon icon_checkbox" onclick="add_MCQ();">
           <%=  l(:label_MCQ) %>
         </a>
       </li>
       <li class="tab_item02 " >
-        <a title="<%= l(:label_single) %>" class="tab_icon icon_text" onclick="add_single();">
-          <%= l(:label_single) %>
-        </a>
-      </li>
-      <li class="tab_item02 " >
-        <a title="<%= l(:label_mulit)%>" class="tab_icon icon_textarea" onclick="add_mulit();">
-          <%= l(:label_mulit)%>
+        <a title="<%= l(:label_subjective) %>" class="tab_icon icon_text" onclick="add_single();">
+          <%= l(:label_subjective) %>
         </a>
       </li>
+      <!--<li class="tab_item02 " >-->
+        <!--<a title="<%#= l(:label_mulit)%>" class="tab_icon icon_textarea" onclick="add_mulit();">-->
+          <!--<%#= l(:label_mulit)%>-->
+        <!--</a>-->
+      <!--</li>-->
     </ul>
     <div class="cl"></div>
   </div><!--选项 end-->
diff --git a/app/views/poll/_show_MC.html.erb b/app/views/poll/_show_MC.html.erb
index 1854a0c5b..a4275da01 100644
--- a/app/views/poll/_show_MC.html.erb
+++ b/app/views/poll/_show_MC.html.erb
@@ -19,12 +19,12 @@
                 method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "poll-delete", :title => "删除")  %>
   </div>
   <div class="poll-content">
-    <div class="testEditTitle">
+    <div class="testEditTitle" style="padding-top:0;">
       <span class="formatContainer m_w500"><%= poll_question.question_title %></span>
       <span class="fontBlue">[单选题]</span>
     </div>
 
-    <a class="ur_icon_edit" title="编辑" onclick="pollQuestionEdit(<%= poll_question.id%>);"></a>
+    <a class="poll-edit" title="编辑" onclick="pollQuestionEdit(<%= poll_question.id%>);"></a>
     <div class="cl"></div>
 
     <div class="ur_inputs">
diff --git a/app/views/poll/_show_MCQ.html.erb b/app/views/poll/_show_MCQ.html.erb
index 8ba5e7deb..540211369 100644
--- a/app/views/poll/_show_MCQ.html.erb
+++ b/app/views/poll/_show_MCQ.html.erb
@@ -19,14 +19,14 @@
                 method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "poll-delete", :title => "删除")  %>
   </div>
   <div class="poll-content">
-      <div class="testEditTitle">
+      <div class="testEditTitle" style="padding-top:0;">
         <span class="formatContainer m_w500"><%= poll_question.question_title %></span>
         <span class="fontBlue">[多选题]</span>
       </div>
-      <a class="ur_icon_edit" title="编辑" onclick="pollQuestionEdit(<%= poll_question.id%>);"></a>
+      <a class="poll-edit" title="编辑" onclick="pollQuestionEdit(<%= poll_question.id%>);"></a>
       <div class="cl"></div>
-      <div class="ur_inputs" style="width:675px;">
-        <table class="ur_table" style="width:675px;">
+      <div class="ur_inputs">
+        <table class="ur_table" style="width:647px;">
           <tbody>
           <% poll_question.poll_answers.reorder("answer_position").each do |poll_answer| %>
               <tr>
diff --git a/app/views/poll/_show_single.html.erb b/app/views/poll/_show_single.html.erb
index 5da06f0c0..7614ea5d8 100644
--- a/app/views/poll/_show_single.html.erb
+++ b/app/views/poll/_show_single.html.erb
@@ -19,15 +19,15 @@
                 method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "poll-delete", :title => "删除")  %>
   </div>
   <div class="poll-content">
-    <div class="testEditTitle">
+    <div class="testEditTitle" style="padding-top:0;">
       <span class="formatContainer m_w500"><%= poll_question.question_title %></span>
       <span class="fontBlue">[主观题]</span>
     </div>
 
-    <a class="ur_icon_edit" title="编辑" onclick="pollQuestionEdit(<%= poll_question.id%>);"></a>
+    <a class="poll-edit" title="编辑" onclick="pollQuestionEdit(<%= poll_question.id%>);"></a>
     <div class="cl"></div>
     <div class="ur_inputs">
-      <input class="questionnaire-input" type="text" size="" maxlength="" value="" style="width:692px;">
+      <textarea type="text" size="" maxlength="" value="" style="width:640px; border:1px solid #ddd;" rows="3"></textarea>
     </div>
   </div>
 </div><!--单行文字展示 end-->
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index c1c81cd04..affe42ac8 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2018,6 +2018,7 @@ zh:
   label_MCQ: 多选题
   label_single: 单行主观
   label_mulit: 多行主观
+  label_subjective: 主观题
   label_enter_single_title: 请输入单选题标题
   label_new_answer: 新建选项
   label_poll_title: 问卷标题
diff --git a/public/stylesheets/css/common.css b/public/stylesheets/css/common.css
index 31cbe5684..b005945d5 100644
--- a/public/stylesheets/css/common.css
+++ b/public/stylesheets/css/common.css
@@ -165,7 +165,8 @@ h4{ font-size:14px;}/*color:#3b3b3b;*/
 .mr60 {margin-right:60px;}
 .mr65 {margin-right:65px;}
 .mr70{margin-right: 70px;}
-.mr100 {margin-right:100px;}
+.mr95 {margin-right:95px !important;}
+.mr100 {margin-right:100px !important;}
 .mr118 {margin-right:118px !important;}
 .mr130 {margin-right:130px;}
 .mr150 {margin-right:150px;}
diff --git a/public/stylesheets/css/courses.css b/public/stylesheets/css/courses.css
index dce0c4680..48f6dc214 100644
--- a/public/stylesheets/css/courses.css
+++ b/public/stylesheets/css/courses.css
@@ -563,7 +563,7 @@ a:hover.blueCir{ background:#3598db; color:#fff;}
 /*20161026问卷调查增加toolbar*/
 .poll-container {width:718px; border:1px solid #ddd; margin-bottom:10px; background-color:#fff; position:relative; color:#767676; border:1px solid #ddd;}
 .pool-tool-bar {width:50px; position:absolute; top:0; left:0; text-align:center;}
-.poll-content {margin-left:50px; padding:10px; border-left:1px solid #ddd;}
+.poll-content {min-height:150px; margin-left:50px; padding:10px; border-left:1px solid #ddd;}
 .poll-up{ background:url(/images/course/icons.png) 0px -479px no-repeat; width:16px; height:20px; display:block; margin-left:auto; margin-right:auto;}
 .poll-up:hover{background:url(/images/course/icons.png) -23px -479px no-repeat;}
 .poll-down{ background:url(/images/course/icons.png) 0px -502px no-repeat; width:16px; height:20px; display:block; margin-left:auto; margin-right:auto;}
@@ -572,6 +572,8 @@ a:hover.blueCir{ background:#3598db; color:#fff;}
 .poll-add:hover{background:url(/images/course/icons.png) -18px -317px no-repeat;}
 .poll-delete{ background:url(/images/course/icons.png) 3px -343px no-repeat; width:16px; height:20px; display:block; margin-left:auto; margin-right:auto;}
 .poll-delete:hover{ background:url(/images/course/icons.png) -17px -343px no-repeat;}
+.poll-edit{ background:url(/images/course/icons.png) 0px -272px no-repeat; width:16px; height:27px; display:block;float:right;}
+.poll-edit:hover{ background:url(/images/course/icons.png) -21px -272px  no-repeat;}
 .poll-add-menu {border:1px solid #eaeaea; background:#fff; padding:5px 10px; width:60px; left:0; top:16px; position:absolute; z-index:9999; line-height:2; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); display:none;}
 .poll-multiple-limit {width:70px; outline: none;}