diff --git a/module/action/config.php b/module/action/config.php
index 06c1e081b9..0946a6c5c6 100755
--- a/module/action/config.php
+++ b/module/action/config.php
@@ -23,3 +23,9 @@ $config->action->objectNameFields['entry']       = 'name';
 $config->action->objectNameFields['webhook']     = 'name';
 
 $config->action->commonImgSize = 870;
+
+$config->action->majorList = array();
+$config->action->majorList['task']    = array('assigned', 'finished', 'activated');
+$config->action->majorList['bug']     = array('assigned', 'resolved');
+$config->action->majorList['release'] = array('opened');
+$config->action->majorList['build']   = array('opened');
diff --git a/module/action/model.php b/module/action/model.php
index fb89679ffe..bbafc118d6 100755
--- a/module/action/model.php
+++ b/module/action/model.php
@@ -782,6 +782,8 @@ class actionModel extends model
             {
                 $action->objectLink = '';
             }
+
+            $action->major = (isset($this->config->action->majorList[$action->objectType]) && in_array($action->action, $this->config->action->majorList[$action->objectType])) ? 1 : 0;
         }
         return $actions;
     }
diff --git a/module/block/css/admin.css b/module/block/css/admin.css
index 4da9ab98db..d8265231b1 100644
--- a/module/block/css/admin.css
+++ b/module/block/css/admin.css
@@ -1,3 +1,4 @@
 #blockAdmin {min-height: 280px;}
 #blockAdmin .form-actions {visibility: hidden;}
 #blockAdmin.form-inited .form-actions {visibility: visible;}
+.form-group .btn + .btn{margin-left: 10px;}
diff --git a/module/block/view/admin.html.php b/module/block/view/admin.html.php
index 440f505571..4ba0f4d1d3 100644
--- a/module/block/view/admin.html.php
+++ b/module/block/view/admin.html.php
@@ -33,7 +33,7 @@ include '../../common/view/chosen.html.php';
   <?php endif;?>
   <div id="blocksList"><?php if(!empty($blocks)) echo $blocks;?></div>
   <div id="blockParams"></div>
-  <div class="form-group form-actions">
+  <div class="form-group">
     <div class="col-sm-7 col-sm-offset-3">
       <button type="submit" class="btn btn-wide btn-primary"><?php echo $lang->save;?></button>
       <button type="cancel" class="btn btn-wide" data-dismiss="modal"><?php echo $lang->cancel;?></button>
diff --git a/module/block/view/dynamic.html.php b/module/block/view/dynamic.html.php
index cd462a7778..9be5e40bc3 100644
--- a/module/block/view/dynamic.html.php
+++ b/module/block/view/dynamic.html.php
@@ -6,7 +6,7 @@
     {
         $user = isset($users[$action->actor]) ? $users[$action->actor] : $action->actor;
         if($action->action == 'login' or $action->action == 'logout' or empty($action->objectLink)) $action->objectName = $action->objectLabel = '';
-        $class = $action->actor == $this->app->user->account ? "class='active'" : '';
+        $class = $action->major ? "class='active'" : '';
         echo "<li $class><div>";
         printf($lang->block->dynamicInfo, $action->date, $user, $action->actionLabel, $action->objectLabel, $action->objectLink, $action->objectName);
         echo "</div></li>";
diff --git a/module/block/view/flowchart.html.php b/module/block/view/flowchart.html.php
index adb223f182..87d28208b8 100644
--- a/module/block/view/flowchart.html.php
+++ b/module/block/view/flowchart.html.php
@@ -11,7 +11,7 @@
 .block-flowchart .table > thead > tr > th:first-child {width: auto;padding: 10px 10px 15px 10px;background: none;}
 .block-flowchart .table > thead > tr > th:first-child + th > div {background: none;}
 .block-flowchart .table > thead > tr > th,
-.block-flowchart .table > thead > tr > th > div {padding: 0;background: url('data:image/gif;base64,R0lGODlhLQAPAJEAAAAAAP///+7u7v///yH5BAEAAAMALAAAAAAtAA8AAAJPlIY5psn92jrSUGVrRFlfvHHh9JGS6aVQ2K2l+LYOO6KuCpby/No8DjvtgrfiD+gj5ozLpvMIfSanu2FyiKX1qqOsrsaNdbXCcfm8Ok1OBQA7') no-repeat;background-position: right -22px top 15px;}
+.block-flowchart .table > thead > tr > th > div {padding: 0;background: url('data:image/gif;base64,R0lGODlhLQAPAJEAAAAAAP///+7u7v///yH5BAEAAAMALAAAAAAtAA8AAAJEnH8imMvKopzKofrg3FRfb2Dc+FmNOYgkqZ4ZunZwm4KxHNH0nds1uuOFfDqf8NcDGoW7IuzYtAWZROmSF1U+oc+qsAAAOw==') no-repeat;background-position: right -22px top 15px;}
 .block-flowchart .table > thead > tr > th > div {padding: 10px 10px 15px 10px;background-position: left -23px top 15px;}
 .block-flowchart .table > thead > tr > th:last-child {background: none;}
 .block-flowchart .table > tbody > tr > td {color: #3c4353;}
diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index 35b0ceff1c..2844331d49 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -252,7 +252,7 @@ js::set('confirmDeleteTemplate', $lang->bug->confirmDeleteTemplate);
         </tbody>
         <tfoot>
           <tr>
-            <td colspan="3" class="text-center">
+            <td colspan="3" class="text-center form-actions">
               <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
               <?php echo html::backButton('', '', 'btn btn-wide');?>
               <?php echo html::hidden('case', (int)$caseID) . html::hidden('caseVersion', (int)$version);?>
diff --git a/module/company/view/dynamic.html.php b/module/company/view/dynamic.html.php
index ddb9dcd48d..78aa75470f 100644
--- a/module/company/view/dynamic.html.php
+++ b/module/company/view/dynamic.html.php
@@ -52,7 +52,7 @@
         <?php if($direction == 'next') $actions = array_reverse($actions);?>
         <?php foreach($actions as $i => $action):?>
         <?php if(empty($firstAction)) $firstAction = $action;?>
-        <li <?php if($action->actor == $this->app->user->account) echo "class='active'";?>>
+        <li <?php if($action->major) echo "class='active'";?>>
           <div>
             <span class="timeline-tag"><?php echo $action->time?></span>
             <span class="timeline-text">
diff --git a/module/my/view/dynamic.html.php b/module/my/view/dynamic.html.php
index ea956441fa..606b504829 100644
--- a/module/my/view/dynamic.html.php
+++ b/module/my/view/dynamic.html.php
@@ -45,7 +45,7 @@
         <?php if($direction == 'next') $actions = array_reverse($actions);?>
         <?php foreach($actions as $i => $action):?>
         <?php if(empty($firstAction)) $firstAction = $action;?>
-        <li <?php if($action->actor == $this->app->user->account) echo "class='active'";?>>
+        <li <?php if($action->major) echo "class='active'";?>>
           <div>
             <span class="timeline-tag"><?php echo $action->time?></span>
             <span class="timeline-text">
diff --git a/module/product/view/dynamic.html.php b/module/product/view/dynamic.html.php
index 54e8910e64..d339fc7378 100755
--- a/module/product/view/dynamic.html.php
+++ b/module/product/view/dynamic.html.php
@@ -48,7 +48,7 @@
         <?php if($direction == 'next') $actions = array_reverse($actions);?>
         <?php foreach($actions as $i => $action):?>
         <?php if(empty($firstAction)) $firstAction = $action;?>
-        <li <?php if($action->actor == $this->app->user->account) echo "class='active'";?>>
+        <li <?php if($action->major) echo "class='active'";?>>
           <div>
             <span class="timeline-tag"><?php echo $action->time?></span>
             <span class="timeline-text">
diff --git a/module/product/view/view.html.php b/module/product/view/view.html.php
index 6da86dd0e8..71c1085858 100644
--- a/module/product/view/view.html.php
+++ b/module/product/view/view.html.php
@@ -52,7 +52,7 @@
             <div class="panel-body">
               <ul class="timeline timeline-tag-left">
                 <?php foreach($actions as $action):?>
-                <li <?php if($action->actor == $this->app->user->account) echo "class='active'";?>>
+                <li <?php if($action->major) echo "class='active'";?>>
                   <div>
                     <span class="timeline-tag"><?php echo $action->date;?></span>
                     <span class="timeline-text"><?php echo zget($users, $action->actor) . ' ' . $action->actionLabel . $action->objectLabel . ' ' . html::a($action->objectLink, $action->objectName);?></span>
diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php
index 427503364b..3b8947803e 100644
--- a/module/project/view/create.html.php
+++ b/module/project/view/create.html.php
@@ -13,10 +13,10 @@
 <?php if(isset($tips)):?>
 <?php $defaultURL = $this-> createLink('project', 'task', 'projectID=' . $projectID);?>
 <?php include '../../common/view/header.lite.html.php';?>
-<body style='background: #e5e5e5'>
+<body>
   <div class='modal-dialog mw-500px' id='tipsModal'>
     <div class='modal-header'>
-      <a href='<?php echo $defaultURL;?>' class='close'>&times;</a>
+      <a href='<?php echo $defaultURL;?>' class='close'><i class="icon icon-close"></i></a>
       <h4 class='modal-title' id='myModalLabel'><?php echo $lang->project->tips;?></h4>
     </div>
     <div class='modal-body'>
diff --git a/module/project/view/dynamic.html.php b/module/project/view/dynamic.html.php
index 4cd93d37d0..b5eb94d236 100755
--- a/module/project/view/dynamic.html.php
+++ b/module/project/view/dynamic.html.php
@@ -49,7 +49,7 @@
         <?php if($direction == 'next') $actions = array_reverse($actions);?>
         <?php foreach($actions as $i => $action):?>
         <?php if(empty($firstAction)) $firstAction = $action;?>
-        <li <?php if($action->actor == $this->app->user->account) echo "class='active'";?>>
+        <li <?php if($action->major) echo "class='active'";?>>
           <div>
             <span class="timeline-tag"><?php echo $action->time?></span>
             <span class="timeline-text">
diff --git a/module/project/view/taskheader.html.php b/module/project/view/taskheader.html.php
index 080da180e0..39d4de8a4c 100644
--- a/module/project/view/taskheader.html.php
+++ b/module/project/view/taskheader.html.php
@@ -8,7 +8,7 @@
         $product    = $this->product->getById($productID);
         $removeLink = $browseType == 'byproduct' ? inlink('task', "projectID=$projectID&browseType=$status&param=0&orderBy=$orderBy&recTotal=0&recPerPage={$pager->recPerPage}") : 'javascript:removeCookieByKey("productBrowseParam")';
         echo '<i class="icon icon-cube"></i> ' . $product->name;
-        echo html::a($removeLink, "<span class='close'>&times;</span>", '', "class='text-muted'");
+        echo html::a($removeLink, "<span class='close'><i class='icon icon-close'></i></span>", '', "class='text-muted'");
     }
     elseif(!empty($moduleID))
     {
@@ -16,7 +16,7 @@
         $module     = $this->tree->getById($moduleID);
         $removeLink = $browseType == 'bymodule' ? inlink('task', "projectID=$projectID&browseType=$status&param=0&orderBy=$orderBy&recTotal=0&recPerPage={$pager->recPerPage}") : 'javascript:removeCookieByKey("moduleBrowseParam")';
         echo $module->name;
-        echo html::a($removeLink, "<span class='close'>&times;</span>", '', "class='text-muted'");
+        echo html::a($removeLink, "<span class='close'><i class='icon icon-close'></i></span>", '', "class='text-muted'");
     }
     else
     {
diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php
index 21251ba7ff..9c407fce3a 100644
--- a/module/project/view/view.html.php
+++ b/module/project/view/view.html.php
@@ -49,7 +49,7 @@
             <div class="panel-body">
               <ul class="timeline timeline-tag-left">
                 <?php foreach($actions as $action):?>
-                <li <?php if($action->actor == $this->app->user->account) echo "class='active'";?>>
+                <li <?php if($action->major) echo "class='active'";?>>
                   <div>
                     <span class="timeline-tag"><?php echo $action->date;?></span>
                     <span class="timeline-text"><?php echo zget($users, $action->actor) . ' ' . $action->actionLabel . $action->objectLabel . ' ' . html::a($action->objectLink, $action->objectName);?></span>
diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php
index c44ae3fbe2..a0862f4c18 100644
--- a/module/testcase/view/create.html.php
+++ b/module/testcase/view/create.html.php
@@ -228,7 +228,7 @@
   <div class='modal-dialog'>
     <div class='modal-content'>
       <div class='modal-header'>
-        <button type='button' class='close' data-dismiss='modal'>&times;</button>
+        <button type='button' class='close' data-dismiss='modal'><i class='icon icon-close'></i></button>
         <div class='searchInput w-p90'>
           <input id='storySearchInput' type='text' class='form-control' placeholder='<?php echo $lang->testcase->searchStories?>'>
           <i class='icon icon-search'></i>
diff --git a/module/testsuite/view/createcase.html.php b/module/testsuite/view/createcase.html.php
index 7e2b40c2b3..376c80b05d 100644
--- a/module/testsuite/view/createcase.html.php
+++ b/module/testsuite/view/createcase.html.php
@@ -203,7 +203,7 @@
     <div class='modal-dialog'>
       <div class='modal-content'>
         <div class='modal-header'>
-          <button type='button' class='close' data-dismiss='modal'>&times;</button>
+          <button type='button' class='close' data-dismiss='modal'><i class='icon icon-close'></i></button>
           <div class='searchInput w-p90'>
             <input id='storySearchInput' type='text' class='form-control' placeholder='<?php echo $lang->testcase->searchStories?>'>
             <i class='icon icon-search'></i>
diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php
index 21a162750f..860718454a 100644
--- a/module/tree/view/browse.html.php
+++ b/module/tree/view/browse.html.php
@@ -252,7 +252,6 @@ $(function()
 
     var tree = $tree.data('zui.tree');
     if(<?php echo $currentModuleID ?>)
-    if(0)
     {
         var $currentLi = $tree.find('.module-name[data-id=' + <?php echo $currentModuleID ?> + ']').closest('li');
         if($currentLi.length) tree.show($currentLi);
diff --git a/module/user/view/dynamic.html.php b/module/user/view/dynamic.html.php
index 13f5a6ec66..9f6501aa83 100644
--- a/module/user/view/dynamic.html.php
+++ b/module/user/view/dynamic.html.php
@@ -47,7 +47,7 @@
         <?php if($direction == 'next') $actions = array_reverse($actions);?>
         <?php foreach($actions as $i => $action):?>
         <?php if(empty($firstAction)) $firstAction = $action;?>
-        <li <?php if($action->actor == $this->app->user->account) echo "class='active'";?>>
+        <li <?php if($action->major) echo "class='active'";?>>
           <div>
             <span class="timeline-tag"><?php echo $action->time?></span>
             <span class="timeline-text">