diff --git a/module/block/view/storyblock.html.php b/module/block/view/storyblock.html.php
index d4b5a745f5..c26ecfef5e 100644
--- a/module/block/view/storyblock.html.php
+++ b/module/block/view/storyblock.html.php
@@ -16,7 +16,7 @@
 <style>
 .block-stories .c-id {width: 55px;}
 .block-stories .c-pri {width: 45px;text-align: center;}
-.block-stories .c-estimate {width: 65px;}
+.block-stories .c-estimate {width: 65px; text-align: right;}
 .block-stories .c-status {width: 80px;}
 .block-stories .c-stage {width: 80px;}
 .block-stories.block-sm .estimate,
diff --git a/module/block/view/taskblock.html.php b/module/block/view/taskblock.html.php
index d90118bcc0..376df8196d 100644
--- a/module/block/view/taskblock.html.php
+++ b/module/block/view/taskblock.html.php
@@ -17,7 +17,7 @@
 .block-tasks .c-id {width: 55px;}
 .block-tasks .c-pri {width: 45px;text-align: center;}
 .block-tasks .c-pri-long {width: 80px;}
-.block-tasks .c-estimate {width: 60px;}
+.block-tasks .c-estimate {width: 60px;text-align: right;}
 .block-tasks .c-deadline {width: 95px;}
 .block-tasks .c-status {width: 80px;}
 .block-tasks.block-sm .c-status {text-align: center;}
diff --git a/module/block/view/waterfallissueblock.html.php b/module/block/view/waterfallissueblock.html.php
index 6b57b2d98f..bc5f5ee000 100644
--- a/module/block/view/waterfallissueblock.html.php
+++ b/module/block/view/waterfallissueblock.html.php
@@ -3,8 +3,8 @@
 <?php else:?>
 <style>
 .block-issues .c-id {width: 55px;}
-.block-issues .c-pri {width: 45px;text-align: center;}
-.block-issues .c-estimate {width: 60px;}
+.block-issues .c-pri {width: 45px; text-align: center;}
+.block-issues .c-estimate {width: 60px; text-align: right;}
 .block-issues .c-deadline {width: 95px;}
 .block-issues .c-status {width: 80px;}
 .block-issues.block-sm .c-status {text-align: center;}
diff --git a/module/build/view/linkstory.html.php b/module/build/view/linkstory.html.php
index f3863d26f8..24c338886c 100644
--- a/module/build/view/linkstory.html.php
+++ b/module/build/view/linkstory.html.php
@@ -31,7 +31,7 @@
           <th class="text-left"><?php echo $lang->story->title;?></th>
           <th class='c-user'>  <?php echo $lang->openedByAB;?></th>
           <th class='c-user'>  <?php echo $lang->assignedToAB;?></th>
-          <th class='w-60px'>  <?php echo $lang->story->estimateAB;?></th>
+          <th class='w-60px text-right'>  <?php echo $lang->story->estimateAB;?></th>
           <th class='c-status'><?php echo $lang->statusAB;?></th>
           <th class='w-80px'>  <?php echo $lang->story->stageAB;?></th>
         </tr>
@@ -52,7 +52,7 @@
           </td>
           <td><?php echo zget($users, $story->openedBy);?></td>
           <td><?php echo zget($users, $story->assignedTo);?></td>
-          <td><?php echo $story->estimate;?></td>
+          <td class='w-right' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
           <td>
             <span class='status-story status-<?php echo $story->status?>'>
               <?php echo $this->processStatus('story', $story);?>
diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php
index c8f015a01f..3cda1b92b7 100644
--- a/module/build/view/view.html.php
+++ b/module/build/view/view.html.php
@@ -89,13 +89,13 @@ tbody tr td:first-child input{display:none;}
                   <?php endif;?>
                   <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
                 </th>
-                <th class='w-70px'>   <?php common::printOrderLink('pri',      $orderBy, $vars, $lang->priAB);?></th>
+                <th class='w-70px'><?php common::printOrderLink('pri',      $orderBy, $vars, $lang->priAB);?></th>
                 <th class='text-left'><?php common::printOrderLink('title',    $orderBy, $vars, $lang->story->title);?></th>
-                <th class='c-user'>   <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
-                <th class='w-70px'>   <?php common::printOrderLink('estimate', $orderBy, $vars, $lang->story->estimateAB);?></th>
-                <th class='w-70px'>   <?php common::printOrderLink('status',   $orderBy, $vars, $lang->statusAB);?></th>
-                <th class='w-100px'>  <?php common::printOrderLink('stage',    $orderBy, $vars, $lang->story->stageAB);?></th>
-                <th class='c-actions-1'>   <?php echo $lang->actions?></th>
+                <th class='c-user'><?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
+                <th class='w-70px text-right'><?php common::printOrderLink('estimate', $orderBy, $vars, $lang->story->estimateAB);?></th>
+                <th class='w-70px'><?php common::printOrderLink('status',   $orderBy, $vars, $lang->statusAB);?></th>
+                <th class='w-100px'><?php common::printOrderLink('stage',    $orderBy, $vars, $lang->story->stageAB);?></th>
+                <th class='c-actions-1'><?php echo $lang->actions?></th>
               </tr>
             </thead>
             <tbody class='text-center'>
@@ -117,7 +117,7 @@ tbody tr td:first-child input{display:none;}
                   ?>
                 </td>
                 <td><?php echo zget($users, $story->openedBy);?></td>
-                <td><?php echo $story->estimate;?></td>
+                <td class='text-right' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
                 <td>
                   <span class='status-story status-<?php echo $story->status;?>'>
                     <?php echo $this->processStatus('story', $story);?>
diff --git a/module/execution/css/task.css b/module/execution/css/task.css
index 7fcc556426..e1899e25c5 100644
--- a/module/execution/css/task.css
+++ b/module/execution/css/task.css
@@ -2,3 +2,6 @@ td.delayed {background: #e84e0f!important; color: white;}
 #int-dropdown {margin-left: -8px; border-radius: 4px; border: 1px solid #0c64eb}
 #projectTaskForm table tbody tr td {overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
 th.c-deadline {text-align:center;}
+.c-estimate {text-align: right;}
+.c-consumed {text-align: right;}
+.c-left {text-align: right;}
diff --git a/module/execution/view/grouptask.html.php b/module/execution/view/grouptask.html.php
index c090530ae1..9c3f9b0842 100644
--- a/module/execution/view/grouptask.html.php
+++ b/module/execution/view/grouptask.html.php
@@ -117,7 +117,7 @@
         <th class="c-status"><?php echo $lang->task->status;?></th>
         <th class="text-left w-60px"><?php echo $lang->task->assignedTo;?></th>
         <th class="w-90px"><?php echo $lang->task->finishedBy;?></th>
-        <th class="w-60px"><?php echo $lang->task->estimateAB;?></th>
+        <th class="w-60px text-right"><?php echo $lang->task->estimateAB;?></th>
         <th class="w-50px"><?php echo $lang->task->consumedAB;?></th>
         <th class="w-50px"><?php echo $lang->task->leftAB;?></th>
         <th class="w-50px" title='<?php echo $lang->task->progress;?>'><?php echo $lang->task->progressAB;?></th>
@@ -202,7 +202,7 @@
         <td class="c-status"><span class='status-task status-<?php echo $task->status;?>'> <?php echo $this->processStatus('task', $task);?></span></td>
         <td class="c-assign text-left"><?php echo "<span class='$assignedToClass'>" . $task->assignedToRealName . "</span>";?></td>
         <td class='c-user'><?php echo zget($users, $task->finishedBy);?></td>
-        <td class="c-hours em" title="<?php echo $task->estimate . ' ' . $lang->execution->workHour;?>"><?php echo $task->estimate . ' ' . $lang->execution->workHourUnit;?></td>
+        <td class="c-hours em text-right" title="<?php echo $task->estimate . ' ' . $lang->execution->workHour;?>"><?php echo $task->estimate . ' ' . $lang->execution->workHourUnit;?></td>
         <td class="c-hours em" title="<?php echo $task->consumed . ' ' . $lang->execution->workHour;?>"><?php echo $task->consumed . ' ' . $lang->execution->workHourUnit;?></td>
         <td class="c-hours em" title="<?php echo $task->left     . ' ' . $lang->execution->workHour;?>"><?php echo $task->left     . ' ' . $lang->execution->workHourUnit;?></td>
         <td class="c-num em"><?php echo $task->progress . '%';?></td>
diff --git a/module/execution/view/linkstory.html.php b/module/execution/view/linkstory.html.php
index ae7e7aca52..0508b64a0e 100644
--- a/module/execution/view/linkstory.html.php
+++ b/module/execution/view/linkstory.html.php
@@ -33,7 +33,7 @@
     <div id='queryBox' data-module='story' class='show no-margin'></div>
   </div>
   <form class='main-table table-story' method='post' data-ride='table' id='linkStoryForm'>
-    <table class='table table-fixed tablesorter' id='linkStoryList'> 
+    <table class='table table-fixed tablesorter' id='linkStoryList'>
       <thead>
         <tr>
           <th class='c-id'>
@@ -54,7 +54,7 @@
           <th class='w-80px'><?php echo $lang->product->branchName[$productType];?></th>
           <?php endif;?>
           <th class='c-user'><?php echo $lang->openedByAB;?></th>
-          <th class='w-80px text-center'><?php echo $lang->story->estimateAB;?></th>
+          <th class='w-80px text-right'><?php echo $lang->story->estimateAB;?></th>
         </tr>
       </thead>
       <tbody>
@@ -81,7 +81,7 @@
         <td><?php if(isset($branchGroups[$story->product][$story->branch])) echo $branchGroups[$story->product][$story->branch];?></td>
         <?php endif;?>
         <td><?php echo zget($users, $story->openedBy);?></td>
-        <td class='text-center' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . $config->hourUnit;?></td>
+        <td class='text-right' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . $config->hourUnit;?></td>
       </tr>
       <?php $storyCount++;?>
       <?php endforeach;?>
diff --git a/module/execution/view/story.html.php b/module/execution/view/story.html.php
index f65e6bc096..0b80df6e58 100644
--- a/module/execution/view/story.html.php
+++ b/module/execution/view/story.html.php
@@ -139,7 +139,7 @@
             <th class='c-name {sorter:false}'> <?php common::printOrderLink('title',      $orderBy, $vars, $lang->execution->storyTitle);?></th>
             <th class='c-user {sorter:false}'> <?php common::printOrderLink('openedBy',   $orderBy, $vars, $lang->openedByAB);?></th>
             <th class='c-user {sorter:false}'> <?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
-            <th class='c-estimate w-80px {sorter:false}'> <?php common::printOrderLink('estimate',   $orderBy, $vars, $lang->story->estimateAB);?></th>
+            <th class='c-estimate w-80px {sorter:false} text-right'> <?php common::printOrderLink('estimate',   $orderBy, $vars, $lang->story->estimateAB);?></th>
             <th class='c-status {sorter:false}'> <?php common::printOrderLink('status',     $orderBy, $vars, $lang->statusAB);?></th>
             <th class='c-stage w-70px {sorter:false}'> <?php common::printOrderLink('stage',      $orderBy, $vars, $lang->story->stageAB);?></th>
             <th title='<?php echo $lang->story->taskCount?>' class='w-30px'><?php echo $lang->story->taskCountAB;?></th>
@@ -173,7 +173,7 @@
             </td>
             <td class='c-user' title='<?php echo zget($users, $story->openedBy);?>'><?php echo zget($users, $story->openedBy);?></td>
             <td class='c-user' title='<?php echo zget($users, $story->assignedTo);?>'><?php echo zget($users, $story->assignedTo);?></td>
-            <td class='c-estimate' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
+            <td class='c-estimate text-right' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
             <?php $status = $this->processStatus('story', $story);?>
             <td class='c-status' title='<?php echo $status;?>'>
               <span class='status-story status-<?php echo $story->status;?>'><?php echo $status;?></span>
diff --git a/module/my/css/common.css b/module/my/css/common.css
index 5c95b3668e..18f10da7a4 100644
--- a/module/my/css/common.css
+++ b/module/my/css/common.css
@@ -8,3 +8,4 @@
 .dropdown-list > li > a:focus {color: #1a4f85;text-decoration: none;background-color: #ddd;}
 
 .btn-toolbar .nav-title {float:left; display:inline-block; padding: 6px 12px; margin-bottom: 0; font-size: 13px; font-weight: bolder; line-height: 18px; text-align: center; white-space: nowrap; vertical-align: middle;}
+.c-hours{text-align: right;}
diff --git a/module/product/css/common.css b/module/product/css/common.css
index 427e63627b..88c563ee85 100644
--- a/module/product/css/common.css
+++ b/module/product/css/common.css
@@ -1,2 +1,3 @@
-.c-pri {overflow:hidden;}
-#mainMenu .btn-toolbar .dropdown-menu li a.btn{text-align:left;}
+.c-pri {overflow: hidden;}
+#mainMenu .btn-toolbar .dropdown-menu li a.btn {text-align: left;}
+.c-estimate {text-align: right;}
diff --git a/module/product/view/project.html.php b/module/product/view/project.html.php
index 5f640f87ee..5a2f067ff5 100644
--- a/module/product/view/project.html.php
+++ b/module/product/view/project.html.php
@@ -39,8 +39,8 @@
           <th class='w-100px'><?php echo $lang->project->end;?></th>
           <th class='w-100px'><?php echo $lang->project->status;?></th>
           <th class='w-100px'><?php echo $lang->project->budget;?></th>
-          <th class='w-80px text-center'><?php echo $lang->project->estimate;?></th>
-          <th class='w-80px text-center'><?php echo $lang->project->consume;?></th>
+          <th class='w-80px text-right'><?php echo $lang->project->estimate;?></th>
+          <th class='w-80px text-right'><?php echo $lang->project->consume;?></th>
           <th class='w-60px'><?php echo $lang->project->progress;?></th>
         </tr>
       </thead>
@@ -62,8 +62,8 @@
             <span class="status-project status-<?php echo $project->status?>"><?php echo $status;?></span>
           </td>
           <td><?php echo $project->budget != 0 ? zget($lang->program->currencySymbol, $project->budgetUnit) . number_format($project->budget, 2) : $this->lang->project->future;?></td>
-          <td class="text-center" title="<?php echo $project->hours->totalEstimate . ' ' . $lang->project->workHour;?>"><?php echo $project->hours->totalEstimate . ' ' . $lang->execution->workHourUnit;?></td>
-          <td class="text-center" title="<?php echo $project->hours->totalConsumed . ' ' . $lang->project->workHour;?>"><?php echo $project->hours->totalConsumed . ' ' . $lang->execution->workHourUnit;?></td>
+          <td class="text-right" title="<?php echo $project->hours->totalEstimate . ' ' . $lang->project->workHour;?>"><?php echo $project->hours->totalEstimate . ' ' . $lang->execution->workHourUnit;?></td>
+          <td class="text-right" title="<?php echo $project->hours->totalConsumed . ' ' . $lang->project->workHour;?>"><?php echo $project->hours->totalConsumed . ' ' . $lang->execution->workHourUnit;?></td>
           <td>
             <div class='progress-pie' data-doughnut-size='90' data-color='#00da88' data-value='<?php echo $project->hours->progress;?>' data-width='24' data-height='24' data-back-color='#e8edf3'>
               <div class='progress-info'><?php echo $project->hours->progress;?></div>
diff --git a/module/productplan/view/linkstory.html.php b/module/productplan/view/linkstory.html.php
index 940ebdf9a8..d149a5dbb2 100644
--- a/module/productplan/view/linkstory.html.php
+++ b/module/productplan/view/linkstory.html.php
@@ -18,7 +18,7 @@
     </div>
     <table class='table tablesorter'>
       <thead>
-        <tr class='text-center'>
+        <tr>
           <th class='c-id text-left'>
             <?php if($allStories):?>
             <div class="checkbox-primary check-all" title="<?php echo $lang->selectAll?>">
@@ -33,12 +33,12 @@
           <th class='text-left'><?php echo $lang->story->title;?></th>
           <th class='c-user'><?php echo $lang->openedByAB;?></th>
           <th class='c-user'><?php echo $lang->assignedToAB;?></th>
-          <th class='w-80px'><?php echo $lang->story->estimateAB;?></th>
+          <th class='w-80px text-right'><?php echo $lang->story->estimateAB;?></th>
           <th class='w-80px'><?php echo $lang->statusAB;?></th>
           <th class='w-80px'><?php echo $lang->story->stageAB;?></th>
         </tr>
       </thead>
-      <tbody class='text-center'>
+      <tbody>
         <?php $unlinkedCount = 0;?>
         <?php foreach($allStories as $story):?>
         <tr>
@@ -56,7 +56,7 @@
           </td>
           <td><?php echo zget($users, $story->openedBy);?></td>
           <td><?php echo zget($users, $story->assignedTo);?></td>
-          <td title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
+          <td class='text-right'title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
           <td>
             <span class='status-story status-<?php echo $story->status?>'>
               <?php echo $this->processStatus('story', $story);?>
diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php
index 6a24c90f64..2c5a66f9f6 100644
--- a/module/productplan/view/view.html.php
+++ b/module/productplan/view/view.html.php
@@ -120,7 +120,7 @@
                 <th class='text-left'><?php common::printOrderLink('title',      $orderBy, $vars, $lang->story->title);?></th>
                 <th class='c-user'> <?php common::printOrderLink('openedBy',   $orderBy, $vars, $lang->openedByAB);?></th>
                 <th class='c-user'> <?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
-                <th class='w-70px'> <?php common::printOrderLink('estimate',   $orderBy, $vars, $lang->story->estimateAB);?></th>
+                <th class='w-70px text-right'> <?php common::printOrderLink('estimate',   $orderBy, $vars, $lang->story->estimateAB);?></th>
                 <th class='w-70px'> <?php common::printOrderLink('status',     $orderBy, $vars, $lang->statusAB);?></th>
                 <th class='w-80px'> <?php common::printOrderLink('stage',      $orderBy, $vars, $lang->story->stageAB);?></th>
                 <th class='c-actions-1'> <?php echo $lang->actions?></th>
@@ -154,7 +154,7 @@
                 </td>
                 <td><?php echo zget($users, $story->openedBy);?></td>
                 <td><?php echo zget($users, $story->assignedTo);?></td>
-                <td title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
+                <td class='text-right' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
                 <td>
                   <span class='status-story status-<?php echo $story->status?>'>
                     <?php echo $this->processStatus('story', $story);?>
diff --git a/module/projectrelease/control.php b/module/projectrelease/control.php
index a9d4e75947..693f61771b 100644
--- a/module/projectrelease/control.php
+++ b/module/projectrelease/control.php
@@ -451,7 +451,7 @@ class projectrelease extends control
         }
         else
         {
-            $allStories = $this->story->getProjectStories($build->execution, 0, 0, 't1.`order`_desc', 'byProduct', $release->product, 'story', $release->stories, $pager);
+            $allStories = $this->story->getExecutionStories($build->execution, 0, 0, 't1.`order`_desc', 'byProduct', $release->product, 'story', $release->stories, $pager);
         }
 
         $this->view->allStories     = $allStories;
diff --git a/module/projectrelease/view/linkstory.html.php b/module/projectrelease/view/linkstory.html.php
index a9540e1e31..a8bb6c8ba6 100644
--- a/module/projectrelease/view/linkstory.html.php
+++ b/module/projectrelease/view/linkstory.html.php
@@ -18,7 +18,7 @@
     </div>
     <table class='table tablesorter'>
       <thead>
-        <tr class='text-center'>
+        <tr>
           <th class='c-id text-left'>
             <?php if($allStories):?>
             <div class="checkbox-primary check-all" title="<?php echo $lang->selectAll?>">
@@ -29,14 +29,14 @@
           </th>
           <th class='c-pri'><?php echo $lang->priAB;?></th>
           <th class='text-left'><?php echo $lang->story->title;?></th>
-          <th class='c-user'>  <?php echo $lang->openedByAB;?></th>
-          <th class='c-user'>  <?php echo $lang->assignedToAB;?></th>
-          <th class='w-70px'>  <?php echo $lang->story->estimateAB;?></th>
+          <th class='c-user'><?php echo $lang->openedByAB;?></th>
+          <th class='c-user'><?php echo $lang->assignedToAB;?></th>
+          <th class='w-70px text-right'><?php echo $lang->story->estimateAB;?></th>
           <th class='c-status'><?php echo $lang->statusAB;?></th>
           <th class='w-80px'><?php echo $lang->story->stageAB;?></th>
         </tr>
       </thead>
-      <tbody class='text-center'>
+      <tbody>
         <?php $unlinkedCount = 0;?>
         <?php foreach($allStories as $story):?>
         <tr>
@@ -56,7 +56,7 @@
           </td>
           <td><?php echo zget($users, $story->openedBy);?></td>
           <td><?php echo zget($users, $story->assignedTo);?></td>
-          <td title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
+          <td class='text-right' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
           <td><span class='status-story status-<?php echo $story->status?>'><?php echo $this->processStatus('story', $story);?></span></td>
           <td><?php echo zget($lang->story->stageList, $story->stage);?></td>
         </tr>
diff --git a/module/projectrelease/view/view.html.php b/module/projectrelease/view/view.html.php
index cf528a85a6..3fa35f6376 100644
--- a/module/projectrelease/view/view.html.php
+++ b/module/projectrelease/view/view.html.php
@@ -76,7 +76,7 @@
                 ?>
                 <?php $vars = "releaseID={$release->id}&type=story&link=$link&param=$param&orderBy=%s";?>
                 <thead>
-                  <tr class='text-center'>
+                  <tr>
                     <th class='c-id text-left'>
                       <?php if(($canBatchUnlink or $canBatchClose) and $canBeChanged):?>
                       <div class="checkbox-primary check-all" title="<?php echo $lang->selectAll?>">
@@ -88,13 +88,13 @@
                     <th class='c-pri'>    <?php common::printOrderLink('pri',      $orderBy, $vars, $lang->priAB);?></th>
                     <th class="text-left"><?php common::printOrderLink('title',    $orderBy, $vars, $lang->story->title);?></th>
                     <th class='c-user'>   <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
-                    <th class='w-80px'>   <?php common::printOrderLink('estimate', $orderBy, $vars, $lang->story->estimateAB);?></th>
-                    <th class='w-90px'>   <?php common::printOrderLink('status',   $orderBy, $vars, $lang->statusAB);?></th>
-                    <th class='w-100px'>  <?php common::printOrderLink('stage',    $orderBy, $vars, $lang->story->stageAB);?></th>
-                    <th class='c-actions-1'>   <?php echo $lang->actions?></th>
+                    <th class='w-80px text-right'><?php common::printOrderLink('estimate', $orderBy, $vars, $lang->story->estimateAB);?></th>
+                    <th class='w-90px'> <?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
+                    <th class='w-100px'><?php common::printOrderLink('stage',  $orderBy, $vars, $lang->story->stageAB);?></th>
+                    <th class='c-actions-1'><?php echo $lang->actions?></th>
                   </tr>
                 </thead>
-                <tbody class='text-center'>
+                <tbody>
                   <?php foreach($stories as $storyID => $story):?>
                   <?php $storyLink = $this->createLink('story', 'view', "storyID=$story->id", '', true);?>
                   <tr>
@@ -115,7 +115,7 @@
                       ?>
                     </td>
                     <td><?php echo zget($users, $story->openedBy);?></td>
-                    <td title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
+                    <td class='text-right' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
                     <td>
                       <span class='status-story status-<?php echo $story->status;?>'><?php echo $this->processStatus('story', $story);?></span>
                     </td>
diff --git a/module/release/view/linkstory.html.php b/module/release/view/linkstory.html.php
index bcdf87925c..0e746d0e2d 100644
--- a/module/release/view/linkstory.html.php
+++ b/module/release/view/linkstory.html.php
@@ -18,7 +18,7 @@
     </div>
     <table class='table tablesorter'>
       <thead>
-        <tr class='text-center'>
+        <tr>
           <th class='c-id text-left'>
             <?php if($allStories):?>
             <div class="checkbox-primary check-all" title="<?php echo $lang->selectAll?>">
@@ -29,14 +29,14 @@
           </th>
           <th class='c-pri'><?php echo $lang->priAB;?></th>
           <th class='text-left'><?php echo $lang->story->title;?></th>
-          <th class='c-user'>  <?php echo $lang->openedByAB;?></th>
-          <th class='c-user'>  <?php echo $lang->assignedToAB;?></th>
-          <th class='w-70px'>  <?php echo $lang->story->estimateAB;?></th>
+          <th class='c-user'><?php echo $lang->openedByAB;?></th>
+          <th class='c-user'><?php echo $lang->assignedToAB;?></th>
+          <th class='w-70px text-right'><?php echo $lang->story->estimateAB;?></th>
           <th class='c-status'><?php echo $lang->statusAB;?></th>
           <th class='w-80px'><?php echo $lang->story->stageAB;?></th>
         </tr>
       </thead>
-      <tbody class='text-center'>
+      <tbody>
         <?php $unlinkedCount = 0;?>
         <?php foreach($allStories as $story):?>
         <tr>
@@ -56,7 +56,7 @@
           </td>
           <td><?php echo zget($users, $story->openedBy);?></td>
           <td><?php echo zget($users, $story->assignedTo);?></td>
-          <td title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
+          <td class='text-right' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
           <td><span class='status-story status-<?php echo $story->status?>'><?php echo $this->processStatus('story', $story);?></span></td>
           <td><?php echo zget($lang->story->stageList, $story->stage);?></td>
         </tr>
diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php
index 151b5336a4..07d9673527 100644
--- a/module/release/view/view.html.php
+++ b/module/release/view/view.html.php
@@ -76,7 +76,7 @@
                 ?>
                 <?php $vars = "releaseID={$release->id}&type=story&link=$link&param=$param&orderBy=%s";?>
                 <thead>
-                  <tr class='text-center'>
+                  <tr>
                     <th class='c-id text-left'>
                       <?php if(($canBatchUnlink or $canBatchClose) and $canBeChanged):?>
                       <div class="checkbox-primary check-all" title="<?php echo $lang->selectAll?>">
@@ -88,13 +88,13 @@
                     <th class='c-pri'>    <?php common::printOrderLink('pri',      $orderBy, $vars, $lang->priAB);?></th>
                     <th class="text-left"><?php common::printOrderLink('title',    $orderBy, $vars, $lang->story->title);?></th>
                     <th class='c-user'>   <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
-                    <th class='w-80px'>   <?php common::printOrderLink('estimate', $orderBy, $vars, $lang->story->estimateAB);?></th>
-                    <th class='w-90px'>   <?php common::printOrderLink('status',   $orderBy, $vars, $lang->statusAB);?></th>
-                    <th class='w-100px'>  <?php common::printOrderLink('stage',    $orderBy, $vars, $lang->story->stageAB);?></th>
-                    <th class='c-actions-1'>   <?php echo $lang->actions?></th>
+                    <th class='w-80px text-right'><?php common::printOrderLink('estimate', $orderBy, $vars, $lang->story->estimateAB);?></th>
+                    <th class='w-90px'> <?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
+                    <th class='w-100px'><?php common::printOrderLink('stage',  $orderBy, $vars, $lang->story->stageAB);?></th>
+                    <th class='c-actions-1'><?php echo $lang->actions?></th>
                   </tr>
                 </thead>
-                <tbody class='text-center'>
+                <tbody>
                   <?php foreach($stories as $storyID => $story):?>
                   <?php $storyLink = $this->createLink('story', 'view', "storyID=$story->id", '', true);?>
                   <tr>
@@ -115,7 +115,7 @@
                       ?>
                     </td>
                     <td><?php echo zget($users, $story->openedBy);?></td>
-                    <td title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
+                    <td class='text-right' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
                     <td>
                       <span class='status-story status-<?php echo $story->status;?>'><?php echo $this->processStatus('story', $story);?></span>
                     </td>
diff --git a/module/story/view/linkstory.html.php b/module/story/view/linkstory.html.php
index 89d5b067b9..486b8fb2c9 100644
--- a/module/story/view/linkstory.html.php
+++ b/module/story/view/linkstory.html.php
@@ -42,7 +42,7 @@
         <th class='w-80px'><?php echo $lang->story->stage;?></th>
         <?php endif;?>
         <th class='w-user'><?php echo $lang->openedByAB;?></th>
-        <th class='w-80px'><?php echo $lang->story->estimateAB;?></th>
+        <th class='w-80px text-right'><?php echo $lang->story->estimateAB;?></th>
       </tr>
       </thead>
       <tbody>
@@ -52,7 +52,7 @@
       <tr>
         <td class='c-id'>
           <div class="checkbox-primary">
-            <input type='checkbox' name='stories[]'  value='<?php echo $story2Link->id;?>'/> 
+            <input type='checkbox' name='stories[]'  value='<?php echo $story2Link->id;?>'/>
             <label></label>
           </div>
           <?php echo html::a($storyLink, sprintf('%03d', $story2Link->id));?>
@@ -64,7 +64,7 @@
         <td><?php echo zget($lang->story->stageList, $story2Link->stage);?></td>
         <?php endif;?>
         <td><?php echo zget($users, $story2Link->openedBy);?></td>
-        <td><?php echo $story2Link->estimate;?></td>
+        <td class='text-right'><?php echo $story2Link->estimate;?></td>
       </tr>
       <?php $storyCount ++;?>
       <?php endforeach;?>
diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index ffe17cbee7..356f724b9e 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -159,7 +159,7 @@
                 </td>
                 <td class='text-left' title='<?php echo $child->title;?>'><a class="iframe" data-width="90%" href="<?php echo $this->createLink('story', 'view', "storyID=$child->id", '', true); ?>"><?php echo $child->title;?></a></td>
                 <td><?php echo zget($users, $child->assignedTo);?></td>
-                <td><?php echo $child->estimate;?></td>
+                <td title="<?php echo $child->estimate . ' ' . $lang->hourCommon;?>"><?php echo $child->estimate . ' ' . $config->hourUnit;?></td>
                 <td><?php echo $this->processStatus('story', $child);?></td>
                 <td class='c-actions'>
                   <?php
@@ -337,7 +337,7 @@
                 </tr>
                 <tr>
                   <th><?php echo $lang->story->estimate;?></th>
-                  <td><?php echo $story->estimate;?></td>
+                  <td title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
                 </tr>
                 <tr>
                   <th><?php echo $lang->story->keywords;?></th>
diff --git a/module/task/config.php b/module/task/config.php
index d6d9dcc7ec..409ec89fdb 100644
--- a/module/task/config.php
+++ b/module/task/config.php
@@ -76,7 +76,7 @@ $config->task->datatable->fieldList['status']['width']    = '80';
 $config->task->datatable->fieldList['status']['required'] = 'no';
 
 $config->task->datatable->fieldList['estimate']['title']    = 'estimateAB';
-$config->task->datatable->fieldList['estimate']['fixed']    = 'no';
+$config->task->datatable->fieldList['estimate']['fixed']    = 'right';
 $config->task->datatable->fieldList['estimate']['width']    = '60';
 $config->task->datatable->fieldList['estimate']['required'] = 'no';