diff --git a/module/bug/css/linkbugs.css b/module/bug/css/linkbugs.css
index c7e5a58b26..94b286b4eb 100644
--- a/module/bug/css/linkbugs.css
+++ b/module/bug/css/linkbugs.css
@@ -1 +1 @@
-#linkBugsForm {min-height: 300px}
+#mainContent {min-height: 300px}
diff --git a/module/bug/view/batchcreate.html.php b/module/bug/view/batchcreate.html.php
index 6942d5687d..b6e8d1b501 100644
--- a/module/bug/view/batchcreate.html.php
+++ b/module/bug/view/batchcreate.html.php
@@ -19,7 +19,7 @@
     </h2>
     <div class="pull-right btn-toolbar">
       <?php if(common::hasPriv('file', 'uploadImages')) echo html::a($this->createLink('file', 'uploadImages', 'module=bug&params=' . helper::safe64Encode("productID=$productID&projectID=$projectID&moduleID=$moduleID")), $lang->uploadImages, '', "data-toggle='modal' data-type='iframe' class='btn btn-info' data-width='70%'")?>
-      <?php echo html::commonButton($lang->pasteText, "data-toggle='importLinesModal'", 'btn btn-info')?>
+      <button type='button' data-toggle="importLinesModal" class="btn btn-info"><?php echo $lang->pasteText;?></button>
       <?php $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=bug&section=custom&key=batchCreateFields')?>
       <?php include '../../common/view/customfield.html.php';?>
     </div>
diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index edd10051ec..43d7823737 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -255,44 +255,6 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
               $misc = common::hasPriv('bug', 'batchActivate') ? "onclick=\"setFormAction('$actionLink')\"" : $class;
               if($misc) echo "<li>" . html::a('javascript:;', $lang->bug->activate, '', $misc) . "</li>";
 
-              if(common::hasPriv('bug', 'batchChangeBranch') and $this->session->currentProductType != 'normal')
-              {
-                  $withSearch = count($branches) > 8;
-                  echo "<li class='dropdown-submenu'>";
-                  echo html::a('javascript:;', $lang->product->branchName[$this->session->currentProductType], '', "id='branchItem'");
-                  echo "<div class='dropdown-menu" . ($withSearch ? ' with-search':'') . "'>";
-                  echo "<ul class='dropdown-list'>";
-                  foreach($branches as $branchID => $branchName)
-                  {
-                      $actionLink = $this->createLink('bug', 'batchChangeBranch', "branchID=$branchID");
-                      echo "<li class='option' data-key='$branchID'>" . html::a('#', $branchName, '', "onclick=\"setFormAction('$actionLink', 'hiddenwin')\"") . "</li>";
-                  }
-                  echo '</ul>';
-                  if($withSearch) echo "<div class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></div>";
-                  echo '</div></li>';
-              }
-
-              if(common::hasPriv('bug', 'batchChangeModule'))
-              {
-                  $withSearch = count($modules) > 8;
-                  echo "<li class='dropdown-submenu'>";
-                  echo html::a('javascript:;', $lang->bug->moduleAB, '', "id='moduleItem'");
-                  echo "<div class='dropdown-menu" . ($withSearch ? ' with-search':'') . "'>";
-                  echo '<ul class="dropdown-list">';
-                  foreach($modules as $moduleId => $module)
-                  {
-                      $actionLink = $this->createLink('bug', 'batchChangeModule', "moduleID=$moduleId");
-                      echo "<li class='option' data-key='$moduleID'>" . html::a('#', $module, '', "onclick=\"setFormAction('$actionLink','hiddenwin')\"") . "</li>";
-                  }
-                  echo "</ul>";
-                  if($withSearch) echo "<div class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></div>";
-                  echo '</div></li>';
-              }
-              else
-              {
-                  echo '<li>' . html::a('javascript:;', $lang->bug->moduleAB, '', $class) . '</li>';
-              }
-
               $misc = common::hasPriv('bug', 'batchResolve') ? "id='resolveItem'" : '';
               if($misc)
               {
@@ -330,37 +292,89 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
                   }
                   echo '</ul></li>';
               }
-              else
-              {
-                  echo "<li>" . html::a('javascript:;', $lang->bug->resolve,  '', $class);
-              }
-
-              $canBatchAssignTo = common::hasPriv('bug', 'batchAssignTo');
-              if($canBatchAssignTo && count($bugs))
-              {
-                  $withSearch = count($memberPairs) > 10;
-                  $actionLink = $this->createLink('bug', 'batchAssignTo', "productID={$productID}&type=product");
-                  echo html::select('assignedTo', $memberPairs, '', 'class="hidden"');
-                  echo "<li class='dropdown-submenu'>";
-                  echo html::a('javascript::', $lang->bug->assignedTo, 'id="assignItem"');
-                  echo "<div class='dropdown-menu" . ($withSearch ? ' with-search':'') . "'>";
-                  echo '<ul class="dropdown-list">';
-                  foreach ($memberPairs as $key => $value)
-                  {
-                      if(empty($key)) continue;
-                      echo "<li class='option' data-key='$key'>" . html::a("javascript:$(\"#assignedTo\").val(\"$key\");setFormAction(\"$actionLink\",\"hiddenwin\")", $value, '', '') . '</li>';
-                  }
-                  echo "</ul>";
-                  if($withSearch) echo "<div class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></div>";
-                  echo "</div></li>";
-              }
-              else
-              {
-                  echo "<li>" . html::a('javascript:;', $lang->bug->assignedTo,  '', $class);
-              }
               ?>
             </ul>
           </div>
+          <?php if(common::hasPriv('bug', 'batchChangeBranch') and $this->session->currentProductType != 'normal'):?>
+          <div class="btn-group dropup">
+            <button data-toggle="dropdown" type="button" class="btn"><?php echo $lang->product->branchName[$this->session->currentProductType];?> <span class="caret"></span></button>
+            <?php $withSearch = count($branches) > 8;?>
+            <?php if($withSearch):?>
+            <div class="dropdown-menu search-list" data-ride="searchList">
+              <div class="input-control search-box search-box-circle has-icon-left has-icon-right search-example">
+                <input id="userSearchBox" type="search" autocomplete="off" class="form-control search-input">
+                <label for="userSearchBox" class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label>
+                <a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a>
+              </div>
+            <?php else:?>
+            <div class="dropdown-menu">
+            <?php endif;?>
+              <div class="list-group">
+                <?php
+                foreach($branches as $branchID => $branchName)
+                {
+                    $actionLink = $this->createLink('bug', 'batchChangeBranch', "branchID=$branchID");
+                    echo html::a('#', $branchName, '', "onclick=\"setFormAction('$actionLink', 'hiddenwin')\" data-key='$branchID'");
+                }
+                ?>
+              </div>
+            </div>
+          </div>
+          <?php endif;?>
+          <?php if(common::hasPriv('bug', 'batchChangeModule')):?>
+          <div class="btn-group dropup">
+            <button data-toggle="dropdown" type="button" class="btn"><?php echo $lang->bug->moduleAB;?> <span class="caret"></span></button>
+            <?php $withSearch = count($modules) > 8;?>
+            <?php if($withSearch):?>
+            <div class="dropdown-menu search-list" data-ride="searchList">
+              <div class="input-control search-box search-box-circle has-icon-left has-icon-right search-example">
+                <input id="userSearchBox" type="search" autocomplete="off" class="form-control search-input">
+                <label for="userSearchBox" class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label>
+                <a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a>
+              </div>
+            <?php else:?>
+            <div class="dropdown-menu">
+            <?php endif;?>
+              <div class="list-group">
+                <?php
+                foreach($modules as $moduleId => $module)
+                {
+                    $actionLink = $this->createLink('bug', 'batchChangeModule', "moduleID=$moduleId");
+                    echo html::a('#', $module, '', "onclick=\"setFormAction('$actionLink','hiddenwin')\" data-key='$moduleID'");
+                }
+                ?>
+              </div>
+            </div>
+          </div>
+          <?php endif;?>
+          <?php if(common::hasPriv('bug', 'batchAssignTo')):?>
+          <div class="btn-group dropup">
+            <button data-toggle="dropdown" type="button" class="btn"><?php echo $lang->bug->assignedTo;?> <span class="caret"></span></button>
+            <?php $withSearch = count($memberPairs) > 10;?>
+            <?php if($withSearch):?>
+            <div class="dropdown-menu search-list" data-ride="searchList">
+              <div class="input-control search-box search-box-circle has-icon-left has-icon-right search-example">
+                <input id="userSearchBox" type="search" autocomplete="off" class="form-control search-input">
+                <label for="userSearchBox" class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label>
+                <a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a>
+              </div>
+            <?php else:?>
+            <div class="dropdown-menu">
+            <?php endif;?>
+              <div class="list-group">
+                <?php
+                $actionLink = $this->createLink('bug', 'batchAssignTo', "productID={$productID}&type=product");
+                echo html::select('assignedTo', $memberPairs, '', 'class="hidden"');
+                foreach ($memberPairs as $key => $value)
+                {
+                    if(empty($key)) continue;
+                    echo html::a("javascript:$(\"#assignedTo\").val(\"$key\");setFormAction(\"$actionLink\",\"hiddenwin\")", $value, '', "data-key='$key'");
+                }
+                ?>
+              </div>
+            </div>
+          </div>
+          <?php endif;?>
         </div>
         <?php $pager->show('right', 'pagerjs');?>
       </div>
diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php
index 76cf0449ff..43086c9240 100644
--- a/module/bug/view/edit.html.php
+++ b/module/bug/view/edit.html.php
@@ -264,8 +264,11 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
               <tbody>
                 <tr class='text-top'>
                   <th class='w-80px'><?php echo $lang->bug->linkBug;?></th>
+                  <td><?php echo html::a($this->createLink('bug', 'linkBugs', "bugID=$bug->id", '', true), $lang->bug->linkBugs, '', "data-toggle='modal' data-type='iframe' data-width='95%'");?></td>
+                </tr>
+                <tr>
+                  <th></th>
                   <td>
-                    <?php echo html::a($this->createLink('bug', 'linkBugs', "bugID=$bug->id", '', true), $lang->bug->linkBugs, '', "data-toggle='modal' data-type='iframe' data-width='95%'");?>
                     <ul class='list-unstyled' id='linkBugBox'>
                     <?php
                     if(isset($bug->linkBugTitles))
diff --git a/module/bug/view/linkbugs.html.php b/module/bug/view/linkbugs.html.php
index caa7b26cdb..e715e7f264 100644
--- a/module/bug/view/linkbugs.html.php
+++ b/module/bug/view/linkbugs.html.php
@@ -11,65 +11,66 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<div class='container'>
-  <div id='titlebar'>
-    <div class='heading'>
-      <span class='prefix'><?php echo html::icon($lang->icons['bug']);?> <strong><?php echo $bug->id;?></strong></span>
-      <strong><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title, '_blank');?></strong>
-      <small class='text-muted'> <?php echo $lang->bug->linkBugs;?> <?php echo html::icon($lang->icons['link']);?></small>
-    </div>
-    <div id='querybox' class='show'></div>
+<div id='mainContent' class='main-content'>
+  <div class='main-header'>
+    <h2>
+      <span class='label label-id'><?php echo $bug->id;?></span>
+      <?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title, '_blank');?>
+      <small class='text-muted'> <?php echo $lang->arrow . $lang->bug->linkBugs;?></small>
+    </h2>
   </div>
-  <form method='post' class='form-condensed' target='hiddenwin' id='linkBugsForm'>
-    <table class='table table-condensed table-hover table-striped tablesorter table-selectable' id='bugList'>
-      <?php if($bugs2Link):?>
+  <div id='queryBox' class='show'></div>
+  <?php if($bugs2Link):?>
+  <form class='main-table' method='post' data-ride='table' target='hiddenwin' id='linkBugsForm'>
+    <table class='table' id='bugList'>
       <thead>
-      <tr>
-        <th class='w-id'><?php echo $lang->idAB;?></th>
-        <th class='w-pri'><?php echo $lang->priAB;?></th>
-        <th><?php echo $lang->bug->product;?></th>
-        <th><?php echo $lang->bug->title;?></th>
-        <th><?php echo $lang->bug->statusAB;?></th>
-        <th class='w-user'><?php echo $lang->openedByAB;?></th>
-        <th class='w-user'><?php echo $lang->assignedToAB;?></th>
-      </tr>
+        <tr>
+          <th class="c-id">
+            <div class="checkbox-primary check-all" title="<?php echo $lang->selectAll?>">
+              <label></label>
+            </div>
+            <?php echo $lang->idAB;?>
+          </th>
+          <th class='c-pri'><?php echo $lang->priAB;?></th>
+          <th><?php echo $lang->bug->product;?></th>
+          <th><?php echo $lang->bug->title;?></th>
+          <th class='w-status'><?php echo $lang->bug->statusAB;?></th>
+          <th class='w-100px'><?php echo $lang->openedByAB;?></th>
+          <th class='w-100px'><?php echo $lang->assignedToAB;?></th>
+        </tr>
       </thead>
       <tbody>
-      <?php $bugCount = 0;?>
-      <?php foreach($bugs2Link as $bug2Link):?>
-      <?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug2Link->id");?>
-      <tr class='text-center'>
-        <td class='cell-id'>
-          <input type='checkbox' name='bugs[]'  value='<?php echo $bug2Link->id;?>'/> 
-          <?php echo html::a($bugLink, sprintf('%03d', $bug2Link->id));?>
-        </td>
-        <td><span class='<?php echo 'pri' . zget($lang->bug->priList, $bug2Link->pri, $bug2Link->pri)?>'><?php echo zget($lang->bug->priList, $bug2Link->pri, $bug2Link->pri);?></span></td>
-        <td><?php echo html::a($this->createLink('product', 'browse', "productID=$bug2Link->product&branch=$bug2Link->branch"), $products[$bug2Link->product], '_blank');?></td>
-        <td class='text-left nobr' title="<?php echo $bug2Link->title?>"><?php echo html::a($bugLink, $bug2Link->title);?></td>
-        <td><?php echo $lang->bug->statusList[$bug->status];?></td>
-        <td><?php echo $users[$bug2Link->openedBy];?></td>
-        <td><?php echo $users[$bug2Link->assignedTo];?></td>
-      </tr>
-      <?php $bugCount ++;?>
-      <?php endforeach;?>
+        <?php $bugCount = 0;?>
+        <?php foreach($bugs2Link as $bug2Link):?>
+        <?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug2Link->id");?>
+        <tr>
+          <td class='c-id'>
+            <div class="checkbox-primary">
+              <input type='checkbox' name='bugs[]'  value='<?php echo $bug2Link->id;?>'/> 
+              <label></label>
+            </div>
+            <?php printf('%03d', $bug2Link->id);?>
+          </td>
+          <td><span class='label-pri <?php echo 'label-pri-' . $bug2Link->pri?>'><?php echo zget($lang->bug->priList, $bug2Link->pri, $bug2Link->pri);?></span></td>
+          <td><?php echo html::a($this->createLink('product', 'browse', "productID=$bug2Link->product&branch=$bug2Link->branch"), $products[$bug2Link->product], '_blank');?></td>
+          <td class='text-left nobr' title="<?php echo $bug2Link->title?>"><?php echo html::a($bugLink, $bug2Link->title);?></td>
+          <td><?php echo zget($lang->bug->statusList, $bug->status, '');?></td>
+          <td><?php echo zget($users, $bug2Link->openedBy);?></td>
+          <td><?php echo zget($users, $bug2Link->assignedTo);?></td>
+        </tr>
+        <?php $bugCount ++;?>
+        <?php endforeach;?>
       </tbody>
-      <tfoot>
-      <tr>
-        <td colspan='7' class='text-left'>
-          <div class='table-actions clearfix'>
-          <?php if($bugCount) echo html::selectButton() . html::submitButton();?>
-          </div>
-        </td>
-      </tr>
-      <tr>
-        <td class='hidden'><?php echo html::input('bug', $bug->id);?></td>
-      </tr>
-      </tfoot>
-      <?php endif;?>
     </table>
+    <div class='table-footer'>
+      <div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
+      <div class="table-actions btn-toolbar"><?php echo html::submitButton();?></div>
+      <?php echo html::hidden('bug', $bug->id);?>
+    </div>
   </form>
+  <?php endif;?>
 </div>
-<script type='text/javascript'>
+<script>
 $(function(){ajaxGetSearchForm();});
 </script>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/file/view/uploadimages.html.php b/module/file/view/uploadimages.html.php
index 40ece425a3..a1c12ddde9 100644
--- a/module/file/view/uploadimages.html.php
+++ b/module/file/view/uploadimages.html.php
@@ -22,18 +22,23 @@ js::set('uid', $uid);
 #uploader{padding: 20px;}
 #uploader > span{display:block; margin-bottom:10px; color: #29a8cd;}
 </style>
-<div class='uploader' id='uploader' data-url='<?php echo inlink('uploadImages', "module=$module&params=$params&uid=$uid");?>'>
-  <div class='uploader-message text-center'>
-    <div class='content'></div>
-    <button type='button' class='close'>×</button>
+<div class='main-content'>
+  <div class='main-header'>
+    <h2><?php echo $lang->file->uploadImages;?></h2>
   </div>
-  <div class='uploader-files file-list file-list-grid' data-drag-placeholder="<?php echo $lang->file->dragFile;?>"></div>
-  <hr/>
-  <span><?php echo $this->lang->file->uploadImagesExplain?></span>
-  <div class='uploader-footer'>
-    <div class='uploader-status pull-right text-muted'></div>
-    <button type='button' class='btn btn-primary uploader-btn-browse'><i class='icon icon-plus'></i><?php echo $lang->file->addFile;?></button>
-    <button type='button' class='btn btn-success uploader-btn-start'><i class='icon icon-cloud-upload'></i><?php echo $lang->file->beginUpload;?></button>
+  <div class='uploader' id='uploader' data-url='<?php echo inlink('uploadImages', "module=$module&params=$params&uid=$uid");?>'>
+    <div class='uploader-message text-center'>
+      <div class='content'></div>
+      <button type='button' class='close'>×</button>
+    </div>
+    <div class='uploader-files file-list file-list-grid' data-drag-placeholder="<?php echo $lang->file->dragFile;?>"></div>
+    <hr/>
+    <span><?php echo $this->lang->file->uploadImagesExplain?></span>
+    <div class='uploader-footer'>
+      <div class='uploader-status pull-right text-muted'></div>
+      <button type='button' class='btn btn-primary uploader-btn-browse'><i class='icon icon-plus'></i><?php echo $lang->file->addFile;?></button>
+      <button type='button' class='btn btn-success uploader-btn-start'><i class='icon icon-cloud-upload'></i><?php echo $lang->file->beginUpload;?></button>
+    </div>
   </div>
 </div>
 <script>
diff --git a/module/search/view/buildform.html.php b/module/search/view/buildform.html.php
index fd26071b73..ec1a363888 100644
--- a/module/search/view/buildform.html.php
+++ b/module/search/view/buildform.html.php
@@ -110,8 +110,7 @@ foreach($fieldParams as $fieldName => $param)
 
                     if($fieldValue && strpos('$lastWeek,$thisWeek,$today,$yesterday,$thisMonth,$lastMonth',$fieldValue) !== false)
                     {
-                        echo html::input("dateValue$fieldNO", '', "class='form-control $extraClass searchInput' placeholder='{$fieldValue}'");
-                        echo html::hidden("value$fieldNO", $fieldValue);
+                        echo html::input("value$fieldNO", $fieldValue, "class='form-control $extraClass searchInput' placeholder='{$fieldValue}'");
                     }
                     else
                     {
@@ -172,8 +171,7 @@ foreach($fieldParams as $fieldName => $param)
 
                     if($fieldValue && strpos('$lastWeek,$thisWeek,$today,$yesterday,$thisMonth,$lastMonth',$fieldValue) !== false)
                     {
-                        echo html::input("dateValue$fieldNO", '', "class='form-control $extraClass searchInput' placeholder='{$fieldValue}'");
-                        echo html::hidden("value$fieldNO", $fieldValue);
+                        echo html::input("value$fieldNO", $fieldValue, "class='form-control $extraClass searchInput' placeholder='{$fieldValue}'");
                     }
                     else
                     {
diff --git a/module/story/view/batchcreate.html.php b/module/story/view/batchcreate.html.php
index 3c5252dac1..0808882521 100644
--- a/module/story/view/batchcreate.html.php
+++ b/module/story/view/batchcreate.html.php
@@ -15,6 +15,7 @@
   <div class="main-header">
     <h2><?php echo $lang->story->batchCreate;?></h2>
     <div class="pull-right btn-toolbar">
+      <?php if(common::hasPriv('file', 'uploadImages')) echo html::a($this->createLink('file', 'uploadImages', 'module=story&params=' . helper::safe64Encode("productID=$productID&branch=$branch&moduleID=$moduleID")), $lang->uploadImages, '', "data-toggle='modal' data-type='iframe' class='btn btn-info' data-width='70%'")?>
       <button type='button' data-toggle="importLinesModal" class="btn btn-info"><?php echo $lang->pasteText;?></button>
       <?php $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=story&section=custom&key=batchCreateFields')?>
       <?php include '../../common/view/customfield.html.php';?>
diff --git a/module/testcase/css/linkcases.css b/module/testcase/css/linkcases.css
index 963893f9a1..bc56fdc1ca 100644
--- a/module/testcase/css/linkcases.css
+++ b/module/testcase/css/linkcases.css
@@ -1,2 +1,2 @@
-#linkCasesForm {min-height: 300px}
+#mainContent {min-height: 300px}
 .table-actions {padding-left: 0}
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index 338101f705..5de8bc33af 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -9,3 +9,4 @@
 * @link        http://www.zentao.net
 */
 th.required:after{position: relative; right: 10px;}
+.divider + .divider{display:none;}