diff --git a/lib/front/front.class.php b/lib/front/front.class.php
index eba046bdf6..a60d55ff2c 100644
--- a/lib/front/front.class.php
+++ b/lib/front/front.class.php
@@ -428,7 +428,7 @@ EOT;
      * @access public
      * @return string the submit button tag.
      */
-    public static function submitButton($label = '', $misc = '', $class = '')
+    public static function submitButton($label = '', $misc = '', $class = 'btn-primary')
     {
         if(empty($label))
         {
diff --git a/module/release/view/create.html.php b/module/release/view/create.html.php
index 4235e4f6ae..f169d33a19 100644
--- a/module/release/view/create.html.php
+++ b/module/release/view/create.html.php
@@ -13,40 +13,51 @@
 <?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->release->create;?></caption>
-    <tr>
-      <th class='rowhead'><?php echo $lang->release->name;?></th>
-      <td>
-        <?php echo html::input('name', '', "class='text-3'");?>
-        <?php if($lastRelease) echo '<span class="gray">(' . $lang->release->last . ': ' . $lastRelease->name . ')</span>';?>
-      </td>
-    </tr>
-    <tr>
-      <th class='rowhead'><?php echo $lang->release->build;?></th>
-      <td>
-      <?php  
-          echo html::select('build', $builds, '', "class='select-3' onchange=loadStoriesAndBugs(this.value,$productID)");
-          if(empty($builds)) echo $lang->build->notice;
-      ?>
-      </td>
-    </tr>  
-    <tr>
-      <th class='rowhead'><?php echo $lang->release->date;?></th>
-      <td><?php echo html::input('date', helper::today(), "class='text-3 date'");?></td>
-    </tr>  
-    <tr id='linkStoriesAndBugs'>
-    </tr>
-    <tr>
-      <th class='rowhead'><?php echo $lang->release->desc;?></th>
-      <td><?php echo html::textarea('desc', '', "rows='10' class='area-1'");?></td>
-    </tr>  
-    <tr>
-      <th class='rowhead'><?php echo $lang->files;?></th>
-      <td class='a-left'><?php echo $this->fetch('file', 'buildform', array('fileCount' => 1));?></td>
-    </tr>  
-    <tr><td colspan='2' class='a-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
-  </table>
-</form>
+<div class='container w-900px'>
+  <div id='titlebar'>
+    <div class='heading'>
+      <span class='prefix'><?php echo html::icon($lang->icons['release']);?></span>
+      <strong><small class='text-muted'><i class='icon icon-plus'></i></small> <?php echo $lang->release->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-80px'><?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>
+        <td></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->release->build;?></th>
+        <td>
+        <?php  
+            echo html::select('build', $builds, '', "class='form-control' onchange=loadStoriesAndBugs(this.value,$productID)");
+        ?>
+        </td>
+        <td><?php if(empty($builds)) echo $lang->build->notice; ?></td>
+      </tr>  
+      <tr>
+        <th><?php echo $lang->release->date;?></th>
+        <td><?php echo html::input('date', helper::today(), "class='form-control form-date'");?></td><td></td>
+      </tr>  
+      <tr id='linkStoriesAndBugs'>
+      </tr>
+      <tr>
+        <th><?php echo $lang->release->desc;?></th>
+        <td colspan='2'><?php echo html::textarea('desc', '', "rows='10' class='form-control'");?></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->files;?></th>
+        <td colspan='2'><?php echo $this->fetch('file', 'buildform', array('fileCount' => 1));?></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/release/view/edit.html.php b/module/release/view/edit.html.php
index e6c83b28c0..4d467daac3 100644
--- a/module/release/view/edit.html.php
+++ b/module/release/view/edit.html.php
@@ -13,108 +13,99 @@
 <?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->release->edit;?></caption>
-    <tr>
-      <th class='rowhead'><?php echo $lang->release->name;?></th>
-      <td><?php echo html::input('name', $release->name, "class='text-3'");?></td>
-    </tr>  
-    <tr>
-      <th class='rowhead'><?php echo $lang->release->build;?></th>
-      <td><?php echo html::select('build', $builds, $release->build, "class='select-3' onchange=loadStoriesAndBugs(this.value,$release->product)"); ?></td>
-    </tr>  
-    <tr>
-      <th class='rowhead'><?php echo $lang->release->date;?></th>
-      <td><?php echo html::input('date', $release->date, "class='text-3 date'");?></td>
-    </tr>  
-    <tr id='linkStoriesAndBugs'>
-      <th class='rowhead'><?php echo $lang->release->linkStoriesAndBugs;?></th>
-      <td>
-        <div class="w-p90">
-
-          <div class='half-left'>
-            <table class='mainTable'>
-              <tr style='border-bottom:none'>
-                <td style='border-bottom:none; padding:0px'>
-                  <table class='headTable'>
-                    <caption><?php echo $lang->release->linkStories;?></caption>
-                    <tr>
-                      <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'>
-                    <table class='f-left table-1 fixed'>
-                      <?php foreach($stories as $key => $story):?>
-                      <?php $storyLink = $this->createLink('story', 'view', "storyID=$story->id", '', true); ?>
-                      <tr class='a-center'>
-                        <td id='story' class='w-id a-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='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>
+<div class='container'>
+  <div id='titlebar'>
+    <div class='heading'>
+      <span class='prefix'><?php echo html::icon($lang->icons['release']) . ' #' . $release->id;;?></span>
+      <strong><?php echo html::a(inlink('view', "release=$release->id"), $release->name);?></strong>
+      <small class='text-muted'> <?php echo $lang->release->edit;?> <i class='icon icon-pencil'></i></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-80px'><?php echo $lang->release->name;?></th>
+        <td class='w-p45'><?php echo html::input('name', $release->name, "class='form-control'");?></td><td></td>
+      </tr>  
+      <tr>
+        <th><?php echo $lang->release->build;?></th>
+        <td><?php echo html::select('build', $builds, $release->build, "class='form-control' onchange=loadStoriesAndBugs(this.value,$release->product)"); ?></td><td></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->release->date;?></th>
+        <td><?php echo html::input('date', $release->date, "class='form-control form-date'");?></td><td></td>
+      </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;?>
+            </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 class='half-right'>
-            <table class='mainTable'>
-              <tr style='border-bottom:none'>
-                <td style='border-bottom:none; padding:0px'>
-                  <table class='headTable'>
-                    <caption><?php echo $lang->release->linkBugs;?></caption>
-                    <tr>
-                      <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'>
-                    <table class='f-left table-1 fixed'>
-                      <?php foreach($bugs as $bug):?>
-                      <?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug->id", '', true);?>
-                      <tr class='a-center'>
-                        <td id='bug' class='w-id a-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='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>
-                      </tr>
-                      <?php endforeach;?>
-                    </table>
-                  </div>
-                </td>
-              </tr>
+        </td>
+        <td>
+          <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>
+        </td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->release->desc;?></th>
+        <td colspan='2'><?php echo html::textarea('desc', $release->desc, "rows=10 class='form-control'");?></td>
+      </tr>  
+      <tr>
+        <th><?php echo $lang->files;?></th>
+        <td colspan='2'><?php echo $this->fetch('file', 'buildform', array('fileCount' => 1));?></td>
+      </tr>  
+      <tr>
+        <td></td>
+        <td colspan='2'><?php echo html::submitButton() . html::backButton() . html::hidden('product', $release->product);?></td>
+      </tr>
+    </table>
+  </form>  
+</div>
 
-        </div>
-      </td>
-    </tr>
-    <tr>
-      <th class='rowhead'><?php echo $lang->release->desc;?></th>
-      <td><?php echo html::textarea('desc', $release->desc, "rows=10 class='area-1'");?></td>
-    </tr>  
-    <tr>
-      <th class='rowhead'><?php echo $lang->files;?></th>
-      <td class='a-left'><?php echo $this->fetch('file', 'buildform', array('fileCount' => 1));?></td>
-    </tr>  
-    <tr>
-      <td colspan='2' class='a-center'><?php echo html::submitButton() . html::backButton() . html::hidden('product', $release->product);?></td>
-    </tr>
-  </table>
-</form>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index 915922f100..50cecdcc00 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -12,7 +12,7 @@
 /* Width definitions */
 .w-p5 {width: 5%} .w-p10 {width: 10%} .w-p15 {width: 15%} .w-p20 {width: 20%} .w-p25 {width: 25%} .w-p30 {width: 30%} .w-p35 {width: 35%} .w-p40 {width: 40%} .w-p45 {width: 45%} .w-p50 {width: 50%} .w-p55 {width: 55%} .w-p60 {width: 60%} .w-p65 {width: 65%} .w-p70 {width: 70%} .w-p75 {width: 75%} .w-p80 {width: 80%} .w-p85 {width: 85%} .w-p90 {width: 90%} .w-p94 {width: 94%} .w-p95 {width: 95%} .w-p98 {width: 98%} .w-p99 {width: 99%} .w-p100{width: 100%}
 
-.w-20px {width:20px} .w-30px {width:30px} .w-35px {width:35px} .w-40px {width:40px} .w-45px {width:45px} .w-50px {width:50px} .w-60px {width:60px} .w-70px {width:70px} .w-80px {width:80px} .w-90px {width:90px} .w-100px {width:100px} .w-110px {width:110px} .w-120px {width:120px} .w-130px {width:130px} .w-140px {width:140px} .w-150px {width:150px} .w-160px {width:160px} .w-180px {width:180px} .w-200px {width:200px} .w-400px {width:400px} .w-500px {width:500px} .w-600px {width:600px} .w-700px {width:700px} .w-800px {width:800px}
+.w-20px {width:20px} .w-30px {width:30px} .w-35px {width:35px} .w-40px {width:40px} .w-45px {width:45px} .w-50px {width:50px} .w-60px {width:60px} .w-70px {width:70px} .w-80px {width:80px} .w-90px {width:90px} .w-100px {width:100px} .w-110px {width:110px} .w-120px {width:120px} .w-130px {width:130px} .w-140px {width:140px} .w-150px {width:150px} .w-160px {width:160px} .w-180px {width:180px} .w-200px {width:200px} .w-400px {width:400px} .w-500px {width:500px} .w-600px {width:600px} .w-700px {width:700px} .w-800px {width:800px} .w-900px {width:900px}
 
 .w-id {width:60px;} .w-pri {width:30px;} .w-severity {width:50px;} .w-hour {width:48px;} .w-date {width:80px;} .w-user {width:60px;} .w-status {width:55px} .w-type {width:80px} .w-resolution {width:60px}
 
@@ -187,19 +187,19 @@ i[class^="icon-"].disabled,i[class*=" icon-"].disabled,i[class^="icon-"].disable
 
 /* === Views === */
 /* Table form */
-.table-form th {text-align:right;vertical-align:middle; border-bottom:none}
-.table-form th.text-left, .table-form tr.text-left th {text-align:left;vertical-align:middle; border-bottom:none}
-.table-form td {vertical-align:middle; border-bottom:none}
-.table-form th,.table-form td {border-bottom:none}
+.table-form > tbody > tr > th {text-align:right;vertical-align:middle; border-bottom:none}
+.table-form > tbody > tr > th.text-left, .table-form > tbody > tr > tr.text-left th {text-align:left;vertical-align:middle; border-bottom:none}
+.table-form > tbody > tr > td {vertical-align:middle; border-bottom:none}
+.table-form > tbody > tr > th,.table-form > tbody > tr > td {border-bottom:none}
 .table th.text-middle, .table td.text-middle, .text-middle {vertical-align: middle;}
-.table-form td.text-bottom {vertical-align:bottom;}
-.table-form td .form-control {vertical-align:middle;margin:0;}
-.table-form .checkbox,.table-form input[type="radio"] + label {margin-right: 10px;}
-.table-form td > .row {margin-right: 0;}
-.table-form td > .row > [class*="col-"] {padding-right: 0;line-height: 34px}
-.table-form td .checkbox {margin: 0}
-.table-form td .btn + .btn {margin-left: 8px;}
-.table-form td .btn-group .btn + .btn {margin-left: -1px;}
+.table-form > tbody > tr > td.text-bottom {vertical-align:bottom;}
+.table-form > tbody > tr > td .form-control {vertical-align:middle;margin:0;}
+.table-form > tbody > tr > td .checkbox,.table-form > tbody > tr > td input[type="radio"] + label {margin-right: 10px;}
+.table-form > tbody > tr > td > .row {margin-right: 0;}
+.table-form > tbody > tr > td > .row > [class*="col-"] {padding-right: 0;line-height: 34px}
+.table-form > tbody > tr > td .checkbox {margin: 0}
+.table-form > tbody > tr > td .btn + .btn {margin-left: 8px;}
+.table-form > tbody > tr > td .btn-group .btn + .btn {margin-left: -1px;}
 
 /* Table data */
 .table-data th, .table-data td {padding: 5px;}
@@ -254,10 +254,12 @@ form .star {display: none;}/* hide star */
 .panel .table-bordered tr > td:first-child,.panel .table-bordered tr > th:first-child {border-left: 0;}
 .panel .table-bordered tr > td:last-child,.panel .table-bordered tr > th:last-child {border-right: 0;}
 
+.panel-sm .panel-heading {padding: 6px 10px}
+
 /* File form */
-.fileBox {margin-bottom: 10px;}
+.fileBox {margin-bottom: 10px; width: 100%}
 #fileform > .fileBox:last-child {margin-bottom: 0;}
-.fileBox .input-group-addon{text-indent: -99em; padding: 0 !important; border-left: 0; border-right: 0}
+.fileBox .input-group-addon{text-indent: -9999em; padding: 0 !important; border-left: 0; border-right: 0}
 .fileBox .form-control[type='text'] + .input-group-btn > .btn {border-left: 0}
 .fileBox .form-control[type='text'] {height: 30px;}
 .fileBox .input-control {display: table-cell; border: 1px solid #ccc; padding: 0 10px; border-radius: 2px 0 0 2px}
@@ -372,11 +374,15 @@ body {font-size: 12px; color:#141414;padding-bottom: 40px;}
 .outer .table {margin-bottom: 0;}
 .outer .table .btn-icon {margin-left: -2px}
 .outer .table thead tr th {text-align: center;}
+.outer .table thead tr th.text-left {text-align: left;}
 .outer .table tbody td {vertical-align: middle;}
 .outer .table th {vertical-align: middle;}
 .outer .table tr > th:first-child, .outer .table tr > td:first-child {padding-left: 15px}
 .outer .table tr > th:last-child, .outer .table tr > td:last-child {padding-right: 15px}
 .outer .table tbody > tr:last-child td {border-bottom: 1px solid #e5e5e5; padding-top: 8px}
+.outer .table-form .table tr > th:first-child, .outer .table-form .table tr > td:first-child {padding-left: 5px}
+.outer .table-form .table tr > th:last-child, .outer .table-form .table tr > td:last-child {padding-right: 5px}
+.outer .table-form .table tbody > tr:last-child td {border-bottom: 1px solid #e5e5e5; padding-top: 5px}
 .outer .table.table-data.table-borderless tbody > tr:last-child td, .outer .table.table-form tbody > tr:last-child td {border: none}
 .outer .table tfoot .dropdown-menu {min-width: 100px}
 .outer .table tfoot .form-control {padding: 1px 8px; height: 30px}
@@ -442,7 +448,8 @@ body {font-size: 12px; color:#141414;padding-bottom: 40px;}
 .outer.with-side.hide-side .main, .outer.with-side.hide-side .side + form, .outer.with-side.hide-side .main, .outer.with-side .side + table {margin-left: 30px}
 
 /* Form in outer */
-form > .btn {margin-right: 10px;}
+.outer form > .btn {margin-right: 10px;}
+.outer form .panel {margin-bottom: 0;}
 
 /* Pager. */
 .pager {margin-bottom:0;line-height: 30px; color: #999}
@@ -546,11 +553,6 @@ td>select{padding-left: 0;padding-right: 0}
 
 
 /* Form settings */
-#dataform{margin-top:20px; padding:0 30px}
-#dataform caption{font-size:14px; padding:5px 5px 5px 10px}
-#dataform .rowhead{font-size:11.5px; font-weight:1.2; border:none}
-#dataform tr, #createform td, #createform th{border:none;}
-
 .actionlink{font-size:14px; font-weight:bold; padding-top:8px}
 .actionlink span{padding:5px 3px}