diff --git a/module/project/view/activate.html.php b/module/project/view/activate.html.php
index fb10dc0bcc..20b8a17436 100644
--- a/module/project/view/activate.html.php
+++ b/module/project/view/activate.html.php
@@ -14,46 +14,50 @@
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
 <?php js::import($jsRoot . 'misc/date.js');?>
-<div class='container'>
-  <div id='titlebar'>
-    <div class='heading'>
-      <span class='prefix'><?php echo html::icon($lang->icons['project']);?> <strong><?php echo $project->id;?></strong></span>
-      <strong><?php echo html::a($this->createLink('project', 'view', 'project=' . $project->id), $project->name, '_blank');?></strong>
-      <small class='text-success'> <?php echo $lang->project->activate;?> <?php echo html::icon($lang->icons['activate']);?></small>
-    </div>
+<div id='mainContent' class='main-content'>
+  <div class='main-header'>
+    <h2>
+      <span class='prefix label-id'><strong><?php echo $project->id;?></strong></span>
+      <?php echo html::a($this->createLink('project', 'view', 'project=' . $project->id), $project->name, '_blank');?>
+      <small><?php echo $lang->arrow . $lang->project->activate;?></small>
+    </h2>
   </div>
-  <form class='form-condensed' method='post' target='hiddenwin'>
+  <form class='load-indicator main-form' method='post' target='hiddenwin'>
     <table class='table table-form'>
       <tr>
-        <th class='w-80px text-right'><?php echo $lang->project->beginAndEnd;?></th>
-        <td class='w-250px'>
-          <div id='sourceTimeBox'>
-            <span style='display:inline-block; padding:5px 10px; width:85px'><?php echo $project->begin?></span>
-            <span style='padding:5px 10px'> ~ </span>
-            <span style='display:inline-block; padding:5px 10px; width:85px'><?php echo $project->end;?></span>
-          </div>
+        <th><?php echo $lang->project->beginAndEnd;?></th>
+        <td class='muted' colspan='2'>
+          <div id='sourceTimeBox'><?php echo $project->begin . ' ~ ' . $project->end;?></div>
           <div id='readjustTimeBox' class='hide'>
-            <span style='display:inline-block; width:85px'><?php echo html::input('begin', $newBegin, "class='form-control form-date'")?></span>
-            <span style='padding:5px 10px;'> ~ </span>
-            <span style='display:inline-block; width:85px'><?php echo html::input('end', $newEnd, "class='form-control form-date'");?></span>
+            <div class='input-group'>
+              <?php echo html::input('begin', $newBegin, "class='form-control form-date'")?>
+              <span class='input-group-addon'> ~ </span>
+              <?php echo html::input('end', $newEnd, "class='form-control form-date'");?>
+            </div>
           </div>
         </td>
-        </td>
-        <td>
-          <label class="checkbox-inline"><input name="readjustTime" value="1" id="readjustTime" type="checkbox"> <strong><?php echo $lang->project->readjustTime?></strong></label>
-          <span id='readjustTaskBox' class='hide'><label class="checkbox-inline"><input name="readjustTask" value="1" id="readjustTask" type="checkbox"> <strong><?php echo $lang->project->readjustTask?></strong></label></span>
+        <td colspan='3'>
+          <div class='clearfix row'>
+            <div class='col-md-6 pull-left'>
+              <div class="checkbox-primary"><input name="readjustTime" value="1" id="readjustTime" type="checkbox"><label for="readjustTime" class="no-margin"><?php echo $lang->project->readjustTime;?></label></div>
+            </div>
+            <div class='col-md-6 pull-left'>
+              <div id='readjustTaskBox' class='checkbox-primary hide'><input name="readjustTask" value="1" id="readjustTask" type="checkbox"> <label for='readjustTask' class='no-margin'><?php echo $lang->project->readjustTask?></label></div>
+            </div>
+          </div>
         </td>
       </tr>
       <tr>
-        <th class='text-right'><?php echo $lang->comment;?></th>
-        <td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
+        <th><?php echo $lang->comment;?></th>
+        <td colspan='5'><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
       </tr>
       <tr>
         <th></th>
-        <td><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList); ?></td>
+        <td colspan='5'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList); ?></td>
       </tr>
     </table>
   </form>
+  <hr class='small' />
   <div class='main'><?php include '../../common/view/action.html.php';?></div>
 </div>
 <script>
diff --git a/module/project/view/close.html.php b/module/project/view/close.html.php
index ad9351e6a3..cca35dc7d6 100644
--- a/module/project/view/close.html.php
+++ b/module/project/view/close.html.php
@@ -12,26 +12,29 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<div class='container mw-800px'>
-  <div id='titlebar'>
-    <div class='heading'>
-      <span class='prefix'><?php echo html::icon($lang->icons['project']);?> <strong><?php echo $project->id;?></strong></span>
-      <strong><?php echo html::a($this->createLink('project', 'view', 'project=' . $project->id), $project->name, '_blank');?></strong>
-      <small class='text-danger'> <?php echo $lang->project->close;?> <?php echo html::icon($lang->icons['close']);?></small>
-    </div>
+<div id='mainContent' class='main-content'>
+  <div class='main-header'>
+    <h2>
+      <span class='prefix label-id'><strong><?php echo $project->id;?></strong></span>
+      <?php echo html::a($this->createLink('project', 'view', 'project=' . $project->id), $project->name, '_blank');?>
+      <small> <?php echo $lang->arrow . $lang->project->close;?></small>
+    </h2>
   </div>
-  <form class='form-condensed' method='post' target='hiddenwin'>
+  <form class='load-indicator main-form' method='post' target='hiddenwin'>
     <table class='table table-form'>
-      <tr>
-        <th class='text-left'><?php echo $lang->comment;?></th>
-        <td><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
-      </tr>
-      <tr>
-        <th></th>
-        <td><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList); ?></td>
-      </tr>
+      <tbody>
+        <tr>
+          <th><?php echo $lang->comment;?></th>
+          <td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
+        </tr>
+        <tr>
+          <th></th>
+          <td><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList); ?></td>
+        </tr>
+      </tbody>
     </table>
   </form>
+   <hr class='small' />
   <div class='main'><?php include '../../common/view/action.html.php';?></div>
 </div>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php
index c3a50aba12..20adc39ff8 100644
--- a/module/project/view/edit.html.php
+++ b/module/project/view/edit.html.php
@@ -18,8 +18,8 @@
   <div class='center-block'>
     <div class='main-header'>
       <h2>
-        <span class='prefix'><?php echo html::icon($lang->icons['project']);?> <strong><?php echo $project->id;?></strong></span>
-        <strong><?php echo html::a($this->createLink('project', 'view', 'project=' . $project->id), $project->name, '_blank');?></strong>
+        <span class='prefix label-id'><strong><?php echo $project->id;?></strong></span>
+        <?php echo html::a($this->createLink('project', 'view', 'project=' . $project->id), $project->name, '_blank');?>
         <small><?php echo $lang->arrow . ' ' . $lang->project->edit;?></small>
       </h2>
     </div>
diff --git a/module/story/css/common.css b/module/story/css/common.css
index bbf40b4424..cbf7b115fe 100644
--- a/module/story/css/common.css
+++ b/module/story/css/common.css
@@ -1,3 +1,7 @@
 .linkbox{height:180px; overflow-y:auto}
 .tab-pane .table-borderless {border: 1px solid #ddd!important}
 .tab-pane .table-data.table-borderless {border: none!important}
+
+.input-group .control-product + .chosen-container-single .chosen-single {border-radius: 2px 0 0 2px; border-right-width: 0; padding-right: 1px;}
+.input-group .control-product + .chosen-container-active .chosen-single {border-right-width: 1px; padding-right: 0;}
+.input-group .control-branch + .chosen-container-single .chosen-single {border-radius: 0 2px 2px 0;}
diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php
index f68b8e0410..a3e51eb480 100644
--- a/module/story/view/create.html.php
+++ b/module/story/view/create.html.php
@@ -31,9 +31,10 @@
             <?php if($product->type != 'normal'):?>
             <div class='input-group'>
             <?php endif;?>
-            <?php echo html::select('product', $products, $productID, "onchange='loadProduct(this.value);' class='form-control chosen'");?>
+            <?php echo html::select('product', $products, $productID, "onchange='loadProduct(this.value);' class='form-control chosen control-product'");?>
             <?php if($product->type != 'normal'):?>
-            <?php echo html::select('branch', $branches, $branch, "onchange='loadBranch();' class='form-control chosen'");?>
+            <span class='input-group-addon fix-border fix-padding'></span>
+            <?php echo html::select('branch', $branches, $branch, "onchange='loadBranch();' class='form-control chosen control-branch'");?>
             </div>
             <?php endif;?>
           </td>
diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php
index e4ceb29d98..af5b1eb74e 100644
--- a/module/story/view/edit.html.php
+++ b/module/story/view/edit.html.php
@@ -68,8 +68,9 @@
                 <th class='w-80px'><?php echo $lang->story->product;?></th>
                 <td>
                   <div class='input-group'>
-                    <?php echo html::select('product', $products, $story->product, "onchange='loadProduct(this.value);' class='form-control chosen'");?>
-                    <?php if($product->type != 'normal') echo html::select('branch', $branches, $story->branch, "onchange='loadBranch();' class='form-control' style='width:65px'");?>
+                    <?php echo html::select('product', $products, $story->product, "onchange='loadProduct(this.value);' class='form-control chosen control-product'");?>
+                    <span class='input-group-addon fix-border fix-padding'></span>
+                    <?php if($product->type != 'normal') echo html::select('branch', $branches, $story->branch, "onchange='loadBranch();' class='form-control chosen control-branch'");?>
                   </div>
                 </td>
               </tr>
diff --git a/module/user/css/batchcreate.css b/module/user/css/batchcreate.css
index 655a1401aa..dfd2b0a558 100644
--- a/module/user/css/batchcreate.css
+++ b/module/user/css/batchcreate.css
@@ -1 +1,2 @@
 .chosen-container[id^="dept"] .chosen-drop {min-width: 400px;!important}
+th.required:after {position: relative; right: 10px;}
diff --git a/module/user/css/batchedit.css b/module/user/css/batchedit.css
index 655a1401aa..dfd2b0a558 100644
--- a/module/user/css/batchedit.css
+++ b/module/user/css/batchedit.css
@@ -1 +1,2 @@
 .chosen-container[id^="dept"] .chosen-drop {min-width: 400px;!important}
+th.required:after {position: relative; right: 10px;}
diff --git a/module/user/view/batchcreate.html.php b/module/user/view/batchcreate.html.php
index 9065295a57..3a7a5b0c93 100644
--- a/module/user/view/batchcreate.html.php
+++ b/module/user/view/batchcreate.html.php
@@ -11,98 +11,103 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<?php include '../../common/view/datepicker.html.php';?>
 <?php js::import($jsRoot . 'md5.js');?>
 <?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 class='actions'>
-      <button type="button" class="btn btn-default" data-toggle="customModal"><i class='icon icon-cog'></i> </button>
+<div id="mainContent" class="main-content">
+  <div class="main-header">
+    <h2><?php echo $lang->user->batchCreate;?></h2>
+    <div class="pull-right btn-toolbar">
+      <?php $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=user&section=custom&key=batchCreateFields')?>
+      <?php include '../../common/view/dropdowncustomfield.html.php';?>
     </div>
   </div>
-</div>
-<?php
-$visibleFields = array();
-foreach(explode(',', $showFields) as $field)
-{
-    if($field)$visibleFields[$field] = '';
-}
-$minWidth = (count($visibleFields) > 5) ? 'w-150px' : '';
-?>
-<form class='form-condensed' method='post' target='hiddenwin' id='dataform'>
-  <table class='table table-form table-fixed'> 
-    <thead>
-      <tr>
-        <th class='w-40px'><?php echo $lang->idAB;?></th> 
-        <th class='w-150px<?php echo zget($visibleFields, 'dept', ' hidden')?>'><?php echo $lang->user->dept;?></th>
-        <th class='w-130px'><?php echo $lang->user->account;?> <span class='required'></span></th>
-        <th class='w-130px'><?php echo $lang->user->realname;?> <span class='required'></span></th>
-        <th class='w-120px'><?php echo $lang->user->role;?> <span class='required'></span></th>
-        <th class='w-120px'><?php echo $lang->user->group;?></th>
-        <th class='<?php echo zget($visibleFields, 'email', "$minWidth hidden", $minWidth)?>'><?php echo $lang->user->email;?></th>
-        <th class='w-90px<?php echo zget($visibleFields, 'gender', ' hidden')?>'><?php echo $lang->user->gender;?></th>
-        <th class="<?php echo $minWidth?>"><?php echo $lang->user->password;?> <span class='required'></span></th>
-        <th class='w-120px<?php echo zget($visibleFields, 'commiter', ' hidden')?>'><?php echo $lang->user->commiter;?></th>
-        <th class='w-120px<?php echo zget($visibleFields, 'join', ' hidden')?>'>    <?php echo $lang->user->join;?></th>
-        <th class='w-120px<?php echo zget($visibleFields, 'skype', ' hidden')?>'>   <?php echo $lang->user->skype;?></th>
-        <th class='w-120px<?php echo zget($visibleFields, 'qq', ' hidden')?>'>      <?php echo $lang->user->qq;?></th>
-        <th class='w-120px<?php echo zget($visibleFields, 'yahoo', ' hidden')?>'>   <?php echo $lang->user->yahoo;?></th>
-        <th class='w-120px<?php echo zget($visibleFields, 'gtalk', ' hidden')?>'>   <?php echo $lang->user->gtalk;?></th>
-        <th class='w-120px<?php echo zget($visibleFields, 'wangwang', ' hidden')?>'><?php echo $lang->user->wangwang;?></th>
-        <th class='w-120px<?php echo zget($visibleFields, 'mobile', ' hidden')?>'>  <?php echo $lang->user->mobile;?></th>
-        <th class='w-120px<?php echo zget($visibleFields, 'phone', ' hidden')?>'>   <?php echo $lang->user->phone;?></th>
-        <th class='w-120px<?php echo zget($visibleFields, 'address', ' hidden')?>'> <?php echo $lang->user->address;?></th>
-        <th class='w-120px<?php echo zget($visibleFields, 'zipcode', ' hidden')?>'> <?php echo $lang->user->zipcode;?></th>
+  <?php
+  $visibleFields = array();
+  foreach(explode(',', $showFields) as $field)
+  {
+      if($field) $visibleFields[$field] = '';
+  }
+  $minWidth = (count($visibleFields) > 5) ? 'w-150px' : '';
+  ?>
+  <form method='post' class='load-indicator main-form' enctype='multipart/form-data' target='hiddenwin' id="batchCreateForm">
+    <table class="table table-form">
+      <thead>
+        <tr class='text-center'>
+          <th class='w-40px'><?php echo $lang->idAB;?></th> 
+          <th class='w-150px<?php echo zget($visibleFields, 'dept', ' hidden')?>'><?php echo $lang->user->dept;?></th>
+          <th class='w-130px required'><?php echo $lang->user->account;?></th>
+          <th class='w-130px required'><?php echo $lang->user->realname;?></th>
+          <th class='w-120px required'><?php echo $lang->user->role;?></th>
+          <th class='w-120px'><?php echo $lang->user->group;?></th>
+          <th class='<?php echo zget($visibleFields, 'email', "$minWidth hidden", $minWidth)?>'><?php echo $lang->user->email;?></th>
+          <th class='w-90px<?php echo zget($visibleFields, 'gender', ' hidden')?>'><?php echo $lang->user->gender;?></th>
+          <th class="<?php echo $minWidth;?> required"><?php echo $lang->user->password;?></th>
+          <th class='w-120px<?php echo zget($visibleFields, 'commiter', ' hidden')?>'><?php echo $lang->user->commiter;?></th>
+          <th class='w-120px<?php echo zget($visibleFields, 'join', ' hidden')?>'>    <?php echo $lang->user->join;?></th>
+          <th class='w-120px<?php echo zget($visibleFields, 'skype', ' hidden')?>'>   <?php echo $lang->user->skype;?></th>
+          <th class='w-120px<?php echo zget($visibleFields, 'qq', ' hidden')?>'>      <?php echo $lang->user->qq;?></th>
+          <th class='w-120px<?php echo zget($visibleFields, 'yahoo', ' hidden')?>'>   <?php echo $lang->user->yahoo;?></th>
+          <th class='w-120px<?php echo zget($visibleFields, 'gtalk', ' hidden')?>'>   <?php echo $lang->user->gtalk;?></th>
+          <th class='w-120px<?php echo zget($visibleFields, 'wangwang', ' hidden')?>'><?php echo $lang->user->wangwang;?></th>
+          <th class='w-120px<?php echo zget($visibleFields, 'mobile', ' hidden')?>'>  <?php echo $lang->user->mobile;?></th>
+          <th class='w-120px<?php echo zget($visibleFields, 'phone', ' hidden')?>'>   <?php echo $lang->user->phone;?></th>
+          <th class='w-120px<?php echo zget($visibleFields, 'address', ' hidden')?>'> <?php echo $lang->user->address;?></th>
+          <th class='w-120px<?php echo zget($visibleFields, 'zipcode', ' hidden')?>'> <?php echo $lang->user->zipcode;?></th>
+        </tr>
+      </thead>
+      <tbody>
+      <?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 class='text-left<?php echo zget($visibleFields, 'dept', ' hidden')?>' style='overflow:visible'><?php echo html::select("dept[$i]", $depts, $i > 0 ? 'ditto' : $deptID, "class='form-control chosen'");?></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' autocomplete='off'");?></td>
+        <td><?php echo html::select("role[$i]", $lang->user->roleList, $i > 0 ? 'ditto' : '', "class='form-control' onchange='changeGroup(this.value, $i)'");?></td>
+        <td class='text-left' style='overflow:visible'><?php echo html::select("group[$i]", $groupList, $i > 0 ? 'ditto' : '', "class='form-control chosen'");?></td>
+        <td <?php echo zget($visibleFields, 'email', "class='hidden'")?>><?php echo html::input("email[$i]", '', "class='form-control email_$i' onchange='setDefaultEmail($i)' autocomplete='off'");?></td>
+        <td <?php echo zget($visibleFields, 'gender', "class='hidden'")?>><?php echo html::radio("gender[$i]", (array)$lang->user->genderList, 'm');?></td>
+        <td align='left'>
+          <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>
+        <td class='<?php echo zget($visibleFields, 'commiter', 'hidden')?>'><?php echo html::input("commiter[$i]", '', "class='form-control' autocomplete='off'");?></td>
+        <td class='<?php echo zget($visibleFields, 'join', 'hidden')?>'>    <?php echo html::input("join[$i]",     '', "class='form-control form-date' autocomplete='off'");?></td>
+        <td class='<?php echo zget($visibleFields, 'skype', 'hidden')?>'>   <?php echo html::input("skype[$i]",    '', "class='form-control' autocomplete='off'");?></td>
+        <td class='<?php echo zget($visibleFields, 'qq', 'hidden')?>'>      <?php echo html::input("qq[$i]",       '', "class='form-control' autocomplete='off'");?></td>
+        <td class='<?php echo zget($visibleFields, 'yahoo', 'hidden')?>'>   <?php echo html::input("yahoo[$i]",    '', "class='form-control' autocomplete='off'");?></td>
+        <td class='<?php echo zget($visibleFields, 'gtalk', 'hidden')?>'>   <?php echo html::input("gtalk[$i]",    '', "class='form-control' autocomplete='off'");?></td>
+        <td class='<?php echo zget($visibleFields, 'wangwang', 'hidden')?>'><?php echo html::input("wangwang[$i]", '', "class='form-control' autocomplete='off'");?></td>
+        <td class='<?php echo zget($visibleFields, 'mobile', 'hidden')?>'>  <?php echo html::input("mobile[$i]",   '', "class='form-control' autocomplete='off'");?></td>
+        <td class='<?php echo zget($visibleFields, 'phone', 'hidden')?>'>   <?php echo html::input("phone[$i]",    '', "class='form-control' autocomplete='off'");?></td>
+        <td class='<?php echo zget($visibleFields, 'address', 'hidden')?>'> <?php echo html::input("address[$i]",  '', "class='form-control' autocomplete='off'");?></td>
+        <td class='<?php echo zget($visibleFields, 'zipcode', 'hidden')?>'> <?php echo html::input("zipcode[$i]",  '', "class='form-control' autocomplete='off'");?></td>
       </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 class='text-left<?php echo zget($visibleFields, 'dept', ' hidden')?>' style='overflow:visible'><?php echo html::select("dept[$i]", $depts, $i > 0 ? 'ditto' : $deptID, "class='form-control chosen'");?></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' autocomplete='off'");?></td>
-      <td><?php echo html::select("role[$i]", $lang->user->roleList, $i > 0 ? 'ditto' : '', "class='form-control' onchange='changeGroup(this.value, $i)'");?></td>
-      <td class='text-left' style='overflow:visible'><?php echo html::select("group[$i]", $groupList, $i > 0 ? 'ditto' : '', "class='form-control chosen'");?></td>
-      <td <?php echo zget($visibleFields, 'email', "class='hidden'")?>><?php echo html::input("email[$i]", '', "class='form-control email_$i' onchange='setDefaultEmail($i)' autocomplete='off'");?></td>
-      <td <?php echo zget($visibleFields, 'gender', "class='hidden'")?>><?php echo html::radio("gender[$i]", (array)$lang->user->genderList, 'm');?></td>
-      <td align='left'>
-        <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>
-      </itd>
-      <td class='<?php echo zget($visibleFields, 'commiter', 'hidden')?>'><?php echo html::input("commiter[$i]", '', "class='form-control' autocomplete='off'");?></td>
-      <td class='<?php echo zget($visibleFields, 'join', 'hidden')?>'>    <?php echo html::input("join[$i]",     '', "class='form-control form-date' autocomplete='off'");?></td>
-      <td class='<?php echo zget($visibleFields, 'skype', 'hidden')?>'>   <?php echo html::input("skype[$i]",    '', "class='form-control' autocomplete='off'");?></td>
-      <td class='<?php echo zget($visibleFields, 'qq', 'hidden')?>'>      <?php echo html::input("qq[$i]",       '', "class='form-control' autocomplete='off'");?></td>
-      <td class='<?php echo zget($visibleFields, 'yahoo', 'hidden')?>'>   <?php echo html::input("yahoo[$i]",    '', "class='form-control' autocomplete='off'");?></td>
-      <td class='<?php echo zget($visibleFields, 'gtalk', 'hidden')?>'>   <?php echo html::input("gtalk[$i]",    '', "class='form-control' autocomplete='off'");?></td>
-      <td class='<?php echo zget($visibleFields, 'wangwang', 'hidden')?>'><?php echo html::input("wangwang[$i]", '', "class='form-control' autocomplete='off'");?></td>
-      <td class='<?php echo zget($visibleFields, 'mobile', 'hidden')?>'>  <?php echo html::input("mobile[$i]",   '', "class='form-control' autocomplete='off'");?></td>
-      <td class='<?php echo zget($visibleFields, 'phone', 'hidden')?>'>   <?php echo html::input("phone[$i]",    '', "class='form-control' autocomplete='off'");?></td>
-      <td class='<?php echo zget($visibleFields, 'address', 'hidden')?>'> <?php echo html::input("address[$i]",  '', "class='form-control' autocomplete='off'");?></td>
-      <td class='<?php echo zget($visibleFields, 'zipcode', 'hidden')?>'> <?php echo html::input("zipcode[$i]",  '', "class='form-control' autocomplete='off'");?></td>
-    </tr>
-    <?php endfor;?>
-    <tr>
-      <th colspan='2'><?php echo $lang->user->verifyPassword?></th>
-      <td colspan='<?php echo count($visibleFields) + 4?>'>
-        <div class="required required-wrapper"></div>
-        <input type='password' style="display:none"> <!-- for disable autocomplete all browser -->
-        <?php echo html::password('verifyPassword', '', "class='form-control disabled-ie-placeholder' autocomplete='off' placeholder='{$lang->user->placeholder->verify}'");?>
-      </td>
-    </tr>
-    <tr><td colspan='<?php echo count($visibleFields) + 6?>' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
-  </table>
-</form>
+      <?php endfor;?>
+      <tr>
+        <th colspan='2'><?php echo $lang->user->verifyPassword?></th>
+        <td colspan='<?php echo count($visibleFields) + 4?>'>
+          <div class="required required-wrapper"></div>
+          <input type='password' style="display:none"> <!-- for disable autocomplete all browser -->
+          <?php echo html::password('verifyPassword', '', "class='form-control disabled-ie-placeholder' autocomplete='off' placeholder='{$lang->user->placeholder->verify}'");?>
+        </td>
+      </tr>
+      </tbody>
+      <tfoot>
+        <tr>
+          <td colspan="<?php echo count($visibleFields) + 6?>" class="text-center">
+            <?php echo html::submitButton($lang->save, '', 'btn btn-wide btn-primary') . '&nbsp;' . html::backButton('', '', "btn btn-wide");?>
+          </td>
+        </tr>
+      </tfoot>
+    </table>
+  </form>
+</div>
 <?php echo html::hidden('verifyRand', $rand);?>
-<?php $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=user&section=custom&key=batchCreateFields')?>
-<?php include '../../common/view/customfield.html.php';?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/user/view/batchedit.html.php b/module/user/view/batchedit.html.php
index ee2624613e..35724b4248 100644
--- a/module/user/view/batchedit.html.php
+++ b/module/user/view/batchedit.html.php
@@ -11,90 +11,95 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<?php include '../../common/view/datepicker.html.php';?>
 <?php js::import($jsRoot . 'md5.js');?>
-<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['batchEdit']);?></small> <?php echo $lang->user->batchEdit;?></strong>
-    <div class='actions'>
-      <button type="button" class="btn btn-default" data-toggle="customModal"><i class='icon icon-cog'></i> </button>
+<div id="mainContent" class="main-content">
+  <div class="main-header">
+    <h2><?php echo $lang->user->batchEdit;?></h2>
+    <div class="pull-right btn-toolbar">
+      <?php $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=user&section=custom&key=batchEditFields')?>
+      <?php include '../../common/view/dropdowncustomfield.html.php';?>
     </div>
   </div>
-</div>
-<?php
-$visibleFields = array();
-foreach(explode(',', $showFields) as $field)
-{
-    if($field)$visibleFields[$field] = '';
-}
-$minWidth = (count($visibleFields) > 7) ? 'w-120px' : '';
-?>
-<form class='form-condensed' method='post' target='hiddenwin' id='dataform'>
-  <table class='table table-form table-fixed'>
-    <thead>
-      <tr>
-        <th class='w-30px'><?php echo $lang->idAB;?></th> 
-        <th class='w-150px<?php echo zget($visibleFields, 'dept', ' hidden')?>'>         <?php echo $lang->user->dept;?></th>
-        <th class='<?php echo $minWidth?>'><?php echo $lang->user->account;?></th>
-        <th class='<?php echo $minWidth?>'><?php echo $lang->user->realname;?></th>
-        <th class='w-120px'><?php echo $lang->user->role;?></th>
-        <th class='<?php echo $minWidth . zget($visibleFields, 'commiter', ' hidden')?>'><?php echo $lang->user->commiter;?></th>
-        <th class='<?php echo $minWidth . zget($visibleFields, 'email', ' hidden')?>'>   <?php echo $lang->user->email;?></th>
-        <th class='w-120px<?php echo zget($visibleFields, 'join', ' hidden')?>'>         <?php echo $lang->user->join;?></th>
-        <th class='w-120px<?php echo zget($visibleFields, 'skype', ' hidden')?>'>        <?php echo $lang->user->skype;?></th>
-        <th class='w-120px<?php echo zget($visibleFields, 'qq', ' hidden')?>'>           <?php echo $lang->user->qq;?></th>
-        <th class='w-120px<?php echo zget($visibleFields, 'yahoo', ' hidden')?>'>        <?php echo $lang->user->yahoo;?></th>
-        <th class='w-120px<?php echo zget($visibleFields, 'gtalk', ' hidden')?>'>        <?php echo $lang->user->gtalk;?></th>
-        <th class='w-120px<?php echo zget($visibleFields, 'wangwang', ' hidden')?>'>     <?php echo $lang->user->wangwang;?></th>
-        <th class='w-120px<?php echo zget($visibleFields, 'mobile', ' hidden')?>'>       <?php echo $lang->user->mobile;?></th>
-        <th class='w-120px<?php echo zget($visibleFields, 'phone', ' hidden')?>'>        <?php echo $lang->user->phone;?></th>
-        <th class='w-120px<?php echo zget($visibleFields, 'address', ' hidden')?>'>      <?php echo $lang->user->address;?></th>
-        <th class='w-120px<?php echo zget($visibleFields, 'zipcode', ' hidden')?>'>      <?php echo $lang->user->zipcode;?></th>
+  <?php
+  $visibleFields = array();
+  foreach(explode(',', $showFields) as $field)
+  {
+      if($field)$visibleFields[$field] = '';
+  }
+  $minWidth = (count($visibleFields) > 7) ? 'w-120px' : '';
+  ?>
+  <form method='post' class='load-indicator main-form' enctype='multipart/form-data' target='hiddenwin' id="batchCreateForm">
+    <table class="table table-form">
+      <thead>
+        <tr class='text-center'>
+          <th class='w-30px'><?php echo $lang->idAB;?></th> 
+          <th class='w-150px<?php echo zget($visibleFields, 'dept', ' hidden')?>'>         <?php echo $lang->user->dept;?></th>
+          <th class='<?php echo $minWidth?> required'><?php echo $lang->user->account;?></th>
+          <th class='<?php echo $minWidth?> required'><?php echo $lang->user->realname;?></th>
+          <th class='w-120px required'><?php echo $lang->user->role;?></th>
+          <th class='<?php echo $minWidth . zget($visibleFields, 'commiter', ' hidden')?>'><?php echo $lang->user->commiter;?></th>
+          <th class='<?php echo $minWidth . zget($visibleFields, 'email', ' hidden')?>'>   <?php echo $lang->user->email;?></th>
+          <th class='w-120px<?php echo zget($visibleFields, 'join', ' hidden')?>'>         <?php echo $lang->user->join;?></th>
+          <th class='w-120px<?php echo zget($visibleFields, 'skype', ' hidden')?>'>        <?php echo $lang->user->skype;?></th>
+          <th class='w-120px<?php echo zget($visibleFields, 'qq', ' hidden')?>'>           <?php echo $lang->user->qq;?></th>
+          <th class='w-120px<?php echo zget($visibleFields, 'yahoo', ' hidden')?>'>        <?php echo $lang->user->yahoo;?></th>
+          <th class='w-120px<?php echo zget($visibleFields, 'gtalk', ' hidden')?>'>        <?php echo $lang->user->gtalk;?></th>
+          <th class='w-120px<?php echo zget($visibleFields, 'wangwang', ' hidden')?>'>     <?php echo $lang->user->wangwang;?></th>
+          <th class='w-120px<?php echo zget($visibleFields, 'mobile', ' hidden')?>'>       <?php echo $lang->user->mobile;?></th>
+          <th class='w-120px<?php echo zget($visibleFields, 'phone', ' hidden')?>'>        <?php echo $lang->user->phone;?></th>
+          <th class='w-120px<?php echo zget($visibleFields, 'address', ' hidden')?>'>      <?php echo $lang->user->address;?></th>
+          <th class='w-120px<?php echo zget($visibleFields, 'zipcode', ' hidden')?>'>      <?php echo $lang->user->zipcode;?></th>
+        </tr>
+      </thead>
+      <tbody>
+      <?php $depts = array('ditto' => $lang->user->ditto) + $depts;?>
+      <?php $lang->user->roleList = array('' => '', 'ditto' => $lang->user->ditto) + $lang->user->roleList;?>
+      <?php $first = true;?>
+      <?php foreach($users as $user):?>
+      <?php
+      $dept  = ($first and empty($user->dept)) ? 0 : (empty($user->dept) ? 'ditto' : $user->dept); 
+      $role  = ($first and empty($user->role)) ? 0 : (empty($user->role) ? 'ditto' : $user->role); 
+      $first = false;
+      ?>
+      <tr class='text-center'>
+        <td><?php echo $user->id;?></td>
+        <td class='text-left<?php echo zget($visibleFields, 'dept', ' hidden')?>' style='overflow:visible'><?php echo html::select("dept[$user->id]", $depts, $dept, "class='form-control chosen'");?></td>
+        <td><?php echo html::input("account[$user->id]",  $user->account, "class='form-control' autocomplete='off'");?></td>
+        <td><?php echo html::input("realname[$user->id]", $user->realname, "class='form-control' autocomplete='off'");?></td>
+        <td><?php echo html::select("role[$user->id]",    $lang->user->roleList, $role, "class='form-control'");?></td>
+        <td class='<?php echo zget($visibleFields, 'commiter', 'hidden')?>'><?php echo html::input("commiter[$user->id]", $user->commiter, "class='form-control' autocomplete='off'");?></td>
+        <td class='<?php echo zget($visibleFields, 'email', 'hidden')?>'>   <?php echo html::input("email[$user->id]",    $user->email, "class='form-control' autocomplete='off'");?></td>
+        <td class='<?php echo zget($visibleFields, 'join', 'hidden')?>'>    <?php echo html::input("join[$user->id]",     $user->join, "class='form-control form-date'");?></td>
+        <td class='<?php echo zget($visibleFields, 'skype', 'hidden')?>'>   <?php echo html::input("skype[$user->id]",    $user->skype, "class='form-control' autocomplete='off'");?></td>
+        <td class='<?php echo zget($visibleFields, 'qq', 'hidden')?>'>      <?php echo html::input("qq[$user->id]",       $user->qq, "class='form-control' autocomplete='off'");?></td>
+        <td class='<?php echo zget($visibleFields, 'yahoo', 'hidden')?>'>   <?php echo html::input("yahoo[$user->id]",    $user->yahoo, "class='form-control' autocomplete='off'");?></td>
+        <td class='<?php echo zget($visibleFields, 'gtalk', 'hidden')?>'>   <?php echo html::input("gtalk[$user->id]",    $user->gtalk, "class='form-control' autocomplete='off'");?></td>
+        <td class='<?php echo zget($visibleFields, 'wangwang', 'hidden')?>'><?php echo html::input("wangwang[$user->id]", $user->wangwang, "class='form-control' autocomplete='off'");?></td>
+        <td class='<?php echo zget($visibleFields, 'mobile', 'hidden')?>'>  <?php echo html::input("mobile[$user->id]",   $user->mobile, "class='form-control' autocomplete='off'");?></td>
+        <td class='<?php echo zget($visibleFields, 'phone', 'hidden')?>'>   <?php echo html::input("phone[$user->id]",    $user->phone, "class='form-control' autocomplete='off'");?></td>
+        <td class='<?php echo zget($visibleFields, 'address', 'hidden')?>'> <?php echo html::input("address[$user->id]",  $user->address, "class='form-control' autocomplete='off'");?></td>
+        <td class='<?php echo zget($visibleFields, 'zipcode', 'hidden')?>'> <?php echo html::input("zipcode[$user->id]",  $user->zipcode, "class='form-control' autocomplete='off'");?></td>
       </tr>
-    </thead>
-    <?php $depts = array('ditto' => $lang->user->ditto) + $depts;?>
-    <?php $lang->user->roleList = array('' => '', 'ditto' => $lang->user->ditto) + $lang->user->roleList;?>
-    <?php $first = true;?>
-    <?php foreach($users as $user):?>
-    <?php
-    $dept  = ($first and empty($user->dept)) ? 0 : (empty($user->dept) ? 'ditto' : $user->dept); 
-    $role  = ($first and empty($user->role)) ? 0 : (empty($user->role) ? 'ditto' : $user->role); 
-    $first = false;
-    ?>
-    <tr class='text-center'>
-      <td><?php echo $user->id;?></td>
-      <td class='text-left<?php echo zget($visibleFields, 'dept', ' hidden')?>' style='overflow:visible'><?php echo html::select("dept[$user->id]", $depts, $dept, "class='form-control chosen'");?></td>
-      <td><?php echo html::input("account[$user->id]",  $user->account, "class='form-control' autocomplete='off'");?></td>
-      <td><?php echo html::input("realname[$user->id]", $user->realname, "class='form-control' autocomplete='off'");?></td>
-      <td><?php echo html::select("role[$user->id]",    $lang->user->roleList, $role, "class='form-control'");?></td>
-      <td class='<?php echo zget($visibleFields, 'commiter', 'hidden')?>'><?php echo html::input("commiter[$user->id]", $user->commiter, "class='form-control' autocomplete='off'");?></td>
-      <td class='<?php echo zget($visibleFields, 'email', 'hidden')?>'>   <?php echo html::input("email[$user->id]",    $user->email, "class='form-control' autocomplete='off'");?></td>
-      <td class='<?php echo zget($visibleFields, 'join', 'hidden')?>'>    <?php echo html::input("join[$user->id]",     $user->join, "class='form-control form-date'");?></td>
-      <td class='<?php echo zget($visibleFields, 'skype', 'hidden')?>'>   <?php echo html::input("skype[$user->id]",    $user->skype, "class='form-control' autocomplete='off'");?></td>
-      <td class='<?php echo zget($visibleFields, 'qq', 'hidden')?>'>      <?php echo html::input("qq[$user->id]",       $user->qq, "class='form-control' autocomplete='off'");?></td>
-      <td class='<?php echo zget($visibleFields, 'yahoo', 'hidden')?>'>   <?php echo html::input("yahoo[$user->id]",    $user->yahoo, "class='form-control' autocomplete='off'");?></td>
-      <td class='<?php echo zget($visibleFields, 'gtalk', 'hidden')?>'>   <?php echo html::input("gtalk[$user->id]",    $user->gtalk, "class='form-control' autocomplete='off'");?></td>
-      <td class='<?php echo zget($visibleFields, 'wangwang', 'hidden')?>'><?php echo html::input("wangwang[$user->id]", $user->wangwang, "class='form-control' autocomplete='off'");?></td>
-      <td class='<?php echo zget($visibleFields, 'mobile', 'hidden')?>'>  <?php echo html::input("mobile[$user->id]",   $user->mobile, "class='form-control' autocomplete='off'");?></td>
-      <td class='<?php echo zget($visibleFields, 'phone', 'hidden')?>'>   <?php echo html::input("phone[$user->id]",    $user->phone, "class='form-control' autocomplete='off'");?></td>
-      <td class='<?php echo zget($visibleFields, 'address', 'hidden')?>'> <?php echo html::input("address[$user->id]",  $user->address, "class='form-control' autocomplete='off'");?></td>
-      <td class='<?php echo zget($visibleFields, 'zipcode', 'hidden')?>'> <?php echo html::input("zipcode[$user->id]",  $user->zipcode, "class='form-control' autocomplete='off'");?></td>
-    </tr>
-    <?php endforeach;?>
-    <tr>
-      <th colspan='2'><?php echo $lang->user->verifyPassword?></th>
-      <td colspan='<?php echo count($visibleFields) + 2?>'>
-        <div class="required required-wrapper"></div>
-        <input type='text'     style="display:none"> <!-- for disable autocomplete all browser -->
-        <input type='password' style="display:none"> <!-- for disable autocomplete all browser -->
-        <?php echo html::password('verifyPassword', '', "class='form-control disabled-ie-placeholder' autocomplete='off' placeholder='{$lang->user->placeholder->verify}'");?>
-      </td>
-    </tr>
-    <tr><td colspan='<?php echo count($visibleFields) + 4?>' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
-  </table>
-</form>
+      <?php endforeach;?>
+      <tr>
+        <th colspan='2'><?php echo $lang->user->verifyPassword?></th>
+        <td colspan='<?php echo count($visibleFields) + 2?>'>
+          <div class="required required-wrapper"></div>
+          <input type='text'     style="display:none"> <!-- for disable autocomplete all browser -->
+          <input type='password' style="display:none"> <!-- for disable autocomplete all browser -->
+          <?php echo html::password('verifyPassword', '', "class='form-control disabled-ie-placeholder' autocomplete='off' placeholder='{$lang->user->placeholder->verify}'");?>
+        </td>
+      </tr>
+      </tbody>
+      <tfoot>
+        <tr>
+          <td colspan="<?php echo count($visibleFields) + 4;?>" class="text-center">
+            <?php echo html::submitButton($lang->save, '', 'btn btn-wide btn-primary') . '&nbsp;' . html::backButton('', '', "btn btn-wide");?>
+          </td>
+        </tr>
+      </tfoot>
+    </table>
+  </form>
+</div>
 <?php echo html::hidden('verifyRand', $rand);?>
-<?php $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=user&section=custom&key=batchEditFields')?>
-<?php include '../../common/view/customfield.html.php';?>
 <?php include '../../common/view/footer.html.php';?>