diff --git a/module/doc/css/view.css b/module/doc/css/view.css
index d15fdf60ef..da6f92a519 100644
--- a/module/doc/css/view.css
+++ b/module/doc/css/view.css
@@ -7,3 +7,11 @@ fieldset > .content table tr th { border-top: 1px solid #BBB;
 }
 fieldset > .content table tr th, fieldset > .content table tr td{ padding: 5px 10px; }
 .col-main{width:100%}
+
+.content table.noBorderTable td,table.noBorderTable th,table.noBorderTable caption{border:1px dashed #ddd !important}
+.content table{margin-bottom:10px;border-collapse:collapse;display:table;}
+.content td,th{padding: 5px 10px;border: 1px solid #DDD;}
+.content caption{border:1px dashed #DDD;border-bottom:0;padding:3px;text-align:center;}
+.content th{border-top:1px solid #BBB;background-color:#F7F7F7;}
+.content table tr.firstRow th{border-top-width:2px;}
+.content td p{margin:0;padding:0;}
diff --git a/module/productplan/model.php b/module/productplan/model.php
index 97f306b8d0..375eead92a 100644
--- a/module/productplan/model.php
+++ b/module/productplan/model.php
@@ -134,6 +134,13 @@ class productplanModel extends model
                 ->fetchPairs();
         }
 
+        foreach($plans as $key => $value)
+        {
+          if(strpos($value,'2030-01-01'))
+          {
+            $plans[$key] = str_replace('2030-01-01 ~ 2030-01-01',$this->lang->productplan->future,$value);
+          }
+        }
         return array('' => '') + $plans;
     }
 
diff --git a/module/project/control.php b/module/project/control.php
index 8b716d2205..83f5bec2af 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -925,7 +925,8 @@ class project extends control
             $acl         = $copyProject->acl;
             $whitelist   = $copyProject->whitelist;
             $products    = $this->project->getProducts($copyProjectID);
-        }
+        }     
+
         if(!empty($planID))
         {
             $plan        = $this->dao->select('*')->from(TABLE_PRODUCTPLAN)->where('id')->eq($planID)->fetch();