diff --git a/module/bug/js/create.js b/module/bug/js/create.js
index f44d38b6df..0b407a1f5e 100644
--- a/module/bug/js/create.js
+++ b/module/bug/js/create.js
@@ -123,7 +123,7 @@ $(function()
     {
         var $group = $('#bugTypeInputGroup');
         var width = $group.width(), addonWidth = 0;
-        var $controls = $group.children('.form-control');
+        var $controls = $group.find('.chosen-single');
         $group.children('.input-group-addon').each(function()
         {
             addonWidth += $(this).outerWidth();
diff --git a/module/bug/view/batchcreate.html.php b/module/bug/view/batchcreate.html.php
index 4b6dda944d..f5122a65a8 100644
--- a/module/bug/view/batchcreate.html.php
+++ b/module/bug/view/batchcreate.html.php
@@ -77,9 +77,9 @@ foreach(explode(',', $showFields) as $field)
       $os        = $i == 0 ? '' : 'ditto';
       $browser   = $i == 0 ? '' : 'ditto';
       ?>
-      <tr class='text-center'>
+      <tr class='text-left'>
         <td><?php echo $i+1;?></td>
-        <td class='text-left<?php echo zget($visibleFields, $product->type, ' hidden')?>'><?php echo html::select("branches[$i]", $branches, $branch, "class='form-control' onchange='setBranchRelated(this.value, $productID, $i)'");?></td>
+        <td class='text-left<?php echo zget($visibleFields, $product->type, ' hidden')?>' style='overflow:visible'><?php echo html::select("branches[$i]", $branches, $branch, "class='form-control chosen' onchange='setBranchRelated(this.value, $productID, $i)'");?></td>
         <td class='text-left<?php echo zget($visibleFields, 'module', ' hidden')?>'  style='overflow:visible'><?php echo html::select("modules[$i]", $moduleOptionMenu, $moduleID, "class='form-control chosen'");?></td>
         <td class='text-left<?php echo zget($visibleFields, 'project', ' hidden')?>' style='overflow:visible'><?php echo html::select("projects[$i]", $projects, $projectID, "class='form-control chosen' onchange='loadProjectBuilds($productID, this.value, $i)'");?></td>
         <td class='text-left' style='overflow:visible' id='buildBox<?php echo $i;?>'><?php echo html::select("openedBuilds[$i][]", $builds, 'trunk', "class='form-control chosen' multiple");?></td>
@@ -90,11 +90,11 @@ foreach(explode(',', $showFields) as $field)
           </div>
         </td>
         <td class='<?php echo zget($visibleFields, 'steps', 'hidden')?>'>   <?php echo html::textarea("stepses[$i]", '', "rows='1' class='form-control autosize'");?></td>
-        <td class='<?php echo zget($visibleFields, 'type', 'hidden')?>'>    <?php echo html::select("types[$i]", $lang->bug->typeList, $type, "class='form-control'");?></td>
-        <td class='<?php echo zget($visibleFields, 'pri', 'hidden')?>'>     <?php echo html::select("pris[$i]", $lang->bug->priList, $pri, "class='form-control'");?></td>
-        <td class='<?php echo zget($visibleFields, 'severity', 'hidden')?>'><?php echo html::select("severities[$i]", $lang->bug->severityList, '', "class='form-control'");?></td>
-        <td class='<?php echo zget($visibleFields, 'os', 'hidden')?>'>      <?php echo html::select("oses[$i]", $lang->bug->osList, $os, "class='form-control'");?></td>
-        <td class='<?php echo zget($visibleFields, 'browser', 'hidden')?>'> <?php echo html::select("browsers[$i]", $lang->bug->browserList, $browser, "class='form-control'");?></td>
+        <td class='<?php echo zget($visibleFields, 'type', 'hidden')?>' style='overflow:visible'>    <?php echo html::select("types[$i]", $lang->bug->typeList, $type, "class='form-control chosen'");?></td>
+        <td class='<?php echo zget($visibleFields, 'pri', 'hidden')?>' style='overflow:visible'>     <?php echo html::select("pris[$i]", $lang->bug->priList, $pri, "class='form-control chosen'");?></td>
+        <td class='<?php echo zget($visibleFields, 'severity', 'hidden')?>' style='overflow:visible'><?php echo html::select("severities[$i]", $lang->bug->severityList, '', "class='form-control chosen'");?></td>
+        <td class='<?php echo zget($visibleFields, 'os', 'hidden')?>' style='overflow:visible'>      <?php echo html::select("oses[$i]", $lang->bug->osList, $os, "class='form-control chosen'");?></td>
+        <td class='<?php echo zget($visibleFields, 'browser', 'hidden')?>' style='overflow:visible'> <?php echo html::select("browsers[$i]", $lang->bug->browserList, $browser, "class='form-control chosen'");?></td>
         <td class='<?php echo zget($visibleFields, 'keywords', 'hidden')?>'><?php echo html::input("keywords[$i]", '', "class='form-control' autocomplete='off'");?></td>
       </tr>
       <?php $i++;?>
@@ -110,9 +110,9 @@ foreach(explode(',', $showFields) as $field)
       $os        = $i - $nextStart == 0 ? '' : 'ditto';
       $browser   = $i - $nextStart == 0 ? '' : 'ditto';
       ?>
-      <tr class='text-center'>
+      <tr class='text-left'>
         <td><?php echo $i+1;?></td>
-        <td class='text-left<?php echo zget($visibleFields, $product->type, ' hidden')?>'><?php echo html::select("branches[$i]", $branches, $branch, "class='form-control' onchange='setBranchRelated(this.value, $productID, $i)'");?></td>
+        <td class='text-left<?php echo zget($visibleFields, $product->type, ' hidden')?>' style='overflow:visible'><?php echo html::select("branches[$i]", $branches, $branch, "class='form-control chosen' onchange='setBranchRelated(this.value, $productID, $i)'");?></td>
         <td class='text-left<?php echo zget($visibleFields, 'module', ' hidden')?>'  style='overflow:visible'><?php echo html::select("modules[$i]", $moduleOptionMenu, $moduleID, "class='form-control chosen'");?></td>
         <td class='text-left<?php echo zget($visibleFields, 'project', ' hidden')?>' style='overflow:visible'><?php echo html::select("projects[$i]", $projects, $projectID, "class='form-control chosen' onchange='loadProjectBuilds($productID, this.value, $i)'");?></td>
         <td class='text-left' style='overflow:visible' id='buildBox<?php echo $i;?>'><?php echo html::select("openedBuilds[$i][]", $builds, '', "class='form-control chosen' multiple");?></td>
@@ -123,11 +123,11 @@ foreach(explode(',', $showFields) as $field)
           </div>
         </td>
         <td class='<?php echo zget($visibleFields, 'steps', 'hidden')?>'>   <?php echo html::textarea("stepses[$i]", '', "rows='1' class='form-control autosize'");?></td>
-        <td class='<?php echo zget($visibleFields, 'type', 'hidden')?>'>    <?php echo html::select("types[$i]", $lang->bug->typeList, $type, "class='form-control'");?></td>
-        <td class='<?php echo zget($visibleFields, 'pri', 'hidden')?>'>     <?php echo html::select("pris[$i]", $lang->bug->priList, $pri, "class='form-control'");?></td>
-        <td class='<?php echo zget($visibleFields, 'severity', 'hidden')?>'><?php echo html::select("severities[$i]", $lang->bug->severityList, '', "class='form-control'");?></td>
-        <td class='<?php echo zget($visibleFields, 'os', 'hidden')?>'>      <?php echo html::select("oses[$i]", $lang->bug->osList, $os, "class='form-control'");?></td>
-        <td class='<?php echo zget($visibleFields, 'browser', 'hidden')?>'> <?php echo html::select("browsers[$i]", $lang->bug->browserList, $browser, "class='form-control'");?></td>
+        <td class='<?php echo zget($visibleFields, 'type', 'hidden')?>' style='overflow:visible'>    <?php echo html::select("types[$i]", $lang->bug->typeList, $type, "class='form-control chosen'");?></td>
+        <td class='<?php echo zget($visibleFields, 'pri', 'hidden')?>' style='overflow:visible'>     <?php echo html::select("pris[$i]", $lang->bug->priList, $pri, "class='form-control chosen'");?></td>
+        <td class='<?php echo zget($visibleFields, 'severity', 'hidden')?>' style='overflow:visible'><?php echo html::select("severities[$i]", $lang->bug->severityList, '', "class='form-control chosen'");?></td>
+        <td class='<?php echo zget($visibleFields, 'os', 'hidden')?>' style='overflow:visible'>      <?php echo html::select("oses[$i]", $lang->bug->osList, $os, "class='form-control chosen'");?></td>
+        <td class='<?php echo zget($visibleFields, 'browser', 'hidden')?>' style='overflow:visible'> <?php echo html::select("browsers[$i]", $lang->bug->browserList, $browser, "class='form-control chosen'");?></td>
         <td class='<?php echo zget($visibleFields, 'keywords', 'hidden')?>'><?php echo html::input("keywords[$i]", '', "class='form-control' autocomplete='off'");?></td>
       </tr>
       <?php endfor;?>
@@ -139,9 +139,9 @@ foreach(explode(',', $showFields) as $field)
 </form>
 <table class='hide' id='trTemp'>
   <tbody>
-    <tr class='text-center'>
+    <tr class='text-left'>
       <td>%s</td>
-      <td class='text-left<?php echo zget($visibleFields, $product->type, ' hidden')?>'><?php echo html::select("branches[%s]", $branches, $branch, "class='form-control' onchange='setBranchRelated(this.value, $productID, \"%s\")'");?></td>
+      <td class='text-left<?php echo zget($visibleFields, $product->type, ' hidden')?>' style='overflow:visible'><?php echo html::select("branches[%s]", $branches, $branch, "class='form-control' onchange='setBranchRelated(this.value, $productID, \"%s\")'");?></td>
       <td class='text-left<?php echo zget($visibleFields, 'module', ' hidden')?>'  style='overflow:visible'><?php echo html::select("modules[%s]", $moduleOptionMenu, $moduleID, "class='form-control'");?></td>
       <td class='text-left<?php echo zget($visibleFields, 'project', ' hidden')?>' style='overflow:visible'><?php echo html::select("projects[%s]", $projects, $projectID, "class='form-control' onchange='loadProjectBuilds($productID, this.value, \"%s\")'");?></td>
       <td class='text-left' style='overflow:visible' id='buildBox%s'><?php echo html::select("openedBuilds[%s][]", $builds, '', "class='form-control' multiple");?></td>
@@ -152,11 +152,11 @@ foreach(explode(',', $showFields) as $field)
         </div>
       </td>
       <td class='<?php echo zget($visibleFields, 'steps', 'hidden')?>'>   <?php echo html::textarea("stepses[%s]", '', "rows='1' class='form-control autosize'");?></td>
-      <td class='<?php echo zget($visibleFields, 'type', 'hidden')?>'>    <?php echo html::select("types[%s]", $lang->bug->typeList, $type, "class='form-control'");?></td>
-      <td class='<?php echo zget($visibleFields, 'pri', 'hidden')?>'>     <?php echo html::select("pris[%s]", $lang->bug->priList, '', "class='form-control'");?></td>
-      <td class='<?php echo zget($visibleFields, 'severity', 'hidden')?>'><?php echo html::select("severities[%s]", $lang->bug->severityList, '', "class='form-control'");?></td>
-      <td class='<?php echo zget($visibleFields, 'os', 'hidden')?>'>      <?php echo html::select("oses[%s]", $lang->bug->osList, $os, "class='form-control'");?></td>
-      <td class='<?php echo zget($visibleFields, 'browser', 'hidden')?>'> <?php echo html::select("browsers[%s]", $lang->bug->browserList, $browser, "class='form-control'");?></td>
+      <td class='<?php echo zget($visibleFields, 'type', 'hidden')?>' style='overflow:visible'>    <?php echo html::select("types[%s]", $lang->bug->typeList, $type, "class='form-control'");?></td>
+      <td class='<?php echo zget($visibleFields, 'pri', 'hidden')?>' style='overflow:visible'>     <?php echo html::select("pris[%s]", $lang->bug->priList, '', "class='form-control'");?></td>
+      <td class='<?php echo zget($visibleFields, 'severity', 'hidden')?>' style='overflow:visible'><?php echo html::select("severities[%s]", $lang->bug->severityList, '', "class='form-control'");?></td>
+      <td class='<?php echo zget($visibleFields, 'os', 'hidden')?>' style='overflow:visible'>      <?php echo html::select("oses[%s]", $lang->bug->osList, $os, "class='form-control'");?></td>
+      <td class='<?php echo zget($visibleFields, 'browser', 'hidden')?>' style='overflow:visible'> <?php echo html::select("browsers[%s]", $lang->bug->browserList, $browser, "class='form-control'");?></td>
       <td class='<?php echo zget($visibleFields, 'keywords', 'hidden')?>'><?php echo html::input("keywords[%s]", '', "class='form-control' autocomplete='off'");?></td>
     </tr>
   </tbody>
diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index a1ba83fc4f..947148fefd 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -74,15 +74,15 @@ js::set('confirmDeleteTemplate', $lang->bug->confirmDeleteTemplate);
             unset($lang->bug->typeList['designchange']);
             unset($lang->bug->typeList['newfeature']);
             unset($lang->bug->typeList['trackthings']);
-            echo html::select('type', $lang->bug->typeList, $type, "class='form-control'");
+            echo html::select('type', $lang->bug->typeList, $type, "class='form-control chosen'");
             ?>
             <?php if($showOS):?>
             <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'");?>
+            <?php echo html::select('os', $lang->bug->osList, $os, "class='form-control chosen'");?>
             <?php endif;?>
             <?php if($showBrowser):?>
             <span class='input-group-addon fix-border'><?php echo $lang->bug->browser?></span>
-            <?php echo html::select('browser', $lang->bug->browserList, $browser, "class='form-control'");?>
+            <?php echo html::select('browser', $lang->bug->browserList, $browser, "class='form-control chosen'");?>
             <?php endif;?>
           </div>
         </td>
@@ -129,15 +129,15 @@ js::set('confirmDeleteTemplate', $lang->bug->confirmDeleteTemplate);
             unset($lang->bug->typeList['designchange']);
             unset($lang->bug->typeList['newfeature']);
             unset($lang->bug->typeList['trackthings']);
-            echo html::select('type', $lang->bug->typeList, $type, "class='form-control'");
+            echo html::select('type', $lang->bug->typeList, $type, "class='form-control chosen'");
             ?>
             <?php if($showOS):?>
             <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'");?>
+            <?php echo html::select('os', $lang->bug->osList, $os, "class='form-control chosen'");?>
             <?php endif;?>
             <?php if($showBrowser):?>
             <span class='input-group-addon fix-border'><?php echo $lang->bug->browser?></span>
-            <?php echo html::select('browser', $lang->bug->browserList, $browser, "class='form-control'");?>
+            <?php echo html::select('browser', $lang->bug->browserList, $browser, "class='form-control chosen'");?>
             <?php endif;?>
           </div>
         </td>
@@ -173,7 +173,7 @@ js::set('confirmDeleteTemplate', $lang->bug->confirmDeleteTemplate);
                 }
                 ?>
                 <?php if($hasCustomSeverity):?>
-                <?php echo html::select('severity', (array)$lang->bug->severityList, $severity, "class='form-control minw-80px'");?> 
+                <?php echo html::select('severity', (array)$lang->bug->severityList, $severity, "class='form-control minw-80px chosen'");?> 
                 <?php else: ?>
                 <div class='input-group-btn dropdown-pris' data-prefix='severity'>
                   <button type='button' class='btn dropdown-toggle br-0' data-toggle='dropdown'>
@@ -198,7 +198,7 @@ js::set('confirmDeleteTemplate', $lang->bug->confirmDeleteTemplate);
                 }
                 ?>
                 <?php if($hasCustomPri):?>
-                <?php echo html::select('pri', (array)$lang->bug->priList, $pri, "class='form-control minw-80px'");?> 
+                <?php echo html::select('pri', (array)$lang->bug->priList, $pri, "class='form-control minw-80px chosen'");?> 
                 <?php else: ?>
                 <div class='input-group-btn dropdown-pris'>
                   <button type='button' class='btn dropdown-toggle br-0' data-toggle='dropdown'>
diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php
index 4d569780f7..e5d5a3009b 100644
--- a/module/bug/view/edit.html.php
+++ b/module/bug/view/edit.html.php
@@ -121,21 +121,21 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
               if($bug->type != 'designchange') unset($lang->bug->typeList['designchange']);
               if($bug->type != 'newfeature')   unset($lang->bug->typeList['newfeature']);
               if($bug->type != 'trackthings')  unset($lang->bug->typeList['trackthings']);
-              echo html::select('type', $lang->bug->typeList, $bug->type, "class='form-control'");
+              echo html::select('type', $lang->bug->typeList, $bug->type, "class='form-control chosen'");
               ?>
             </td>
           </tr>
           <tr>
             <th><?php echo $lang->bug->severity;?></th>
-            <td><?php echo html::select('severity', $lang->bug->severityList, $bug->severity, "class='form-control'");?></td>
+            <td><?php echo html::select('severity', $lang->bug->severityList, $bug->severity, "class='form-control chosen'");?></td>
           </tr>
           <tr>
             <th><?php echo $lang->bug->pri;?></th>
-            <td><?php echo html::select('pri', $lang->bug->priList, $bug->pri, "class='form-control'");?></td>
+            <td><?php echo html::select('pri', $lang->bug->priList, $bug->pri, "class='form-control chosen'");?></td>
           </tr>
           <tr>
             <th><?php echo $lang->bug->status;?></th>
-            <td><?php echo html::select('status', $lang->bug->statusList, $bug->status, "class='form-control'");?></td>
+            <td><?php echo html::select('status', $lang->bug->statusList, $bug->status, "class='form-control chosen'");?></td>
           </tr>
           <tr>
             <th><?php echo $lang->bug->confirmed;?></th>
@@ -151,11 +151,11 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
           </tr>
           <tr>
             <th><?php echo $lang->bug->os;?></th>
-            <td><?php echo html::select('os', $lang->bug->osList, $bug->os, "class='form-control'");?></td>
+            <td><?php echo html::select('os', $lang->bug->osList, $bug->os, "class='form-control chosen'");?></td>
           </tr>
           <tr>
             <th><?php echo $lang->bug->browser;?></th>
-            <td><?php echo html::select('browser', $lang->bug->browserList, $bug->browser, "class='form-control'");?></td>
+            <td><?php echo html::select('browser', $lang->bug->browserList, $bug->browser, "class='form-control chosen'");?></td>
           </tr>
           <tr>
             <th><?php echo $lang->bug->keywords;?></th>
@@ -163,7 +163,10 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
           </tr>
           <tr>
             <th><?php echo $lang->bug->mailto;?></th>
-            <td><?php echo html::select('mailto[]', $users, str_replace(' ', '', $bug->mailto), 'class="form-control chosen" multiple');?></td>
+            <td>
+              <?php echo html::select('mailto[]', $users, str_replace(' ', '', $bug->mailto), 'class="form-control chosen" multiple');?>
+              <?php echo $this->fetch('my', 'buildContactLists');?>
+            </td>
           </tr>
         </table>
       </fieldset>
diff --git a/module/story/view/batchcreate.html.php b/module/story/view/batchcreate.html.php
index 186532129f..f53046a876 100644
--- a/module/story/view/batchcreate.html.php
+++ b/module/story/view/batchcreate.html.php
@@ -93,7 +93,7 @@ if($this->story->checkForceReview()) unset($visibleFields['review']);
     <?php $source   = $i - $nextStart == 0 ? '' : 'ditto';?>
     <tr class='text-center'>
       <td><?php echo $i+1;?></td>
-      <td class='text-left<?php echo zget($visibleFields, $product->type, ' hidden')?>'><?php echo html::select("branch[$i]", $branches, $branch, "class='form-control' onchange='setModuleAndPlan(this.value, $productID, $i)'");?></td>
+      <td class='text-left<?php echo zget($visibleFields, $product->type, ' hidden')?>' style='overflow:visible'><?php echo html::select("branch[$i]", $branches, $branch, "class='form-control chosen' onchange='setModuleAndPlan(this.value, $productID, $i)'");?></td>
       <td class='text-left<?php echo zget($visibleFields, 'module', ' hidden')?>' style='overflow:visible'><?php echo html::select("module[$i]", $moduleOptionMenu, $moduleID, "class='form-control chosen'");?></td>
       <td class='text-left<?php echo zget($visibleFields, 'plan', ' hidden')?>' style='overflow:visible'><?php echo html::select("plan[$i]", $plans, $planID, "class='form-control chosen'");?></td>
       <td style='overflow:visible'>
@@ -121,7 +121,7 @@ if($this->story->checkForceReview()) unset($visibleFields['review']);
   <tbody>
     <tr class='text-center'>
       <td>%s</td>
-      <td class='text-left<?php echo zget($visibleFields, $product->type, ' hidden')?>'><?php echo html::select("branch[%s]", $branch, $branch, "class='form-control' onchange='setModuleAndPlan(this.value, $productID, \"%s\")'");?></td>
+      <td class='text-left<?php echo zget($visibleFields, $product->type, ' hidden')?>' style='overflow:visible'><?php echo html::select("branch[%s]", $branches, $branch, "class='form-control' onchange='setModuleAndPlan(this.value, $productID, \"%s\")'");?></td>
       <td class='text-left<?php echo zget($visibleFields, 'module', ' hidden')?>' style='overflow:visible'><?php echo html::select("module[%s]", $moduleOptionMenu, $moduleID, "class='form-control'");?></td>
       <td class='text-left<?php echo zget($visibleFields, 'plan', ' hidden')?>' style='overflow:visible'><?php echo html::select("plan[%s]", $plans, $planID, "class='form-control'");?></td>
       <td style='overflow:visible'>
diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php
index a114a8a932..0303cb03b6 100644
--- a/module/story/view/create.html.php
+++ b/module/story/view/create.html.php
@@ -71,9 +71,9 @@
         <td>
           <div class='input-group'>
             <span class='input-group-addon w-60px'><?php echo $lang->story->source?></span>
-            <?php echo html::select('source', $lang->story->sourceList, $source, "class='form-control'");?>
+            <?php echo html::select('source', $lang->story->sourceList, $source, "class='form-control chosen'");?>
             <span class='input-group-addon fix-border'><?php echo $lang->story->sourceNote?></span>
-            <?php echo html::input('sourceNote', $sourceNote, "class='form-control' autocomplete='off'");?>
+            <?php echo html::input('sourceNote', $sourceNote, "class='form-control' autocomplete='off' style='width:200px;'");?>
           </div>
         </td>
         <?php endif;?>
@@ -120,8 +120,8 @@
                     }
                 }
                 ?>
-                <?php if($hasCustomPri):?>
-                <?php echo html::select('pri', (array)$lang->story->priList, $pri, "class='form-control minw-80px'");?> 
+                <?php if(!$hasCustomPri):?>
+                <?php echo html::select('pri', (array)$lang->story->priList, $pri, "class='form-control minw-80px chosen'");?> 
                 <?php else: ?>
                 <div class='input-group-btn dropdown-pris' data-set='0,1,2,3,4'>
                   <button type='button' class='btn dropdown-toggle br-0' data-toggle='dropdown'>
diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php
index 434f9ec4aa..34c6a131e1 100644
--- a/module/story/view/edit.html.php
+++ b/module/story/view/edit.html.php
@@ -108,7 +108,7 @@
           </tr>
           <tr>
             <th><?php echo $lang->story->source;?></th>
-            <td><?php echo html::select('source', $lang->story->sourceList, $story->source, 'class=form-control');?></td>
+            <td><?php echo html::select('source', $lang->story->sourceList, $story->source, "class='form-control chosen'");?></td>
           </tr>
           <tr>
             <th><?php echo $lang->story->sourceNote;?></th>
@@ -122,12 +122,12 @@
           <?php if($story->status != 'draft'):?>
           <tr>
             <th><?php echo $lang->story->stage;?></th>
-            <td><?php echo html::select('stage', $lang->story->stageList, $story->stage, 'class=form-control');?></td>
+            <td><?php echo html::select('stage', $lang->story->stageList, $story->stage, "class='form-control chosen'");?></td>
           </tr>
           <?php endif;?>
           <tr>
             <th><?php echo $lang->story->pri;?></th>
-            <td><?php echo html::select('pri', $lang->story->priList, $story->pri, 'class=form-control');?></td>
+            <td><?php echo html::select('pri', $lang->story->priList, $story->pri, "class='form-control chosen'");?></td>
           </tr>
           <tr>
             <th><?php echo $lang->story->estimate;?></th>
@@ -139,7 +139,10 @@
           </tr>
           <tr>
             <th><?php echo $lang->story->mailto;?></th>
-            <td><?php echo html::select('mailto[]', $users, str_replace(' ' , '', $story->mailto), "class='form-control' multiple");?></td>
+            <td>
+              <?php echo html::select('mailto[]', $users, str_replace(' ' , '', $story->mailto), "class='form-control' multiple");?>
+              <?php echo $this->fetch('my', 'buildContactLists')?>
+            </td>
           </tr>
         </table>
       </fieldset>
diff --git a/module/task/model.php b/module/task/model.php
index 7ae4d1a5a3..57fe71c99a 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -2088,8 +2088,8 @@ class taskModel extends model
                     echo $canView ? html::a($taskLink, sprintf('%03d', $task->id)) : sprintf('%03d', $task->id);
                     break;
                 case 'pri':
-                    echo "<span class='pri" . zget(array_keys($this->lang->task->priList), $task->pri, $task->pri) . "'>";
-                    echo $task->pri == '0' ? '' : zget(array_keys($this->lang->task->priList), $task->pri, $task->pri);
+                    echo "<span class='pri" . zget($this->lang->task->priList, $task->pri) . "'>";
+                    echo $task->pri == '0' ? '' : zget($this->lang->task->priList, $task->pri);
                     echo "</span>";
                     break;
                 case 'name':
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index 891c29d5e8..f373bfc004 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -34,7 +34,7 @@
       </tr>
       <tr>
         <th><?php echo $lang->task->type;?></th>
-        <td><?php echo html::select('type', $lang->task->typeList, $task->type, 'class=form-control onchange="setOwners(this.value)"');?></td><td></td>
+        <td><?php echo html::select('type', $lang->task->typeList, $task->type, "class='form-control chosen' onchange='setOwners(this.value)'");?></td><td></td>
       </tr>
       <tr>
         <th><?php echo $lang->task->assignedTo;?></th>
@@ -101,7 +101,7 @@
               <div class='input-group'>
                 <span class='input-group-addon fix-border br-0'><?php echo $lang->task->pri;?></span>
                 <?php if($hasCustomPri):?>
-                <?php echo html::select('pri', $lang->task->priList, $task->pri, "class='form-control'");?> 
+                <?php echo html::select('pri', $lang->task->priList, $task->pri, "class='form-control chosen'");?> 
                 <?php else:?>
                 <div class='input-group-btn dropdown-pris'>
                   <button type='button' class='btn dropdown-toggle br-0' data-toggle='dropdown'>
diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php
index 380d0f0a11..0fe0e0ae8e 100644
--- a/module/task/view/edit.html.php
+++ b/module/task/view/edit.html.php
@@ -96,21 +96,24 @@
           </tr>
           <tr>
             <th><?php echo $lang->task->type;?></th>
-            <td><?php echo html::select('type', $lang->task->typeList, $task->type, 'class=form-control');?></td>
+            <td><?php echo html::select('type', $lang->task->typeList, $task->type, "class='form-control chosen'");?></td>
           </tr>
           <?php if(empty($task->children)):?>
           <tr>
             <th><?php echo $lang->task->status;?></th>
-            <td><?php echo html::select('status', (array)$lang->task->statusList, $task->status, 'class=form-control');?></td>
+            <td><?php echo html::select('status', (array)$lang->task->statusList, $task->status, "class='form-control chosen'");?></td>
           </tr>
           <?php endif;?>
           <tr>
             <th><?php echo $lang->task->pri;?></th>
-            <td><?php echo html::select('pri', $lang->task->priList, $task->pri, 'class=form-control');?> </td>
+            <td><?php echo html::select('pri', $lang->task->priList, $task->pri, "class='form-control chosen'");?> </td>
           </tr>
           <tr>
             <th><?php echo $lang->task->mailto;?></th>
-            <td><?php echo html::select('mailto[]', $project->acl == 'private' ? $members : $users, str_replace(' ' , '', $task->mailto), 'class="form-control" multiple');?></td>
+            <td>
+            <?php echo html::select('mailto[]', $project->acl == 'private' ? $members : $users, str_replace(' ' , '', $task->mailto), 'class="form-control" multiple');?>
+            <?php echo $this->fetch('my', 'buildContactLists');?>
+            </td>
           </tr>
         </table>
       </fieldset>
diff --git a/module/testcase/control.php b/module/testcase/control.php
index c7ddbdae68..543777b6be 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -1333,7 +1333,7 @@ class testcase extends control
                 $columnKey[] = $fields[$title];
             }
 
-            if(count($columnKey) != count($header) or $this->post->encode != 'utf-8')
+            if(count($columnKey) == 0 or $this->post->encode != 'utf-8')
             {
                 $fc     = file_get_contents($fileName);
                 $encode = $this->post->encode != "utf-8" ? $this->post->encode : 'gbk';
@@ -1354,7 +1354,7 @@ class testcase extends control
                     if(!isset($fields[$title])) continue;
                     $columnKey[] = $fields[$title];
                 }
-                if(count($columnKey) != count($header)) die(js::alert($this->lang->testcase->errorEncode));
+                if(count($columnKey) == 0) die(js::alert($this->lang->testcase->errorEncode));
             }
 
             $this->session->set('importFile', $fileName);
diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php
index f4391981cf..6b181a15dd 100644
--- a/module/testcase/view/create.html.php
+++ b/module/testcase/view/create.html.php
@@ -109,7 +109,7 @@
                 }
                 ?>
                 <?php if($hasCustomPri):?>
-                <?php echo html::select('pri', (array)$lang->testcase->priList, $pri, "class='form-control minw-80px'");?> 
+                <?php echo html::select('pri', (array)$lang->testcase->priList, $pri, "class='form-control minw-80px chosen'");?> 
                 <?php else: ?>
                 <div class='input-group-btn dropdown-pris'>
                   <button type='button' class='btn dropdown-toggle br-0' data-toggle='dropdown'>
diff --git a/module/testcase/view/edit.html.php b/module/testcase/view/edit.html.php
index b6b4217092..09571f6396 100644
--- a/module/testcase/view/edit.html.php
+++ b/module/testcase/view/edit.html.php
@@ -187,7 +187,7 @@
           <?php endif;?>
           <tr>
             <th><?php echo $lang->testcase->type;?></th>
-            <td><?php echo html::select('type', (array)$lang->testcase->typeList, $case->type, 'class=form-control');?></td>
+            <td><?php echo html::select('type', (array)$lang->testcase->typeList, $case->type, "class='form-control chosen'");?></td>
           </tr>
           <tr>
             <th><?php echo $lang->testcase->stage;?></th>
@@ -195,11 +195,11 @@
           </tr>  
           <tr>
             <th><?php echo $lang->testcase->pri;?></th>
-            <td><?php echo html::select('pri', (array)$lang->testcase->priList, $case->pri, 'class=form-control');?></td>
+            <td><?php echo html::select('pri', (array)$lang->testcase->priList, $case->pri, "class='form-control chosen'");?></td>
           </tr>
           <tr>
             <th><?php echo $lang->testcase->status;?></th>
-            <td><?php echo html::select('status', (array)$lang->testcase->statusList, $case->status, 'class=form-control');?></td>
+            <td><?php echo html::select('status', (array)$lang->testcase->statusList, $case->status, "class='form-control chosen'");?></td>
           </tr>
           <tr>
             <th><?php echo $lang->testcase->keywords;?></th>