diff --git a/module/bug/view/batchcreate.html.php b/module/bug/view/batchcreate.html.php
index 8a9559af0c..ba89892d7e 100644
--- a/module/bug/view/batchcreate.html.php
+++ b/module/bug/view/batchcreate.html.php
@@ -43,8 +43,7 @@
       <td class='text-left' style='overflow:visible' id='buildBox<?php echo $i;?>'><?php echo html::select("openedBuilds[$i][]", $builds, '', "class='form-control chosen' multiple");?></td>
       <td><?php echo html::input("titles[$i]", '', 'class=form-control');?></td>
       <td>
-        <div class='form-control' contenteditable='true' data-sync-target='#stepses\[<?php echo $i;?>\]'></div>
-        <?php echo html::textarea("stepses[$i]", '', "rows='1' class='form-control hidden'");?>
+        <?php echo html::textarea("stepses[$i]", '', "rows='1' class='form-control'");?>
       </td>
       <td><?php echo html::select("types[$i]", $lang->bug->typeList, '', "class='form-control'");?></td>
       <td><?php echo html::select("severities[$i]", $lang->bug->severityList, '', "class='form-control'");?></td>
diff --git a/module/editor/css/extend.css b/module/editor/css/extend.css
index 962b31d624..b1ba5a96f8 100644
--- a/module/editor/css/extend.css
+++ b/module/editor/css/extend.css
@@ -1,2 +1,3 @@
-  .expandable > ul {display: none!important}
-  .collapsable > ul {display: block!important}
+.expandable > ul {display: none!important}
+.collapsable > ul {display: block!important}
+.tree li:before {margin-right: 4px;}
diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php
index 8ab10a72c7..ac2c8f5cb0 100644
--- a/module/my/view/todo.html.php
+++ b/module/my/view/todo.html.php
@@ -106,13 +106,13 @@
           if(common::hasPriv('todo', 'batchEdit'))
           {
               $actionLink = $this->createLink('todo', 'batchEdit', "from=myTodo&type=$type&account=$account&status=$status");
-              echo html::commonButton($lang->edit, "onclick=\"setFormAction('$actionLink')\"", '', 'edit');
+              echo html::commonButton($lang->edit, "onclick=\"setFormAction('$actionLink')\"");
 
           }
           if(common::hasPriv('todo', 'batchFinish'))
           {
               $actionLink = $this->createLink('todo', 'batchFinish');
-              echo html::commonButton($lang->todo->finish, "onclick=\"setFormAction('$actionLink','hiddenwin')\"", '', 'ok');
+              echo html::commonButton($lang->todo->finish, "onclick=\"setFormAction('$actionLink','hiddenwin')\"");
 
           }
           echo '</div>';
diff --git a/module/product/view/dynamic.html.php b/module/product/view/dynamic.html.php
index 3d1909a9a6..dd582c2d3e 100755
--- a/module/product/view/dynamic.html.php
+++ b/module/product/view/dynamic.html.php
@@ -34,7 +34,7 @@
     <th class='w-150px'><?php echo $lang->action->date;?></th>
     <th class='w-80px'> <?php echo $lang->action->actor;?></th>
     <th class='w-100px'><?php echo $lang->action->action;?></th>
-    <th class='w-80px'> <?php echo $lang->action->objectType;?></th>
+    <th class='w-90px'> <?php echo $lang->action->objectType;?></th>
     <th class='w-id'>   <?php echo $lang->idAB;?></th>
     <th><?php echo $lang->action->objectName;?></th>
   </tr>
diff --git a/module/story/view/batchcreate.html.php b/module/story/view/batchcreate.html.php
index 2ee8457755..20f1323ec2 100644
--- a/module/story/view/batchcreate.html.php
+++ b/module/story/view/batchcreate.html.php
@@ -41,8 +41,7 @@
       <td><?php echo html::select("plan[$i]", $plans, $planID, 'class=form-control');?></td>
       <td><?php echo html::input("title[$i]", $storyTitle, "class='form-control'");?></td>
       <td>
-        <div class='form-control' contenteditable='true' data-sync-target='#spec\[<?php echo $i;?>\]'></div>
-        <?php echo html::textarea("spec[$i]", $spec, "rows='1' class='form-control hidden'");?>
+        <?php echo html::textarea("spec[$i]", $spec, "rows='1' class='form-control'");?>
       </td>
       <td><?php echo html::select("pri[$i]", (array)$lang->story->priList, $pri, 'class=form-control');?></td>
       <td><?php echo html::input("estimate[$i]", $estimate, "class='form-control'");?></td>
diff --git a/module/task/view/batchcreate.html.php b/module/task/view/batchcreate.html.php
index 8b107dde42..5fb2167008 100644
--- a/module/task/view/batchcreate.html.php
+++ b/module/task/view/batchcreate.html.php
@@ -75,8 +75,7 @@
       <td><?php echo html::select("assignedTo[$i]", $members, $member, 'class=form-control');?></td>
       <td><?php echo html::input("estimate[$i]", '', 'class=form-control text-center');?></td>
       <td>
-        <div class='form-control' contenteditable='true' data-sync-target='#desc\[<?php echo $i;?>\]'></div>
-        <?php echo html::textarea("desc[$i]", '', "rows='1' class='form-control hidden'");?>
+        <?php echo html::textarea("desc[$i]", '', "rows='1' class='form-control'");?>
       </td>
       <td><?php echo html::select("pri[$i]", (array)$lang->task->priList, $pri, 'class=form-control');?></td>
     </tr>
diff --git a/module/todo/view/batchcreate.html.php b/module/todo/view/batchcreate.html.php
index bb80241a77..9e036e65ce 100755
--- a/module/todo/view/batchcreate.html.php
+++ b/module/todo/view/batchcreate.html.php
@@ -16,7 +16,7 @@
   <div id='titlebar'>
     <div class='heading'>
       <span class='prefix pull-left'><?php echo html::icon($lang->icons['todo']);?></span>
-      <strong class='pull-left'><small class='text-muted'><?php echo html::icon($lang->icons['batchCreate']);?></small> <?php echo $lang->todo->common . $lang->colon . $lang->todo->batchCreate;?></strong>
+      <strong class='pull-left'><small class='text-muted'><?php echo html::icon($lang->icons['batchCreate']);?></small> <?php echo $lang->todo->batchCreate;?></strong>
       <div class='input-group w-200px pull-left' id='datepicker'>
         <span class='input-group-addon'><?php echo $lang->todo->date;?></span>
         <?php echo html::input('date', $date, "class='form-control form-date' onchange='updateAction(this.value)'");?>
@@ -45,7 +45,7 @@
         <div id='<?php echo "nameBox" . ($i+1);?>' class='hidden'><?php echo html::input("names[$i]", '', 'class="text-left form-control"');?></div>
         <div class='<?php echo "nameBox" . ($i+1);?>'><?php echo html::input("names[$i]", '', 'class="text-left form-control"');?></div>
       </td>
-      <td><div class='form-control' contenteditable='true' data-sync-target='#descs\[<?php echo $i;?>\]'></div><?php echo html::textarea("descs[$i]", '', "rows='1' class='form-control hidden'");?></td>
+      <td><?php echo html::textarea("descs[$i]", '', "rows='1' class='form-control'");?></td>
       <td>
         <div class='input-group'>
           <?php echo html::select("begins[$i]", $times, $time, "onchange=\"setBeginsAndEnds($i, 'begin');\" class='form-control' style='width: 50%'") . html::select("ends[$i]", $times, '', "onchange=\"setBeginsAndEnds($i, 'end');\" class='form-control' style='width: 50%'");?>
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index 1073d7469f..6aa9339eb9 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -393,7 +393,7 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;}
 #titlebar > .heading {font-size: 14px; line-height: 20px; font-weight: bold;}
 #titlebar > .heading > i {display: none;}
 #titlebar > .heading > .prefix {display: inline-block; margin-right: 5px; color: #666; border-radius: 4px;}
-#titlebar > .heading > .prefix > i {font-size: 14px; color: #808080}
+#titlebar > .heading > .prefix > i {font-size: 14px; color: #808080; display: none}
 #titlebar > .heading > strong {display: inline-block; margin-right: 5px;}
 #titlebar > .heading > strong > i, #titlebar > .heading > strong > small > i {display: none}
 #titlebar > .heading > small > i {position: relative; top: 1px;}
@@ -414,7 +414,6 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;}
 
 /* table in outer */
 .outer .table {margin-bottom: 0; border: 1px solid #ddd;}
-.outer .table.table-form, .outer .table.table-data {border: none}
 .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;}
@@ -453,6 +452,7 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;}
 .outer > .container {margin: 0 auto 20px; padding: 0; border: 1px solid #ddd;}
 .outer > .container > #featurebar, .outer > .container > #titlebar {margin: 0}
 .outer > .container > form, body > .container > form{padding: 10px 30px 10px 15px}
+.outer > .container .table-form, .outer > .container .table-data {border: none}
 .outer > .container > .table-data {margin: 10px 0}
 
 /* Main content in outer */
@@ -548,13 +548,13 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;}
 /* Tree menu. */
 .tree {padding: 0; margin: 0;}
 .tree li,.tree ul {margin: 0; padding: 0; display: block; position: relative;}
-.tree > li {margin-right: 20px; font-weight: 400; padding-bottom: 8px;}
-.tree > li > ul li {padding: 10px 15px 0; margin: 0;}
-.tree li:before {display: inline-block; margin-right: 6px; content: '\e6ec'; font-family: ZenIcon; color: #ddd;}
-.tree > li ul {border-left: 1px dashed #ccc; margin-left: 7px; font-weight: normal;}
-.tree > li ul > li:before {content: '\e6e8';}
-.tree > li ul > li:hover:before {content: '\e6ec';}
-.tree > li ul > li:after {position: absolute; display: block; content: ""; width: 15px; left: -1px; top: 20px; height: 20px; border-top: 1px dashed #ccc;}
+.tree > li {margin-right: 20px; font-weight: 400; padding-bottom: 6px;}
+.tree > li > ul li {padding: 6px 15px 0; margin: 0;}
+.tree li:before {display: inline-block; margin-right: 6px; position: relative; top: 0; left: 0; content: ' '; width: 8px; height: 8px; background: #f1f1f1; border: 1px solid #ccc; border-radius: 2px}
+.tree > li ul {border-left: 1px dotted #aaa; margin-left: 3px; font-weight: normal;}
+.tree > li ul > li:before {margin-right: 4px;}
+.tree > li ul > li:hover:before {content: ' ';}
+.tree > li ul > li:after {position: absolute; display: block; content: ""; width: 15px; left: -1px; top: 16px; height: 20px; border-top: 1px dotted #aaa;}
 .tree > li > ul li:last-child:after {border-left: 1px solid #fff;}
 
 /* Select all and select reverse. */
diff --git a/www/theme/default/treeview.css b/www/theme/default/treeview.css
index f6d413e03d..d320e17c6f 100644
--- a/www/theme/default/treeview.css
+++ b/www/theme/default/treeview.css
@@ -1,8 +1,8 @@
 /*treeview*/
 .treeview .hitarea {position: absolute; left: 15px; top: 10px; background-color: #fff; cursor: pointer;}
-.treeview > li > .hitarea {left: 0px; top: 0px;}
-.treeview .hitarea:before {color: #999; content: '\e710'; font-family: ZenIcon; transition:all 0.3s;}
+.treeview > li > .hitarea {left: -1px; top: -1px;}
+.treeview .hitarea:before {color: #999; content: '\e6f1'; font-family: ZenIcon; transition:all 0.3s; font-size: 14px}
 .treeview li:hover .hitarea:before {color: #2973EA;}
-.treeview .hitarea.collapsable-hitarea:before {content: '\e712';}
+.treeview .hitarea.collapsable-hitarea:before {content: '\e6f2';}
 
-.treeview .form-control {padding: 1px 2px; height: 22px;}
+.treeview .form-control {padding: 1px 2px; height: 22px; display: inline-block;}