diff --git a/module/block/control.php b/module/block/control.php
index 10d0aca623..e6be90f536 100644
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -1196,7 +1196,7 @@ class block extends control
             $charts['PV']      .= $this->milestone->getPV($projectIdList, $begin, $stageEnd) . ',';
             $charts['EV']      .= $this->milestone->getEV($projectIdList, $begin, $stageEnd) . ',';
             $charts['AC']      .= $this->milestone->getAC($projectIdList, $begin, $stageEnd) . ',';
-            $start              = $longProgram ? date('Y-m-d', strtotime("$start + 1 month")) : date('Y-m-d', strtotime("$start + 7 days"));
+            $start              = date('Y-m-d', strtotime("$stageEnd + 1 day"));
             $i ++;
         }
 
diff --git a/module/block/view/cmmiestimateblock.html.php b/module/block/view/cmmiestimateblock.html.php
index 909cea5fb1..cae8155d74 100644
--- a/module/block/view/cmmiestimateblock.html.php
+++ b/module/block/view/cmmiestimateblock.html.php
@@ -2,15 +2,15 @@
 <table class='table table-data'>
   <tr>
     <th class='w-100px'><?php echo $lang->durationestimation->people;?></th>
-    <td><?php echo $people;?></td>
+    <td><?php echo $people ? $people : 0;?></td>
     <th class='w-80px'><?php echo $lang->durationestimation->members;?></th>
     <td><?php echo $members;?></td>
   </tr>
   <tr>
     <th><?php echo $lang->workestimation->duration;?></th>
-    <td><?php echo zget($budget, 'duration', 0) . ' ' . $lang->workestimation->hour;?></td>
+    <td><?php echo zget($budget, 'duration', 0);?></td>
     <th><?php echo $lang->workestimation->consumed;?></th>
-    <td><?php echo $consumed . $lang->workestimation->hour;?></td>
+    <td><?php echo $consumed ? $consumed : 0;?></td>
   </tr>
   <tr>
     <th><?php echo $lang->workestimation->totalLaborCost;?></th>
diff --git a/module/block/view/programstatisticblock.html.php b/module/block/view/programstatisticblock.html.php
index e739b2941e..db877a9462 100644
--- a/module/block/view/programstatisticblock.html.php
+++ b/module/block/view/programstatisticblock.html.php
@@ -68,7 +68,7 @@ html[lang="en"] .product-info .type-info {color: #A6AAB8; text-align: center; po
 .block-statistic .weekly-small{font-size:12px; color: #838A9D;}
 .block-statistic .weekly-progress {font-weight: bold; font-size:24px;}
 .block-statistic .weekly-name{font-size:14px; color: #838A9D;}
-.block-statistic .weekly-value{font-size:18px; color: #3C4253;}
+.block-statistic .weekly-value{font-size:14px;}
 .block-statistic .col-6 .stage{margin-left: 10px}
 </style>
 <script>
@@ -185,7 +185,7 @@ $(function()
                 <div class="progress-bar" role="progressbar" aria-valuenow="82" aria-valuemin="0" aria-valuemax="100" style="width: <?php echo $program->progress;?>%"></div>
               </div>
             </div>
-            <div class="table-row text-center small text-muted with-padding col-10 center-block">
+            <div class="table-row text-center small with-padding col-10 center-block">
               <div class="col-4 text-bottom">
                 <div class='weekly-name'><?php echo $lang->program->pv;?></div>
                 <div class='weekly-value'><?php echo $program->pv;?></div>
@@ -208,7 +208,7 @@ $(function()
               <div class='col-8'></div>
             </div>
             <div class='progress-group'>
-              <div class="table-row text-center small text-muted with-padding">
+              <div class="table-row text-center small with-padding">
                 <div class="col-4 text-bottom">
                   <div class='weekly-name'><?php echo $lang->program->pm;?></div>
                   <div class='weekly-value'><?php echo $program->PM ? $program->PM : $lang->program->emptyPM;?></div>
@@ -223,7 +223,7 @@ $(function()
                 </div>
               </div>
             </div>
-            <div class="table-row text-center small text-muted with-padding">
+            <div class="table-row text-center small with-padding">
                 <div class="col-4 text-bottom">
                   <div class='weekly-name'><?php echo $lang->program->ac;?></div>
                   <div class='weekly-value'><?php echo $program->ac;?></div>
diff --git a/module/design/lang/en.php b/module/design/lang/en.php
index 5dc76bccad..94c96296e8 100644
--- a/module/design/lang/en.php
+++ b/module/design/lang/en.php
@@ -9,12 +9,18 @@ $lang->design->actions       = 'Actions';
 $lang->design->delete        = 'Delete';
 $lang->design->confirmDelete = 'Do you want to delete this design?';
 $lang->design->edit          = 'Edit';
+$lang->design->byQuery       = 'Search';
 $lang->design->products      = 'Linked Product';
 $lang->design->story         = 'Linked Story';
 $lang->design->file          = 'File';
+$lang->design->id            = 'ID';
+$lang->design->type          = 'Type';
+$lang->design->story         = 'Story';
+$lang->design->ditto         = 'Ditto';
 $lang->design->type          = 'Type';
 $lang->design->name          = 'Name';
 $lang->design->create        = 'Create Design';
+$lang->design->batchCreate   = 'Batch Create';
 $lang->design->view          = 'View';
 $lang->design->desc          = 'Description';
 $lang->design->product       = 'Linked Product';
@@ -31,6 +37,7 @@ $lang->design->createdDate   = 'CreatedDate';
 $lang->design->basicInfo     = 'Basic Information';
 
 $lang->design->typeList         = array();
+$lang->design->typeList['']     = '';
 $lang->design->typeList['HLDS'] = 'High-Level';
 $lang->design->typeList['DDS']  = 'Detailed';
 $lang->design->typeList['DBDS'] = 'Database';
diff --git a/module/task/control.php b/module/task/control.php
index c6264caa62..eb8fab2c1f 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -53,6 +53,9 @@ class task extends control
             die(js::locate($this->createLink('project', 'task', "projectID=$projectID")));
         }
 
+        $program = $this->loadModel('project')->getByID($this->session->program);
+        if($program->template == 'cmmi') $this->config->task->create->requiredFields .= ',estStarted,deadline';
+
         $task = new stdClass();
         $task->module     = $moduleID;
         $task->assignedTo = '';
@@ -236,6 +239,9 @@ class task extends control
             die(js::locate($this->createLink('project', 'task', "projectID=$projectID")));
         }
 
+        $program = $this->loadModel('project')->getByID($this->session->program);
+        if($program->template == 'cmmi') $this->config->task->create->requiredFields .= ',estStarted,deadline';
+
         $project   = $this->project->getById($projectID);
         $taskLink  = $this->createLink('project', 'browse', "projectID=$projectID&tab=task");
         $storyLink = $this->session->storyList ? $this->session->storyList : $this->createLink('project', 'story', "projectID=$projectID");