diff --git a/module/bug/css/create.css b/module/bug/css/create.css
index 88962a459d..916014f09f 100644
--- a/module/bug/css/create.css
+++ b/module/bug/css/create.css
@@ -45,8 +45,4 @@ html[lang='en'] #deadlineTd .input-group-addon {padding: 5px 18px;}
 #osBox .required:after {right: 1px;}
 #osBox {width: 190px;}
 #projectBox .required:after {right: 1px;}
-#assignedTo_chosen, .load-all-user {float: left;;}
-.assigned-box #assignedTo_chosen {width: 80% !important;}
-.deadline-box #assignedTo_chosen {width: 153px !important;}
-.assigned-box .load-all-user {float: left;}
-.load-all-user .btn {border-left: none;}
+#notifyEmailTd .input-group-addon, #deadlineTd .input-group-addon {border-radius: 2px 0px 2px 0px !important;}
diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index 19c011153d..f49d8dd535 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -129,31 +129,41 @@ js::set('moduleID', $moduleID);
           <tr>
             <th><nobr><?php echo $lang->bug->lblAssignedTo;?></nobr></th>
             <td>
-              <div class='table-row'>
-                <?php $showDeadline = strpos(",$showFields,", ',deadline,') !== false;?>
-                <div class='table-col <?php echo $showDeadline ? 'deadline-box' : 'assigned-box';?>'>
-                  <?php echo html::select('assignedTo', $productMembers, $assignedTo, "class='form-control chosen'");?>
-                  <span class='input-group-btn load-all-user'><?php echo html::commonButton($lang->bug->allUsers, "class='btn btn-default' onclick='loadAllUsers()' data-toggle='tooltip'");?></span>
-                </div>
-                <?php if($showDeadline):?>
-                <div class='table-col'>
-                  <div class='input-group' id='deadlineBox'>
-                    <span class='input-group-addon fix-border'><?php echo $lang->bug->deadline;?></span>
-                    <?php echo html::input('deadline', $deadline, "class='form-control form-date'");?>
-                  </div>
-                </div>
-                <?php endif;?>
+              <div class='input-group'>
+                <?php echo html::select('assignedTo', $productMembers, $assignedTo, "class='form-control chosen'");?>
+                <span class='input-group-btn'><?php echo html::commonButton($lang->bug->allUsers, "class='btn btn-default' onclick='loadAllUsers()' data-toggle='tooltip'");?></span>
               </div>
             </td>
-            <td>
-              <div class='input-group' id='feedback'>
-                <span class="input-group-addon"><?php echo $lang->bug->feedbackBy?></span>
-                <?php echo html::input('feedbackBy', '', "class='form-control'");?>
-                <span class="input-group-addon"><?php echo $lang->bug->notifyEmail?></span>
-                <?php echo html::input('notifyEmail', '', "class='form-control'");?>
+          <?php $showDeadline = strpos(",$showFields,", ',deadline,') !== false;?>
+          <?php if($showDeadline):?>
+            <td id='deadlineTd'>
+              <div class='input-group'>
+                <span class='input-group-addon'><?php echo $lang->bug->deadline?></span>
+                <span><?php echo html::input('deadline', $deadline, "class='form-control form-date'");?></span>
               </div>
             </td>
           </tr>
+          <tr>
+            <th><nobr><?php echo $lang->bug->feedbackBy;?></nobr></th>
+            <td><?php echo html::input('feedbackBy', '', "class='form-control'");?></td>
+            <td id='notifyEmailTd'>
+              <div class='input-group'>
+                <span class='input-group-addon'><?php echo $lang->bug->notifyEmail?></span>
+                <span><?php echo html::input('notifyEmail', '', "class='form-control'");?></span>
+              </div>
+            </td>
+          </tr>
+          <?php else:?>
+            <td>
+              <div class='input-group' id='feedback'>
+              <span class="input-group-addon"><?php echo $lang->bug->feedbackBy?></span>
+              <?php echo html::input('feedbackBy', '', "class='form-control'");?>
+              <span class="input-group-addon"><?php echo $lang->bug->notifyEmail?></span>
+              <?php echo html::input('notifyEmail', '', "class='form-control'");?>
+              </div>
+            </td>
+          </tr>
+          <?php endif;?>
           <?php if($showExecution):?>
           <?php $showOS      = strpos(",$showFields,", ',os,')      !== false;?>
           <?php $showBrowser = strpos(",$showFields,", ',browser,') !== false;?>
diff --git a/module/execution/view/activate.html.php b/module/execution/view/activate.html.php
index d8f34124cc..7cb5cd726b 100644
--- a/module/execution/view/activate.html.php
+++ b/module/execution/view/activate.html.php
@@ -5,7 +5,7 @@
  * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
  * @license     ZPL (http://zpl.pub/page/zplv12.html)
  * @author      Chunsheng Wang<wwccss@gmail.com>
- * @package     execution 
+ * @package     execution
  * @version     $Id: suspend.html.php 935 2013-01-16 07:49:24Z wwccss@gmail.com $
  * @link        http://www.zentao.net
  */
@@ -59,7 +59,7 @@
         <td colspan='5'><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
       </tr>
       <tr>
-        <td class='text-center form-actions' colspan='6'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?></td>
+        <td class='text-center form-actions' colspan='6'><?php echo html::submitButton($lang->execution->activate . $lang->executionCommon) . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?></td>
       </tr>
     </table>
   </form>
diff --git a/module/execution/view/close.html.php b/module/execution/view/close.html.php
index 9d9edf493d..cd2f0062bf 100644
--- a/module/execution/view/close.html.php
+++ b/module/execution/view/close.html.php
@@ -5,7 +5,7 @@
  * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
  * @license     ZPL (http://zpl.pub/page/zplv12.html)
  * @author      Chunsheng Wang<wwccss@gmail.com>
- * @package     execution 
+ * @package     execution
  * @version     $Id: suspend.html.php 935 2013-01-16 07:49:24Z wwccss@gmail.com $
  * @link        http://www.zentao.net
  */
@@ -35,7 +35,7 @@
           <td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
         </tr>
         <tr>
-          <td class='text-center form-actions' colspan='2'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?></td>
+          <td class='text-center form-actions' colspan='2'><?php echo html::submitButton($lang->execution->close . $lang->executionCommon) . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?></td>
         </tr>
       </tbody>
     </table>
diff --git a/module/execution/view/start.html.php b/module/execution/view/start.html.php
index 43cc98ccad..b45485f913 100644
--- a/module/execution/view/start.html.php
+++ b/module/execution/view/start.html.php
@@ -31,7 +31,7 @@
           <td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
         </tr>
         <tr>
-          <td colspan='2' class='text-center form-actions'><?php echo html::submitButton($lang->execution->start) . ' ' .  html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?></td>
+          <td colspan='2' class='text-center form-actions'><?php echo html::submitButton($lang->execution->start . $lang->executionCommon) . ' ' .  html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?></td>
         </tr>
       </tbody>
     </table>
diff --git a/module/execution/view/suspend.html.php b/module/execution/view/suspend.html.php
index 1581055615..b061a5e683 100644
--- a/module/execution/view/suspend.html.php
+++ b/module/execution/view/suspend.html.php
@@ -5,7 +5,7 @@
  * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
  * @license     ZPL (http://zpl.pub/page/zplv12.html)
  * @author      Chunsheng Wang<wwccss@gmail.com>
- * @package     execution 
+ * @package     execution
  * @version     $Id: suspend.html.php 935 2013-01-16 07:49:24Z wwccss@gmail.com $
  * @link        http://www.zentao.net
  */
@@ -34,11 +34,11 @@
         <td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
       </tr>
       <tr>
-        <td colspan='2' class='text-center form-actions'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?></td>
+        <td colspan='2' class='text-center form-actions'><?php echo html::submitButton($lang->execution->suspend . $lang->executionCommon) . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?></td>
       </tr>
     </table>
   </form>
-  <hr class='small' /> 
+  <hr class='small' />
   <div class='main'><?php include '../../common/view/action.html.php';?></div>
 </div>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/story/css/create.css b/module/story/css/create.css
index b059c5ef9f..8cf063f7ef 100644
--- a/module/story/css/create.css
+++ b/module/story/css/create.css
@@ -3,3 +3,5 @@
 
 .pri-selector > .btn {padding: 5px 8px !important; width: 100%;}
 .pri-selector > .dropdown-menu {padding: 10px;}
+
+#source_chosen {min-width: 50px !important;}
diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php
index 2fc377548b..2c425cd239 100644
--- a/module/story/view/create.html.php
+++ b/module/story/view/create.html.php
@@ -91,7 +91,7 @@
                   <div class="input-group-addon" style="min-width: 77px;"><?php echo $lang->story->source;?></div>
                   <?php echo html::select('source', $lang->story->sourceList, $source, "class='form-control chosen'");?>
                   <span class='input-group-addon' id='sourceNoteBox'><?php echo $lang->story->sourceNote;?></span>
-                  <?php $sourceNoteWidth = isonlybody() ? "style='width: 70px;'" : "style='width: 140px;'"?>
+                  <?php $sourceNoteWidth = isonlybody() ? "style='width: 89px;'" : "style='width: 180px;'"?>
                   <?php echo html::input('sourceNote', $sourceNote, "class='form-control' $sourceNoteWidth");?>
                 </div>
               </div>