diff --git a/VERSION b/VERSION
index d346e2ab7f..284af3c89d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5.3
+5.3.stable
diff --git a/module/bug/view/activate.html.php b/module/bug/view/activate.html.php
index 30585ec00b..f38945dda6 100644
--- a/module/bug/view/activate.html.php
+++ b/module/bug/view/activate.html.php
@@ -16,15 +16,15 @@
   <table class='table-1'>
     <caption><?php echo $bug->title;?></caption>
     <tr>
-      <td class='rowhead'><?php echo $lang->bug->assignedTo;?></td>
+      <th class='rowhead'><?php echo $lang->bug->assignedTo;?></th>
       <td><?php echo html::select('assignedTo', $users, $bug->resolvedBy, 'class=select-3');?></td>
     </tr>
     <tr>
-      <td class='rowhead'><?php echo $lang->bug->openedBuild;?></td>
+      <th class='rowhead'><?php echo $lang->bug->openedBuild;?></th>
       <td><?php echo html::select('openedBuild[]', $builds, $bug->openedBuild, 'size=4 multiple=multiple class=select-3');?></td>
     </tr>
     <tr>
-      <td class='rowhead'><?php echo $lang->comment;?></td>
+      <th class='rowhead'><?php echo $lang->comment;?></th>
       <td><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
     </tr>
     <tr>
diff --git a/module/bug/view/assignto.html.php b/module/bug/view/assignto.html.php
index b990f69534..934b452bb2 100644
--- a/module/bug/view/assignto.html.php
+++ b/module/bug/view/assignto.html.php
@@ -25,11 +25,11 @@ js::set('page', 'assignedto');
       <td><?php echo html::select('assignedTo', $users, $bug->assignedTo, "class='text-3 chosen'");?></td>
     </tr>  
     <tr>
-      <td class='rowhead'><?php echo $lang->bug->mailto;?></td>
+      <th class='rowhead'><?php echo $lang->bug->mailto;?></th>
       <td><?php echo html::select('mailto[]', $users, str_replace(' ', '', $bug->mailto), 'class="w-p98" multiple');?></td>
     </tr>
     <tr>
-      <td class='rowhead'><?php echo $lang->comment;?></td>
+      <th class='rowhead'><?php echo $lang->comment;?></th>
       <td><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
     </tr>
     <tr>
diff --git a/module/bug/view/close.html.php b/module/bug/view/close.html.php
index 52e94f7831..f1f940a95a 100644
--- a/module/bug/view/close.html.php
+++ b/module/bug/view/close.html.php
@@ -16,7 +16,7 @@
   <table class='table-1'>
     <caption><?php echo $bug->title;?></caption>
     <tr>
-      <td class='rowhead v-middle'><?php echo $lang->comment;?></td>
+      <th class='rowhead'><?php echo $lang->comment;?></th>
       <td><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
     </tr>
     <tr>
diff --git a/module/bug/view/confirmbug.html.php b/module/bug/view/confirmbug.html.php
index 1a021187a4..bf378c2cfb 100755
--- a/module/bug/view/confirmbug.html.php
+++ b/module/bug/view/confirmbug.html.php
@@ -29,11 +29,11 @@ js::set('page', 'confirmbug');
       <td><?php echo html::select('pri', $lang->bug->priList, $bug->pri, 'class=select-2');?></td>
     </tr>  
     <tr>
-      <td class='rowhead'><?php echo $lang->bug->mailto;?></td>
+      <th class='rowhead'><?php echo $lang->bug->mailto;?></th>
       <td><?php echo html::select('mailto[]', $users, str_replace(' ' , '', $bug->mailto), 'class="w-p98" multiple');?></td>
     </tr>
     <tr>
-      <td class='rowhead'><?php echo $lang->comment;?></td>
+      <th class='rowhead'><?php echo $lang->comment;?></th>
       <td><?php echo html::textarea('comment', '', "rows='6' class='w-p94'");?></td>
     </tr>
     <tr>
diff --git a/module/bug/view/resolve.html.php b/module/bug/view/resolve.html.php
index 760fdbdbac..c47fd28ced 100644
--- a/module/bug/view/resolve.html.php
+++ b/module/bug/view/resolve.html.php
@@ -16,27 +16,27 @@
   <table class='table-1'>
     <caption><?php echo $bug->title;?></caption>
     <tr>
-      <td class='rowhead'><?php echo $lang->bug->resolution;?></td>
+      <th class='rowhead'><?php echo $lang->bug->resolution;?></th>
       <td><?php unset($lang->bug->resolutionList['tostory']); echo html::select('resolution', $lang->bug->resolutionList, '', 'class=select-3 onchange=setDuplicate(this.value)');?></td>
     </tr>
     <tr id='duplicateBugBox' style='display:none'>
-      <td class='rowhead'><?php echo $lang->bug->duplicateBug;?></td>
+      <th class='rowhead'><?php echo $lang->bug->duplicateBug;?></th>
       <td><?php echo html::input('duplicateBug', '', 'class=text-3');?></td>
     </tr>
     <tr>
-      <td class='rowhead'><?php echo $lang->bug->resolvedBuild;?></td>
+      <th class='rowhead'><?php echo $lang->bug->resolvedBuild;?></th>
       <td><?php echo html::select('resolvedBuild', $builds, '', 'class=select-3');?></td>
     </tr>
     <tr>
-      <td class='rowhead'><?php echo $lang->bug->resolvedDate;?></td>
+      <th class='rowhead'><?php echo $lang->bug->resolvedDate;?></th>
       <td><?php echo html::input('resolvedDate', helper::now(), "class='select-3'");?></td>
     </tr>
     <tr>
-      <td class='rowhead'><?php echo $lang->bug->assignedTo;?></td>
+      <th class='rowhead'><?php echo $lang->bug->assignedTo;?></th>
       <td><?php echo html::select('assignedTo', $users, $bug->openedBy, "class='select-3 chosen'");?></td>
     </tr>
     <tr>
-      <td class='rowhead'><?php echo $lang->comment;?></td>
+      <th class='rowhead'><?php echo $lang->comment;?></th>
       <td><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
     </tr>
     <tr>
diff --git a/module/my/view/bug.html.php b/module/my/view/bug.html.php
index 5527301799..71753da327 100644
--- a/module/my/view/bug.html.php
+++ b/module/my/view/bug.html.php
@@ -33,6 +33,7 @@
       <th class='w-type'>      <?php common::printOrderLink('type',       $orderBy, $vars, $lang->typeAB);?></th>
       <th>                     <?php common::printOrderLink('title',      $orderBy, $vars, $lang->bug->title);?></th>
       <th class='w-user'>      <?php common::printOrderLink('openedBy',   $orderBy, $vars, $lang->openedByAB);?></th>
+      <th class='w-user'>      <?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->bug->assignedTo);?></th>
       <th class='w-user'>      <?php common::printOrderLink('resolvedBy', $orderBy, $vars, $lang->bug->resolvedByAB);?></th>
       <th class='w-resolution'><?php common::printOrderLink('resolution', $orderBy, $vars, $lang->bug->resolutionAB);?></th>
       <th class='w-140px'><?php echo $lang->actions;?></th>
@@ -51,6 +52,7 @@
       <td><?php echo $lang->bug->typeList[$bug->type]?></td>
       <td class='a-left nobr'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?></td>
       <td><?php echo $users[$bug->openedBy];?></td>
+      <td><?php echo $users[$bug->assignedTo];?></td>
       <td><?php echo $users[$bug->resolvedBy];?></td>
       <td><?php echo $lang->bug->resolutionList[$bug->resolution];?></td>
       <td class='a-right'>
@@ -67,28 +69,30 @@
     <?php endforeach;?>
     </tbody>
     <tfoot>
-      <tr><td colspan='9'>
-      <?php if($bugs and $canBatchEdit):?>
-      <div class='f-left'>
-        <?php
-        echo html::selectAll() . html::selectReverse();
+      <tr>
+        <td colspan='10'>
+          <?php if($bugs and $canBatchEdit):?>
+          <div class='f-left'>
+            <?php
+            echo html::selectAll() . html::selectReverse();
 
-        if(common::hasPriv('bug', 'batchEdit'))
-        {
-            $actionLink = $this->createLink('bug', 'batchEdit', "productID=0");
-            echo html::commonButton($lang->edit, "onclick=\"setFormAction('$actionLink')\"");
-        }
+            if(common::hasPriv('bug', 'batchEdit'))
+            {
+                $actionLink = $this->createLink('bug', 'batchEdit', "productID=0");
+                echo html::commonButton($lang->edit, "onclick=\"setFormAction('$actionLink')\"");
+            }
 
-        if(common::hasPriv('bug', 'batchClose') and $type != 'closedBy')
-        {
-            $actionLink = $this->createLink('bug', 'batchClose');
-            echo html::commonButton($lang->bug->close, "onclick=\"setFormAction('$actionLink','hiddenwin')\"");
-        }
-        ?>
-      </div>
-      <?php endif;?>
-      <?php $pager->show();?>
-      </td></tr>
+            if(common::hasPriv('bug', 'batchClose') and $type != 'closedBy')
+            {
+                $actionLink = $this->createLink('bug', 'batchClose');
+                echo html::commonButton($lang->bug->close, "onclick=\"setFormAction('$actionLink','hiddenwin')\"");
+            }
+            ?>
+          </div>
+          <?php endif;?>
+          <?php $pager->show();?>
+        </td>
+      </tr>
     </tfoot>
   </table>
 </form>
diff --git a/module/product/view/close.html.php b/module/product/view/close.html.php
index b7d398ff09..44bd431684 100644
--- a/module/product/view/close.html.php
+++ b/module/product/view/close.html.php
@@ -16,7 +16,7 @@
   <table class='table-1'>
     <caption><?php echo $product->name;?></caption>
     <tr>
-      <td class='rowhead'><?php echo $lang->comment;?></td>
+      <th class='rowhead'><?php echo $lang->comment;?></th>
       <td><?php echo html::textarea('comment', '', "rows='6' class='area-1'");?></td>
     </tr>
     <tr>
diff --git a/module/project/control.php b/module/project/control.php
index 8dd37ea902..d3ef0da58d 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -670,6 +670,7 @@ class project extends control
      * 
      * @param  int       $projectID 
      * @param  string    $type 
+     * @param  int       $interval 
      * @access public
      * @return void
      */
diff --git a/module/project/css/burn.css b/module/project/css/burn.css
index 8c592e0787..9248966d3d 100644
--- a/module/project/css/burn.css
+++ b/module/project/css/burn.css
@@ -1,4 +1,5 @@
 .pr-25px{padding-right:25px;}
 #burn h1{font-size:14px;}
 .icon-question-sign{color:#666}
-#computeBurn{padding:2px 10px;}
+a.btn{padding:1.5px 10px;}
+#interval{margin-right:10px;}
diff --git a/module/project/js/burn.js b/module/project/js/burn.js
index 30d33bbef9..630354c2b4 100644
--- a/module/project/js/burn.js
+++ b/module/project/js/burn.js
@@ -1,13 +1,9 @@
-$('#interval').change(function()
+$(function()
 {
-    location.href = createLink('project', 'burn', 'projectID=' + projectID + '&type=' + type + '&interval=' + $(this).val());
-})
+    $('#burnTab').addClass('active');
 
-var weekendType = $('#weekend').attr('checked');
-$('#weekend').click(function()
-{
-    weekendType = weekendType ? 'noweekend' : 'widthweekend';
-    params      = 'projectID=' + projectID + '&type=' + weekendType;
-    if(interval) params = params + '&interval=' + interval;
-    location.href = createLink('project', 'burn', params);
+    $('#interval').change(function()
+    {
+        location.href = createLink('project', 'burn', 'projectID=' + projectID + '&type=' + type + '&interval=' + $(this).val());
+    })
 })
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index 385c23887b..eb4134ff28 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -193,7 +193,8 @@ $lang->project->linkStory             = 'Link story';
 $lang->project->createTask            = 'Create task';
 $lang->project->goback                = 'Go back';
 $lang->project->linkProduct           = 'Select product to link...';
-$lang->project->weekend               = 'Weekend';
+$lang->project->noweekend             = 'No weekend';
+$lang->project->widthweekend          = 'Width weekend';
 $lang->project->interval              = 'Interval';
 
 /* Report. */
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index 393f442308..36e7ba0bdb 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -193,7 +193,8 @@ $lang->project->linkStory             = '关联需求';
 $lang->project->createTask            = '添加任务';
 $lang->project->goback                = '返回项目首页';
 $lang->project->linkProduct           = '选择产品关联...';
-$lang->project->weekend               = '周末';
+$lang->project->noweekend             = '去除周末';
+$lang->project->withweekend           = '显示周末';
 $lang->project->interval              = '间隔';
 
 /* 统计。*/
diff --git a/module/project/model.php b/module/project/model.php
index 3e0c6c66d4..4fbf9736ab 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1486,9 +1486,10 @@ class projectModel extends model
     /**
      * Get no weekend date 
      * 
-     * @param  string    $begin 
-     * @param  string    $end 
-     * @param  string    $type 
+     * @param  string     $begin 
+     * @param  string     $end 
+     * @param  string     $type 
+     * @param  string|int $interval 
      * @access public
      * @return array
      */
diff --git a/module/project/view/activate.html.php b/module/project/view/activate.html.php
index 6490e80b89..b85792c3d6 100644
--- a/module/project/view/activate.html.php
+++ b/module/project/view/activate.html.php
@@ -17,7 +17,7 @@
   <table class='table-1'>
     <caption><?php echo $project->name;?></caption>
     <tr>
-      <td class='rowhead'><?php echo $lang->comment;?></td>
+      <th class='rowhead'><?php echo $lang->comment;?></th>
       <td><?php echo html::textarea('comment', '', "rows='6' class='area-1'");?></td>
     </tr>
     <tr>
diff --git a/module/project/view/burn.html.php b/module/project/view/burn.html.php
index df9ee9e263..9f2fbbae10 100644
--- a/module/project/view/burn.html.php
+++ b/module/project/view/burn.html.php
@@ -12,16 +12,13 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include './taskheader.html.php';?>
-<script>$('#burnTab').addClass('active');</script>
 <table width='950' align='center' class='bd-none' id='burn'>
   <tr>
-    <td class='a-right pr-25px v-middle'>
+    <td class='a-right pr-25px'>
       <?php
-      $checked = ($type == 'noweekend') ? '' : "weekend";
-      echo html::checkbox('', array('weekend' => $lang->project->weekend), $checked);
-
       if($interval) echo html::select('interval', $dayList, $interval);
-
+      $weekend = ($type == 'noweekend') ? 'withweekend' : "noweekend";
+      echo html::a($this->createLink('project', 'burn', "projectID=$projectID&type=$weekend&interval=$interval"), $lang->project->$weekend, '', "class='btn'");
       common::printLink('project', 'computeBurn', 'reload=yes', $lang->project->computeBurn, 'hiddenwin', "title='{$lang->project->computeBurn}{$lang->project->burn}' class='btn' id='computeBurn'");
       echo $lang->project->howToUpdateBurn;
       ?>
@@ -30,8 +27,9 @@
   <tr><td class='a-center'><?php echo $charts; ?></td></tr>
 </table>
 <?php
+/* Interval is keyword in javascript so use intervals. */
+js::set('intervals', $interval);
 js::set('projectID', $projectID);
 js::set('type', $type);
-js::set('interval', $interval);
 ?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/view/close.html.php b/module/project/view/close.html.php
index f8e1820f43..a82cae3555 100644
--- a/module/project/view/close.html.php
+++ b/module/project/view/close.html.php
@@ -16,7 +16,7 @@
   <table class='table-1'>
     <caption><?php echo $project->name;?></caption>
     <tr>
-      <td class='rowhead'><?php echo $lang->comment;?></td>
+      <th class='rowhead'><?php echo $lang->comment;?></th>
       <td><?php echo html::textarea('comment', '', "rows='6' class='area-1'");?></td>
     </tr>
     <tr>
diff --git a/module/project/view/putoff.html.php b/module/project/view/putoff.html.php
index ec05c2d633..dd55698859 100644
--- a/module/project/view/putoff.html.php
+++ b/module/project/view/putoff.html.php
@@ -18,11 +18,11 @@
   <table class='table-1'>
     <caption><?php echo $project->name;?></caption>
     <tr>
-      <td class='rowhead'><?php echo $lang->project->begin;?></td>
+      <th class='rowhead'><?php echo $lang->project->begin;?></th>
       <td><?php echo html::input('begin', $project->begin, "class='text-3 date' onchange='computeWorkDays()'");?></td>
     </tr>
     <tr>
-      <td class='rowhead'><?php echo $lang->project->end;?></td>
+      <th class='rowhead'><?php echo $lang->project->end;?></th>
       <td><?php echo html::input('end', $project->end, "class='text-3 date' onchange='computeWorkDays()'");?></td>
     </tr>
     <tr>
@@ -30,7 +30,7 @@
       <td><?php echo html::input('days', $project->days, "class='text-3'") . $lang->project->day;?></td>
     </tr>  
     <tr>
-      <td class='rowhead'><?php echo $lang->comment;?></td>
+      <th class='rowhead'><?php echo $lang->comment;?></th>
       <td><?php echo html::textarea('comment', '', "rows='6' class='area-1'");?></td>
     </tr>
     <tr>
diff --git a/module/project/view/start.html.php b/module/project/view/start.html.php
index 7c765abf6a..edd00e45c9 100644
--- a/module/project/view/start.html.php
+++ b/module/project/view/start.html.php
@@ -16,7 +16,7 @@
   <table class='table-1'>
     <caption><?php echo $project->name;?></caption>
     <tr>
-      <td class='rowhead'><?php echo $lang->comment;?></td>
+      <th class='rowhead'><?php echo $lang->comment;?></th>
       <td><?php echo html::textarea('comment', '', "rows='6' class='area-1'");?></td>
     </tr>
     <tr>
diff --git a/module/project/view/suspend.html.php b/module/project/view/suspend.html.php
index f8e1820f43..a82cae3555 100644
--- a/module/project/view/suspend.html.php
+++ b/module/project/view/suspend.html.php
@@ -16,7 +16,7 @@
   <table class='table-1'>
     <caption><?php echo $project->name;?></caption>
     <tr>
-      <td class='rowhead'><?php echo $lang->comment;?></td>
+      <th class='rowhead'><?php echo $lang->comment;?></th>
       <td><?php echo html::textarea('comment', '', "rows='6' class='area-1'");?></td>
     </tr>
     <tr>
diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php
index db0d5676a5..b6d4c3bafe 100644
--- a/module/release/view/view.html.php
+++ b/module/release/view/view.html.php
@@ -21,13 +21,20 @@
       </fieldset>
       <fieldset>
         <legend><?php echo $lang->files?></legend>
-        <?php if($release->files):?>
-        <?php echo $this->fetch('file', 'printFiles', array('files' => $release->files, 'fieldset' => 'false'));?>
-        <?php elseif($release->filePath):?>
-        <?php echo $lang->release->filePath . html::a($release->filePath, $release->filePath, '_blank')?>
-        <?php elseif($release->scmPath):?>
-        <?php echo $lang->release->scmPath . html::a($release->scmPath, $release->scmPath, '_blank')?>
-        <?php endif;?>
+        <?php
+        if($release->files)
+        {
+            echo $this->fetch('file', 'printFiles', array('files' => $release->files, 'fieldset' => 'false'));
+        }
+        elseif($release->filePath)
+        {
+            echo $lang->release->filePath . html::a($release->filePath, $release->filePath, '_blank');
+        }
+        elseif($release->scmPath)
+        {
+            echo $lang->release->scmPath . html::a($release->scmPath, $release->scmPath, '_blank');
+        }
+        ?>
       </fieldset>
       <?php include '../../common/view/action.html.php';?>
       <div class='a-center f-16px pb-10px'>
diff --git a/module/task/view/activate.html.php b/module/task/view/activate.html.php
index 4b230c5c5b..05d43a77f4 100644
--- a/module/task/view/activate.html.php
+++ b/module/task/view/activate.html.php
@@ -24,7 +24,7 @@
       <td><?php echo html::input('left', '', "class='text-3'") . $lang->task->hour;?></td>
     </tr>
     <tr>
-      <td class='rowhead'><?php echo $lang->comment;?></td>
+      <th class='rowhead'><?php echo $lang->comment;?></th>
       <td><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
     </tr>
     <tr>
diff --git a/module/task/view/assignto.html.php b/module/task/view/assignto.html.php
index 9df4a92c04..9ec97c626d 100644
--- a/module/task/view/assignto.html.php
+++ b/module/task/view/assignto.html.php
@@ -24,7 +24,7 @@
       <td><?php echo html::input('left', $task->left, "class='text-3'") . $lang->task->hour;?></td>
     </tr>  
     <tr>
-      <td class='rowhead'><?php echo $lang->comment;?></td>
+      <th class='rowhead'><?php echo $lang->comment;?></th>
       <td><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
     </tr>
     <tr>
diff --git a/module/task/view/cancel.html.php b/module/task/view/cancel.html.php
index d7a03dd743..3946f104a9 100644
--- a/module/task/view/cancel.html.php
+++ b/module/task/view/cancel.html.php
@@ -16,7 +16,7 @@
   <table class='table-1'>
     <caption><?php echo $task->name;?></caption>
     <tr>
-      <td class='rowhead'><?php echo $lang->comment;?></td>
+      <th class='rowhead'><?php echo $lang->comment;?></th>
       <td><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
     </tr>
     <tr><td colspan='2' class='a-center'><?php echo html::submitButton();?></td></tr>
diff --git a/module/task/view/close.html.php b/module/task/view/close.html.php
index 88e3ecc032..661221bc2c 100644
--- a/module/task/view/close.html.php
+++ b/module/task/view/close.html.php
@@ -16,7 +16,7 @@
   <table class='table-1'>
     <caption><?php echo $task->name;?></caption>
     <tr>
-      <td class='rowhead v-middle'><?php echo $lang->comment;?></td>
+      <th class='rowhead'><?php echo $lang->comment;?></th>
       <td><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
     </tr>
     <tr>
diff --git a/module/task/view/finish.html.php b/module/task/view/finish.html.php
index 3a4ec291f6..2bf19f8ab2 100644
--- a/module/task/view/finish.html.php
+++ b/module/task/view/finish.html.php
@@ -20,16 +20,16 @@
       <td><?php echo html::input('consumed', $task->consumed, "class='text-3'") . $lang->task->hour;?></td>
     </tr>
     <tr>
-      <td class='rowhead'><?php echo $lang->task->assignedTo;?></td>
+      <th class='rowhead'><?php echo $lang->task->assignedTo;?></th>
       <td><?php echo html::select('assignedTo', $members, $task->openedBy, "class='select-3 chosen'");?></td>
     </tr>
     <tr>
-      <td class='rowhead'><?php echo $lang->task->finishedDate;?></td>
+      <th class='rowhead'><?php echo $lang->task->finishedDate;?></th>
       <td><?php echo html::input('finishedDate',$date, "class='text-3'");?></td>
     </tr>
 
     <tr>
-      <td class='rowhead'><?php echo $lang->comment;?></td>
+      <th class='rowhead'><?php echo $lang->comment;?></th>
       <td><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
     </tr>
     <tr>
diff --git a/module/task/view/start.html.php b/module/task/view/start.html.php
index ffb37f3d79..d2871801ae 100644
--- a/module/task/view/start.html.php
+++ b/module/task/view/start.html.php
@@ -30,7 +30,7 @@
       <td><?php echo html::input('left', $task->left, "class='text-2'") . $lang->task->hour;?></td>
     </tr>
     <tr>
-      <td class='rowhead'><?php echo $lang->comment;?></td>
+      <th class='rowhead'><?php echo $lang->comment;?></th>
       <td><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
     </tr>
     <tr>
diff --git a/module/testtask/view/close.html.php b/module/testtask/view/close.html.php
index 76cd4bf6fd..2e535ab43a 100644
--- a/module/testtask/view/close.html.php
+++ b/module/testtask/view/close.html.php
@@ -17,11 +17,11 @@
   <table class='table-1'>
     <caption><?php echo $testtask->name;?></caption>
     <tr>
-      <td class='rowhead'><?php echo $lang->testtask->report;?></td>
+      <th class='rowhead'><?php echo $lang->testtask->report;?></th>
       <td><?php echo html::textarea('report', '', "rows='6' class='area-1'");?></td>
     </tr>
     <tr>
-      <td class='rowhead'><?php echo $lang->comment;?></td>
+      <th class='rowhead'><?php echo $lang->comment;?></th>
       <td><?php echo html::textarea('comment', '', "rows='6' class='area-1'");?></td>
     </tr>
     <tr>
diff --git a/module/testtask/view/start.html.php b/module/testtask/view/start.html.php
index 37fc44b64f..c44865eb1d 100644
--- a/module/testtask/view/start.html.php
+++ b/module/testtask/view/start.html.php
@@ -17,7 +17,7 @@
   <table class='table-1'>
     <caption><?php echo $testtask->name;?></caption>
     <tr>
-      <td class='rowhead'><?php echo $lang->comment;?></td>
+      <th class='rowhead'><?php echo $lang->comment;?></th>
       <td><?php echo html::textarea('comment', '', "rows='6' class='area-1'");?></td>
     </tr>
     <tr>
diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php
index b1d19eec1f..3259f92769 100644
--- a/module/upgrade/lang/zh-cn.php
+++ b/module/upgrade/lang/zh-cn.php
@@ -78,4 +78,4 @@ $lang->upgrade->fromVersions['5_0_beta2'] = '5.0.beta2';
 $lang->upgrade->fromVersions['5_0']       = '5.0';
 $lang->upgrade->fromVersions['5_1']       = '5.1';
 $lang->upgrade->fromVersions['5_2']       = '5.2';
-$lang->upgrade->fromVersions['5_2_1']     = '5.2_1';
+$lang->upgrade->fromVersions['5_2_1']     = '5.2.1';
diff --git a/module/upgrade/lang/zh-tw.php b/module/upgrade/lang/zh-tw.php
index ed3845e030..e2d6523ac3 100644
--- a/module/upgrade/lang/zh-tw.php
+++ b/module/upgrade/lang/zh-tw.php
@@ -78,4 +78,4 @@ $lang->upgrade->fromVersions['5_0_beta2'] = '5.0.beta2';
 $lang->upgrade->fromVersions['5_0']       = '5.0';
 $lang->upgrade->fromVersions['5_1']       = '5.1';
 $lang->upgrade->fromVersions['5_2']       = '5.2';
-$lang->upgrade->fromVersions['5_2_1']     = '5.2_1';
+$lang->upgrade->fromVersions['5_2_1']     = '5.2.1';
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index efa29c38ba..12f6822e87 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -445,6 +445,8 @@ table.data-table td:last-child{padding-right: 20px;}
 .green {color:green;}
 .star {color:red; font-size:18px; font-weight:bold;}
 .warning {background:yellow; color:red; font-weight:bold}
+.alert {padding: 15px; margin-bottom: 20px; border: 1px solid transparent; border-radius: 3px; background-color: #f1f1f1; border-color: #e4e4e4; color: #333;}
+.alert-danger {background-color: #ffe6e5; border-color: #ffccd3; color: #d2322d;}
 
 /*-----------------------NAV----------------------------*/
 /* The nav bar. */
@@ -663,6 +665,3 @@ table.data-table td:last-child{padding-right: 20px;}
 .link-button a{ color:#036; font-weight:normal; font-size:14px;padding: 3px 4px;}
 .link-button a i{font-size: 18px;}
 .link-button a:hover {color:#000;}
-
-.alert{padding: 15px; margin-bottom: 20px; border: 1px solid transparent; border-radius: 3px; background-color: #f1f1f1; border-color: #e4e4e4; color: #333;}
-.alert-danger{background-color: #ffe6e5; border-color: #ffccd3; color: #d2322d;}
diff --git a/www/upgrade.php b/www/upgrade.php
index 0ce2755eaf..36d7b08c31 100644
--- a/www/upgrade.php
+++ b/www/upgrade.php
@@ -38,7 +38,7 @@ $app->setDebug();
 
 /* Check the installed version is the latest or not. */
 $config->installedVersion = $common->loadModel('setting')->getVersion();
-if(!$_SERVER['HTTP_X_REQUESTED_WITH'] and version_compare($config->version, $config->installedVersion) <= 0) die(header('location: index.php'));
+if(!empty($_SERVER['HTTP_X_REQUESTED_WITH']) and version_compare($config->version, $config->installedVersion) <= 0) die(header('location: index.php'));
 
 /* Run it. */
 $app->parseRequest();