diff --git a/module/block/view/productoverviewblock.html.php b/module/block/view/productoverviewblock.html.php
index 3be71d86ff..7a0d7f4b46 100644
--- a/module/block/view/productoverviewblock.html.php
+++ b/module/block/view/productoverviewblock.html.php
@@ -14,7 +14,7 @@
   .block-overview .status-list li + li {margin-top: 5px;}
   .block-overview .status-list li > strong {font-size: 16px;}
   .progress-pie {position: relative;}
-  .progress-pie .progress-info {position: absolute; width: 105%; height: 105%; left: 0; top: 0; text-align: center; padding-top: 25px;}
+  .progress-pie .progress-info {position: absolute; width: 100%; height: 100%; left: 0; top: 0; text-align: center; padding-top: 25px;}
   .progress-pie .progress-info > small {display: block; color: #A6AAB8; line-height: 14px;}
   .progress-pie .progress-info > strong {display: block; font-size: 36px; line-height: 40px;}
 </style>
diff --git a/module/productplan/lang/en.php b/module/productplan/lang/en.php
index 74eed8e985..d207ef7b33 100644
--- a/module/productplan/lang/en.php
+++ b/module/productplan/lang/en.php
@@ -44,23 +44,25 @@ $lang->productplan->confirmUnlinkBug   = "Do you want to unlink this bug?";
 $lang->productplan->noPlan             = 'No plans yet. ';
 $lang->productplan->cannotDeleteParent = 'Cannot delete parent plan';
 
-$lang->productplan->id       = 'ID';
-$lang->productplan->product  = $lang->productCommon;
-$lang->productplan->branch   = 'Platform/Branch';
-$lang->productplan->title    = 'Title';
-$lang->productplan->desc     = 'Description';
-$lang->productplan->begin    = 'Begin';
-$lang->productplan->end      = 'End';
-$lang->productplan->last     = 'Last Plan';
-$lang->productplan->future   = 'TBD';
-$lang->productplan->stories  = 'Story';
-$lang->productplan->bugs     = 'Bug';
-$lang->productplan->hour     = 'Hours';
-$lang->productplan->project  = $lang->projectCommon;
-$lang->productplan->parent   = "Parent Plan";
-$lang->productplan->children = "Child Plan";
-$lang->productplan->order    = "Order";
-$lang->productplan->deleted  = "Deleted";
+$lang->productplan->id         = 'ID';
+$lang->productplan->product    = $lang->productCommon;
+$lang->productplan->branch     = 'Platform/Branch';
+$lang->productplan->title      = 'Title';
+$lang->productplan->desc       = 'Description';
+$lang->productplan->begin      = 'Begin';
+$lang->productplan->end        = 'End';
+$lang->productplan->last       = 'Last Plan';
+$lang->productplan->future     = 'TBD';
+$lang->productplan->stories    = 'Story';
+$lang->productplan->bugs       = 'Bug';
+$lang->productplan->hour       = 'Hours';
+$lang->productplan->project    = $lang->projectCommon;
+$lang->productplan->parent     = "Parent Plan";
+$lang->productplan->parentAB   = "Parent";
+$lang->productplan->children   = "Child Plan";
+$lang->productplan->childrenAB = "C";
+$lang->productplan->order      = "Order";
+$lang->productplan->deleted    = "Deleted";
 
 $lang->productplan->endList[7]    = '1 Week';
 $lang->productplan->endList[14]   = '2 Weeks';
diff --git a/module/productplan/lang/zh-cn.php b/module/productplan/lang/zh-cn.php
index ca0dcc68d5..cb58e032d9 100644
--- a/module/productplan/lang/zh-cn.php
+++ b/module/productplan/lang/zh-cn.php
@@ -44,23 +44,25 @@ $lang->productplan->confirmUnlinkBug   = "您确认移除该Bug吗？";
 $lang->productplan->noPlan             = '暂时没有计划。';
 $lang->productplan->cannotDeleteParent = '不能删除父计划';
 
-$lang->productplan->id       = '编号';
-$lang->productplan->product  = $lang->productCommon;
-$lang->productplan->branch   = '平台/分支';
-$lang->productplan->title    = '名称';
-$lang->productplan->desc     = '描述';
-$lang->productplan->begin    = '开始日期';
-$lang->productplan->end      = '结束日期';
-$lang->productplan->last     = '上次计划';
-$lang->productplan->future   = '待定';
-$lang->productplan->stories  = '需求数';
-$lang->productplan->bugs     = 'Bug数';
-$lang->productplan->hour     = '工时';
-$lang->productplan->project  = $lang->projectCommon;
-$lang->productplan->parent   = "父计划";
-$lang->productplan->children = "子计划";
-$lang->productplan->order    = "排序";
-$lang->productplan->deleted  = "已删除";
+$lang->productplan->id         = '编号';
+$lang->productplan->product    = $lang->productCommon;
+$lang->productplan->branch     = '平台/分支';
+$lang->productplan->title      = '名称';
+$lang->productplan->desc       = '描述';
+$lang->productplan->begin      = '开始日期';
+$lang->productplan->end        = '结束日期';
+$lang->productplan->last       = '上次计划';
+$lang->productplan->future     = '待定';
+$lang->productplan->stories    = '需求数';
+$lang->productplan->bugs       = 'Bug数';
+$lang->productplan->hour       = '工时';
+$lang->productplan->project    = $lang->projectCommon;
+$lang->productplan->parent     = "父计划";
+$lang->productplan->parentAB   = "父";
+$lang->productplan->children   = "子计划";
+$lang->productplan->childrenAB = "子";
+$lang->productplan->order      = "排序";
+$lang->productplan->deleted    = "已删除";
 
 $lang->productplan->endList[7]   = '一星期';
 $lang->productplan->endList[14]  = '两星期';
diff --git a/module/report/model.php b/module/report/model.php
index 96d8dec0fc..8bf1976af0 100644
--- a/module/report/model.php
+++ b/module/report/model.php
@@ -143,8 +143,23 @@ class reportModel extends model
             ->fetchAll('id');
         $plans    = $this->dao->select('*')->from(TABLE_PRODUCTPLAN)->where('deleted')->eq(0)->andWhere('product')->in(array_keys($products))
             ->beginIF(strpos($conditions, 'overduePlan') === false)->andWhere('end')->gt(date('Y-m-d'))->fi()
+            ->orderBy('product,parent_desc,begin')
             ->fetchAll('id');
-        foreach($plans as $plan) $products[$plan->product]->plans[$plan->id] = $plan;
+        foreach($plans as $plan)
+        {
+            if($plan->parent > 0)
+            {
+                $parentPlan = zget($plans, $plan->parent, null);
+                if($parentPlan)
+                {
+                    $parentPlan->title = "[" . $this->lang->productplan->parentAB . '] ' . $parentPlan->title;
+                    $products[$plan->product]->plans[$parentPlan->id] = $parentPlan;
+                    unset($plans[$parentPlan->id]);
+                }
+                $plan->title = "[" . $this->lang->productplan->childrenAB . '] ' . $plan->title;
+            }
+            $products[$plan->product]->plans[$plan->id] = $plan;
+        }
 
         $planStories      = array();
         $unplannedStories = array();