diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index 586f6a7b8b..2f75131e46 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -332,7 +332,7 @@ $lang->my->dividerMenu = ',myProject,team,';
 $lang->todo = new stdclass();
 $lang->todo->menu = $lang->my->menu;
 
-$lang->product->dividerMenu = ',plan,project,dynamic,';
+$lang->product->dividerMenu = ',requirement,set,';
 
 $lang->story = new stdclass();
 
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 30d1c60a2c..906afa294f 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -332,7 +332,7 @@ $lang->my->dividerMenu = ',myProject,team,';
 $lang->todo       = new stdclass();
 $lang->todo->menu = $lang->my->menu;
 
-$lang->product->dividerMenu = ',plan,project,dynamic,';
+$lang->product->dividerMenu = ',requirement,set,';
 
 $lang->story = new stdclass();
 
diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php
index 85a7431226..38d539a6fb 100644
--- a/module/common/lang/fr.php
+++ b/module/common/lang/fr.php
@@ -332,7 +332,7 @@ $lang->my->dividerMenu = ',myProject,team,';
 $lang->todo       = new stdclass();
 $lang->todo->menu = $lang->my->menu;
 
-$lang->product->dividerMenu = ',plan,project,dynamic,';
+$lang->product->dividerMenu = ',requirement,set,';
 
 $lang->story = new stdclass();
 
diff --git a/module/common/lang/menuOrder.php b/module/common/lang/menuOrder.php
index c91d39f787..946f4b2e75 100644
--- a/module/common/lang/menuOrder.php
+++ b/module/common/lang/menuOrder.php
@@ -60,19 +60,31 @@ $lang->my->menuOrder[55] = 'contacts';
 $lang->todo->menuOrder = $lang->my->menuOrder;
 
 /* product menu order. */
+<<<<<<< HEAD
 $lang->product->menuOrder[1]  = 'dashboard';
 $lang->product->menuOrder[5]  = 'requirement';
+=======
+$lang->product->menuOrder[5]  = 'dashboard';
+>>>>>>> f6bc489e36d6d6f13c214a30e0fea2f6d3bceeed
 $lang->product->menuOrder[10] = 'story';
 $lang->product->menuOrder[15] = 'plan';
+$lang->product->menuOrder[30] = 'project';
 $lang->product->menuOrder[20] = 'release';
 $lang->product->menuOrder[25] = 'roadmap';
-$lang->product->menuOrder[30] = 'project';
+$lang->product->menuOrder[30] = 'requirement';
 $lang->product->menuOrder[35] = 'track';
 $lang->product->menuOrder[40] = 'doc';
+<<<<<<< HEAD
 $lang->product->menuOrder[45] = 'dynamic';
 $lang->product->menuOrder[50] = 'setting';
 $lang->product->menuOrder[55] = 'create';
 $lang->product->menuOrder[60] = 'all';
+=======
+$lang->product->menuOrder[50] = 'dynamic';
+$lang->product->menuOrder[55] = 'setting';
+$lang->product->menuOrder[60] = 'create';
+$lang->product->menuOrder[65] = 'all';
+>>>>>>> f6bc489e36d6d6f13c214a30e0fea2f6d3bceeed
 
 $lang->story->menuOrder       = $lang->product->menuOrder;
 $lang->productplan->menuOrder = $lang->product->menuOrder;
diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php
index 4886cae96d..e8cd20c5da 100644
--- a/module/common/lang/vi.php
+++ b/module/common/lang/vi.php
@@ -332,7 +332,7 @@ $lang->my->dividerMenu = ',myProject,team,';
 $lang->todo       = new stdclass();
 $lang->todo->menu = $lang->my->menu;
 
-$lang->product->dividerMenu = ',plan,project,dynamic,';
+$lang->product->dividerMenu = ',requirement,set,';
 
 $lang->story = new stdclass();
 
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index a3e179cf1f..39e19d26fc 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -332,7 +332,7 @@ $lang->my->dividerMenu = ',myProject,team,';
 $lang->todo       = new stdclass();
 $lang->todo->menu = $lang->my->menu;
 
-$lang->product->dividerMenu = ',plan,project,dynamic,';
+$lang->product->dividerMenu = ',requirement,set,';
 
 $lang->story = new stdclass();
 
diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php
index c9ef06753c..99c4745557 100644
--- a/module/common/lang/zh-tw.php
+++ b/module/common/lang/zh-tw.php
@@ -332,7 +332,7 @@ $lang->my->dividerMenu = ',myProject,team,';
 $lang->todo       = new stdclass();
 $lang->todo->menu = $lang->my->menu;
 
-$lang->product->dividerMenu = ',plan,project,dynamic,';
+$lang->product->dividerMenu = ',requirement,set,';
 
 $lang->story = new stdclass();
 
diff --git a/module/datatable/model.php b/module/datatable/model.php
index dca133dd43..d37b0db5c6 100644
--- a/module/datatable/model.php
+++ b/module/datatable/model.php
@@ -153,7 +153,7 @@ class datatableModel extends model
             $title = (isset($col->name) and $col->name) ? "title='$col->name'" : $title;
             if($id == 'id' and (int)$width < 90) $width = '90px';
             $width = "data-width='$width' style='width:$width'";
-            $align = ($id == 'actions' || $id == 'progress') ? 'text-center' : '';
+            $align = $id == 'actions' ? 'text-center' : '';
 
             echo "<th data-flex='$fixed' $width class='c-$id $align' $title>";
             if($id == 'actions')
diff --git a/module/my/view/execution.html.php b/module/my/view/execution.html.php
index e00f93cb0d..c2402101a9 100644
--- a/module/my/view/execution.html.php
+++ b/module/my/view/execution.html.php
@@ -70,8 +70,8 @@
         <td><?php echo $execution->hours;?></td>
         <td><?php echo $execution->assignedToMeTasks;?></td>
         <td>
-          <div class='progress-pie' data-doughnut-size='80' data-color='#00da88' data-value='<?php echo $execution->progress;?>' data-width='24' data-height='24' data-back-color='#e8edf3'>
-            <div class='progress-info'><?php echo $execution->progress;?>%</div>
+          <div class='progress-pie' data-doughnut-size='90' data-color='#00da88' data-value='<?php echo $execution->progress;?>' data-width='24' data-height='24' data-back-color='#e8edf3'>
+            <div class='progress-info'><?php echo $execution->progress;?></div>
           </div>
         </td>
       </tr>
diff --git a/module/product/view/project.html.php b/module/product/view/project.html.php
index 916e60599d..5f640f87ee 100644
--- a/module/product/view/project.html.php
+++ b/module/product/view/project.html.php
@@ -65,8 +65,8 @@
           <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>
-            <div class='progress-pie' data-doughnut-size='80' 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>
+            <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>
             </div>
           </td>
         </tr>
diff --git a/module/project/model.php b/module/project/model.php
index 0c6e9576b3..a4170a3a19 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1131,7 +1131,7 @@ class projectModel extends model
                     echo $project->hours->totalLeft     . ' ' . $this->lang->execution->workHourUnit;
                     break;
                 case 'progress':
-                    echo "<div class='progress-pie' data-doughnut-size='80' data-color='#00da88' data-value='{$project->hours->progress}' data-width='24' data-height='24' data-back-color='#e8edf3'><div class='progress-info'>{$project->hours->progress}%</div></div>";
+                    echo "<div class='progress-pie' data-doughnut-size='90' data-color='#00da88' data-value='{$project->hours->progress}' data-width='24' data-height='24' data-back-color='#e8edf3'><div class='progress-info'>{$project->hours->progress}</div></div>";
                     break;
                 case 'actions':
                     if($project->status == 'wait' || $project->status == 'suspended') common::printIcon('project', 'start', "projectID=$project->id", $project, 'list', 'play', '', 'iframe', true);