diff --git a/module/bug/control.php b/module/bug/control.php
index 02a196bbc9..b25f1db0d5 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -1007,7 +1007,7 @@ class bug extends control
         $projectMembers = $this->loadModel('project')->getTeamMemberPairs($projectID);
         $assignedToList = array_merge($projectMembers, $allUsers);
         
-        die(html::select('assignedTo', $assignedToList, $selectedUser, 'class="select-3"'));
+        die(html::select('assignedTo', $assignedToList, $selectedUser, 'class="form-control"'));
     }
 
     /**
diff --git a/module/bug/js/common.js b/module/bug/js/common.js
index 7f475d3108..c0a7577752 100644
--- a/module/bug/js/common.js
+++ b/module/bug/js/common.js
@@ -218,7 +218,7 @@ function setStories(moduleID, productID)
     link = createLink('story', 'ajaxGetProductStories', 'productID=' + productID + '&moduleID=' + moduleID);
     $.get(link, function(stories)
     {
-        if(!stories) stories = '<select id="story" name="story" class="select-3"></select>';
+        if(!stories) stories = '<select id="story" name="story" class="form-control"></select>';
         $('#story').replaceWith(stories);
         $('#story_chzn').remove();
         $("#story").chosen({no_results_text: ''});
diff --git a/module/bug/view/assignto.html.php b/module/bug/view/assignto.html.php
index 56758bfe8c..c887450e1d 100644
--- a/module/bug/view/assignto.html.php
+++ b/module/bug/view/assignto.html.php
@@ -17,25 +17,34 @@ include '../../common/view/chosen.html.php';
 js::set('holders', $lang->bug->placeholder);
 js::set('page', 'assignedto');
 ?>
+<div id='titlebar'>
+  <div class='heading'>
+    <span class='prefix'><?php echo html::icon($lang->icons['bug']) . ' #' . $bug->id;;?></span>
+    <strong><?php echo html::a($this->createLink('bug', 'view', 'bug=' . $bug->id), $bug->title, '_blank');?></strong>
+    <small class='text-muted'> <?php echo $lang->bug->assignedTo;?> <?php echo html::icon($lang->icons['assignTo']);?></small>
+  </div>
+</div>
+
 <form class='form-condensed' method='post' target='hiddenwin'>
   <table class='table table-form'>
-    <caption><?php echo $bug->title;?></caption>
     <tr>
-      <th><?php echo $lang->bug->assignedTo;?></th>
-      <td><?php echo html::select('assignedTo', $users, $bug->assignedTo, "class='form-control chosen'");?></td>
+      <th class='w-60px'><?php echo $lang->bug->assignedTo;?></th>
+      <td class='w-p45'><?php echo html::select('assignedTo', $users, $bug->assignedTo, "class='form-control chosen'");?></td><td></td>
     </tr>  
     <tr>
-      <th class='rowhead'><?php echo $lang->bug->mailto;?></td>
-      <td><?php echo html::select('mailto[]', $users, str_replace(' ', '', $bug->mailto), 'class="w-p98" multiple');?></td>
+      <th><?php echo $lang->bug->mailto;?></th>
+      <td colspan='2'><?php echo html::select('mailto[]', $users, str_replace(' ', '', $bug->mailto), 'class="form-control chosen" multiple');?></td>
     </tr>
     <tr>
-      <th class='rowhead'><?php echo $lang->comment;?></td>
-      <td><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
+      <th><?php echo $lang->comment;?></th>
+      <td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
     </tr>
     <tr>
-      <td colspan='2' class='text-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->server->http_referer);?></td>
+      <td colspan='3' class='text-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->server->http_referer);?></td>
     </tr>
   </table>
-  <?php include '../../common/view/action.html.php';?>
 </form>
+<div class='main'>
+  <?php include '../../common/view/action.html.php';?>
+</div>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/build/css/common.css b/module/build/css/common.css
index 02e13fa590..d79a092dee 100644
--- a/module/build/css/common.css
+++ b/module/build/css/common.css
@@ -1,4 +1,2 @@
-.mainTable  { width:100%;}
-.headTable  { width:100%; height:30px; margin:0px; border:0px}
-.contentDiv { height:195px; overflow-y:auto}
-.mainTable select{padding:0px;margin:0px;height:20px;}
+.contentDiv { height:190px; overflow-y:auto; margin-bottom: 10px!important}
+.contentDiv .panel-heading {line-height: 14px;}
diff --git a/module/build/view/create.html.php b/module/build/view/create.html.php
index 6329a34b62..5a569df3c4 100644
--- a/module/build/view/create.html.php
+++ b/module/build/view/create.html.php
@@ -13,109 +13,115 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<form method='post' target='hiddenwin' id='dataform' enctype='multipart/form-data'>
-  <table class='table-1 fixed'> 
-    <caption><?php echo $lang->build->create;?></caption>
-    <tr>
-      <th><?php echo $lang->build->product;?></th>
-      <td><?php echo html::select('product', $products, '', "class='form-control'");?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->build->name;?></th>
-      <td>
-        <?php echo html::input('name', '', "class='form-control'");?>
-        <?php if($lastBuild) echo '<span class="gray">(' . $lang->build->last . ': ' . $lastBuild->name . ')</span>';?>
-      </td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->build->builder;?></th>
-      <td><?php echo html::select('builder', $users, $app->user->account, 'class="select-3"');?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->build->date;?></th>
-      <td><?php echo html::input('date', helper::today(), "class='form-control form-date'");?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->build->scmPath;?></th>
-      <td><?php echo html::input('scmPath', '', "class='form-control'");?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->build->packageType;?></th>
-      <td><?php echo html::radio('packageType', $lang->build->packageTypeList, 'path');?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->build->filePath;?></th>
-      <td><?php echo html::input('filePath', '', "class='form-control'");?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->build->files;?></th>
-      <td><?php echo $this->fetch('file', 'buildForm', array('fileCount' => 1));?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->build->linkStoriesAndBugs;?></th>
-      <td>
-
-        <table class='bd-none' style='margin-bottom:0px;width:91%'>
-          <tr>
-            <td class='w-p50' style='padding-left:0px;padding-right:8px;'>
-              <table class='mainTable'>
-                <caption style='padding-left:3px'><?php echo html::selectAll('story', 'checkbox') . ' ' . $lang->build->linkStories;?></caption>
-                <tr style='border-bottom:none'>
-                  <td style='border-bottom:none; padding:0px'>
-                    <div class='contentDiv'>
-                      <table class='table-1 fixed bd-none' id='story'>
-                        <?php foreach($stories as $key => $story):?>
-                        <?php $storyLink = $this->createLink('story', 'view', "storyID=$story->id", '', true); ?>
-                        <tr class='text-center'>
-                          <td class='w-id a-left'>
-                            <input type='checkbox' name='stories[]' value="<?php echo $story->id;?>" <?php if($story->stage == 'developed' or $story->status == 'closed') echo 'checked';?>> <?php echo sprintf('%03d', $story->id);?>
-                          </td>
-                          <td class='a-left nobr'><?php echo html::a($storyLink,$story->title, '', "class='preview'");?></td>
-                          <td class='<?php echo $story->status;?> w-50px'><?php echo $lang->story->statusList[$story->status];?></td>
-                          <td class='w-80px'><?php echo $lang->story->stageList[$story->stage];?></td>
-                        </tr>
-                      <?php endforeach;?>
-                      </table>
-                    </div>
-                  </td>
-                </tr>
-              </table>
-            </td>
-
-            <td class='w-p50' style='padding-left:0px;padding-right:5px;'>
-              <table class='mainTable'>
-                <caption style='padding-left:3px'><?php echo html::selectAll('bug', 'checkbox') . ' ' . $lang->build->linkBugs;?></caption>
-                <tr style='border-bottom:none'>
-                  <td style='border-bottom:none; padding:0px'>
-                    <div class='contentDiv'>
-                      <table class='table-1 fixed bd-none' id='bug'>
-                        <?php foreach($bugs as $bug):?>
-                        <?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug->id", '', true);?>
-                        <tr class='text-center'>
-                          <td class='w-id a-left'>
-                            <input type='checkbox' name='bugs[]' value="<?php echo $bug->id;?>" <?php if($bug->status == 'resolved' or $bug->status == 'closed') echo "checked";?>> <?php echo sprintf('%03d', $bug->id);?>
-                          </td>
-                          <td class='a-left nobr'><?php echo html::a($bugLink, $bug->title, '', "class='preview'");?></td>
-                          <td class='w-80px'><?php echo $lang->bug->statusList[$bug->status];?></td>
-                          <td class='w-80px' style='padding:0px'><?php echo $bug->status == 'resolved' ? substr($users[$bug->resolvedBy], 2) : html::select('resolvedBy[]', $users, $this->app->user->account, "class='w-70px'");?></td>
-                        </tr>
-                        <?php endforeach;?>
-                      </table>
-                    </div>
-                  </td>
-                </tr>
-              </table>
-            </td>
-          </tr>
-        </table>
-
-      </td>
-    </tr>
-    <tr>
-      <th><?php echo $lang->build->desc;?></th>
-      <td><?php echo html::textarea('desc', '', "rows='10' class='form-control'");?></td>
-    </tr>  
-    <tr><td colspan='2' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
-  </table>
-</form>
+<div class='container'>
+  <div id='titlebar'>
+    <div class='heading'>
+      <span class='prefix'><?php echo html::icon($lang->icons['build']);?></span>
+      <strong><small class='text-muted'><?php echo html::icon($lang->icons['create']);?></small> <?php echo $lang->build->create;?></strong>
+    </div>
+  </div>
+  <form class='form-condensed' method='post' target='hiddenwin' id='dataform' enctype='multipart/form-data'>
+    <table class='table table-form'> 
+      <tr>
+        <th class='w-110px'><?php echo $lang->build->product;?></th>
+        <td class='w-p45'><?php echo html::select('product', $products, '', "class='form-control'");?></td><td></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->build->name;?></th>
+        <td>
+          <?php echo html::input('name', '', "class='form-control'");?>
+        </td>
+        <td>
+          <?php if($lastBuild):?>
+          <div class='help-block'> &nbsp; <?php echo $lang->build->last . ': <strong>' . $lastBuild->name . '</strong>';?></div>
+          <?php endif;?>
+        </td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->build->builder;?></th>
+        <td><?php echo html::select('builder', $users, $app->user->account, 'class="form-control"');?></td>
+      </tr>  
+      <tr>
+        <th><?php echo $lang->build->date;?></th>
+        <td><?php echo html::input('date', helper::today(), "class='form-control form-date'");?></td>
+      </tr>  
+      <tr>
+        <th><?php echo $lang->build->scmPath;?></th>
+        <td colspan='2'><?php echo html::input('scmPath', '', "class='form-control'");?></td>
+      </tr>  
+      <tr>
+        <th><?php echo $lang->build->packageType;?></th>
+        <td colspan='2'><?php echo html::radio('packageType', $lang->build->packageTypeList, 'path');?></td>
+      </tr>  
+      <tr>
+        <th><?php echo $lang->build->filePath;?></th>
+        <td colspan='2'><?php echo html::input('filePath', '', "class='form-control'");?></td>
+      </tr>  
+      <tr>
+        <th><?php echo $lang->build->files;?></th>
+        <td colspan='2'><?php echo $this->fetch('file', 'buildForm', array('fileCount' => 1));?></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->build->linkStoriesAndBugs;?></th>
+        <td colspan='2'>
+          <div class='row pd-0' style='margin: 0 0 0 -15px'>
+            <div class='col-md-6'>
+              <div class='panel panel-sm contentDiv'>
+                <div class='panel-heading'><?php echo html::icon($lang->icons['story']) . ' ' . $lang->build->linkStories;?></div>
+                <table class='table table table-borderless table-condensed table-hover'>
+                  <thead>
+                    <tr class='text-center'>
+                      <th class='w-id text-left'><?php echo html::selectAll('story', 'checkbox') . ' ' . $lang->idAB;?></th>
+                      <th><?php echo $lang->story->title;?></th>
+                      <th class='w-hour'><?php echo $lang->statusAB;?></th>
+                      <th class='w-100px'><?php echo $lang->story->stageAB;?></th>
+                    </tr>
+                  </thead>
+                  <?php foreach($stories as $key => $story):?>
+                  <?php $storyLink = $this->createLink('story', 'view', "storyID=$story->id", '', true);?>
+                  <tr class='text-center'>
+                    <td class='w-id text-left' id='story'><input type='checkbox' name='stories[]' value="<?php echo $story->id;?>" <?php if($story->stage == 'developed' or $story->status == 'closed') echo 'checked';?>> <?php echo sprintf('%03d', $story->id);?></td>
+                    <td class='text-left nobr'><?php echo html::a($storyLink, $story->title, '', "class='preview iframe'");?></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>
+                  </tr>
+                  <?php endforeach;?>
+                </table>
+              </div>
+            </div>
+            <div class='col-md-6'>
+              <div class='panel panel-sm contentDiv'>
+                <div class='panel-heading'><?php echo html::icon($lang->icons['bug']) . ' ' . $lang->build->linkBugs;?></div>
+                <table class='table table table-borderless table-condensed table-hover'>
+                  <thead>
+                    <tr class='text-center'>
+                      <th class='w-id text-left'><?php echo html::selectAll('bug', 'checkbox') . ' ' . $lang->idAB;?></th>
+                      <th><?php echo $lang->bug->title;?></th>
+                      <th class='w-100px'><?php echo $lang->bug->status;?></th>
+                      <th class='w-80px'><?php echo $lang->bug->resolvedBy;?></th>
+                    </tr>
+                  </thead>
+                  <?php foreach($bugs as $bug):?>
+                  <?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug->id", '', true);?>
+                  <tr class='text-center'>
+                    <td class='w-id text-left' id='bug'><input type='checkbox' name='bugs[]' value="<?php echo $bug->id;?>" <?php if($bug->status == 'resolved' or $bug->status == 'closed') echo "checked";?>> <?php echo sprintf('%03d', $bug->id);?></td>
+                    <td class='text-left nobr'><?php echo html::a($bugLink, $bug->title, '', "class='preview iframe'");?></td>
+                    <td><?php echo $lang->bug->statusList[$bug->status];?></td>
+                    <td><?php echo ($bug->status == 'resolved' or $bug->status == 'closed') ? substr($users[$bug->resolvedBy], 2) : html::select('resolvedBy[]', $users, $this->app->user->account, "class='w-70px'");?></td>
+                  </tr>
+                  <?php endforeach;?>
+                </table>
+              </div>
+            </div>
+          </div>
+        </td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->build->desc;?></th>
+        <td colspan='2'><?php echo html::textarea('desc', '', "rows='10' class='form-control'");?></td>
+      </tr>  
+      <tr><td></td><td colspan='2'><?php echo html::submitButton() . html::backButton();?></td></tr>
+    </table>
+  </form>
+</div>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/build/view/edit.html.php b/module/build/view/edit.html.php
index 4c61fafc9e..e83968a5fc 100644
--- a/module/build/view/edit.html.php
+++ b/module/build/view/edit.html.php
@@ -13,125 +13,109 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<form method='post' target='hiddenwin' id='dataform' enctype='multipart/form-data'>
-  <table class='table-1'> 
-    <caption><?php echo $lang->build->edit;?></caption>
-    <tr>
-      <th><?php echo $lang->build->product;?></th>
-      <td><?php echo html::select('product', $products, $build->product, "class='form-control'");?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->build->name;?></th>
-      <td><?php echo html::input('name', $build->name, "class='form-control'");?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->build->builder;?></th>
-      <td><?php echo html::select('builder', $users, $build->builder, 'class="select-3"');?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->build->date;?></th>
-      <td><?php echo html::input('date', $build->date, "class='form-control form-date'");?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->build->scmPath;?></th>
-      <td><?php echo html::input('scmPath', $build->scmPath, "class='form-control'");?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->build->packageType;?></th>
-      <td><?php echo html::radio('packageType', $lang->build->packageTypeList, $build->packageType);?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->build->filePath;?></th>
-      <td><?php echo html::input('filePath', $build->filePath, "class='form-control'");?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->build->files;?></th>
-      <td><?php echo $this->fetch('file', 'buildForm', array('fileCount' => 1));?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->build->linkStoriesAndBugs;?></th>
-      <td>
-
-        <table class='bd-none' style='margin-bottom:0px;width:91%'>
-          <tr>
-            <td class='w-p50' style='padding-left:0px;padding-right:8px'>
-              <table class='mainTable bd-none'>
-                <tr style='border-bottom:none'>
-                  <td style='border-bottom:none;padding:0px'>
-                    <table class='headTable'>
-                      <caption><?php echo $lang->build->linkStories;?></caption>
-                      <tr style='border-left:1px solid #e4e4e4; border-right:1px solid #e4e4e4;'>
-                        <th class='w-id a-left'><?php echo html::selectAll('story', 'checkbox') . ' ' . $lang->idAB;?></th>
-                        <th><?php echo $lang->story->title;?></th>
-                        <th class='w-hour'><?php echo $lang->statusAB;?></th>
-                        <th class='w-100px'><?php echo $lang->story->stageAB;?></th>
-                      </tr>
-                    </table>
-                  </td>
-                </tr>
-                <tr style='border-bottom:none'>
-                  <td style='border-bottom:none; padding:0px'>
-                    <div class="contentDiv" style='border:1px solid #e4e4e4;'>
-                      <table class='f-left table-1 fixed bd-none'>
-                        <?php foreach($stories as $key => $story):?>
-                        <?php $storyLink = $this->createLink('story', 'view', "storyID=$story->id", '', true);?>
-                        <tr class='text-center'>
-                          <td class='w-id a-left' id='story'><input type='checkbox' name='stories[]' value="<?php echo $story->id;?>" <?php if(strpos(',' . $build->stories . ',', ',' . $story->id . ',') !== false) echo 'checked';?>> <?php echo sprintf('%03d', $story->id);?></td>
-                          <td class='a-left nobr'><?php echo html::a($storyLink, $story->title, '', "class='preview'");?></td>
-                          <td class='<?php echo $story->status;?> w-50px'><?php echo $lang->story->statusList[$story->status];?></td>
-                          <td class='w-80px'><?php echo $lang->story->stageList[$story->stage];?></td>
-                        </tr>
-                        <?php endforeach;?>
-                      </table>
-                    </div>
-                  </td>
-                </tr>
-              </table>
-            </td>
-
-            <td class='w-p50' style='padding-left:0px;padding-right:5px;'>
-              <table class='mainTable bd-none'>
-                <tr style='border-bottom:none'>
-                  <td style='border-bottom:none; padding:0px'>
-                    <table class='headTable'>
-                      <caption><?php echo $lang->build->linkBugs;?></caption>
-                      <tr style='border-left:1px solid #e4e4e4; border-right:1px solid #e4e4e4;'>
-                        <th class='w-id a-left'><?php echo html::selectAll('bug', 'checkbox') . ' ' . $lang->idAB;?></th>
-                        <th><?php echo $lang->bug->title;?></th>
-                        <th class='w-100px'><?php echo $lang->bug->status;?></th>
-                      </tr>
-                    </table>
-                  </td>
-                </tr>
-                <tr style='border-bottom:none'>
-                  <td style='border-bottom:none; padding:0px'>
-                    <div class='contentDiv' style='border:1px solid #e4e4e4;'>
-                      <table class='f-left table-1 fixed bd-none'>
-                        <?php foreach($bugs as $bug):?>
-                        <?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug->id", '', true);?>
-                        <tr class='text-center'>
-                          <td class='w-id a-left' id='bug'><input type='checkbox' name='bugs[]' value="<?php echo $bug->id;?>" <?php if(strpos(',' . $build->bugs . ',', ',' . $bug->id . ',') !== false) echo 'checked';?>> <?php echo sprintf('%03d', $bug->id);?></td>
-                          <td class='a-left nobr'><?php echo html::a($bugLink, $bug->title, '', "class='preview'");?></td>
-                          <td class='w-80px'><?php echo $lang->bug->statusList[$bug->status];?></td>
-                          <td class='w-80px' style='padding:0px'><?php echo ($bug->status == 'resolved' or $bug->status == 'closed') ? substr($users[$bug->resolvedBy], 2) : html::select('resolvedBy[]', $users, $this->app->user->account, "class='w-70px'");?></td>
-                        </tr>
-                        <?php endforeach;?>
-                      </table>
-                    </div>
-                  </td>
-                </tr>
-              </table>
-            </td>
-          </tr>
-        </table>
-
-      </td>
-    </tr>
-    <tr>
-      <th><?php echo $lang->build->desc;?></th>
-      <td><?php echo html::textarea('desc', $build->desc, "rows='10' class='form-control'");?></td>
-    </tr>  
-    <tr><td colspan='2' class='text-center'><?php echo html::submitButton() . html::backButton() .html::hidden('project', $build->project);?></td></tr>
-  </table>
-</form>
+<div class='container'>
+  <div id='titlebar'>
+    <div class='heading'>
+      <span class='prefix'><?php echo html::icon($lang->icons['build']) . ' #' . $build->id;?></span>
+      <strong><?php echo html::a($this->createLink('build', 'view', 'build=' . $build->id), $build->name, '_blank');?></strong>
+      <small class='text-muted'> <?php echo $lang->build->edit;?> <?php echo html::icon($lang->icons['edit']);?></small>
+    </div>
+  </div>
+  <form class='form-condensed' method='post' target='hiddenwin' id='dataform' enctype='multipart/form-data'>
+    <table class='table table-form'> 
+      <tr>
+        <th class='w-110px'><?php echo $lang->build->product;?></th>
+        <td class='w-p45'><?php echo html::select('product', $products, $build->product, "class='form-control'");?></td><td></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->build->name;?></th>
+        <td><?php echo html::input('name', $build->name, "class='form-control'");?></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->build->builder;?></th>
+        <td><?php echo html::select('builder', $users, $build->builder, 'class="form-control"');?></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->build->date;?></th>
+        <td><?php echo html::input('date', $build->date, "class='form-control form-date'");?></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->build->scmPath;?></th>
+        <td colspan='2'><?php echo html::input('scmPath', $build->scmPath, "class='form-control'");?></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->build->packageType;?></th>
+        <td colspan='2'><?php echo html::radio('packageType', $lang->build->packageTypeList, $build->packageType);?></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->build->filePath;?></th>
+        <td colspan='2'><?php echo html::input('filePath', $build->filePath, "class='form-control'");?></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->build->files;?></th>
+        <td colspan='2'><?php echo $this->fetch('file', 'buildForm', array('fileCount' => 1));?></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->build->linkStoriesAndBugs;?></th>
+        <td colspan='2'>
+          <div class='row pd-0' style='margin: 0 0 0 -15px'>
+            <div class='col-md-6'>
+              <div class='panel panel-sm contentDiv'>
+                <div class='panel-heading'><?php echo html::icon($lang->icons['story']) . ' ' . $lang->build->linkStories;?></div>
+                <table class='table table table-borderless table-condensed table-hover'>
+                  <thead>
+                    <tr class='text-center'>
+                      <th class='w-id text-left'><?php echo html::selectAll('story', 'checkbox') . ' ' . $lang->idAB;?></th>
+                      <th><?php echo $lang->story->title;?></th>
+                      <th class='w-hour'><?php echo $lang->statusAB;?></th>
+                      <th class='w-100px'><?php echo $lang->story->stageAB;?></th>
+                    </tr>
+                  </thead>
+                  <?php foreach($stories as $key => $story):?>
+                  <?php $storyLink = $this->createLink('story', 'view', "storyID=$story->id", '', true);?>
+                  <tr class='text-center'>
+                    <td class='w-id text-left' id='story'><input type='checkbox' name='stories[]' value="<?php echo $story->id;?>" <?php if(strpos(',' . $build->stories . ',', ',' . $story->id . ',') !== false) echo 'checked';?>> <?php echo sprintf('%03d', $story->id);?></td>
+                    <td class='text-left nobr'><?php echo html::a($storyLink, $story->title, '', "class='preview iframe'");?></td>
+                    <td class='story-<?php echo $story->status;?> w-50px'><?php echo $lang->story->statusList[$story->status];?></td>
+                    <td><?php echo $lang->story->stageList[$story->stage];?></td>
+                  </tr>
+                  <?php endforeach;?>
+                </table>
+              </div>
+            </div>
+            <div class='col-md-6'>
+              <div class='panel panel-sm contentDiv'>
+                <div class='panel-heading'><?php echo html::icon($lang->icons['bug']) . ' ' . $lang->build->linkBugs;?></div>
+                <table class='table table table-borderless table-condensed table-hover'>
+                  <thead>
+                    <tr class='text-center'>
+                      <th class='w-id text-left'><?php echo html::selectAll('bug', 'checkbox') . ' ' . $lang->idAB;?></th>
+                      <th><?php echo $lang->bug->title;?></th>
+                      <th class='w-100px'><?php echo $lang->bug->status;?></th>
+                      <th class='w-80px'><?php echo $lang->bug->resolvedBy;?></th>
+                    </tr>
+                  </thead>
+                  <?php foreach($bugs as $bug):?>
+                  <?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug->id", '', true);?>
+                  <tr class='text-center'>
+                    <td class='w-id text-left' id='bug'><input type='checkbox' name='bugs[]' value="<?php echo $bug->id;?>" <?php if(strpos(',' . $build->bugs . ',', ',' . $bug->id . ',') !== false) echo 'checked';?>> <?php echo sprintf('%03d', $bug->id);?></td>
+                    <td class='text-left nobr'><?php echo html::a($bugLink, $bug->title, '', "class='preview iframe'");?></td>
+                    <td><?php echo $lang->bug->statusList[$bug->status];?></td>
+                    <td><?php echo ($bug->status == 'resolved' or $bug->status == 'closed') ? substr($users[$bug->resolvedBy], 2) : html::select('resolvedBy[]', $users, $this->app->user->account, "class='w-70px'");?></td>
+                  </tr>
+                  <?php endforeach;?>
+                </table>
+              </div>
+            </div>
+          </div>
+        </td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->build->desc;?></th>
+        <td colspan='2'><?php echo html::textarea('desc', $build->desc, "rows='10' class='form-control'");?></td>
+      </tr>
+      <tr><td></td><td colspan='2'><?php echo html::submitButton() . html::backButton() .html::hidden('project', $build->project);?></td></tr>
+    </table>
+  </form>
+</div>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/file/view/buildform.html.php b/module/file/view/buildform.html.php
index c1a34491c2..7d1bae4dc4 100644
--- a/module/file/view/buildform.html.php
+++ b/module/file/view/buildform.html.php
@@ -19,7 +19,7 @@ EOT;
 </div>
 
 <?php if(!$writeable):?>
-<h5 class='text-danger a-left'> <?php echo $this->lang->file->errorUnwritable;?> </h5>
+<div class='text-danger help-block'> <?php echo $this->lang->file->errorUnwritable;?> </div>
 <?php else:?>
 <div class="file-form">
   <?php for($i = 0; $i < $fileCount; $i ++):?>
diff --git a/module/project/control.php b/module/project/control.php
index e9e2309f23..f8b946a8af 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -1570,7 +1570,7 @@ class project extends control
     public function ajaxGetProducts($projectID)
     {
         $products = $this->project->getProducts($projectID);
-        die(html::select('product', $products, '', 'class="select-3"'));
+        die(html::select('product', $products, '', 'class="form-control"'));
     }
     
     /**
diff --git a/module/story/view/activate.html.php b/module/story/view/activate.html.php
index 84ff38b8b5..6a79fa3268 100644
--- a/module/story/view/activate.html.php
+++ b/module/story/view/activate.html.php
@@ -16,7 +16,7 @@
   <caption><?php echo $lang->story->activate;?></caption>
   <tr>
     <th><?php echo $lang->story->assignedTo;?></th>
-    <td><?php echo html::select('assignedTo', $users, $story->closedBy, 'class="select-3"');?></td>
+    <td><?php echo html::select('assignedTo', $users, $story->closedBy, 'class="form-control"');?></td>
   </tr>
   <tr>
     <th><?php echo $lang->story->comment;?></th>
diff --git a/module/task/css/recordestimate.css b/module/task/css/recordestimate.css
new file mode 100644
index 0000000000..a08b1b272f
--- /dev/null
+++ b/module/task/css/recordestimate.css
@@ -0,0 +1 @@
+body {padding-bottom: 200px !important;}
diff --git a/module/task/js/recordestimate.js b/module/task/js/recordestimate.js
index ce1fcc0970..29b1dae49d 100644
--- a/module/task/js/recordestimate.js
+++ b/module/task/js/recordestimate.js
@@ -1,10 +1,10 @@
 $(function(){
-    startDate = new Date(1970, 1, 1);
-    $(".date").datePicker({
-          createButton: true,
-          startDate: startDate,
-          endDate: new Date()
-    }).dpSetPosition($.dpConst.POS_TOP, $.dpConst.POS_LEFT);
+    // startDate = new Date(1970, 1, 1);
+    // $(".date").datePicker({
+    //       createButton: true,
+    //       startDate: startDate,
+    //       endDate: new Date()
+    // }).dpSetPosition($.dpConst.POS_TOP, $.dpConst.POS_LEFT);
 })
 
 $("#recordForm").submit(function()
diff --git a/module/task/view/activate.html.php b/module/task/view/activate.html.php
index ddc47a3d63..b76752bd11 100644
--- a/module/task/view/activate.html.php
+++ b/module/task/view/activate.html.php
@@ -12,23 +12,35 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
+<div id='titlebar'>
+  <div class='heading'>
+    <span class='prefix'><?php echo html::icon($lang->icons['task']) . ' #' . $task->id;;?></span>
+    <strong><?php echo html::a($this->createLink('task', 'view', 'task=' . $task->id), $task->name, '_blank');?></strong>
+    <small class='text-success'> <?php echo $lang->task->activate;?> <?php echo html::icon($lang->icons['activate']);?></small>
+  </div>
+</div>
+
 <form class='form-condensed' method='post' target='hiddenwin'>
   <table class='table table-form'>
-    <caption><?php echo $task->name;?></caption>
     <tr>
-      <th><?php echo $lang->task->assignedTo;?></th>
-      <td><?php echo html::select('assignedTo', $members, $task->finishedBy, "class='form-control'");?></td>
+      <th class='w-80px'><?php echo $lang->task->assignedTo;?></th>
+      <td class='w-p45'><?php echo html::select('assignedTo', $members, $task->finishedBy, "class='form-control'");?></td><td></td>
     </tr>
     <tr>
       <th><?php echo $lang->task->left;?></th>
-      <td><?php echo html::input('left', '', "class='form-control'") . $lang->task->hour;?></td>
+      <td>
+        <div class='input-group'>
+          <?php echo html::input('left', '', "class='form-control'");?>
+          <span class='input-group-addon'><?php echo $lang->task->hour;?></span>
+        </div>
+      </td>
     </tr>
     <tr>
-      <td><?php echo $lang->comment;?></td>
-      <td><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
+      <th><?php echo $lang->comment;?></th>
+      <td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
     </tr>
     <tr>
-      <td colspan='2' class='text-center'>
+      <td colspan='3' class='text-center'>
        <?php 
        echo html::submitButton();
        echo html::linkButton($lang->goback, $this->session->taskList);
@@ -36,6 +48,8 @@
       </td>
     </tr>
   </table>
-  <?php include '../../common/view/action.html.php';?>
 </form>
+<div class='main'>
+  <?php include '../../common/view/action.html.php';?>
+</div>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/task/view/editestimate.html.php b/module/task/view/editestimate.html.php
index 3b266c18af..391e7dad37 100644
--- a/module/task/view/editestimate.html.php
+++ b/module/task/view/editestimate.html.php
@@ -22,11 +22,11 @@
     </tr>  
     <tr>
       <th><?php echo $lang->task->record;?></th>
-      <td><?php echo html::input('consumed', $estimate->consumed, 'class="select-3"');?></td>
+      <td><?php echo html::input('consumed', $estimate->consumed, 'class="form-control"');?></td>
     </tr>
     <tr>
       <th><?php echo $lang->task->left;?></th>
-      <td><?php echo html::input('left', $estimate->left, 'class="select-3"');?></td>
+      <td><?php echo html::input('left', $estimate->left, 'class="form-control"');?></td>
     </tr>
     <tr>
       <th><?php echo $lang->comment;?></th>
diff --git a/www/js/my.full.js b/www/js/my.full.js
index 9103db88ee..4e59643776 100644
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -854,7 +854,7 @@ function setModal()
 
                         setTimeout(function()
                         {
-                            modal.find('.modal-body').animate({height: $frame.find('body').addClass('body-modal').height()}, 100);
+                            modal.find('.modal-body').animate({height: $frame.find('body').addClass('body-modal').outerHeight()}, 100);
                         }, 100);
                     }
                     catch(e){}
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index 1ba2effc3f..34f2ee67bf 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -22,6 +22,7 @@
 
 /* paddings */
 .pd-0 {padding: 0 !important}
+.mg-0 {margin: 0 !important}
 
 /* Style of text */
 .text-latin {font-family: Arial;}
@@ -237,6 +238,7 @@ i[class^="icon-"].disabled,i[class*=" icon-"].disabled,i[class^="icon-"].disable
 .form-condensed .table-fixed select.form-control {padding: 5px}
 .form-condensed .chosen-container {font-size: 12px}
 .form-condensed .chosen-container-single .chosen-single {padding: 5px 10px}
+.form-condensed .chosen-container-single .chosen-single abbr {top: 5px; right: 18px}
 
 /* help in form */
 .help-block {margin-bottom: 5px;}