diff --git a/module/convert/view/index.html.php b/module/convert/view/index.html.php
index 3aa7a07516..63a6e96cb4 100644
--- a/module/convert/view/index.html.php
+++ b/module/convert/view/index.html.php
@@ -17,7 +17,7 @@
       <strong><?php echo $lang->convert->common;?></strong>
     </div>
   </div>
-  <div class='alert'>
+  <div class='alert mg-0 bd-0'>
     <div class='content'>
       <?php echo nl2br($lang->convert->desc);?>
       <div class='text-center pdt-20'>
diff --git a/module/custom/view/set.html.php b/module/custom/view/set.html.php
index 15d7498574..71e59aa735 100644
--- a/module/custom/view/set.html.php
+++ b/module/custom/view/set.html.php
@@ -44,8 +44,8 @@ EOT;
   ?>
   </ul>
 </div>
-<div class='container'>
-  <div class='row'>
+<div class='container bd-0'>
+  <div class='row pd-0'>
     <div class='col-sm-4 col-md-3'>
       <div class='panel panel-sm'>
         <div class='panel-heading'>
diff --git a/module/editor/view/index.html.php b/module/editor/view/index.html.php
index 3bac080613..4c290b3486 100644
--- a/module/editor/view/index.html.php
+++ b/module/editor/view/index.html.php
@@ -11,7 +11,7 @@
  */
 ?>
 <?php include '../../extension/view/header.html.php';?>
-<div class='container'>
+<div class='container bd-0'>
   <table class='w-p100'>
     <tr>
       <td class='w-200px'>
diff --git a/module/extension/view/obtain.html.php b/module/extension/view/obtain.html.php
index e68579da10..7bb7f6f08e 100644
--- a/module/extension/view/obtain.html.php
+++ b/module/extension/view/obtain.html.php
@@ -12,8 +12,8 @@
 ?>
 <?php include 'header.html.php';?>
 <?php include '../../common/view/treeview.html.php';?>
-<div class='container'>
-  <div class='row'>
+<div class='container bd-0'>
+  <div class='row pd-0'>
     <div class='col-md-4 col-lg-3'>
       <form class='side-search mgb-20' method='post' action='<?php echo inlink('obtain', 'type=bySearch');?>'>
         <div class="input-group">
diff --git a/module/productplan/view/linkbug.html.php b/module/productplan/view/linkbug.html.php
index 7c5f98af0d..d26398d3a0 100644
--- a/module/productplan/view/linkbug.html.php
+++ b/module/productplan/view/linkbug.html.php
@@ -26,7 +26,7 @@
 <div id='bugList'>
   <form method='post' id='unlinkedBugsForm'>
     <table class='table table-condensed table-hover table-striped table-borderless tablesorter table-fixed'> 
-      <caption class='text-left text-special'><?php echo html::icon('unlink');?> &nbsp;<strong><?php echo $lang->productplan->unlinkedBugs;?></strong> (<?php echo count($allBugs);?>)</caption>
+      <caption class='text-left text-special'><?php echo html::icon('unlink');?> &nbsp;<strong><?php echo $lang->productplan->unlinkedBugs;?></strong></caption>
       <thead>
       <tr class='colhead'>
         <th class='w-id {sorter:"currency"}'><?php echo $lang->idAB;?></th>
diff --git a/module/productplan/view/linkstory.html.php b/module/productplan/view/linkstory.html.php
index 58341a7af2..99028c3f6e 100644
--- a/module/productplan/view/linkstory.html.php
+++ b/module/productplan/view/linkstory.html.php
@@ -24,7 +24,7 @@
 <div id='storyList'>
   <form method='post' id='unlinkedStoriesForm'>
     <table class='table table-condensed table-hover table-striped table-borderless tablesorter table-fixed'> 
-    <caption class='text-left text-special'><?php echo html::icon('unlink');?> &nbsp;<strong><?php echo $lang->productplan->unlinkedStories;?></strong> (<?php echo count($allStories);?>)</caption>
+    <caption class='text-left text-special'><?php echo html::icon('unlink');?> &nbsp;<strong><?php echo $lang->productplan->unlinkedStories;?></strong></caption>
       <thead>
         <tr>
           <th class='w-id {sorter:"currency"}'><?php echo $lang->idAB;?></th>
diff --git a/module/sso/css/create.css b/module/sso/css/create.css
index d9259e62b2..58a0b29696 100644
--- a/module/sso/css/create.css
+++ b/module/sso/css/create.css
@@ -1 +1 @@
-.instruction {margin-top:15px; margin-left: 20px; padding:20px 30px;}
+.instruction {margin-top:5px; margin-left: 20px; padding:20px 30px;}
diff --git a/module/story/css/report.css b/module/story/css/report.css
index 9c3849153e..83f749b531 100644
--- a/module/story/css/report.css
+++ b/module/story/css/report.css
@@ -1 +1,3 @@
-.side span {display:block}
+.table-bordered caption {border: 1px solid #ddd;}
+.table-bordered tr > th:first-child, .table-bordered tr > td:first-child {border-left: 1px solid #ddd!important}
+.table-bordered tr > th:last-child, .table-bordered tr > td:last-child {border-right: 1px solid #ddd!important}
diff --git a/module/story/view/report.html.php b/module/story/view/report.html.php
index 60facbc692..9f1b50a196 100644
--- a/module/story/view/report.html.php
+++ b/module/story/view/report.html.php
@@ -11,39 +11,53 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<?php include '../../common/view/colorize.html.php';?>
-<table class='cont-lt1'>
-  <tr valign='top'>
-    <td class='side'>
-      <div class='box-title'><?php echo $lang->story->report->select;?></div>
-      <div class='box-content'>
-        <form method='post'>
-        <?php echo html::checkBox('charts', $lang->story->report->charts, $checkedCharts);?>
-        <?php echo html::selectAll();?>
-        <?php echo html::selectReverse();?>
-        <br /><br />
-        <?php echo html::submitButton($lang->story->report->create);?>
+<div id='titlebar'>
+  <div class='heading'>
+    <span class='prefix'><?php echo html::icon($lang->icons['story']);?></span>
+    <strong><small class='text-muted'><?php echo html::icon($lang->icons['report']);?></small> <?php echo $lang->story->report->common;?></strong>
+  </div>
+  <div class='actions'>
+    <?php echo html::a($this->createLink('product', 'browse', "productID=$productID&browseType=$browseType&moduleID=$moduleID"), $lang->goback, '', "class='btn'");?>
+  </div>
+</div>
+<div class='row'>
+  <div class='col-md-3 col-lg-2'>
+    <div class='panel panel-sm'>
+      <div class='panel-heading'>
+        <strong><?php echo $lang->story->report->select;?></strong>
       </div>
-    </td>
-    <td class='divider'></td>
-    <td>
-      <table class='table-1'>
-        <caption>
-          <div class='f-left'><?php echo $lang->story->report->common;?></div>
-          <div class='text-right'><?php echo html::a($this->createLink('product', 'browse', "productID=$productID&browseType=$browseType&moduleID=$moduleID"), $lang->goback); ?></div>
-        </caption>
+      <div class='panel-body' style='padding-top:0'>
+        <form method='post'>
+          <?php echo html::checkBox('charts', $lang->story->report->charts, $checkedCharts, '', 'block');?>
+          <div class='btn-group'>
+            <?php echo html::selectAll(); ?>
+            <?php echo html::selectReverse(); ?>
+            <?php echo html::submitButton($lang->story->report->create);?>
+          </div>
+        </form>
+      </div>
+    </div>
+  </div>
+  <div class='col-md-9 col-lg-10'>
+    <div class='panel panel-sm'>
+      <div class='panel-heading'>
+        <strong><?php echo $lang->story->report->common;?></strong>
+      </div>
+      <table class='table active-disabled'>
         <?php foreach($charts as $chartType => $chartContent):?>
         <tr valign='top'>
           <td><?php echo $chartContent;?></td>
           <td width='300'>
             <div style="height:<?php echo $lang->story->report->options->height . 'px';?>; overflow:auto">
-              <table class='table-1 colored'>
-                <caption><?php echo $lang->story->report->charts[$chartType];?></caption>
-                <tr>
-                  <th><?php echo $lang->story->report->$chartType->item;?></th>
-                  <th><?php echo $lang->story->report->value;?></th>
-                  <th><?php echo $lang->report->percent;?></th>
-                </tr>
+              <table class='table table-condensed table-hover table-striped table-bordered'>
+                <caption class='text-left'><?php echo $lang->story->report->charts[$chartType];?></caption>
+                <thead>
+                  <tr>
+                    <th><?php echo $lang->story->report->$chartType->item;?></th>
+                    <th><?php echo $lang->story->report->value;?></th>
+                    <th><?php echo $lang->report->percent;?></th>
+                  </tr>
+                </thead>
                 <?php foreach($datas[$chartType] as $key => $data):?>
                 <tr class='text-center'>
                   <td><?php echo $data->name;?></td>
@@ -57,8 +71,8 @@
         </tr>
         <?php endforeach;?>
       </table>
-    </td>
-  </tr>
-</table>
+    </div>
+  </div>
+</div>
 <?php echo $renderJS;?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/user/view/batchcreate.html.php b/module/user/view/batchcreate.html.php
index 0dbd8f76ad..55a7bfe267 100644
--- a/module/user/view/batchcreate.html.php
+++ b/module/user/view/batchcreate.html.php
@@ -13,38 +13,48 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/chosen.html.php';?>
 <?php js::set('roleGroup', $roleGroup);?>
+<div id='titlebar'>
+  <div class='heading'>
+    <span class='prefix'><?php echo html::icon($lang->icons['user']);?></span>
+    <strong><small class='text-muted'><?php echo html::icon($lang->icons['batchCreate']);?></small> <?php echo $lang->user->batchCreate;?></strong>
+  </div>
+</div>
+
 <form class='form-condensed' method='post' target='hiddenwin' id='dataform'>
-  <table class='table-1 fixed'> 
-    <caption><?php echo $lang->user->batchCreate;?></caption>
-    <tr>
-      <th class='w-20px'><?php echo $lang->idAB;?></th> 
-      <th class='w-150px'><?php echo $lang->user->dept;?></th>
-      <th class='w-130px red'><?php echo $lang->user->account;?></th>
-      <th class='w-130px red'><?php echo $lang->user->realname;?></th>
-      <th class='w-100px red'><?php echo $lang->user->role;?></th>
-      <th class='w-100px'><?php echo $lang->user->group;?></th>
-      <th><?php echo $lang->user->email;?></th>
-      <th class='w-70px'><?php echo $lang->user->gender;?></th>
-      <th class="red"><?php echo $lang->user->password;?></th>
-    </tr>
+  <table class='table table-form table-fixed'> 
+    <thead>
+      <tr>
+        <th class='w-40px'><?php echo $lang->idAB;?></th> 
+        <th class='w-150px'><?php echo $lang->user->dept;?></th>
+        <th class='w-130px red'><?php echo $lang->user->account;?></th>
+        <th class='w-130px red'><?php echo $lang->user->realname;?></th>
+        <th class='w-100px red'><?php echo $lang->user->role;?></th>
+        <th class='w-100px'><?php echo $lang->user->group;?></th>
+        <th><?php echo $lang->user->email;?></th>
+        <th class='w-90px'><?php echo $lang->user->gender;?></th>
+        <th class="red"><?php echo $lang->user->password;?></th>
+      </tr>
+    </thead>
     <?php $depts = $depts + array('ditto' => $lang->user->ditto)?>
     <?php $lang->user->roleList = $lang->user->roleList + array('ditto' => $lang->user->ditto)?>
     <?php $groupList = $groupList + array('ditto' => $lang->user->ditto)?>
     <?php for($i = 0; $i < $config->user->batchCreate; $i++):?>
     <tr class='text-center'>
       <td><?php echo $i+1;?></td>
-      <td><?php echo html::select("dept[$i]", $depts, $i > 0 ? 'ditto' : $deptID, "class='form-control'");?>
-      <td><?php echo html::input("account[$i]", '', "class='text-1 account_$i' autocomplete='off' onchange='changeEmail($i)'");?></td>
+      <td><?php echo html::select("dept[$i]", $depts, $i > 0 ? 'ditto' : $deptID, "class='form-control'");?></td>
+      <td><?php echo html::input("account[$i]", '', "class='form-control account_$i' autocomplete='off' onchange='changeEmail($i)'");?></td>
       <td><?php echo html::input("realname[$i]", '', "class='form-control'");?></td>
       <td><?php echo html::select("role[$i]", $lang->user->roleList, $i > 0 ? 'ditto' : '', "class='form-control' onchange='changeGroup(this.value, $i)'");?></td>
       <td><?php echo html::select("group[$i]", $groupList, $i > 0 ? 'ditto' : '', "class='form-control'");?></td>
-      <td><?php echo html::input("email[$i]", '', "class='text-1 email_$i' onchange='setDefaultEmail($i)'");?></td>
+      <td><?php echo html::input("email[$i]", '', "class='form-control email_$i' onchange='setDefaultEmail($i)'");?></td>
       <td><?php echo html::radio("gender[$i]", (array)$lang->user->genderList, 'm');?></td>
       <td align='left'>
-      <?php
-      echo html::input("password[$i]", '', "class='w-p70' autocomplete='off' onkeyup='toggleCheck(this, $i)'");
-      if($i != 0) echo "<input type='checkbox' name='ditto[$i]' id='ditto$i' " . ($i> 0 ? "checked" : '') . " /> {$lang->user->ditto}";
-      ?>
+        <div class='input-group'>
+        <?php
+        echo html::input("password[$i]", '', "class='form-control' autocomplete='off' onkeyup='toggleCheck(this, $i)'");
+        if($i != 0) echo "<span class='input-group-addon'><input type='checkbox' name='ditto[$i]' id='ditto$i' " . ($i> 0 ? "checked" : '') . " /> {$lang->user->ditto}</span>";
+        ?>
+        </div>
       </td>
     </tr>  
     <?php endfor;?>
diff --git a/module/user/view/create.html.php b/module/user/view/create.html.php
index 5e91b7d124..6b7c0d81e3 100644
--- a/module/user/view/create.html.php
+++ b/module/user/view/create.html.php
@@ -14,55 +14,62 @@
 <?php include '../../common/view/datepicker.html.php';?>
 <?php js::set('holders', $lang->user->placeholder);?>
 <?php js::set('roleGroup', $roleGroup);?>
-<form class='form-condensed' method='post' target='hiddenwin' id='dataform'>
-  <table align='center' class='table-5'> 
-    <caption><?php echo $lang->user->create;?></caption>
-    <tr>
-      <th><?php echo $lang->user->dept;?></th>
-      <td><?php echo html::select('dept', $depts, $deptID, "class='form-control'");?>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->user->account;?></th>
-      <td><?php echo html::input('account', '', "class='form-control' autocomplete='off'");?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->user->realname;?></th>
-      <td><?php echo html::input('realname', '', "class='form-control'");?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->user->password;?></th>
-      <td><?php echo html::password('password1', '', "class='form-control' autocomplete='off'");?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->user->password2;?></th>
-      <td><?php echo html::password('password2', '', "class='form-control' autocomplete='off'");?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->user->role;?></th>
-      <td><?php echo html::select('role', $lang->user->roleList, '', "class='form-control' onchange='changeGroup(this.value)'");?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->user->group;?></th>
-      <td><?php echo html::select('group', $groupList, '', "class='form-control'");?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->user->email;?></th>
-      <td><?php echo html::input('email', '', "class='form-control'");?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->user->commiter;?></th>
-      <td><?php echo html::input('commiter', '', "class='form-control'");?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->user->join;?></th>
-      <td><?php echo html::input('join', '', "class='form-control form-date'");?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->user->gender;?></th>
-      <td><?php echo html::radio('gender', (array)$lang->user->genderList, 'm');?></td>
-    </tr>  
+<div class='container mw-600px'>
+  <div id='titlebar'>
+    <div class='heading'>
+      <span class='prefix'><?php echo html::icon($lang->icons['user']);?></span>
+      <strong><small class='text-muted'><?php echo html::icon($lang->icons['create']);?></small> <?php echo $lang->user->create;?></strong>
+    </div>
+  </div>
+  <form class='form-condensed mw-500px' method='post' target='hiddenwin' id='dataform'>
+    <table align='center' class='table table-form'> 
+      <tr>
+        <th class='w-100px'><?php echo $lang->user->dept;?></th>
+        <td><?php echo html::select('dept', $depts, $deptID, "class='form-control'");?></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->user->account;?></th>
+        <td><?php echo html::input('account', '', "class='form-control' autocomplete='off'");?></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->user->realname;?></th>
+        <td><?php echo html::input('realname', '', "class='form-control'");?></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->user->password;?></th>
+        <td><?php echo html::password('password1', '', "class='form-control' autocomplete='off'");?></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->user->password2;?></th>
+        <td><?php echo html::password('password2', '', "class='form-control' autocomplete='off'");?></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->user->role;?></th>
+        <td><?php echo html::select('role', $lang->user->roleList, '', "class='form-control' onchange='changeGroup(this.value)'");?></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->user->group;?></th>
+        <td><?php echo html::select('group', $groupList, '', "class='form-control'");?></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->user->email;?></th>
+        <td><?php echo html::input('email', '', "class='form-control'");?></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->user->commiter;?></th>
+        <td><?php echo html::input('commiter', '', "class='form-control'");?></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->user->join;?></th>
+        <td><?php echo html::input('join', '', "class='form-control form-date'");?></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->user->gender;?></th>
+        <td><?php echo html::radio('gender', (array)$lang->user->genderList, 'm');?></td>
+      </tr>
 
-    <tr><td colspan='2' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
-  </table>
-</form>
+      <tr><td colspan='2' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
+    </table>
+  </form>
+</div>
 <?php include '../../common/view/footer.html.php';?>