diff --git a/module/bug/view/assignto.html.php b/module/bug/view/assignto.html.php
index c887450e1d..7861f15442 100644
--- a/module/bug/view/assignto.html.php
+++ b/module/bug/view/assignto.html.php
@@ -28,8 +28,8 @@ js::set('page', 'assignedto');
 <form class='form-condensed' method='post' target='hiddenwin'>
   <table class='table table-form'>
     <tr>
-      <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>
+      <th class='w-80px'><?php echo $lang->bug->assignedTo;?></th>
+      <td class='w-p25-f'><?php echo html::select('assignedTo', $users, $bug->assignedTo, "class='form-control chosen'");?></td><td></td>
     </tr>  
     <tr>
       <th><?php echo $lang->bug->mailto;?></th>
diff --git a/module/bug/view/confirmbug.html.php b/module/bug/view/confirmbug.html.php
index 871c6ecee3..2fa217083e 100755
--- a/module/bug/view/confirmbug.html.php
+++ b/module/bug/view/confirmbug.html.php
@@ -29,7 +29,7 @@ js::set('page', 'confirmbug');
   <table class='table table-form'>
     <tr>
       <th class='w-80px'><?php echo $lang->bug->assignedTo;?></th>
-      <td class='w-p45'><?php echo html::select('assignedTo', $users, $bug->assignedTo, "class='select-2 chosen'");?></td>
+      <td class='w-p25-f'><?php echo html::select('assignedTo', $users, $bug->assignedTo, "class='select-2 chosen'");?></td>
       <td></td>
     </tr>  
     <tr>
diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index f0774a8a38..7d0799d86e 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -32,11 +32,11 @@ js::set('refresh', $lang->refresh);
     <table class='table table-form'> 
       <tr>
         <th class='w-110px'><?php echo $lang->bug->lblProductAndModule;?></th>
-        <td class='w-400px'>
+        <td class='w-p25-f'>
           <?php echo html::select('product', $products, $productID, "onchange=loadAll(this.value) class='form-control' autocomplete='off'");?>
         </td>
         <td>
-          <div class='input-group' id='moduleIdBox'>
+          <div class='input-group w-p25-f' id='moduleIdBox'>
           <?php
           echo html::select('module', $moduleOptionMenu, $moduleID, "onchange='loadModuleRelated()' class='form-control'");
           if(count($moduleOptionMenu) == 1)
diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php
index 2466298bac..2653e9b0e2 100644
--- a/module/bug/view/edit.html.php
+++ b/module/bug/view/edit.html.php
@@ -195,7 +195,7 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
         <legend><?php echo $lang->bug->legendMisc;?></legend>
         <table class='table table-form'>
           <tr>
-            <th><?php echo $lang->bug->linkBug;?></th>
+            <th class='w-60px'><?php echo $lang->bug->linkBug;?></th>
             <td><?php echo html::input('linkBug', $bug->linkBug, 'class="form-control"');?></td>
           </tr>
           <tr>
diff --git a/module/bug/view/resolve.html.php b/module/bug/view/resolve.html.php
index 08d346b398..5bfa69d8f0 100644
--- a/module/bug/view/resolve.html.php
+++ b/module/bug/view/resolve.html.php
@@ -25,7 +25,7 @@
   <table class='table table-form'>
     <tr>
       <th class='w-80px'><?php echo $lang->bug->resolution;?></th>
-      <td class='w-p45'><?php unset($lang->bug->resolutionList['tostory']); echo html::select('resolution', $lang->bug->resolutionList, '', 'class=form-control onchange=setDuplicate(this.value)');?></td><td></td>
+      <td class='w-p35-f'><?php unset($lang->bug->resolutionList['tostory']); echo html::select('resolution', $lang->bug->resolutionList, '', 'class=form-control onchange=setDuplicate(this.value)');?></td><td></td>
     </tr>
     <tr id='duplicateBugBox' style='display:none'>
       <th><?php echo $lang->bug->duplicateBug;?></th>
diff --git a/module/build/view/create.html.php b/module/build/view/create.html.php
index 46d123b13f..4077ea94a6 100644
--- a/module/build/view/create.html.php
+++ b/module/build/view/create.html.php
@@ -24,7 +24,7 @@
     <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>
+        <td class='w-p25-f'><?php echo html::select('product', $products, '', "class='form-control'");?></td><td></td>
       </tr>
       <tr>
         <th><?php echo $lang->build->name;?></th>
diff --git a/module/build/view/edit.html.php b/module/build/view/edit.html.php
index 59f73062ba..43e1509f5b 100644
--- a/module/build/view/edit.html.php
+++ b/module/build/view/edit.html.php
@@ -25,7 +25,7 @@
     <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>
+        <td class='w-p25-f'><?php echo html::select('product', $products, $build->product, "class='form-control'");?></td><td></td>
       </tr>
       <tr>
         <th><?php echo $lang->build->name;?></th>
diff --git a/module/doc/view/create.html.php b/module/doc/view/create.html.php
index 444cce8a42..e09af5b458 100644
--- a/module/doc/view/create.html.php
+++ b/module/doc/view/create.html.php
@@ -25,7 +25,7 @@
       <?php if($libID == 'product'):?>
       <tr>
         <th class='w-80px'><?php echo $lang->doc->product;?></th>
-        <td><?php echo html::select('product', $products, $productID, "class='form-control'");?></td>
+        <td class='w-p25-f'><?php echo html::select('product', $products, $productID, "class='form-control'");?></td><td></td>
       </tr>  
       <?php elseif($libID == 'project'):?>
       <tr>
@@ -43,31 +43,31 @@
       </tr>  
       <tr>
         <th><?php echo $lang->doc->type;?></th>
-        <td><?php echo html::radio('type', $lang->doc->types, 'file', "onclick=setType(this.value)");?></td>
+        <td colspan='2'><?php echo html::radio('type', $lang->doc->types, 'file', "onclick=setType(this.value)");?></td>
       </tr>  
       <tr>
         <th><?php echo $lang->doc->title;?></th>
-        <td><?php echo html::input('title', '', "class='form-control'");?></td>
+        <td colspan='2'><?php echo html::input('title', '', "class='form-control'");?></td>
       </tr> 
       <tr id='urlBox' class='hidden'>
         <th><?php echo $lang->doc->url;?></th>
-        <td><?php echo html::input('url', '', "class='form-control'");?></td>
+        <td colspan='2'><?php echo html::input('url', '', "class='form-control'");?></td>
       </tr>  
       <tr id='contentBox' class='hidden'>
         <th><?php echo $lang->doc->content;?></th>
-        <td><?php echo html::textarea('content', '', "class='form-control' style='width:90%; height:200px'");?></td>
+        <td colspan='2'><?php echo html::textarea('content', '', "class='form-control' style='width:90%; height:200px'");?></td>
       </tr>  
       <tr>
         <th><?php echo $lang->doc->keywords;?></th>
-        <td><?php echo html::input('keywords', '', "class='form-control'");?></td>
+        <td colspan='2'><?php echo html::input('keywords', '', "class='form-control'");?></td>
       </tr>  
       <tr>
         <th><?php echo $lang->doc->digest;?></th>
-        <td><?php echo html::textarea('digest', '', "class='form-control' rows=3");?></td>
+        <td colspan='2'><?php echo html::textarea('digest', '', "class='form-control' rows=3");?></td>
       </tr>  
       <tr id='fileBox'>
         <th><?php echo $lang->doc->files;?></th>
-        <td><?php echo $this->fetch('file', 'buildform', 'fileCount=2');?></td>
+        <td colspan='2'><?php echo $this->fetch('file', 'buildform', 'fileCount=2');?></td>
       </tr>  
       <tr>
         <td></td>
diff --git a/module/doc/view/edit.html.php b/module/doc/view/edit.html.php
index ac0c60b991..611032a707 100644
--- a/module/doc/view/edit.html.php
+++ b/module/doc/view/edit.html.php
@@ -31,43 +31,43 @@ $(document).ready(function()
     <table class='table table-form'> 
       <tr>
         <th class='w-80px'><?php echo $lang->doc->module;?></th>
-        <td><?php echo html::select('module', $moduleOptionMenu, $doc->module, "class='form-control'");?></td>
+        <td class='w-p25-f'><?php echo html::select('module', $moduleOptionMenu, $doc->module, "class='form-control'");?></td><td></td>
       </tr>  
       <tr>
         <th><?php echo $lang->doc->type;?></th>
-        <td><?php echo $lang->doc->types[$doc->type];?></td>
+        <td colspan='2'><?php echo $lang->doc->types[$doc->type];?></td>
       </tr>
       <tr>
         <th><?php echo $lang->doc->title;?></th>
-        <td><?php echo html::input('title', $doc->title, "class='form-control'");?></td>
+        <td colspan='2'><?php echo html::input('title', $doc->title, "class='form-control'");?></td>
       </tr> 
       <tr>
         <th><?php echo $lang->doc->keywords;?></th>
-        <td><?php echo html::input('keywords', $doc->keywords, "class='form-control'");?></td>
+        <td colspan='2'><?php echo html::input('keywords', $doc->keywords, "class='form-control'");?></td>
       </tr>  
       <tr id='urlBox' class='hidden'>
         <th><?php echo $lang->doc->url;?></th>
-        <td><?php echo html::input('url', urldecode($doc->url), "class='form-control'");?></td>
+        <td colspan='2'><?php echo html::input('url', urldecode($doc->url), "class='form-control'");?></td>
       </tr>  
       <tr id='contentBox' class='hidden'>
         <th><?php echo $lang->doc->content;?></th>
-        <td><?php echo html::textarea('content', $doc->content, "class='form-control' rows='8' style='width:90%; height:200px'");?></td>
+        <td colspan='2'><?php echo html::textarea('content', $doc->content, "class='form-control' rows='8' style='width:90%; height:200px'");?></td>
       </tr>  
       <tr>
         <th><?php echo $lang->doc->digest;?></th>
-        <td><?php echo html::textarea('digest', $doc->digest, "class='form-control' rows=3");?></td>
+        <td colspan='2'><?php echo html::textarea('digest', $doc->digest, "class='form-control' rows=3");?></td>
       </tr>  
       <tr>
         <th><?php echo $lang->doc->comment;?></th>
-        <td><?php echo html::textarea('comment','', "class='form-control' rows=3");?></td>
+        <td colspan='2'><?php echo html::textarea('comment','', "class='form-control' rows=3");?></td>
       </tr> 
       <tr id='fileBox' class='hidden'>
         <th><?php echo $lang->doc->files;?></th>
-        <td><?php echo $this->fetch('file', 'buildform', 'fileCount=2');?></td>
+        <td colspan='2'><?php echo $this->fetch('file', 'buildform', 'fileCount=2');?></td>
       </tr>
       <tr>
         <td></td>
-        <td>
+        <td colspan='2'>
           <?php echo html::submitButton() . html::backButton() . html::hidden('lib', $libID);?>
           <?php echo html::hidden('product', $doc->product) . html::hidden('project', $doc->project);?>
         </td>
diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php
index f9f3f1650e..c98e54e083 100644
--- a/module/my/view/task.html.php
+++ b/module/my/view/task.html.php
@@ -63,9 +63,9 @@
         <?php 
         common::printIcon('task', 'assignTo', "projectID=$task->project&taskID=$task->id", $task, 'list', 'hand-right', '', 'iframe', true);
         common::printIcon('task', 'start',    "taskID=$task->id", $task, 'list', 'play', '', 'iframe', true);
-        common::printIcon('task', 'recordEstimate', "taskID=$task->id", $task, 'list', 'off', '', 'iframe text-danger', true);
+        common::printIcon('task', 'recordEstimate', "taskID=$task->id", $task, 'list', 'time', '', 'iframe', true);
         common::printIcon('task', 'finish',   "taskID=$task->id", $task, 'list', 'ok-sign', '', 'iframe', true);
-        common::printIcon('task', 'close',    "taskID=$task->id", $task, 'list', 'remove', '', 'iframe', true);
+        common::printIcon('task', 'close',    "taskID=$task->id", $task, 'list', 'off', '', 'iframe text-danger', true);
         common::printIcon('task', 'edit', "taskID=$task->id", '', 'list', 'pencil');
         ?>
       </td>
diff --git a/module/product/view/create.html.php b/module/product/view/create.html.php
index 6e4609ab98..e40cff06a4 100644
--- a/module/product/view/create.html.php
+++ b/module/product/view/create.html.php
@@ -12,7 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<div class='container'>
+<div class='container mw-800px'>
   <div id='titlebar'>
     <div class='heading'>
       <span class='prefix'><?php echo html::icon($lang->icons['product']);?></span>
@@ -23,7 +23,7 @@
     <table class='table table-form'> 
       <tr>
         <th class='w-90px'><?php echo $lang->product->name;?></th>
-        <td class='w-p45'><?php echo html::input('name', '', "class='form-control'");?></td><td></td>
+        <td class='w-p35-f'><?php echo html::input('name', '', "class='form-control'");?></td><td></td>
       </tr>  
       <tr>
         <th><?php echo $lang->product->code;?></th>
diff --git a/module/product/view/edit.html.php b/module/product/view/edit.html.php
index 85c647a1e2..8bcf94357f 100644
--- a/module/product/view/edit.html.php
+++ b/module/product/view/edit.html.php
@@ -12,7 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<div class='container'>
+<div class='container mw-800px'>
   <div id='titlebar'>
     <div class='heading'>
       <span class='prefix'><?php echo html::icon($lang->icons['product']) . ' #' . $product->id;;?></span>
@@ -24,7 +24,7 @@
     <table align='center' class='table table-form'> 
       <tr>
         <th class='w-90px'><?php echo $lang->product->name;?></th>
-        <td class='w-p45'><?php echo html::input('name', $product->name, "class='form-control'");?></td><td></td>
+        <td class='w-p35-f'><?php echo html::input('name', $product->name, "class='form-control'");?></td><td></td>
       </tr>  
       <tr>
         <th><?php echo $lang->product->code;?></th>
diff --git a/module/productplan/view/create.html.php b/module/productplan/view/create.html.php
index a4fbd88562..d87b1dca29 100644
--- a/module/productplan/view/create.html.php
+++ b/module/productplan/view/create.html.php
@@ -25,29 +25,29 @@
     <table class='table table-form'> 
       <tr>
         <th class='w-80px'><?php echo $lang->productplan->product;?></th>
-        <td class='w-p45'><?php echo $product->name;?></td><td></td>
-      </tr>  
+        <td class='w-p25-f'><?php echo $product->name;?></td><td></td>
+      </tr>
       <tr>
         <th><?php echo $lang->productplan->title;?></th>
-        <td><?php echo html::input('title', '', "class='form-control'");?></td><td></td>
-      </tr>  
+        <td><?php echo html::input('title', '', "class='form-control'");?></td>
+      </tr>
       <tr>
         <th><?php echo $lang->productplan->begin;?></th>
-        <td><?php echo html::input('begin', $begin, "class='form-control date'");?></td><td></td>
-      </tr>  
+        <td><?php echo html::input('begin', $begin, "class='form-control form-date'");?></td>
+      </tr>
       <tr>
         <th><?php echo $lang->productplan->end;?></th>
-        <td colspan='2'>
-          <div class='input-group w-p100'>
-            <?php echo html::input('end', '', "class='form-control form-date'");?>
-            <span class='input-group-addon'><?php echo html::radio('delta', $lang->productplan->endList , '', "onclick='computeEndDate(this.value)'");?></span>
-          </div>
+        <td>
+          <?php echo html::input('end', '', "class='form-control form-date'");?>
+        </td>
+        <td>
+          &nbsp; &nbsp; <?php echo html::radio('delta', $lang->productplan->endList , '', "onclick='computeEndDate(this.value)'");?>
         </td>
       </tr>
       <tr>
         <th><?php echo $lang->productplan->desc;?></th>
         <td colspan='2'><?php echo html::textarea('desc', '', "rows='10' class='form-control'");?></td>
-      </tr>  
+      </tr>
       <tr>
         <td></td>
         <td colspan='2'>
diff --git a/module/productplan/view/edit.html.php b/module/productplan/view/edit.html.php
index 0c9188b0be..54438cbe2b 100644
--- a/module/productplan/view/edit.html.php
+++ b/module/productplan/view/edit.html.php
@@ -25,19 +25,19 @@
     <table class='table table-form'> 
       <tr>
         <th class='w-80px'><?php echo $lang->productplan->product;?></th>
-        <td class='w-p45'><?php echo $product->name;?></td><td></td>
+        <td class='w-p25-f'><?php echo $product->name;?></td><td></td>
       </tr>  
       <tr>
         <th><?php echo $lang->productplan->title;?></th>
-        <td><?php echo html::input('title', $plan->title, 'class="form-control"');?></td><td></td>
+        <td><?php echo html::input('title', $plan->title, 'class="form-control"');?></td>
       </tr>  
       <tr>
         <th><?php echo $lang->productplan->begin;?></th>
-        <td><?php echo html::input('begin', $plan->begin, 'class="form-control date"');?></td><td></td>
+        <td><?php echo html::input('begin', $plan->begin, 'class="form-control date"');?></td>
       </tr>  
       <tr>
         <th><?php echo $lang->productplan->end;?></th>
-        <td><?php echo html::input('end', $plan->end, 'class="form-control form-date"');?></td><td></td>
+        <td><?php echo html::input('end', $plan->end, 'class="form-control form-date"');?></td>
       </tr>
       <tr>
         <th><?php echo $lang->productplan->desc;?></th>
diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php
index dcdc35c3c7..2f3874dfd8 100644
--- a/module/project/view/create.html.php
+++ b/module/project/view/create.html.php
@@ -59,7 +59,7 @@
     <table class='table table-form'> 
       <tr>
         <th class='w-90px'><?php echo $lang->project->name;?></th>
-        <td class='w-p50'><?php echo html::input('name', $name, "class='form-control'");?></td><td></td>
+        <td class='w-p35-f'><?php echo html::input('name', $name, "class='form-control'");?></td><td></td>
       </tr>
       <tr>
         <th><?php echo $lang->project->code;?></th>
diff --git a/module/release/view/create.html.php b/module/release/view/create.html.php
index 665d715ebf..97b7b90c94 100644
--- a/module/release/view/create.html.php
+++ b/module/release/view/create.html.php
@@ -24,13 +24,12 @@
     <table class='table table-form'> 
       <tr>
         <th class='w-110px'><?php echo $lang->release->name;?></th>
-        <td class='w-p45'>
-          <div class='input-group'>
-            <?php echo html::input('name', '', "class='form-control'");?>
-            <?php if($lastRelease) echo '<span class="input-group-addon">(' . $lang->release->last . ': ' . $lastRelease->name . ')</span>';?>
-          </div>
+        <td class='w-p25-f'>
+          <?php echo html::input('name', '', "class='form-control'");?>
+        </td>
+        <td>
+          <?php if($lastRelease) echo '<span class="help-block"> &nbsp; (' . $lang->release->last . ': ' . $lastRelease->name . ')</span>';?>
         </td>
-        <td></td>
       </tr>
       <tr>
         <th><?php echo $lang->release->build;?></th>
diff --git a/module/release/view/edit.html.php b/module/release/view/edit.html.php
index 95821c818e..9645ef3f0a 100644
--- a/module/release/view/edit.html.php
+++ b/module/release/view/edit.html.php
@@ -24,8 +24,8 @@
   <form class='form-condensed' method='post' target='hiddenwin' id='dataform' enctype='multipart/form-data'>
     <table class='table table-form'> 
       <tr>
-        <th class='w-80px'><?php echo $lang->release->name;?></th>
-        <td class='w-p45'><?php echo html::input('name', $release->name, "class='form-control'");?></td><td></td>
+        <th class='w-90px'><?php echo $lang->release->name;?></th>
+        <td class='w-p25-f'><?php echo html::input('name', $release->name, "class='form-control'");?></td><td></td>
       </tr>  
       <tr>
         <th><?php echo $lang->release->build;?></th>
@@ -37,58 +37,62 @@
       </tr>  
       <tr id='linkStoriesAndBugs'>
         <th><?php echo $lang->release->linkStoriesAndBugs;?></th>
-        <td>
-          <div class='panel panel-sm'>
-            <div class='panel-heading'>
-              <?php echo html::icon($lang->icons['story'], 'icon') . ' ' . $lang->release->linkStories;?>
+        <td colspan='2'>
+          <div class='row pd-0' style='margin: 0 0 0 -15px'>
+            <div class='col-md-6'>
+              <div class='panel panel-sm'>
+                <div class='panel-heading'>
+                  <?php echo html::icon($lang->icons['story'], 'icon') . ' ' . $lang->release->linkStories;?>
+                </div>
+                <table class='mainTable table table-condensed table-hover table-borderless'>
+                  <thead>
+                    <tr>
+                      <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>
+                  <tbody>
+                    <?php foreach($stories as $key => $story):?>
+                    <?php $storyLink = $this->createLink('story', 'view', "storyID=$story->id", '', true); ?>
+                    <tr class='text-center'>
+                      <td id='story' class='w-id text-left'><input type='checkbox' name='stories[]' value="<?php echo $story->id;?>" <?php if(strpos($release->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'");?></td>
+                      <td class='story-<?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;?>
+                  </tbody>
+                </table>
+              </div>
             </div>
-            <table class='mainTable table table-condensed table-hover table-borderless'>
-              <thead>
-                <tr>
-                  <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>
-              <tbody>
-                <?php foreach($stories as $key => $story):?>
-                <?php $storyLink = $this->createLink('story', 'view', "storyID=$story->id", '', true); ?>
-                <tr class='text-center'>
-                  <td id='story' class='w-id text-left'><input type='checkbox' name='stories[]' value="<?php echo $story->id;?>" <?php if(strpos($release->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'");?></td>
-                  <td class='story-<?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;?>
-              </tbody>
-            </table>
-          </div>
-        </td>
-        <td>
-          <div class='panel panel-sm'>
-            <div class='panel-heading'>
-              <?php echo html::icon($lang->icons['bug'], 'icon') . ' ' . $lang->release->linkBugs;?>
+            <div class='col-md-6'>
+              <div class='panel panel-sm'>
+                <div class='panel-heading'>
+                  <?php echo html::icon($lang->icons['bug'], 'icon') . ' ' . $lang->release->linkBugs;?>
+                </div>
+                <table class='mainTable table table-condensed table-hover table-borderless'>
+                  <thead>
+                    <tr>
+                      <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>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    <?php foreach($bugs as $bug):?>
+                    <?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug->id", '', true);?>
+                    <tr class='text-center'>
+                      <td id='bug' class='w-id text-left'><input type='checkbox' name='bugs[]' value="<?php echo $bug->id;?>" <?php if(strpos($release->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'");?></td>
+                      <td class='bug-<?php echo $bug->status;?> w-80px'><?php echo $lang->bug->statusList[$bug->status];?></td>
+                    </tr>
+                    <?php endforeach;?>
+                  </tbody>
+                </table>
+              </div>
             </div>
-            <table class='mainTable table table-condensed table-hover table-borderless'>
-              <thead>
-                <tr>
-                  <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>
-                </tr>
-              </thead>
-              <tbody>
-                <?php foreach($bugs as $bug):?>
-                <?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug->id", '', true);?>
-                <tr class='text-center'>
-                  <td id='bug' class='w-id text-left'><input type='checkbox' name='bugs[]' value="<?php echo $bug->id;?>" <?php if(strpos($release->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'");?></td>
-                  <td class='bug-<?php echo $bug->status;?> w-80px'><?php echo $lang->bug->statusList[$bug->status];?></td>
-                </tr>
-                <?php endforeach;?>
-              </tbody>
-            </table>
           </div>
         </td>
       </tr>
diff --git a/module/search/view/buildform.html.php b/module/search/view/buildform.html.php
index de53fefdfe..b415b6ca31 100644
--- a/module/search/view/buildform.html.php
+++ b/module/search/view/buildform.html.php
@@ -28,9 +28,9 @@
 .outer #querybox .table tbody > tr:last-child td {padding: 2px}
 #querybox a:hover {text-decoration: none;}
 
-#selectPeriod {padding: 4px; height: 244px}
-#selectPeriod > .dropdown-header {background: #f1f1f1; display: block; text-align: center; padding: 5px 0; line-height: 20px; margin-bottom: 5px; font-size: 14px; border-radius: 4px; color: #333}
-#selectPeriod li > a {padding: 6px 15px; border-radius: 4px}
+#selectPeriod {padding: 4px; height: 197px}
+#selectPeriod > .dropdown-header {background: #f1f1f1; display: block; text-align: center; padding: 4px 0; line-height: 20px; margin-bottom: 5px; font-size: 14px; border-radius: 4px; color: #333}
+#selectPeriod li > a {padding: 4px 15px; border-radius: 4px}
 
 #searchform.showmore #searchmore, #searchform #searchlite {display: none;}
 #searchform.showmore #searchlite, #searchform #searchmore {display: block;}
@@ -103,7 +103,7 @@ function setDateField(query)
     {
         var $e = $(e.target);
         var ePos = $e.offset();
-        $period.css({'left': ePos.left + 200, 'top': ePos.top + 29, 'min-height': $('.datetimepicker').outerHeight()}).show().data('target', $e.attr('id')).find('li.active').removeClass('active');
+        $period.css({'left': ePos.left + 175, 'top': ePos.top + 29, 'min-height': $('.datetimepicker').outerHeight()}).show().data('target', $e.attr('id')).find('li.active').removeClass('active');
         $period.find("li > a[href='" + $e.val().replace('$', '#') + "']").closest('li').addClass('active');
     }).on('hide', function(e){setTimeout(function(){$period.hide();}, 100)});
 }
diff --git a/module/story/view/change.html.php b/module/story/view/change.html.php
index 0b7cfc8ad4..be9fb3c1d9 100644
--- a/module/story/view/change.html.php
+++ b/module/story/view/change.html.php
@@ -26,7 +26,7 @@
           <tr>
             <th class='w-80px'><?php echo $lang->story->reviewedBy;?></th>
             <td>
-              <div class="input-group">
+              <div class="input-group w-p35-f">
                 <?php echo html::select('assignedTo', $users, $story->assignedTo, 'class="form-control chosen"');?>
                 <span class="input-group-addon">
                 <?php echo html::checkbox('needNotReview', $lang->story->needNotReview, '', "id='needNotReview'");?>
diff --git a/module/story/view/close.html.php b/module/story/view/close.html.php
index f8bbc4a058..1e45e9a0c5 100644
--- a/module/story/view/close.html.php
+++ b/module/story/view/close.html.php
@@ -25,13 +25,13 @@
           <table class='table table-form'>
             <tr>
               <th class='w-80px'><?php echo $lang->story->closedReason;?></th>
-              <td class='w-p45'><?php echo html::select('closedReason', $lang->story->reasonList, '', 'class=form-control onchange="setStory(this.value)"');?></td><td></td>
+              <td class='w-p25-f'><?php echo html::select('closedReason', $lang->story->reasonList, '', 'class=form-control onchange="setStory(this.value)"');?></td><td></td>
             </tr>
-            <tr id='duplicateStoryBox' class='hidden1'>
+            <tr id='duplicateStoryBox' style='display:none'>
               <th><?php echo $lang->story->duplicateStory;?></th>
               <td><?php echo html::input('duplicateStory', '', 'class=form-control');?></td><td></td>
             </tr>
-            <tr id='childStoriesBox' class='hidden1'>
+            <tr id='childStoriesBox' style='display:none'>
               <th><?php echo $lang->story->childStories;?></th>
               <td><?php echo html::input('childStories', '', 'class=form-control');?></td><td></td>
             </tr>
diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php
index c88c78b92a..167f44f967 100644
--- a/module/story/view/create.html.php
+++ b/module/story/view/create.html.php
@@ -24,10 +24,10 @@
     <table class='table table-form'> 
       <tr>
         <th class='w-80px'><?php echo $lang->story->product;?></th>
-        <td class='w-p35'>
+        <td class='w-p25-f'>
           <?php echo html::select('product', $products, $productID, "onchange='loadProduct(this.value);' class='form-control'");?>
         </td>
-        <td class='w-p25'>
+        <td class='w-p15-f'>
           <div class='input-group' id='moduleIdBox'>
           <?php 
           echo html::select('module', $moduleOptionMenu, $moduleID, "class='form-control'");
diff --git a/module/story/view/review.html.php b/module/story/view/review.html.php
index c495923265..92e9c00e01 100644
--- a/module/story/view/review.html.php
+++ b/module/story/view/review.html.php
@@ -28,7 +28,7 @@ var assignedTo = '<?php $story->lastEditedBy ? print($story->lastEditedBy) : pri
           <table class='table table-form'>
             <tr>
               <th class='w-80px'><?php echo $lang->story->reviewedDate;?></th>
-              <td class='w-p45'><?php echo html::input('reviewedDate', helper::today(), 'class=form-control');?></td><td></td>
+              <td class='w-p25-f'><?php echo html::input('reviewedDate', helper::today(), 'class=form-control');?></td><td></td>
             </tr>
             <tr>
               <th><?php echo $lang->story->reviewResult;?></th>
@@ -58,7 +58,7 @@ var assignedTo = '<?php $story->lastEditedBy ? print($story->lastEditedBy) : pri
             </tr>
             <tr>
               <th><?php echo $lang->story->reviewedBy;?></th>
-              <td><?php echo html::select('reviewedBy[]', $users, $app->user->account, "class='form-control' multiple data-placeholder='{$lang->story->chosen->reviewedBy}'");?></td><td></td>
+              <td colspan='2'><?php echo html::select('reviewedBy[]', $users, $app->user->account, "class='form-control' multiple data-placeholder='{$lang->story->chosen->reviewedBy}'");?></td>
             </tr>
             <tr>
               <th><?php echo $lang->story->comment;?></th>
diff --git a/module/task/view/assignto.html.php b/module/task/view/assignto.html.php
index 5f3a34afd9..b44e0286b3 100644
--- a/module/task/view/assignto.html.php
+++ b/module/task/view/assignto.html.php
@@ -23,7 +23,7 @@
   <table class='table table-form'>
     <tr>
       <th class='w-80px'><?php echo $lang->task->assignedTo;?></th>
-      <td class='w-p45'><?php echo html::select('assignedTo', $users, '', "class='form-control chosen'");?></td><td></td>
+      <td class='w-p25-f'><?php echo html::select('assignedTo', $users, '', "class='form-control chosen'");?></td><td></td>
     </tr>  
     <tr>
       <th><?php echo $lang->task->left;?></th>
diff --git a/module/task/view/finish.html.php b/module/task/view/finish.html.php
index d9f820963e..a53b7e23eb 100644
--- a/module/task/view/finish.html.php
+++ b/module/task/view/finish.html.php
@@ -24,19 +24,19 @@
   <table class='table table-form'>
     <tr>
       <th class='w-80px'><?php echo $lang->task->consumed;?></th>
-      <td class='w-p45'><div class='input-group'><?php echo html::input('consumed', $task->consumed, "class='form-control'");?> <span class='input-group-addon'><?php echo $lang->task->hour;?></span></div></td><td></td>
+      <td class='w-p25-f'><div class='input-group'><?php echo html::input('consumed', $task->consumed, "class='form-control'");?> <span class='input-group-addon'><?php echo $lang->task->hour;?></span></div></td><td></td>
     </tr>
     <tr>
-      <td><?php echo $lang->task->assignedTo;?></td>
+      <th><?php echo $lang->task->assignedTo;?></th>
       <td><?php echo html::select('assignedTo', $members, $task->openedBy, "class='form-control chosen'");?></td><td></td>
     </tr>
     <tr>
-      <td><?php echo $lang->task->finishedDate;?></td>
+      <th><?php echo $lang->task->finishedDate;?></th>
       <td><div class='datepicker-wrapper'><?php echo html::input('finishedDate', helper::today(), "class='form-control form-datetime'");?></div></td><td></td>
     </tr>
 
     <tr>
-      <td><?php echo $lang->comment;?></td>
+      <th><?php echo $lang->comment;?></th>
       <td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
     </tr>
     <tr>
diff --git a/module/task/view/start.html.php b/module/task/view/start.html.php
index 1f1600fa13..f44a761746 100644
--- a/module/task/view/start.html.php
+++ b/module/task/view/start.html.php
@@ -25,7 +25,7 @@
   <table class='table table-form'>
     <tr>
       <th class='w-80px'><?php echo $lang->task->realStarted;?></th>
-      <td class='w-p45'><div class='datepicker-wrapper'><?php echo html::input('realStarted', helper::today(), "class='form-control form-datetime'");?></div></td><td></td>
+      <td class='w-p25-f'><div class='datepicker-wrapper'><?php echo html::input('realStarted', helper::today(), "class='form-control form-datetime'");?></div></td><td></td>
     </tr>  
     <tr>
       <th><?php echo $lang->task->consumed;?></th>
diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php
index 547aa25b51..ba7eb1853c 100644
--- a/module/testcase/view/create.html.php
+++ b/module/testcase/view/create.html.php
@@ -27,10 +27,10 @@
     <table class='table table-form'> 
       <tr>
         <th class='w-80px'><?php echo $lang->testcase->lblProductAndModule;?></th>
-        <td class='w-p35'>
+        <td class='w-p25-f'>
           <?php echo html::select('product', $products, $productID, "onchange=loadAll(this.value); class='form-control'");?>
         </td>
-        <td class='w-p25'>
+        <td class='w-p25-f'>
           <div class='input-group' id='moduleIdBox'>
           <?php 
           echo html::select('module', $moduleOptionMenu, $currentModuleID, "onchange='loadModuleRelated();' class='form-control'");
diff --git a/module/testtask/view/edit.html.php b/module/testtask/view/edit.html.php
index 04aaeaf377..aec582503f 100644
--- a/module/testtask/view/edit.html.php
+++ b/module/testtask/view/edit.html.php
@@ -25,7 +25,7 @@
     <table class='table table-form'> 
       <tr>
         <th class='w-80px'><?php echo $lang->testtask->project;?></th>
-        <td class='w-p45'><?php echo html::select('project', $projects, $task->project, "class='form-control'");?></td><td></td>
+        <td class='w-p25-f'><?php echo html::select('project', $projects, $task->project, "class='form-control'");?></td><td></td>
       </tr>
       <tr>
         <th><?php echo $lang->testtask->build;?></th>
diff --git a/module/todo/css/batchcreate.css b/module/todo/css/batchcreate.css
index f7d0b1a669..1f638429aa 100755
--- a/module/todo/css/batchcreate.css
+++ b/module/todo/css/batchcreate.css
@@ -1 +1,2 @@
 #datepicker {position: relative; top: -6px; margin-left: 10px;}
+.input-group > .form-control:first-child {border-right: 0}
diff --git a/module/todo/view/create.html.php b/module/todo/view/create.html.php
index 47d2b041a4..c604b53a25 100644
--- a/module/todo/view/create.html.php
+++ b/module/todo/view/create.html.php
@@ -24,7 +24,7 @@
     <table class='table table-form'> 
       <tr>
         <th class='w-80px'><?php echo $lang->todo->date;?></th>
-        <td class='w-p45'>
+        <td class='w-p25-f'>
           <div class='input-group'>
             <?php echo html::input('date', $date, "class='form-control form-date'");?>
             <span class='input-group-addon'><input type='checkbox' id='switchDate' onclick='switchDateTodo(this);'> <?php echo $lang->todo->periods['future'];?></td><td></td></span>
diff --git a/module/todo/view/edit.html.php b/module/todo/view/edit.html.php
index 653a9fda48..cc08fc66b5 100644
--- a/module/todo/view/edit.html.php
+++ b/module/todo/view/edit.html.php
@@ -26,7 +26,7 @@
     <table class='table table-form'> 
       <tr>
         <th class='w-80px'><?php echo $lang->todo->date;?></th>
-        <td class='w-p45'>
+        <td class='w-p25-f'>
           <div class='input-group'>
             <?php echo html::input('date', $todo->date, "class='form-control form-date'");?>
             <span class='input-group-addon'><input type='checkbox' id='switchDate' onclick='switchDateTodo(this);'> <?php echo $lang->todo->periods['future'];?></span>
diff --git a/module/tree/css/common.css b/module/tree/css/common.css
index fbc9b78596..6ac6c5ed31 100644
--- a/module/tree/css/common.css
+++ b/module/tree/css/common.css
@@ -3,6 +3,7 @@
 
 .outer .row .col-md-8 .table-form {max-width: 600px}
 
+#sonModule {max-width: 240px}
 #moduleBox span > .form-control {margin-bottom: 5px;}
 #moduleBox .copy {display: table; width: 100%}
 #moduleBox .copy > .form-control, #moduleBox .copy > .btn {display: table-cell; width: auto}
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index c92a5860af..5496e92240 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -18,6 +18,8 @@
 
 .w-id {width:70px;} .w-pri {width:40px;} .w-severity {width:50px;} .w-hour {width:48px;} .w-date {width:80px;} .w-user {width:65px;} .w-status {width:55px} .w-type {width:80px} .w-resolution {width:60px}
 
+.w-p15-f {width: 15% !important; min-width: 120px} .w-p25-f {width: 25% !important; min-width: 200px} .w-p35-f {width: 35% !important; min-width: 300px} .w-p45-f {width: 45% !important; min-width: 400px}
+
 /* Height definitions */
 .h-5px {height:5px} .h-10px {height:10px} .h-20px {height:20px} .h-30px {height:30px} .h-35px {height:35px} .h-40px {height:40px} .h-45px {height:45px} .h-50px {height:50px} .h-60px {height:60px} .h-70px {height:70px} .h-80px {height:80px} .h-100px {height:100px} .h-120px {height:120px} .h-130px {height:130px} .h-140px {height:140px} .h-150px {height:150px} .h-200px {height:200px}
 
@@ -63,7 +65,6 @@
 
 /* Style of text */
 .text-latin {font-family: Arial;}
-.text-lg {font-size: 24px;}
 .text-strong {font-weight: bold;}
 .text-middle,.text-middle td {vertical-align: middle !important;}
 tr.text-center > td, tr.text-center > th {text-align: center;}
@@ -161,13 +162,11 @@ i[class^="icon-"].disabled,i[class*=" icon-"].disabled,i[class^="icon-"].disable
 .icon-rotate-270:before {display: inline-block; -webkit-transform: rotate(270deg); -moz-transform: rotate(270deg); -ms-transform: rotate(270deg); -o-transform: rotate(270deg); transform: rotate(270deg); filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);}
 
 /* Button icon */
-.btn-icon {border-radius: 2px; display: inline-block; width: 20px; height: 20px; line-height: 20px; font-size: 14px; border: none; background: none; padding: 0; color: #4d90fe; text-align: center;}
-.btn-icon > i {color: #4d90fe}
-.btn-icon:hover {text-decoration: none; background: #145CCD; color: #fff;}
-.btn-icon:hover > i {color: #fff}
+.btn-icon {border-radius: 2px; display: inline-block; width: 20px; height: 20px; line-height: 20px; font-size: 14px; border: none; background: none; padding: 0; color: #4d90fe!important; text-align: center;}
+.btn-icon:hover {text-decoration: none; background: #145CCD; color: #fff!important;}
 .btn-icon.disabled:hover, .btn-icon.disabled:hover > i {background: none!important; color: #ccc!important; cursor: default}
-.btn-icon.text-danger {color: #D2322D}
-.btn-icon.text-danger:hover {background: #D2322D; color: #fff}
+.btn-icon.text-danger {color: #D2322D!important}
+.btn-icon.text-danger:hover {background: #D2322D; color: #fff!important}
 
 /* stars list */
 .stars-list {color: #E48600}