diff --git a/module/bug/css/create.css b/module/bug/css/create.css
index 87f3809f1a..e34aa1f98b 100644
--- a/module/bug/css/create.css
+++ b/module/bug/css/create.css
@@ -16,3 +16,6 @@
 
 #module_chosen.chosen-container .chosen-drop {min-width: 400px; border-top: 1px solid #ddd!important}
 #openedBuild_chosen.chosen-container .chosen-drop {min-width: 450px; border-top: 1px solid #ddd!important}
+
+.row .col-sm-8{width:75%;}
+.row .col-sm-4{padding-left:0px; width:25%;}
diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index 96ddada8f8..4832d5ca22 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -77,14 +77,6 @@ js::set('refresh', $lang->refresh);
             unset($lang->bug->typeList['trackthings']);
             echo html::select('type', $lang->bug->typeList, $type, "class='form-control'");
             ?>
-            <span class='input-group-addon fix-border'><?php echo $lang->bug->pri?></span>
-            <?php echo html::select('pri', $lang->bug->priList, $severity, "class='form-control'");?>
-            <span class='input-group-addon fix-border'><?php echo $lang->bug->severity?></span>
-            <?php echo html::select('severity', $lang->bug->severityList, $severity, "class='form-control'");?>
-          </div>
-        </td>
-        <td>
-          <div class='input-group'>
             <span class='input-group-addon fix-border'><?php echo $lang->bug->os?></span>
             <?php echo html::select('os', $lang->bug->osList, $os, "class='form-control'");?>
             <span class='input-group-addon fix-border'><?php echo $lang->bug->browser?></span>
@@ -94,7 +86,19 @@ js::set('refresh', $lang->refresh);
       </tr>
       <tr>
         <th><?php echo $lang->bug->title;?></th>
-        <td colspan='2'><?php echo html::input('title', $bugTitle, "class='form-control'");?></td>
+        <td colspan='2'>
+          <div class='row'>
+            <div class='col-sm-8'><?php echo html::input('title', $bugTitle, "class='form-control'");?></div>
+            <div class='col-sm-4'>
+              <div class='input-group'>
+                <span class='input-group-addon fix-border'><?php echo $lang->bug->pri?></span>
+                <?php echo html::select('pri', $lang->bug->priList, $severity, "class='form-control'");?>
+                <span class='input-group-addon fix-border'><?php echo $lang->bug->severity?></span>
+                <?php echo html::select('severity', $lang->bug->severityList, $severity, "class='form-control'");?>
+              </div>
+            </div>
+          </div>
+        </td>
       </tr>  
       <tr>
         <th><?php echo $lang->bug->steps;?></th>
diff --git a/module/file/control.php b/module/file/control.php
index def0a79bf1..386a1ea8d4 100644
--- a/module/file/control.php
+++ b/module/file/control.php
@@ -204,8 +204,9 @@ class file extends control
      */
     public function sendDownHeader($fileName, $fileType, $content)
     {
+        /* Clean the ob content to make sure no space or utf-8 bom output. */
         $obLevel = ob_get_level();
-        for($i = 0; $i < $obLevel; $i++) ob_end_clean();    // clean the ob content to make sure no space or utf-8 bom output.
+        for($i = 0; $i < $obLevel; $i++) ob_end_clean();
 
         /* Set the downloading cookie, thus the export form page can use it to judge whether to close the window or not. */
         setcookie('downloading', 1);
diff --git a/module/productplan/model.php b/module/productplan/model.php
index 284f138ee0..16850378e8 100644
--- a/module/productplan/model.php
+++ b/module/productplan/model.php
@@ -85,7 +85,7 @@ class productplanModel extends model
     public function getPairs($product = 0, $expired = '')
     {
         $date = date('Y-m-d');
-        return array('' => '') + $this->dao->select('id,CONCAT(title, " (", begin, " ~ ", end, ")") as title')->from(TABLE_PRODUCTPLAN)
+        return array('' => '') + $this->dao->select('id,CONCAT(title, " [", begin, " ~ ", end, "]") as title')->from(TABLE_PRODUCTPLAN)
             ->where('product')->in($product)
             ->andWhere('deleted')->eq(0)
             ->beginIF($expired == 'unexpired')
diff --git a/module/story/css/create.css b/module/story/css/create.css
index 935c7a68ab..099514a464 100644
--- a/module/story/css/create.css
+++ b/module/story/css/create.css
@@ -1,3 +1,6 @@
 #mailto {width:90.3%}
 select {border:1px solid #ccc}
 #module_chosen.chosen-container .chosen-drop {min-width: 400px; border-top: 1px solid #ddd!important}
+
+.row .col-sm-10{width:89%}
+.row .col-sm-2{padding-left:0px; width:11%}
diff --git a/module/story/js/create.js b/module/story/js/create.js
index 45592f2f9d..bad3c11473 100644
--- a/module/story/js/create.js
+++ b/module/story/js/create.js
@@ -9,7 +9,6 @@ $(function()
         $('#assignedTo').removeAttr('disabled');
     }
     $('#assignedTo').trigger("chosen:updated");
-    $('#assignedTo_chosen').width(150);
 })
 
 $('#needNotReview').change(function()
diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php
index bbd97a0a29..d412182c6c 100644
--- a/module/story/view/create.html.php
+++ b/module/story/view/create.html.php
@@ -68,8 +68,13 @@
         </td>
       </tr>
       <tr>
-        <th><?php echo $lang->story->pri;?></th>
-        <td><?php echo html::select('pri', (array)$lang->story->priList, $pri, "class='form-control'");?></td>
+        <th><?php echo $lang->story->reviewedBy;?></th>
+        <td>
+          <div class='input-group'>
+            <?php echo html::select('assignedTo', $users, empty($needReview) ? $product->PO : '', "class='form-control chosen'");?>
+            <span class='input-group-addon'><?php echo html::checkbox('needNotReview', $lang->story->needNotReview, '', "id='needNotReview' {$needReview}");?></span>
+          </div>
+        </td>
         <td>
           <div class='input-group'>
             <span class='input-group-addon'><?php echo $lang->story->estimate;?></span>
@@ -81,11 +86,16 @@
       <tr>
         <th><?php echo $lang->story->title;?></th>
         <td colspan='3'>
-          <div class='input-group'>
-            <?php echo html::input('title', $storyTitle, "class='form-control'");?>
-            <span class='input-group-addon fix-border'><?php echo $lang->story->reviewedBy?></span>
-            <?php echo html::select('assignedTo', $users, empty($needReview) ? $product->PO : '', "class='form-control chosen'");?>
-            <span class='input-group-addon'><?php echo html::checkbox('needNotReview', $lang->story->needNotReview, '', "id='needNotReview' {$needReview}");?></span>
+          <div class='row'>
+            <div class='col-sm-10'>
+              <?php echo html::input('title', $storyTitle, "class='form-control'");?>
+            </div>
+            <div class='col-sm-2'>
+              <div class='input-group'>
+                <span class='input-group-addon fix-border'><?php echo $lang->story->pri?></span>
+                <?php echo html::select('pri', (array)$lang->story->priList, $pri, "class='form-control'");?>
+              </div>
+            </div>
           </div>
         </td>
       </tr>  
diff --git a/module/task/css/create.css b/module/task/css/create.css
index 9d64549f55..55a19185ae 100644
--- a/module/task/css/create.css
+++ b/module/task/css/create.css
@@ -1 +1,5 @@
 .input-group-btn {width: 0.01%}
+.input-group-btn #copyButton{margin-top: -5px;}
+
+.row .col-sm-8{width:76%}
+.row .col-sm-2{padding-left:0px; width:12%}
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index fa86bb081f..2a9b1a0769 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -51,9 +51,25 @@
       <tr>
         <th><?php echo $lang->task->name;?></th>
         <td colspan='3'>
-          <div class='input-group'>
-            <?php echo html::input('name', $task->name, "class='form-control'");?>
-            <span class='input-group-btn'><a href='javascript:copyStoryTitle();' id='copyButton' class='btn'><?php echo $lang->task->copyStoryTitle;?></a></span>
+          <div class='row'>
+            <div class='col-sm-8'>
+              <div class='input-group' style='display:block'>
+                <?php echo html::input('name', $task->name, "class='form-control'");?>
+                <span class='input-group-btn'><a href='javascript:copyStoryTitle();' id='copyButton' class='btn'><?php echo $lang->task->copyStoryTitle;?></a></span>
+              </div>
+            </div>
+            <div class='col-sm-2'>
+              <div class="input-group">
+                <span class='input-group-addon fix-border'><?php echo $lang->task->pri;?></span>
+                <?php echo html::select('pri', $lang->task->priList, $task->pri, 'class=form-control');?>
+              </div>
+            </div>
+            <div class='col-sm-2'>
+              <div class="input-group">
+                <span class='input-group-addon fix-border'><?php echo $lang->task->estimate;?></span>
+                <?php echo html::input('estimate', $task->estimate, "class='form-control' autocomplete='off' placeholder='{$lang->task->hour}'")?>
+              </div>
+            </div>
           </div>
         </td>
       </tr>
@@ -61,17 +77,6 @@
         <th><?php echo $lang->task->desc;?></th>
         <td colspan='3'><?php echo html::textarea('desc', $task->desc, "rows='10' class='form-control'");?></td><td></td>
       </tr>  
-      <tr>
-        <th><?php echo $lang->task->pri;?></th>
-        <td><?php echo html::select('pri', $lang->task->priList, $task->pri, 'class=form-control');?></td>
-        <td>
-          <div class="input-group">
-            <span class='input-group-addon'><?php echo $lang->task->estimate;?></span>
-            <?php echo html::input('estimate', $task->estimate, "class='form-control'")?>
-            <span class="input-group-addon"><?php echo $lang->task->hour;?></span>
-          </div>
-        </td><td><div class='help-block'><?php echo $lang->task->estimateTip?></div></td>
-      </tr>
       <tr>
         <th><?php echo $lang->task->estStarted;?></th>
         <td><?php echo html::input('estStarted', $task->estStarted, "class='form-control form-date'");?></td>
diff --git a/module/testcase/css/create.css b/module/testcase/css/create.css
index 5845b45cc4..3a5fca4722 100644
--- a/module/testcase/css/create.css
+++ b/module/testcase/css/create.css
@@ -15,3 +15,6 @@
 #story_chosen .chosen-results > li.no-results:hover {color: #1a4f85; background-color: #ddd;}
 #story_chosen .chosen-results > li.no-results > span {font-weight: bold;}
 #module_chosen .chosen-drop {min-width: 400px; border-top: 1px solid #ddd!important}
+
+.row .col-sm-10{width:89%;}
+.row .col-sm-2{padding-left:0px; width:11%;}
diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php
index 52f2cb2bec..9c6ad59de3 100644
--- a/module/testcase/view/create.html.php
+++ b/module/testcase/view/create.html.php
@@ -55,10 +55,6 @@
           </div>
         </td>
       </tr>  
-      <tr>
-        <th><?php echo $lang->testcase->pri;?></th>
-        <td><?php echo html::select('pri', $lang->testcase->priList, $pri, "class='form-control'");?></td>
-      </tr>  
       <tr>
         <th><?php echo $lang->testcase->lblStory;?></th>
         <td colspan='3'>
@@ -76,7 +72,19 @@
       </tr>  
       <tr>
         <th><?php echo $lang->testcase->title;?></th>
-        <td colspan='3'><?php echo html::input('title', $caseTitle, "class='form-control'");?></td>
+        <td colspan='3'>
+          <div class='row'>
+            <div class='col-sm-10'>
+              <?php echo html::input('title', $caseTitle, "class='form-control'");?>
+            </div>
+            <div class='col-sm-2'>
+              <div class='input-group'>
+                <span class='input-group-addon fix-border'><?php echo $lang->testcase->pri;?></span>
+                <?php echo html::select('pri', $lang->testcase->priList, $pri, "class='form-control'");?>
+              </div>
+            </div>
+          </div>
+        </td>
       </tr>  
       <tr>
         <th><?php echo $lang->testcase->precondition;?></th>