diff --git a/lib/dao/dao.class.php b/lib/dao/dao.class.php
index 6cff3c9b85..a8a69b94bb 100644
--- a/lib/dao/dao.class.php
+++ b/lib/dao/dao.class.php
@@ -52,7 +52,7 @@ class sql extends baseSQL
     public function groupBy($groupBy)
     {
         if($this->inCondition and !$this->conditionIsTrue) return $this;
-        if(!preg_match('/^\w+[a-zA-Z0-9_`.,\s]+$/', $groupBy))
+        if(!preg_match('/^[a-zA-Z0-9_`\.,\s]+$/', $groupBy))
         {
             $groupBy = htmlspecialchars($groupBy);
             die("Group is bad query, The group is $groupBy");
diff --git a/module/common/model.php b/module/common/model.php
index 8f8ea981c0..1c02032543 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -776,11 +776,11 @@ EOD;
             {
                 if($method != 'edit' and $method != 'copy' and $method != 'delete')
                 {
-                    return html::a($link, "<i class='$class muted'></i> " . "<span class='text'>{$title}</span>", $target, "class='btn btn-link $extraClass' $misc", true);
+                    return html::a($link, "<i class='$class'></i> " . "<span class='text'>{$title}</span>", $target, "class='btn btn-link $extraClass' $misc", true);
                 }
                 else
                 {
-                    return html::a($link, "<i class='$class muted'></i>", $target, "class='btn btn-link $extraClass' title='$title' $misc", false);
+                    return html::a($link, "<i class='$class'></i>", $target, "class='btn btn-link $extraClass' title='$title' $misc", false);
                 }
             }
             else
@@ -836,7 +836,7 @@ EOD;
         if(isonlybody()) return false;
 
         $title = $lang->goback . $lang->backShortcutKey;
-        echo html::a($backLink, '<i class="icon-goback icon-level-up icon-large icon-rotate-270"></i>', '', "id='back' class='btn' title={$title}");
+        echo html::a($backLink, '<i class="icon-goback icon-back icon-large"></i>', '', "id='back' class='btn' title={$title}");
 
         if(isset($preAndNext->pre) and $preAndNext->pre)
         {
@@ -856,15 +856,33 @@ EOD;
         }
     }
 
-    static public function printBack($backLink)
+    /**
+     * Print back link
+     * 
+     * @param  string $backLink 
+     * @static
+     * @access public
+     * @return void
+     */
+    static public function printBack($backLink, $class = '')
     {
         global $lang, $app;
         if(isonlybody()) return false;
 
+        if(empty($class)) $class = 'btn';
         $title = $lang->goback . $lang->backShortcutKey;
-        echo html::a($backLink, '<i class="icon-goback icon-level-up icon-large icon-rotate-270"></i>', '', "id='back' class='btn' title={$title}");
+        echo html::a($backLink, '<i class="icon-goback icon-back"></i>', '', "id='back' class='{$class}' title={$title}");
     }
 
+    /**
+     * Print pre and next link
+     * 
+     * @param  string $preAndNext 
+     * @param  string $linkTemplate 
+     * @static
+     * @access public
+     * @return void
+     */
     public static function printPreAndNext($preAndNext = '', $linkTemplate = '')
     {
         global $lang, $app;
diff --git a/module/release/css/view.css b/module/release/css/view.css
index cb46e0d642..3e9f7ed286 100644
--- a/module/release/css/view.css
+++ b/module/release/css/view.css
@@ -1,14 +1,14 @@
 .tabs{position:relative;}
-.tabs .nav-tabs{border-bottom:none;}
 .tabs .nav-tabs>li{margin-bottom:0px;}
-.tabs .tab-content{padding:0px; border:0px;}
-.tabs .tab-content .tab-pane #querybox{margin:0px; border-left:1px solid #ddd; border-right:1px solid #ddd;}
-.tabs .tab-content .tab-pane #querybox form{padding-left:0px;}
+.tabs .tab-content .tab-pane #queryBox{margin:0px; border-left:1px solid #ddd; border-right:1px solid #ddd;}
+.tabs .tab-content .tab-pane #queryBox form{padding-left:0px;}
 
-.table-actions {padding-left: 5px;}
+.checkbox.btn{margin-top:0px}
+#unlinkStoryList, #unlinkBugList, #unlinkLeftBugList{border:1px solid #ddd;}
+
+.table-footer .text{line-height:30px;}
 
-#releaseInfo {border-top: 1px solid #ddd;}
 #releaseInfo > div {padding-top: 15px;}
 
-#querybox form {margin: 0px !important;}
+#queryBox form {margin: 0px !important;}
 #moreOrLite {right: 0px !important;}
diff --git a/module/release/js/view.js b/module/release/js/view.js
index 0aba453fe1..bc98ca25c3 100644
--- a/module/release/js/view.js
+++ b/module/release/js/view.js
@@ -7,7 +7,7 @@ function showLink(releaseID, type, param)
     {
         var obj = type == 'story' ? '.tab-pane#stories .linkBox' : (type == 'leftBug' ? '.tab-pane#leftBugs .linkBox' : '.tab-pane#bugs .linkBox');
         $(obj).html(data);
-        $('#' + type + 'List').hide();
+        $('#' + type + 'List').closest('form').hide();
 
         var formID = type == 'story' ? '#unlinkedStoriesForm' : (type == 'leftBug' ? '#unlinkedLeftBugsForm' : '#unlinkedBugsForm');
         setTimeout(function(){fixedTfootAction(formID)}, 100);
diff --git a/module/release/view/linkbug.html.php b/module/release/view/linkbug.html.php
index 908e02aeb4..5aec203c78 100644
--- a/module/release/view/linkbug.html.php
+++ b/module/release/view/linkbug.html.php
@@ -10,66 +10,66 @@
  * @link        http://www.zentao.net
  */
 ?>
-<?php
-$jsRoot = $this->app->getWebRoot() . "js/";
-include '../../common/view/tablesorter.html.php';
-?>
-<div id='querybox' class='show'></div>
+<div id='queryBox' class='show'></div>
 <?php
 $releaseBugs = $type == 'bug' ? $release->bugs : $release->leftBugs;
 $formID      = $type == 'leftBug' ? 'unlinkedLeftBugsForm' : 'unlinkedBugsForm';
 ?>
 <div id='<?php echo $type == 'bug' ? 'unlinkBugList' : 'unlinkLeftBugList';?>'>
-  <form method='post' target='hiddenwin' id='<?php echo $formID?>' action='<?php echo $this->createLink('release', 'linkBug', "releaseID=$release->id&browseType=$browseType&param=$param&type=$type")?>'>
-    <table class='table table-condensed table-hover table-striped tablesorter table-fixed table-selectable'> 
-      <caption class='text-left text-special'><?php echo html::icon('unlink');?> &nbsp;<strong><?php echo $lang->productplan->unlinkedBugs;?></strong></caption>
+  <form class='main-table' method='post' target='hiddenwin' id='<?php echo $formID?>' action='<?php echo $this->createLink('release', 'linkBug', "releaseID=$release->id&browseType=$browseType&param=$param&type=$type")?>'>
+    <div class='table-header'>
+      <div class='table-statistic'><?php echo html::icon('unlink');?> &nbsp;<strong><?php echo $lang->productplan->unlinkedBugs;?></strong></div>
+    </div>
+    <table class='table'> 
       <thead>
-      <tr class='colhead'>
-        <th class='w-id {sorter:"currency"}'><?php echo $lang->idAB;?></th>
-        <th class='w-pri'>   <?php echo $lang->priAB;?></th>
-        <th>                 <?php echo $lang->bug->title;?></th>
-        <th class='w-user text-left'>  <?php echo $lang->openedByAB;?></th>
-        <th class='w-user'> <?php echo $lang->bug->resolvedBy;?></th>
-        <th class='w-80px'>  <?php echo $lang->statusAB;?></th>
-      </tr>
+        <tr>
+          <th class='c-id'> <?php echo $lang->idAB;?></th>
+          <th class='w-pri'><?php echo $lang->priAB;?></th>
+          <th>              <?php echo $lang->bug->title;?></th>
+          <th class='w-user text-left'>  <?php echo $lang->openedByAB;?></th>
+          <th class='w-user'> <?php echo $lang->bug->resolvedBy;?></th>
+          <th class='w-80px'>  <?php echo $lang->statusAB;?></th>
+        </tr>
       </thead>
       <tbody>
-      <?php foreach($allBugs as $bug):?>
-      <?php if(strpos(",{$releaseBugs},", ",$bug->id,") !== false) continue;?>
-      <tr>
-        <td class='cell-id'>
-          <input type='checkbox' name='bugs[<?php echo $bug->id?>]'  value='<?php echo $bug->id;?>' <?php if($type == 'leftBug' or $bug->status == 'resolved' or $bug->status == 'closed') echo "checked";?> /> 
-          <?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->id);?>
-        </td>
-        <td><span class='<?php echo 'pri' . zget($lang->bug->priList, $bug->pri, $bug->pri);?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?></span></td>
-        <td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id", '', true), $bug->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?></td>
-        <td><?php echo $users[$bug->openedBy];?></td>
-        <td><?php echo $users[$bug->resolvedBy];?></td>
-        <td class='text-center bug-<?php echo $bug->status?>'><?php echo $lang->bug->statusList[$bug->status];?></td>
-      </tr>
-      <?php endforeach;?>
+        <?php $unlinkedCount = 0;?>
+        <?php foreach($allBugs as $bug):?>
+        <?php if(strpos(",{$releaseBugs},", ",$bug->id,") !== false) continue;?>
+        <tr>
+          <td class='c-id'>
+            <input class='ml-10px' type='checkbox' name='bugs[<?php echo $bug->id?>]'  value='<?php echo $bug->id;?>' <?php if($type == 'leftBug' or $bug->status == 'resolved' or $bug->status == 'closed') echo "checked";?> /> 
+            <?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->id);?>
+          </td>
+          <td><span class='<?php echo 'pri' . zget($lang->bug->priList, $bug->pri, $bug->pri);?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?></span></td>
+          <td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id", '', true), $bug->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?></td>
+          <td><?php echo $users[$bug->openedBy];?></td>
+          <td><?php echo $users[$bug->resolvedBy];?></td>
+          <td class='text-center bug-<?php echo $bug->status?>'><?php echo $lang->bug->statusList[$bug->status];?></td>
+        </tr>
+        <?php $unlinkedCount++;?>
+        <?php endforeach;?>
       </tbody>
+      <?php if($unlinkedCount):?>
       <tfoot>
-      <tr>
-        <td colspan='6' class='text-left'>
-          <?php if(count($allBugs))
-          {
-              echo "<div class='table-actions clearfix'>";
+        <tr>
+          <td colspan='6' class='text-left table-footer'>
+            <div class='clearfix'>
+              <?php
               echo html::selectButton() . html::submitButton($lang->release->linkBug);
               echo html::a(inlink('view', "releaseID=$release->id&type=$type"), $lang->goback, '', "class='btn'");
-              echo '</div>';
-          }
-          ?>
-        </td>
-      </tr>
+              ?>
+            </div>
+          </td>
+        </tr>
       </tfoot>
+      <?php endif;?>
     </table>
   </form>
 </div>
 <script>
 $(function()
 {
-    ajaxGetSearchForm('#<?php echo $type == 'bug' ? 'bugs' : 'leftBugs'?> .linkBox #querybox')
+    ajaxGetSearchForm('#<?php echo $type == 'bug' ? 'bugs' : 'leftBugs'?> .linkBox #queryBox')
     setModal();
 })
 </script>
diff --git a/module/release/view/linkstory.html.php b/module/release/view/linkstory.html.php
index bcd02262a1..a37f48bc60 100644
--- a/module/release/view/linkstory.html.php
+++ b/module/release/view/linkstory.html.php
@@ -10,67 +10,67 @@
  * @link        http://www.zentao.net
  */
 ?>
-<?php
-$jsRoot = $this->app->getWebRoot() . "js/";
-include '../../common/view/tablesorter.html.php';
-?>
-<div id='querybox' class='show'></div>
+<div id='queryBox' class='show'></div>
 <div id='unlinkStoryList'>
-  <form method='post' target='hiddenwin' id='unlinkedStoriesForm' action='<?php echo $this->createLink('release', 'linkStory', "releaseID=$release->id&browseType=$browseType&param=$param")?>'>
-    <table class='table table-condensed table-hover table-striped tablesorter table-fixed table-selectable'> 
-      <caption class='text-left text-special'><?php echo html::icon('unlink');?> &nbsp;<strong><?php echo $lang->productplan->unlinkedStories;?></strong></caption>
+  <form class='main-table' method='post' target='hiddenwin' id='unlinkedStoriesForm' action='<?php echo $this->createLink('release', 'linkStory', "releaseID=$release->id&browseType=$browseType&param=$param")?>'>
+    <div class='table-header'>
+      <div class='table-statistic'><?php echo html::icon('unlink');?> &nbsp;<strong><?php echo $lang->productplan->unlinkedStories;?></strong></div>
+    </div>
+    <table class='table'> 
       <thead>
         <tr>
-          <th class='w-id {sorter:"currency"}'><?php echo $lang->idAB;?></th>
-          <th class='w-pri'>   <?php echo $lang->priAB;?></th>
-          <th>                 <?php echo $lang->story->title;?></th>
+          <th class='c-id'> <?php echo $lang->idAB;?></th>
+          <th class='w-pri'><?php echo $lang->priAB;?></th>
+          <th>              <?php echo $lang->story->title;?></th>
           <th class='w-user text-left'>  <?php echo $lang->openedByAB;?></th>
           <th class='w-user text-left'>  <?php echo $lang->assignedToAB;?></th>
           <th class='w-50px text-left'>  <?php echo $lang->story->estimateAB;?></th>
           <th class='w-status text-left'><?php echo $lang->statusAB;?></th>
-          <th class='w-80px text-center'>  <?php echo $lang->story->stageAB;?></th>
+          <th class='w-80px text-center'><?php echo $lang->story->stageAB;?></th>
         </tr>
       </thead>
       <tbody>
-      <?php foreach($allStories as $story):?>
-      <?php if(strpos(",{$release->stories},", ",{$story->id},") !== false) continue; ?>
-      <?php if($release->product != $story->product) continue; ?>
-      <tr>
-        <td class='cell-id'>
-          <input class='ml-10px' type='checkbox' name='stories[]'  value='<?php echo $story->id;?>' <?php if($story->stage == 'developed' or $story->status == 'closed') echo 'checked';?> /> 
-          <?php echo html::a($this->createLink('story', 'view', "storyID=$story->id"), $story->id);?>
-        </td>
-        <td><span class='<?php echo 'pri' . zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri)?></span></td>
-        <td class='text-left nobr' title='<?php echo $story->title?>'><?php echo html::a($this->createLink('story', 'view', "storyID=$story->id", '', true), $story->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?></td>
-        <td><?php echo $users[$story->openedBy];?></td>
-        <td><?php echo $users[$story->assignedTo];?></td>
-        <td><?php echo $story->estimate;?></td>
-        <td class='story-<?php echo $story->status?>'><?php echo $lang->story->statusList[$story->status];?></td>
-        <td class='text-center'><?php echo $lang->story->stageList[$story->stage];?></td>
-      </tr>
-      <?php endforeach;?>
+        <?php $unlinkedCount = 0;?>
+        <?php foreach($allStories as $story):?>
+        <?php if(strpos(",{$release->stories},", ",{$story->id},") !== false) continue; ?>
+        <?php if($release->product != $story->product) continue; ?>
+        <tr>
+          <td class='c-id'>
+              <input class='ml-10px' type='checkbox' name='stories[]'  value='<?php echo $story->id;?>' <?php if($story->stage == 'developed' or $story->status == 'closed') echo 'checked';?> /> 
+              <?php printf('%03d', $story->id);?>
+          </td>
+          <td><span class='label-pri <?php echo 'label-pri-' . $story->pri;?>'><?php echo zget($lang->story->priList, $story->pri)?></span></td>
+          <td class='text-left nobr' title='<?php echo $story->title?>'><?php echo html::a($this->createLink('story', 'view', "storyID=$story->id", '', true), $story->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?></td>
+          <td><?php echo zget($users, $story->openedBy);?></td>
+          <td><?php echo zget($users, $story->assignedTo);?></td>
+          <td><?php echo $story->estimate;?></td>
+          <td><span class='status-<?php echo $story->status?>'><span class="label label-dot"></span> <?php echo zget($lang->story->statusList, $story->status);?></span></td>
+          <td class='text-center'><?php echo zget($lang->story->stageList, $story->stage);?></td>
+        </tr>
+        <?php $unlinkedCount++;?>
+        <?php endforeach;?>
       </tbody>
+      <?php if($unlinkedCount):?>
       <tfoot>
         <tr>
-          <td colspan='8' class='text-left'>
-            <?php if(count($allStories))
-            {
-                echo "<div class='table-actions clearfix'>";
-                echo html::selectButton() . html::submitButton($lang->story->linkStory);
-                echo html::a(inlink('view', "releaseID=$release->id&type=story"), $lang->goback, '', "class='btn'");
-                echo '</div>';
-            }
-            ?>
+          <td colspan='8' class='text-left table-footer'>
+            <div class='clearfix'>
+              <?php
+              echo html::selectButton() . html::submitButton($lang->story->linkStory);
+              echo html::a(inlink('view', "releaseID=$release->id&type=story"), $lang->goback, '', "class='btn'");
+              ?>
+            </div>
           </td>
         </tr>
       </tfoot>
+      <?php endif;?>
     </table>
   </form>
 </div>
 <script>
 $(function()
 {
-    ajaxGetSearchForm('#stories .linkBox #querybox');
+    ajaxGetSearchForm('#stories .linkBox #queryBox');
     setModal();
 })
 </script>
diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php
index 618d9bc8a2..84c36457d6 100644
--- a/module/release/view/view.html.php
+++ b/module/release/view/view.html.php
@@ -13,53 +13,43 @@
 <?php include '../../common/view/header.html.php';?>
 <?php js::set('confirmUnlinkStory', $lang->release->confirmUnlinkStory)?>
 <?php js::set('confirmUnlinkBug', $lang->release->confirmUnlinkBug)?>
-<div id='titlebar'>
-  <div class='heading'>
-    <span class='prefix'><?php echo html::icon($lang->icons['release']);?> <strong><?php echo $release->id;?></strong></span>
-    <strong><?php echo $release->name;?></strong>
-    <?php if($release->deleted):?>
-    <span class='label label-danger'><?php echo $lang->release->deleted;?></span>
-    <?php endif; ?>
+<div id='mainMenu' class='clearfix'>
+  <div class='btn-toolbar pull-left'>
+    <?php $browseLink = $this->session->releaseList ? $this->session->releaseList : inlink('browse', "productID=$release->product");?>
+    <div class='page-title'>
+      <span class='label label-id'><?php echo $release->id;?></span>
+      <?php echo $release->name;?>
+      <?php if($release->deleted):?>
+      <span class='label label-danger'><?php echo $lang->release->deleted;?></span>
+      <?php endif; ?>
+    </div>
   </div>
-  <div class='actions'>
+  <div class='btn-toolbar pull-right'>
     <?php
-    $browseLink = $this->session->releaseList ? $this->session->releaseList : inlink('browse', "productID=$release->product");
     if(!$release->deleted)
     {
-        ob_start();
-
-        echo "<div class='btn-group'>";
         if(common::hasPriv('release', 'changeStatus', $release))
         {
             $changedStatus = $release->status == 'normal' ? 'terminate' : 'normal';
-            echo html::a(inlink('changeStatus', "releaseID=$release->id&type=$changedStatus"), '<i class="icon-' . ($release->status == 'normal' ? 'pause' : 'play') . '"></i> ' . $lang->release->changeStatusList[$changedStatus], 'hiddenwin', "class='btn'");
+            echo html::a(inlink('changeStatus', "releaseID=$release->id&type=$changedStatus"), '<i class="icon-' . ($release->status == 'normal' ? 'pause' : 'play') . '"></i> ' . $lang->release->changeStatusList[$changedStatus], 'hiddenwin', "class='btn btn-link'");
         }
-        if(common::hasPriv('release', 'linkStory')) echo html::a(inlink('view', "releaseID=$release->id&type=story&link=true"), '<i class="icon-link"></i> ' . $lang->release->linkStory, '', "class='btn'");
-        if(common::hasPriv('release', 'linkBug') and $this->config->global->flow != 'onlyStory') echo html::a(inlink('view', "releaseID=$release->id&type=bug&link=true"),   '<i class="icon-bug"></i> '  . $lang->release->linkBug,   '', "class='btn'");
-        echo '</div>';
+        if(common::hasPriv('release', 'linkStory')) echo html::a(inlink('view', "releaseID=$release->id&type=story&link=true"), '<i class="icon-link"></i> ' . $lang->release->linkStory, '', "class='btn btn-link'");
+        if(common::hasPriv('release', 'linkBug') and $this->config->global->flow != 'onlyStory') echo html::a(inlink('view', "releaseID=$release->id&type=bug&link=true"),   '<i class="icon-bug"></i> '  . $lang->release->linkBug,   '', "class='btn btn-link'");
 
-        echo "<div class='btn-group'>";
         common::printIcon('release', 'edit',   "releaseID=$release->id", $release);
         common::printIcon('release', 'delete', "releaseID=$release->id", $release, 'button', '', 'hiddenwin');
-        echo '</div>';
 
-        echo "<div class='btn-group'>";
-        echo common::printRPN($browseLink, $lang->goback);
-        echo '</div>';
-
-        $actionLinks = ob_get_contents();
-        ob_end_clean();
-        echo $actionLinks;
+        common::printBack($browseLink, 'btn btn-link');
     }
     else
     {
-        common::printRPN($browseLink);
+        common::printBack($browseLink, 'btn btn-link');
     }
     ?>
   </div>
 </div>
-<div class='row-table'>
-  <div class='col-main'>
+<div id='mainContent' class='main-content'>
+  <div class='main-col'>
     <div class='main'>
       <div class='tabs'>
         <?php $countStories = count($stories); $countBugs = count($bugs); $countLeftBugs = count($leftBugs);?>
@@ -80,59 +70,68 @@
             <div class='action'><?php echo html::a("javascript:showLink({$release->id}, \"story\")", '<i class="icon-link"></i> ' . $lang->release->linkStory, '', "class='btn btn-sm btn-primary'");?></div>
             <div class='linkBox'></div>
             <?php endif;?>
-            <form method='post' target='hiddenwin' action="<?php echo inLink('batchUnlinkStory', "release=$release->id");?>" id='linkedStoriesForm'>
-            <table class='table table-hover table-condensed table-striped tablesorter table-fixed table-selectable' id='storyList'>
-              <?php $vars = "releaseID={$release->id}&type=story&link=$link&param=$param&orderBy=%s";?>
-              <thead>
+            <form class='main-table table-story' method='post' target='hiddenwin' action="<?php echo inLink('batchUnlinkStory', "release=$release->id");?>" id='linkedStoriesForm' data-ride="table">
+              <table class='table has-sort-head' id='storyList'>
+                <?php $canBatchUnlink = common::hasPriv('release', 'batchUnlinkStory');?>
+                <?php $vars = "releaseID={$release->id}&type=story&link=$link&param=$param&orderBy=%s";?>
+                <thead>
+                  <tr>
+                    <th class='c-id'>
+                      <?php if($canBatchUnlink):?>
+                      <div class="checkbox-primary check-all" title="<?php echo $lang->selectAll?>">
+                        <label></label>
+                      </div>
+                      <?php endif;?>
+                      <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
+                    </th>
+                    <th class='w-pri'>    <?php common::printOrderLink('pri',      $orderBy, $vars, $lang->priAB);?></th>
+                    <th class="text-left"><?php common::printOrderLink('title',    $orderBy, $vars, $lang->story->title);?></th>
+                    <th class='w-user'>   <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
+                    <th class='w-80px'>   <?php common::printOrderLink('estimate', $orderBy, $vars, $lang->story->estimateAB);?></th>
+                    <th class='w-90px'>   <?php common::printOrderLink('status',   $orderBy, $vars, $lang->statusAB);?></th>
+                    <th class='w-100px'>  <?php common::printOrderLink('stage',    $orderBy, $vars, $lang->story->stageAB);?></th>
+                    <th class='w-50px'>   <?php echo $lang->actions?></th>
+                  </tr>
+                </thead>
+                <?php foreach($stories as $storyID => $story):?>
+                <?php $storyLink = $this->createLink('story', 'view', "storyID=$story->id", '', true);?>
                 <tr>
-                  <th class='w-id {sorter:false}'>     <?php common::printOrderLink('id',       $orderBy, $vars, $lang->idAB);?></th>
-                  <th class='w-pri {sorter:false}'>    <?php common::printOrderLink('pri',      $orderBy, $vars, $lang->priAB);?></th>
-                  <th class="text-left {sorter:false}"><?php common::printOrderLink('title',    $orderBy, $vars, $lang->story->title);?></th>
-                  <th class='w-user {sorter:false}'>   <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
-                  <th class='w-hour {sorter:false}'>   <?php common::printOrderLink('estimate', $orderBy, $vars, $lang->story->estimateAB);?></th>
-                  <th class='w-hour {sorter:false}'>   <?php common::printOrderLink('status',   $orderBy, $vars, $lang->statusAB);?></th>
-                  <th class='w-100px {sorter:false}'>  <?php common::printOrderLink('stage',    $orderBy, $vars, $lang->story->stageAB);?></th>
-                  <th class='w-50px {sorter:false}'>   <?php echo $lang->actions?></th>
-                </tr>
-              </thead>
-              <?php $canBatchUnlink = common::hasPriv('release', 'batchUnlinkStory');?>
-              <?php foreach($stories as $storyID => $story):?>
-              <?php $storyLink = $this->createLink('story', 'view', "storyID=$story->id", '', true);?>
-              <tr class='text-center'>
-                <td class='cell-id'>
-                  <?php if($canBatchUnlink):?>
-                  <input type='checkbox' name='unlinkStories[]'  value='<?php echo $story->id;?>'/> 
-                  <?php endif;?>
-                  <?php echo sprintf('%03d', $story->id);?>
-                </td>
-                <td><span class='<?php echo 'pri' . zget($lang->story->priList, $story->pri, $story->pri)?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
-                <td class='text-left nobr' title='<?php echo $story->title?>'><?php echo html::a($storyLink,$story->title, '', "class='preview'");?></td>
-                <td><?php echo $users[$story->openedBy];?></td>
-                <td><?php echo $story->estimate;?></td>
-                <td class='story-<?php echo $story->status;?>'><?php echo $lang->story->statusList[$story->status];?></td>
-                <td><?php echo $lang->story->stageList[$story->stage];?></td>
-                <td>
-                  <?php
-                  if(common::hasPriv('release', 'unlinkStory'))
-                  {
-                      $unlinkURL = $this->createLink('release', 'unlinkStory', "releaseID=$release->id&story=$story->id");
-                      echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"storyList\",confirmUnlinkStory)", '<i class="icon-unlink"></i>', '', "class='btn-icon' title='{$lang->release->unlinkStory}'");
-                  }
-                  ?>
-                </td>
-              </tr>
-              <?php endforeach;?>
-              <tfoot>
-                <tr>
-                  <td colspan='8'>
-                    <div class='table-actions clearfix'>
-                      <?php if($countStories and $canBatchUnlink) echo html::selectButton() . html::submitButton($lang->release->batchUnlink);?>
-                      <div class='text'><?php echo sprintf($lang->release->finishStories, $countStories);?></div>
+                  <td class='c-id'>
+                    <div class="checkbox-primary">
+                      <?php if($canBatchUnlink):?>
+                      <input type='checkbox' name='unlinkStories[]'  value='<?php echo $story->id;?>'/> 
+                      <label></label>
+                      <?php endif;?>
+                      <?php echo sprintf('%03d', $story->id);?>
                     </div>
                   </td>
+                  <td><span class='label-pri <?php echo 'label-pri-' . $story->pri;?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
+                  <td class='text-left nobr' title='<?php echo $story->title?>'><?php echo html::a($storyLink,$story->title, '', "class='preview'");?></td>
+                  <td><?php echo $users[$story->openedBy];?></td>
+                  <td><?php echo $story->estimate;?></td>
+                  <td><span class='status-<?php echo $story->status;?>'><span class="label label-dot"></span> <?php echo $lang->story->statusList[$story->status];?></span></td>
+                  <td><?php echo $lang->story->stageList[$story->stage];?></td>
+                  <td class='c-actions'>
+                    <?php
+                    if(common::hasPriv('release', 'unlinkStory'))
+                    {
+                        $unlinkURL = $this->createLink('release', 'unlinkStory', "releaseID=$release->id&story=$story->id");
+                        echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"storyList\",confirmUnlinkStory)", '<i class="icon-unlink"></i>', '', "class='btn-icon' title='{$lang->release->unlinkStory}'");
+                    }
+                    ?>
+                  </td>
                 </tr>
-              </tfoot>
-            </table>
+                <?php endforeach;?>
+              </table>
+              <?php if($countStories and $canBatchUnlink):?>
+              <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($lang->release->batchUnlink);?>
+                </div>
+                <div class='text'><?php echo sprintf($lang->release->finishStories, $countStories);?></div>
+              </div>
+              <?php endif;?>
             </form>
           </div>
           <div class='tab-pane <?php if($type == 'bug') echo 'active'?>' id='bugs'>
@@ -140,59 +139,68 @@
             <div class='action'><?php echo html::a("javascript:showLink({$release->id}, \"bug\")", '<i class="icon-bug"></i> ' . $lang->release->linkBug, '', "class='btn btn-sm btn-primary'");?></div>
             <div class='linkBox'></div>
             <?php endif;?>
-            <form method='post' target='hiddenwin' action="<?php echo inLink('batchUnlinkBug', "releaseID=$release->id");?>" id='linkedBugsForm'>
-            <table class='table table-hover table-condensed table-striped tablesorter table-fixed table-selectable' id='bugList'>
-              <?php $vars = "releaseID={$release->id}&type=bug&link=$link&param=$param&orderBy=%s";?>
-              <thead>
+            <form class='main-table table-bug' method='post' target='hiddenwin' action="<?php echo inLink('batchUnlinkBug', "releaseID=$release->id");?>" id='linkedBugsForm' data-ride="table">
+              <table class='table has-sort-head' id='bugList'>
+                <?php $canBatchUnlink = common::hasPriv('release', 'batchUnlinkBug');?>
+                <?php $vars = "releaseID={$release->id}&type=bug&link=$link&param=$param&orderBy=%s";?>
+                <thead>
+                  <tr>
+                    <th class='c-id'>
+                      <?php if($canBatchUnlink):?>
+                      <div class="checkbox-primary check-all" title="<?php echo $lang->selectAll?>">
+                        <label></label>
+                      </div>
+                      <?php endif;?>
+                      <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
+                    </th>
+                    <th class='text-left'><?php common::printOrderLink('title',        $orderBy, $vars, $lang->bug->title);?></th>
+                    <th class='w-100px'>  <?php common::printOrderLink('status',       $orderBy, $vars, $lang->bug->status);?></th>
+                    <th class='w-user'>   <?php common::printOrderLink('openedBy',     $orderBy, $vars, $lang->openedByAB);?></th>
+                    <th class='w-date'>   <?php common::printOrderLink('openedDate',   $orderBy, $vars, $lang->bug->openedDateAB);?></th>
+                    <th class='w-user'>   <?php common::printOrderLink('resolvedBy',   $orderBy, $vars, $lang->bug->resolvedByAB);?></th>
+                    <th class='w-100px'>  <?php common::printOrderLink('resolvedDate', $orderBy, $vars, $lang->bug->resolvedDateAB);?></th>
+                    <th class='w-50px'>   <?php echo $lang->actions;?></th>
+                  </tr>
+                </thead>
+                <?php foreach($bugs as $bug):?>
+                <?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug->id", '', true);?>
                 <tr>
-                  <th class='w-id {sorter:false}'>     <?php common::printOrderLink('id',           $orderBy, $vars, $lang->idAB);?></th>
-                  <th class='text-left {sorter:false}'><?php common::printOrderLink('title',        $orderBy, $vars, $lang->bug->title);?></th>
-                  <th class='w-100px {sorter:false}'>  <?php common::printOrderLink('status',       $orderBy, $vars, $lang->bug->status);?></th>
-                  <th class='w-user {sorter:false}'>   <?php common::printOrderLink('openedBy',     $orderBy, $vars, $lang->openedByAB);?></th>
-                  <th class='w-date {sorter:false}'>   <?php common::printOrderLink('openedDate',   $orderBy, $vars, $lang->bug->openedDateAB);?></th>
-                  <th class='w-user {sorter:false}'>   <?php common::printOrderLink('resolvedBy',   $orderBy, $vars, $lang->bug->resolvedByAB);?></th>
-                  <th class='w-100px {sorter:false}'>  <?php common::printOrderLink('resolvedDate', $orderBy, $vars, $lang->bug->resolvedDateAB);?></th>
-                  <th class='w-50px {sorter:false}'>   <?php echo $lang->actions;?></th>
-                </tr>
-              </thead>
-              <?php $canBatchUnlink = common::hasPriv('release', 'batchUnlinkBug');?>
-              <?php foreach($bugs as $bug):?>
-              <?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug->id", '', true);?>
-              <tr class='text-center'>
-                <td class='cell-id'>
-                  <?php if($canBatchUnlink):?>
-                  <input type='checkbox' name='unlinkBugs[]'  value='<?php echo $bug->id;?>'/> 
-                  <?php endif;?>
-                  <?php echo sprintf('%03d', $bug->id);?>
-                </td>
-                <td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($bugLink, $bug->title, '', "class='preview'");?></td>
-                <td class='bug-<?php echo $bug->status?>'><?php echo $lang->bug->statusList[$bug->status];?></td>
-                <td><?php echo $users[$bug->openedBy];?></td>
-                <td><?php echo substr($bug->openedDate, 5, 11)?></td>
-                <td><?php echo $users[$bug->resolvedBy];?></td>
-                <td><?php echo substr($bug->resolvedDate, 5, 11)?></td>
-                <td>
-                  <?php
-                  if(common::hasPriv('release', 'unlinkBug'))
-                  {
-                      $unlinkURL = $this->createLink('release', 'unlinkBug', "releaseID=$release->id&bug=$bug->id");
-                      echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"bugList\",confirmUnlinkBug)", '<i class="icon-unlink"></i>', '', "class='btn-icon' title='{$lang->release->unlinkBug}'");
-                  }
-                  ?>
-                </td>
-              </tr>
-              <?php endforeach;?>
-              <tfoot>
-                <tr>
-                  <td colspan='8'>
-                    <div class='table-actions clearfix'>
-                      <?php if($countBugs and $canBatchUnlink) echo html::selectButton() . html::submitButton($lang->release->batchUnlink);?>
-                      <div class='text'><?php echo sprintf($lang->release->resolvedBugs, $countBugs);?></div>
+                  <td class='c-id'>
+                    <div class="checkbox-primary">
+                      <?php if($canBatchUnlink):?>
+                      <input type='checkbox' name='unlinkBugs[]'  value='<?php echo $bug->id;?>'/> 
+                      <label></label>
+                      <?php endif;?>
+                      <?php echo sprintf('%03d', $bug->id);?>
                     </div>
                   </td>
+                  <td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($bugLink, $bug->title, '', "class='preview'");?></td>
+                  <td><span class='status-<?php echo $bug->status?>'><span class="label label-dot"></span> <?php echo zget($lang->bug->statusList, $bug->status);?></td>
+                  <td><?php echo $users[$bug->openedBy];?></td>
+                  <td><?php echo substr($bug->openedDate, 5, 11)?></td>
+                  <td><?php echo $users[$bug->resolvedBy];?></td>
+                  <td><?php echo substr($bug->resolvedDate, 5, 11)?></td>
+                  <td class='c-actions'>
+                    <?php
+                    if(common::hasPriv('release', 'unlinkBug'))
+                    {
+                        $unlinkURL = $this->createLink('release', 'unlinkBug', "releaseID=$release->id&bug=$bug->id");
+                        echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"bugList\",confirmUnlinkBug)", '<i class="icon-unlink"></i>', '', "class='btn-icon' title='{$lang->release->unlinkBug}'");
+                    }
+                    ?>
+                  </td>
                 </tr>
-              </tfoot>
-            </table>
+                <?php endforeach;?>
+              </table>
+              <?php if($countBugs and $canBatchUnlink):?>
+              <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($lang->release->batchUnlink);?>
+                </div>
+                <div class='text'><?php echo sprintf($lang->release->resolvedBugs, $countBugs);?></div>
+              </div>
+              <?php endif;?>
             </form>
           </div>
           <div class='tab-pane <?php if($type == 'leftBug') echo 'active'?>' id='leftBugs'>
@@ -200,121 +208,134 @@
             <div class='action'><?php echo html::a("javascript:showLink({$release->id}, \"leftBug\")", '<i class="icon-bug"></i> ' . $lang->release->linkBug, '', "class='btn btn-sm btn-primary'");?></div>
             <div class='linkBox'></div>
             <?php endif;?>
-            <form method='post' target='hiddenwin' action="<?php echo inLink('batchUnlinkBug', "releaseID=$release->id&type=leftBug");?>" id='linkedBugsForm'>
-            <table class='table table-hover table-condensed table-striped tablesorter table-fixed table-selectable' id='leftBugList'>
-              <?php $vars = "releaseID={$release->id}&type=leftBug&link=$link&param=$param&orderBy=%s";?>
-              <thead>
+            <form class='main-table table-bug' method='post' target='hiddenwin' action="<?php echo inLink('batchUnlinkBug', "releaseID=$release->id&type=leftBug");?>" id='linkedBugsForm' data-ride="table">
+              <table class='table has-sort-head' id='leftBugList'>
+                <?php $canBatchUnlink = common::hasPriv('release', 'batchUnlinkBug');?>
+                <?php $vars = "releaseID={$release->id}&type=leftBug&link=$link&param=$param&orderBy=%s";?>
+                <thead>
+                  <tr>
+                    <th class='c-id'>
+                      <?php if($canBatchUnlink):?>
+                      <div class="checkbox-primary check-all" title="<?php echo $lang->selectAll?>">
+                        <label></label>
+                      </div>
+                      <?php endif;?>
+                      <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
+                    </th>
+                    <th class='w-80px'>    <?php common::printOrderLink('severity',   $orderBy, $vars, $lang->bug->severityAB);?></th>
+                    <th class='text-left'> <?php common::printOrderLink('title',      $orderBy, $vars, $lang->bug->title);?></th>
+                    <th class='w-100px'>   <?php common::printOrderLink('status',     $orderBy, $vars, $lang->bug->status);?></th>
+                    <th class='w-user'>    <?php common::printOrderLink('openedBy',   $orderBy, $vars, $lang->openedByAB);?></th>
+                    <th class='w-150px'>   <?php common::printOrderLink('openedDate', $orderBy, $vars, $lang->bug->openedDateAB);?></th>
+                    <th class='w-50px'>    <?php echo $lang->actions;?></th>
+                  </tr>
+                </thead>
+                <?php foreach($leftBugs as $bug):?>
+                <?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug->id", '', true);?>
                 <tr>
-                  <th class='w-id {sorter:false}'>      <?php common::printOrderLink('id',         $orderBy, $vars, $lang->idAB);?></th>
-                  <th class='w-severity {sorter:false}'><?php common::printOrderLink('severity',   $orderBy, $vars, $lang->bug->severityAB);?></th>
-                  <th class='text-left {sorter:false}'> <?php common::printOrderLink('title',      $orderBy, $vars, $lang->bug->title);?></th>
-                  <th class='w-100px {sorter:false}'>   <?php common::printOrderLink('status',     $orderBy, $vars, $lang->bug->status);?></th>
-                  <th class='w-user {sorter:false}'>    <?php common::printOrderLink('openedBy',   $orderBy, $vars, $lang->openedByAB);?></th>
-                  <th class='w-150px {sorter:false}'>   <?php common::printOrderLink('openedDate', $orderBy, $vars, $lang->bug->openedDateAB);?></th>
-                  <th class='w-50px {sorter:false}'>    <?php echo $lang->actions;?></th>
-                </tr>
-              </thead>
-              <?php $canBatchUnlink = common::hasPriv('release', 'batchUnlinkBug');?>
-              <?php foreach($leftBugs as $bug):?>
-              <?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug->id", '', true);?>
-              <tr class='text-center'>
-                <td class='cell-id'>
-                  <?php if($canBatchUnlink):?>
-                  <input type='checkbox' name='unlinkBugs[]'  value='<?php echo $bug->id;?>'/> 
-                  <?php endif;?>
-                  <?php echo sprintf('%03d', $bug->id);?>
-                </td>
-                <td><span class='severity<?php echo zget($lang->bug->severityList, $bug->severity, $bug->severity)?>'><?php echo zget($lang->bug->severityList, $bug->severity, $bug->severity);?></span></td>
-                <td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($bugLink, $bug->title, '', "class='preview'");?></td>
-                <td class='bug-<?php echo $bug->status?>'><?php echo $lang->bug->statusList[$bug->status];?></td>
-                <td><?php echo $users[$bug->openedBy];?></td>
-                <td><?php echo $bug->openedDate?></td>
-                <td>
-                  <?php
-                  if(common::hasPriv('release', 'unlinkBug'))
-                  {
-                      $unlinkURL = $this->createLink('release', 'unlinkBug', "releaseID=$release->id&bug=$bug->id&type=leftBug");
-                      echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"leftBugList\",confirmUnlinkBug)", '<i class="icon-unlink"></i>', '', "class='btn-icon' title='{$lang->release->unlinkBug}'");
-                  }
-                  ?>
-                </td>
-              </tr>
-              <?php endforeach;?>
-              <tfoot>
-                <tr>
-                  <td colspan='7'>
-                    <div class='table-actions clearfix'>
-                      <?php if($countLeftBugs and $canBatchUnlink) echo html::selectButton() . html::submitButton($lang->release->batchUnlink);?>
-                      <div class='text'><?php echo sprintf($lang->release->createdBugs, $countLeftBugs);?></div>
+                  <td class='c-id'>
+                    <div class="checkbox-primary">
+                      <?php if($canBatchUnlink):?>
+                      <input type='checkbox' name='unlinkBugs[]'  value='<?php echo $bug->id;?>'/> 
+                      <label></label>
+                      <?php endif;?>
+                      <?php echo sprintf('%03d', $bug->id);?>
                     </div>
                   </td>
+                  <td><span class='severity<?php echo zget($lang->bug->severityList, $bug->severity, $bug->severity)?>'><?php echo zget($lang->bug->severityList, $bug->severity, $bug->severity);?></span></td>
+                  <td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($bugLink, $bug->title, '', "class='preview'");?></td>
+                  <td><span class='status-<?php echo $bug->status?>'><span class="label label-dot"></span> <?php echo zget($lang->bug->statusList, $bug->status);?></span></td>
+                  <td><?php echo zget($users, $bug->openedBy);?></td>
+                  <td><?php echo $bug->openedDate?></td>
+                  <td class='c-actions'>
+                    <?php
+                    if(common::hasPriv('release', 'unlinkBug'))
+                    {
+                        $unlinkURL = $this->createLink('release', 'unlinkBug', "releaseID=$release->id&bug=$bug->id&type=leftBug");
+                        echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"leftBugList\",confirmUnlinkBug)", '<i class="icon-unlink"></i>', '', "class='btn-icon' title='{$lang->release->unlinkBug}'");
+                    }
+                    ?>
+                  </td>
                 </tr>
-              </tfoot>
-            </table>
+                <?php endforeach;?>
+              </table>
+              <?php if($countLeftBugs and $canBatchUnlink):?>
+              <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($lang->release->batchUnlink);?>
+                </div>
+                <div class='text'><?php echo sprintf($lang->release->createdBugs, $countLeftBugs);?></div>
+              </div>
+              <?php endif;?>
             </form>
           </div>
 
           <div class='tab-pane <?php if($type == 'releaseInfo') echo 'active'?>' id='releaseInfo'>
-            <div class="row-table">
-              <div class="col-main">
-                <fieldset>
-                  <legend><?php echo $lang->release->basicInfo?></legend>
-                  <table class='table table-data table-condensed table-borderless table-fixed'>
-                    <tr>
-                      <th class='w-80px'><?php echo $lang->release->product;?></th>
-                      <td><?php echo $release->productName;?></td>
-                    </tr>
-                      <?php if($release->productType != 'normal'):?>
+            <div class="main-row">
+              <div class="main-col col-8">
+                <div class='cell'>
+                  <div class='detail'>
+                    <div class='detail-title'><?php echo $lang->release->basicInfo?></div>
+                    <div class='detail-content'>
+                      <table class='table table-data'>
                         <tr>
-                          <th><?php echo $lang->product->branch;?></th>
-                          <td><?php echo $branchName;?></td>
+                          <th class='w-80px'><?php echo $lang->release->product;?></th>
+                          <td><?php echo $release->productName;?></td>
                         </tr>
-                      <?php endif;?>
-                    <tr>
-                      <th><?php echo $lang->release->name;?></th>
-                      <td><?php echo $release->name;?></td>
-                    </tr>
-                    <tr>
-                      <th><?php echo $lang->release->build;?></th>
-                      <td title='<?php echo $release->buildName?>'>
-                          <?php echo ($release->project) ? html::a($this->createLink('build', 'view', "buildID=$release->buildID"), $release->buildName, '_blank') : $release->buildName;?>
-                      </td>
-                    </tr>
-                    <tr>
-                      <th><?php echo $lang->release->status;?></th>
-                      <td><?php echo $lang->release->statusList[$release->status];?></td>
-                    </tr>
-                    <tr>
-                      <th><?php echo $lang->release->date;?></th>
-                      <td><?php echo $release->date;?></td>
-                    </tr>
-                    <tr>
-                      <th><?php echo $lang->release->desc;?></th>
-                      <td><?php echo $release->desc;?></td>
-                    </tr>
-                  </table>
-                </fieldset>
-                <fieldset>
-                  <legend><?php echo $lang->files?></legend>
-                  <div class='article-content'>
-                      <?php
-                      if($release->files)
-                      {
-                          echo $this->fetch('file', 'printFiles', array('files' => $release->files, 'fieldset' => 'false'));
-                      }
-                      elseif($release->filePath)
-                      {
-                          echo $lang->release->filePath . html::a($release->filePath, $release->filePath, '_blank');
-                      }
-                      elseif($release->scmPath)
-                      {
-                          echo $lang->release->scmPath . html::a($release->scmPath, $release->scmPath, '_blank');
-                      }
-                      ?>
+                          <?php if($release->productType != 'normal'):?>
+                            <tr>
+                              <th><?php echo $lang->product->branch;?></th>
+                              <td><?php echo $branchName;?></td>
+                            </tr>
+                          <?php endif;?>
+                        <tr>
+                          <th><?php echo $lang->release->name;?></th>
+                          <td><?php echo $release->name;?></td>
+                        </tr>
+                        <tr>
+                          <th><?php echo $lang->release->build;?></th>
+                          <td title='<?php echo $release->buildName?>'>
+                              <?php echo ($release->project) ? html::a($this->createLink('build', 'view', "buildID=$release->buildID"), $release->buildName, '_blank') : $release->buildName;?>
+                          </td>
+                        </tr>
+                        <tr>
+                          <th><?php echo $lang->release->status;?></th>
+                          <td><?php echo $lang->release->statusList[$release->status];?></td>
+                        </tr>
+                        <tr>
+                          <th><?php echo $lang->release->date;?></th>
+                          <td><?php echo $release->date;?></td>
+                        </tr>
+                        <tr>
+                          <th><?php echo $lang->release->desc;?></th>
+                          <td><?php echo $release->desc;?></td>
+                        </tr>
+                      </table>
+                    </div>
                   </div>
-                </fieldset>
+                  <div class='detail'>
+                    <div class='detail-title'><?php echo $lang->files?></div>
+                    <div class='detail-content article-content'>
+                        <?php
+                        if($release->files)
+                        {
+                            echo $this->fetch('file', 'printFiles', array('files' => $release->files, 'fieldset' => 'false'));
+                        }
+                        elseif($release->filePath)
+                        {
+                            echo $lang->release->filePath . html::a($release->filePath, $release->filePath, '_blank');
+                        }
+                        elseif($release->scmPath)
+                        {
+                            echo $lang->release->scmPath . html::a($release->scmPath, $release->scmPath, '_blank');
+                        }
+                        ?>
+                    </div>
+                  </div>
+                  <?php include '../../common/view/action.html.php';?>
+                </div>
               </div>
-              <div class="col-side"><?php include '../../common/view/action.html.php';?></div>
             </div>
           </div>
         </div>
@@ -323,7 +344,7 @@
   </div>
 </div>
 <style>
-.tabs .tab-content .tab-pane .action{position: absolute; right: <?php echo ($countStories or $countBugs or $countLeftBugs) ? '110px' : '-1px'?>; top: 0px;}
+.tabs .tab-content .tab-pane .action{position: absolute; right: <?php echo ($countStories or $countBugs or $countLeftBugs) ? '80px' : '-1px'?>; top: 0px;}
 </style>
 <?php js::set('param', helper::safe64Decode($param))?>
 <?php js::set('link', $link)?>
diff --git a/module/search/view/buildform.html.php b/module/search/view/buildform.html.php
index ecd9545efc..907a4c626e 100644
--- a/module/search/view/buildform.html.php
+++ b/module/search/view/buildform.html.php
@@ -29,7 +29,7 @@ include '../../common/view/chosen.html.php';
 #searchForm > table > tbody > tr > td {padding: 10px 15px; color: #838A9D;}
 #searchForm .form-actions {padding-bottom: 20px; padding-top: 0;}
 #searchForm .chosen-container[id^="field"] .chosen-drop {min-width: 140px;}
-#searchForm [id^="valueBox"] .chosen-container .chosen-single {max-width: 170px;}
+#searchForm [id^="valueBox"] .chosen-container .chosen-single {min-width: 140px;}
 #searchForm [id^="valueBox"] .chosen-container .chosen-drop {min-width: 300px;}
 #searchForm .chosen-container .chosen-drop ul.chosen-results li {white-space:normal}
 #searchForm input.date::-webkit-input-placeholder {color: #000000; opacity: 1;}
@@ -97,7 +97,7 @@ foreach($fieldParams as $fieldName => $param)
                 echo "<td class='w-110px' style='overflow: visible'>" . html::select("field$fieldNO", $searchFields, $formSession["field$fieldNO"], "onchange='setField(this, $fieldNO, {$module}params)' class='form-control chosen'") . '</td>';
 
                 /* Print operator. */
-                echo "<td class='w-70px'>" . html::select("operator$fieldNO", $lang->search->operators, $formSession["operator$fieldNO"], "class='form-control'") . '</td>';
+                echo "<td class='w-80px'>" . html::select("operator$fieldNO", $lang->search->operators, $formSession["operator$fieldNO"], "class='form-control'") . '</td>';
 
                 /* Print value. */
                 echo "<td id='valueBox$fieldNO' style='overflow:visible'>";
@@ -127,7 +127,7 @@ foreach($fieldParams as $fieldName => $param)
           </tbody>
         </table>
       </td>
-      <td class='text-center nobr'><?php echo html::select('groupAndOr', $lang->search->andor, $formSession['groupAndOr'], "class='form-control w-60px'")?></td>
+      <td class='text-center nobr w-90px'><?php echo html::select('groupAndOr', $lang->search->andor, $formSession['groupAndOr'], "class='form-control'")?></td>
       <td class='w-400px'>
         <table class='table table-form'>
           <tbody>
@@ -155,10 +155,10 @@ foreach($fieldParams as $fieldName => $param)
                 echo '</td>';
 
                 /* Print field. */
-                echo "<td class='w-90px' style='overflow: visible'>" . html::select("field$fieldNO", $searchFields, $formSession["field$fieldNO"], "onchange='setField(this, $fieldNO, {$module}params)' class='form-control chosen'") . '</td>';
+                echo "<td class='w-110px' style='overflow: visible'>" . html::select("field$fieldNO", $searchFields, $formSession["field$fieldNO"], "onchange='setField(this, $fieldNO, {$module}params)' class='form-control chosen'") . '</td>';
 
                 /* Print operator. */
-                echo "<td class='w-70px'>" .  html::select("operator$fieldNO", $lang->search->operators, $formSession["operator$fieldNO"], "class='form-control'") . '</td>';
+                echo "<td class='w-80px'>" .  html::select("operator$fieldNO", $lang->search->operators, $formSession["operator$fieldNO"], "class='form-control'") . '</td>';
 
                 /* Print value. */
                 echo "<td id='valueBox$fieldNO'>";
@@ -189,6 +189,7 @@ foreach($fieldParams as $fieldName => $param)
           </tbody>
         </table>
       </td>
+      <?php if($style != 'simple'):?>
       <td class='w-160px' rowspan='2' id='userQueries'>
         <h4><?php echo $lang->search->savedQuery;?></h4>
         <div>
@@ -198,6 +199,7 @@ foreach($fieldParams as $fieldName => $param)
           <?php endforeach;?>
         </div>
       </td>
+      <?php endif;?>
     </tr>
     <tr>
       <td colspan='3' class='text-center form-actions'>
diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index ca4932ff42..108582cdf3 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -179,9 +179,9 @@
             }
             if(count($story->tasks) == 0)
             {
-                foreach($story->projects as $project)
+                foreach($story->projects as $projectID => $project)
                 {
-                    echo "<li title='$project->name'>" . html::a($this->createLink('project', 'browse', "projectID=$project->id"), $project->name, '', "class='text-muted'") . '</li>';
+                    echo "<li title='$project->name'>" . html::a($this->createLink('project', 'browse', "projectID=$projectID"), $project->name, '', "class='text-muted'") . '</li>';
                 }
             }
             ?>
diff --git a/module/story/view/zerocase.html.php b/module/story/view/zerocase.html.php
index d9445bb681..0f3d270625 100644
--- a/module/story/view/zerocase.html.php
+++ b/module/story/view/zerocase.html.php
@@ -57,7 +57,7 @@
         <td><?php echo $users[$story->openedBy];?></td>
         <td><?php echo $users[$story->assignedTo];?></td>
         <td><?php echo $story->estimate;?></td>
-        <td><span class='status-<?php echo $story->status;?>'><span class="label label-dot"></span> <?php echo zget($lang->story->statusList, $story->status);?></td>
+        <td><span class='status-<?php echo $story->status;?>'><span class="label label-dot"></span> <?php echo zget($lang->story->statusList, $story->status);?></span></td>
         <td><?php echo zget($lang->story->stageList, $story->stage);?></td>
         <td class='c-actions'>
           <?php 
diff --git a/www/js/my.full.js b/www/js/my.full.js
index a1d16cef84..4716fad6a0 100644
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -1076,7 +1076,7 @@ function setModal()
             var frame$ = window.frames[options.name].$;
             frame$(function()
             {
-                if(frame$('#titlebar').length || frame$('.main-header').length || frame$('.modal-header').length)
+                if(frame$('#titlebar').length || frame$('.main-header').length || frame$('.modal-header').length || frame$('#mainMenu').length)
                 {
                     modal.addClass('with-titlebar');
                     if(options.size == 'fullscreen')
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index 00f75ad8df..e58edc1fed 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -60,6 +60,7 @@ a,a:focus,a:active {text-decoration: none; outline:none;}
 .modal-content {background-color:#fff;}
 body.body-modal{padding-bottom:0px;}
 body.body-modal .container{padding:0px;}
+body.body-modal #mainMenu{margin-top:5px;}
 
 .modal-iframe .modal-body {padding: 0;}
 .modal.with-titlebar .modal-header, .modal-dialog.hide-header .modal-header{position: relative; height: 0; padding: 0; border: none; z-index: 999; min-height: 0}