diff --git a/module/custom/css/execution.css b/module/custom/css/execution.css
new file mode 100644
index 0000000000..c72631bb78
--- /dev/null
+++ b/module/custom/css/execution.css
@@ -0,0 +1,2 @@
+#readOnlyOfExecution {font-size: 13px; color: #5e626d;}
+#readOnlyOfExecution i {font-size: 14px; color: #0075ff; margin-right: 3px;}
diff --git a/module/custom/css/kanban.css b/module/custom/css/kanban.css
new file mode 100644
index 0000000000..92d15f96d7
--- /dev/null
+++ b/module/custom/css/kanban.css
@@ -0,0 +1,2 @@
+#readOnlyOfKanban {font-size: 13px; color: #5e626d;}
+#readOnlyOfKanban i {font-size: 14px; color: #0075ff; margin-right: 3px;}
diff --git a/module/custom/css/product.css b/module/custom/css/product.css
new file mode 100644
index 0000000000..777bce5dff
--- /dev/null
+++ b/module/custom/css/product.css
@@ -0,0 +1,2 @@
+#readOnlyOfProduct {font-size: 13px; color: #5e626d;}
+#readOnlyOfProduct i {font-size: 14px; color: #0075ff; margin-right: 3px;}
diff --git a/module/custom/view/execution.html.php b/module/custom/view/execution.html.php
index 24d7b5a58c..2d42966221 100644
--- a/module/custom/view/execution.html.php
+++ b/module/custom/view/execution.html.php
@@ -21,7 +21,13 @@
           <label class="radio-inline"><input type="radio" name="execution" value="<?php echo $key?>"<?php echo $key == $checkedKey ? " checked='checked'" : ''?> id="execution<?php echo $key;?>"><?php echo $value;?></label>
           <?php endforeach;?>
         </td>
-        <td><span class='alert alert-info no-margin'><?php echo $lang->custom->notice->readOnlyOfExecution;?></span></td>
+        <td></td>
+      </tr>
+      <tr>
+        <th></th>
+        <td colspan="2" id="readOnlyOfExecution">
+          <i class="icon-exclamation-sign"></i>&nbsp;<?php echo $lang->custom->notice->readOnlyOfExecution;?>
+        </td>
       </tr>
       <tr>
         <th></th>
diff --git a/module/custom/view/kanban.html.php b/module/custom/view/kanban.html.php
index 495bef43ea..a1a6446a49 100644
--- a/module/custom/view/kanban.html.php
+++ b/module/custom/view/kanban.html.php
@@ -21,7 +21,13 @@
           <label class="radio-inline"><input type="radio" name="kanban" value="<?php echo $key?>"<?php echo $key == $checkedKey ? " checked='checked'" : ''?> id="kanban<?php echo $key;?>"><?php echo $value;?></label>
           <?php endforeach;?>
         </td>
-        <td><span class='alert alert-info no-margin'><?php echo $lang->custom->notice->readOnlyOfKanban;?></span></td>
+        <td></td>
+      </tr>
+      <tr>
+        <th></th>
+        <td colspan="2" id="readOnlyOfKanban">
+          <i class="icon-exclamation-sign"></i>&nbsp;<?php echo $lang->custom->notice->readOnlyOfKanban;?>
+        </td>
       </tr>
       <tr>
         <th></th>
diff --git a/module/custom/view/product.html.php b/module/custom/view/product.html.php
index bcdd452301..aa592a79fd 100644
--- a/module/custom/view/product.html.php
+++ b/module/custom/view/product.html.php
@@ -21,7 +21,13 @@
           <label class="radio-inline"><input type="radio" name="product" value="<?php echo $key?>"<?php echo $key == $checkedKey ? " checked='checked'" : ''?> id="product<?php echo $key;?>"><?php echo $value;?></label>
           <?php endforeach;?>
         </td>
-        <td><div class='alert alert-info no-margin'><?php echo $lang->custom->notice->readOnlyOfProduct;?></div></td>
+        <td></td>
+      </tr>
+      <tr>
+        <th></th>
+        <td colspan="2" id="readOnlyOfProduct">
+          <i class="icon-exclamation-sign"></i>&nbsp;<?php echo $lang->custom->notice->readOnlyOfProduct;?>
+        </td>
       </tr>
       <tr>
         <th></th>
diff --git a/module/dev/view/api.html.php b/module/dev/view/api.html.php
index 6e2aae1da7..fd85489d17 100644
--- a/module/dev/view/api.html.php
+++ b/module/dev/view/api.html.php
@@ -54,9 +54,9 @@
         <?php echo $api['desc'];?>
         <table class='table table-bordered'>
           <tr>
-            <td><?php echo $lang->dev->params?></td>
-            <td><?php echo $lang->dev->type?></td>
-            <td><?php echo $lang->dev->desc?></td>
+            <th><?php echo $lang->dev->params?></th>
+            <th><?php echo $lang->dev->type?></th>
+            <th><?php echo $lang->dev->desc?></th>
           </tr>
           <?php if(isset($api['param'])):?>
           <?php foreach($api['param'] as $param):?>
@@ -78,9 +78,9 @@
         <table class='table table-bordered'>
           <caption><?php echo $lang->dev->post;?></caption>
           <tr>
-            <td><?php echo $lang->dev->params?></td>
-            <td><?php echo $lang->dev->type?></td>
-            <td><?php echo $lang->dev->desc?></td>
+            <th><?php echo $lang->dev->params?></th>
+            <th><?php echo $lang->dev->type?></th>
+            <th><?php echo $lang->dev->desc?></th>
           </tr>
           <?php foreach($config->dev->postParams[$selectedModule][$methodName] as $paramName => $paramType):?>
           <tr>
diff --git a/module/message/lang/zh-cn.php b/module/message/lang/zh-cn.php
index 34c7e2b051..dccd7cc1d4 100644
--- a/module/message/lang/zh-cn.php
+++ b/module/message/lang/zh-cn.php
@@ -27,7 +27,7 @@ $lang->message->label->assigned     = '指派';
 $lang->message->label->closed       = '关闭';
 $lang->message->label->deleted      = '删除';
 $lang->message->label->undeleted    = '还原';
-$lang->message->label->commented    = '评论';
+$lang->message->label->commented    = '备注';
 $lang->message->label->activated    = '激活';
 $lang->message->label->resolved     = '解决';
 $lang->message->label->reviewed     = '评审';
diff --git a/module/message/lang/zh-tw.php b/module/message/lang/zh-tw.php
index 81d980f3af..1b2821d784 100644
--- a/module/message/lang/zh-tw.php
+++ b/module/message/lang/zh-tw.php
@@ -27,7 +27,7 @@ $lang->message->label->assigned     = '指派';
 $lang->message->label->closed       = '關閉';
 $lang->message->label->deleted      = '刪除';
 $lang->message->label->undeleted    = '還原';
-$lang->message->label->commented    = '評論';
+$lang->message->label->commented    = '備註';
 $lang->message->label->activated    = '激活';
 $lang->message->label->resolved     = '解決';
 $lang->message->label->reviewed     = '評審';
diff --git a/module/my/css/team.css b/module/my/css/team.css
index cc48190d78..f576f4cc76 100644
--- a/module/my/css/team.css
+++ b/module/my/css/team.css
@@ -1,2 +1,5 @@
 .c-gender {width: 80px;}
-.c-phone, .c-skype, .c-visits {width: 100px;}
+.c-skype, .c-visits {width: 100px;}
+.c-phone {width: 128px;}
+.c-email {width: 128px;}
+.c-role {width: 96px;}
diff --git a/module/report/css/productsummary.css b/module/report/css/productsummary.css
index 7fb68a2ab8..d3aeb68419 100644
--- a/module/report/css/productsummary.css
+++ b/module/report/css/productsummary.css
@@ -1,3 +1,5 @@
 td.child {padding-left: 15px;}
 .c-name {width: 200px;}
 .c-count {width: 70px;}
+#conditions {display: flex;}
+#conditions .condition-options {margin-left: 16px;}
diff --git a/module/report/view/productsummary.html.php b/module/report/view/productsummary.html.php
index 7130368d5e..16ea2e1e5c 100644
--- a/module/report/view/productsummary.html.php
+++ b/module/report/view/productsummary.html.php
@@ -22,10 +22,9 @@
       <div class='panel'>
         <div class="panel-heading">
           <div class="panel-title">
-            <div class="table-row" id='conditions'>
-              <div class="col-xs"><?php echo $title;?></div>
-              <div class="col-xs text-right text-gray text-middle"><?php echo $lang->report->conditions?></div>
-              <div class='col'>
+            <div id='conditions'>
+              <div><?php echo $title;?></div>
+              <div class='condition-options'>
                 <div class="checkbox-primary inline-block">
                   <input type="checkbox" name="closedProduct" value="closedProduct" id="closedProduct" <?php if(strpos($conditions, 'closedProduct') !== false) echo "checked='checked'"?> />
                   <label for="closedProduct"><?php echo $lang->report->closedProduct?></label>
diff --git a/module/story/control.php b/module/story/control.php
index b82d400136..d24ca310df 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -1200,8 +1200,7 @@ class story extends control
     public function view($storyID, $version = 0, $param = 0)
     {
         $uri = $this->app->getURI(true);
-        $this->session->set('productList',     $uri . "#app={$this->app->tab}", 'product');
-        $this->session->set('productPlanList', $uri, 'product');
+        $this->session->set('productList', $uri . "#app={$this->app->tab}", 'product');
 
         $storyID = (int)$storyID;
         $story   = $this->story->getById($storyID, $version, true);