diff --git a/module/execution/control.php b/module/execution/control.php
index 62de145e05..06c63487db 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1705,7 +1705,7 @@ class execution extends control
                 foreach($branches[$productIndex] as $branchID => $branch)
                 {
                     $linkedBranches[$productIndex][$branchID] = $branchID;
-                    $productPlans[$productIndex][$branchID]   = isset($plans[$productIndex][$branchID]) ? $plans[$productIndex][$branchID] : array();
+                    $productPlans[$productIndex]              = isset($plans[$productIndex][$branchID]) ? $plans[$productIndex][$branchID] : array();
                 }
             }
 
@@ -1740,7 +1740,7 @@ class execution extends control
                 foreach($branches[$productIndex] as $branchID => $branch)
                 {
                     $linkedBranches[$productIndex][$branchID] = $branchID;
-                    $productPlans[$productIndex][$branchID]   = isset($plans[$productIndex][$branchID]) ? $plans[$productIndex][$branchID] : array();
+                    $productPlans[$productIndex]              = isset($plans[$productIndex][$branchID]) ? $plans[$productIndex][$branchID] : array();
                 }
             }
 
@@ -2033,8 +2033,8 @@ class execution extends control
             {
                 $linkedBranchList[$branchID]           = $branchID;
                 $linkedBranches[$productID][$branchID] = $branchID;
-                $productPlans[$productID][$branchID]   = isset($plans[$productID][$branchID]) ? $plans[$productID][$branchID] : array();
-                if($branchID != BRANCH_MAIN and isset($plans[$productID][BRANCH_MAIN])) $productPlans[$productID][$branchID] += $plans[$productID][BRANCH_MAIN];
+                $productPlans[$productID]              = isset($plans[$productID][$branchID]) ? $plans[$productID][$branchID] : array();
+                if($branchID != BRANCH_MAIN and isset($plans[$productID][BRANCH_MAIN])) $productPlans[$productID] += $plans[$productID][BRANCH_MAIN];
                 if(!empty($executionStories[$productID][$branchID]))
                 {
                     array_push($unmodifiableProducts, $productID);
diff --git a/module/execution/css/create.css b/module/execution/css/create.css
index 839355f188..b3ef4c9ba2 100644
--- a/module/execution/css/create.css
+++ b/module/execution/css/create.css
@@ -21,9 +21,9 @@
 
 .chosen-container.chosen-highlight-selected .disabled-result.result-selected {background: none;}
 
-#productsBox .row .col-sm-4 {padding-right: 13px;}
-#plansBox .row {display: inline-table; width: 102%;}
-#plansBox .row .col-sm-4 {display: inline-block; float: none; padding-right: 13px;}
+.productsBox .row .col-sm-4 {padding-right: 13px;}
+.plansBox .row {display: inline-table; width: 102%;}
+.plansBox .row .col-sm-4 {display: inline-block; float: none; padding-right: 13px;}
 
 #dateRange {vertical-align: top; padding-top: 13px;}
 #dateRangeOption {vertical-align: top; padding-top: 13px;}
@@ -32,3 +32,9 @@
 #copyProjectModal .projectSelect {display: inline-block; margin-left: 10px; width: 20%;}
 #copyProjectModal .titleBox{position: relative; bottom: 3px; display: inline-block;}
 a.chosen-single > div > b {top: -4px !important;}
+
+.productsBox a {border-radius: 2px !important;}
+.productsBox .required:after {right: -9.5px !important;}
+.productsBox .input-group-addon > div {display: inline-block !important;}
+.productsBox .required + .text-danger.help-text {position: relative; left: 10px;}
+.productsBox > #productNameLabel {padding-top: 8px;}
diff --git a/module/execution/js/common.js b/module/execution/js/common.js
index 19d68b6372..b7a2eb2964 100644
--- a/module/execution/js/common.js
+++ b/module/execution/js/common.js
@@ -113,6 +113,15 @@ function computeEndDate(delta)
     computeWorkDays();
 }
 
+/* Auto compute the work days. */
+$(function()
+{
+    $(".date").bind('dateSelected', function()
+    {
+        computeWorkDays(this.id);
+    })
+});
+
 /**
  * Load branches.
  *
@@ -122,118 +131,127 @@ function computeEndDate(delta)
  */
 function loadBranches(product)
 {
-    if($('#productsBox .input-group:last select:first').val() != 0)
+    /* When selecting a product, delete a plan that is empty by default. */
+    $("#planDefault").remove();
+
+    $(".productsBox select[name^='products']").each(function()
     {
-        if(model !== 'waterfall')
+        var $product  = $(product);
+        var productID = $(this).val();
+        if($product.val() != 0 && $product.val() == $(this).val() && $product.attr('id') != $(this).attr('id') && !multiBranchProducts[$product.val()])
         {
-            var length = $('#productsBox .input-group').size();
-            $('#productsBox .row').append('<div class="col-sm-4">' + $('#productsBox .col-sm-4:last').html().replace('required', '') + '</div>');
-            if($('#productsBox .input-group:last select').size() >= 2) $('#productsBox .input-group:last select:last').remove();
-            $('#productsBox .input-group:last .chosen-container').remove();
-            $('#productsBox .input-group:last select:first').attr('name', 'products[' + length + ']').attr('id', 'products' + length);
-            $('#productsBox .input-group:last .chosen').chosen();
+            bootbox.alert(errorSameProducts);
+            $product.val(0);
+            $product.trigger("chosen:updated");
+            return false;
         }
-        adjustProductBoxMargin();
+    });
+
+    var $tableRow = $(product).closest('.table-row');
+    var index     = $tableRow.find('select:first').attr('id').replace('products' , '');
+    var oldBranch = $(product).attr('data-branch') !== undefined ? $(product).attr('data-branch') : 0;
+    if($(product).val() != 0)
+    {
+        $(product).closest('tr').find('.newProduct').addClass('hidden')
+    }
+    else
+    {
+        $(product).closest('tr').find('.newProduct').removeClass('hidden')
     }
 
-    var $inputgroup = $(product).closest('.input-group');
-    if($inputgroup.find('select').size() >= 2) $inputgroup.removeClass('has-branch').find('select:last').remove();
-    if($inputgroup.find('.chosen-container').size() >= 2) $inputgroup.find('.chosen-container:last').remove();
+    if(!multiBranchProducts[$(product).val()])
+    {
+        $tableRow.find('.table-col:last select').val('').trigger('chosen:updated');
+        $tableRow.find('.table-col:last').addClass('hidden');
+    }
 
-    var projectID = $('#project').val();
-    if(typeof(projectID) == 'undefined') projectID = 0;
-
-    var index = $inputgroup.find('select:first').attr('id').replace('products' , '');
-    $.get(createLink('branch', 'ajaxGetBranches', "productID=" + $(product).val() + "&oldBranch=0&param=active&projectID=" + projectID + "&withMainBranch=true"), function(data)
+    $.get(createLink('branch', 'ajaxGetBranches', "productID=" + $(product).val() + "&oldBranch=" + oldBranch + "&param=active&projectID=" + projectID + "&withMainBranch=true"), function(data)
     {
         if(data)
         {
-            $inputgroup.addClass('has-branch').append(data);
-            $inputgroup.find('select:last').attr('name', 'branch[' + index + ']').attr('id', 'branch' + index).attr('onchange', "loadPlans('#products" + index + "', this.value)").chosen();
+            $tableRow.find("select[name^='branch']").replaceWith(data);
+            $tableRow.find('.table-col:last .chosen-container').remove();
+            $tableRow.find('.table-col:last').removeClass('hidden');
+            $tableRow.find("select[name^='branch']").attr('multiple', '').attr('name', 'branch[' + index + '][]').attr('id', 'branch' + index).attr('onchange', "loadPlans('#products" + index + "', this)").chosen();
 
-            $inputgroup.find('select:last').each(disableSelectedBranch);
             disableSelectedProduct();
         }
 
-        var branchID = $('#branch' + index).val();
-        loadPlans(product, branchID);
+        var branch = $('#branch' + index);
+        loadPlans(product, branch);
     });
-
-    if(!multiBranchProducts[$(product).val()]) disableSelectedProduct();
 }
 
 /**
- * Load plans by product id.
+ * Load plans.
  *
- * @param  int $product
- * @param  int $branchID
+ * @param  obj $product
+ * @param  obj $branchID
  * @access public
  * @return void
  */
-function loadPlans(product, branchID)
+function loadPlans(product, branch)
 {
-    if($('#plansBox').size() == 0) return false;
-
     var productID = $(product).val();
-    var branchID  = typeof(branchID) == 'undefined' ? 0 : branchID;
+    var branchID  = $(branch).val() == null ? 0 : '0,' + $(branch).val();
+    var planID    = $(product).attr('data-plan') !== undefined ? $(product).attr('data-plan') : 0;
     var index     = $(product).attr('id').replace('products', '');
 
-    $.get(createLink('product', 'ajaxGetPlans', "productID=" + productID + '&branch=0,' + branchID + '&planID=0&fieldID&needCreate=&expired=noclosed,unexpired&param=skipParent,multiple'), function(data)
+    $.get(createLink('product', 'ajaxGetPlans', "productID=" + productID + '&branch=' + branchID + '&planID=' + planID + '&fieldID&needCreate=&expired=unexpired,noclosed&param=skipParent,multiple'), function(data)
     {
         if(data)
         {
-            if($("div#plan" + index).size() == 0) $("#plansBox .row").append('<div class="col-sm-4" id="plan' + index + '"></div>');
-            $("div#plan" + index).html(data).find('select').attr('name', 'plans[' + productID + '][' + branchID + '][]').attr('id', 'plans' + productID).chosen();
-
-            adjustPlanBoxMargin();
+            $("div#plan" + index).find("select[name^='plans']").replaceWith(data);
+            $("div#plan" + index).find('.chosen-container').remove();
+            $("div#plan" + index).find('select').attr('name', 'plans[' + productID + ']' + '[]').attr('id', 'plans' + productID).chosen();
         }
     });
 }
 
 /**
- * Adjust product box margin.
- *
+ * Add new line for link product.
+ * 
+ * @param  obj $obj 
  * @access public
  * @return void
  */
-function adjustProductBoxMargin()
+function addNewLine(obj)
 {
-    var productRows = Math.ceil($('#productsBox > .row > .col-sm-4').length / 3);
-    if(productRows > 1)
+    var newLine = $(obj).closest('tr').clone();
+    var index   = 0; 
+    $(".productsBox select[name^='products']").each(function()
     {
-        for(i = 1; i <= productRows - 1; i++)
-        {
-            $('#productsBox .col-sm-4:lt(' + (i * 3) + ')').css('margin-bottom', '10px');
-        }
-    }
-}
+        var id = $(this).attr('id').replace('products' , '');
 
-/**
- * Adjust plan box margin.
- *
- * @access public
- * @return void
- */
-function adjustPlanBoxMargin()
-{
-    var planRows = Math.ceil($('#plansBox > .row > .col-sm-4').length / 3);
-    if(planRows > 1)
-    {
-        for(j = 1; j <= planRows - 1; j++)
-        {
-            $('#plansBox .col-sm-4:lt(' + (j * 3) + ')').css('margin-bottom', '10px');
-        }
-    }
-}
+        id = parseInt(id);
+        id ++;
 
-/* Auto compute the work days. */
-$(function()
-{
-    $(".date").bind('dateSelected', function()
-    {
-        computeWorkDays(this.id);
+        index = id > index ? id : index;
     })
-});
+
+    newLine.find('.newProduct').remove();
+    newLine.find('.addProduct').remove();
+    newLine.addClass('newLine');
+    newLine.find('th').html('');
+    newLine.find('.removeLine').css('visibility', 'visible');
+    newLine.find('.chosen-container').remove();
+    newLine.find('.productsBox .table-col:last').addClass('hidden');
+    newLine.find("select[name^='products']").attr('name', 'products[' + index + ']').attr('id', 'products' + index).val('').chosen();
+    newLine.find("select[name^='plans']").attr('name', 'plans[' + index + '][' + 0 + '][]').chosen();
+    newLine.find("div[id^='plan']").attr('id', 'plan' + index);
+
+    $(obj).closest('tr').after(newLine);
+    var product = newLine.find("select[name^='products']");
+    var branch  = newLine.find("select[name^='branch']");
+    loadPlans(product, branch);
+    disableSelectedProduct();
+}
+
+function removeLine(obj)
+{
+    $(obj).closest('tr').remove();
+    disableSelectedProduct();
+}
 
 $(function()
 {
@@ -247,9 +265,6 @@ $(function()
         e.stopPropagation();
         e.preventDefault();
     });
-
-    adjustProductBoxMargin();
-    adjustPlanBoxMargin();
 });
 
 /**
diff --git a/module/execution/model.php b/module/execution/model.php
index 8aecc43b56..cc2033499b 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -2370,23 +2370,28 @@ class executionModel extends model
             $oldPlan = 0;
             $branch  = isset($branches[$i]) ? $branches[$i] : 0;
 
-            if(isset($existedProducts[$productID][$branch])) continue;
+            if(!is_array($branch)) $branch = array($branch);
 
-            if(isset($oldProducts[$productID][$branch]))
+            foreach($branch as $branchID)
             {
-                $oldProduct = $oldProducts[$productID][$branch];
-                if($this->app->rawMethod != 'edit') $oldPlan = $oldProduct->plan;
-            }
+                if(isset($existedProducts[$productID][$branchID])) continue;
 
-            $data = new stdclass();
-            $data->project = $executionID;
-            $data->product = $productID;
-            $data->branch  = $branch;
-            $data->plan    = isset($plans[$productID][$branch]) ? implode(',', $plans[$productID][$branch]) : $oldPlan;
-            $data->plan    = trim($data->plan, ',');
-            $data->plan    = empty($data->plan) ? 0 : ",$data->plan,";
-            $this->dao->insert(TABLE_PROJECTPRODUCT)->data($data)->exec();
-            $existedProducts[$productID][$branch] = true;
+                if(isset($oldProducts[$productID][$branchID]))
+                {
+                    $oldProduct = $oldProducts[$productID][$branchID];
+                    if($this->app->rawMethod != 'edit') $oldPlan = $oldProduct->plan;
+                }
+
+                $data = new stdclass();
+                $data->project = $executionID;
+                $data->product = $productID;
+                $data->branch  = $branchID;
+                $data->plan    = isset($plans[$productID]) ? implode(',', $plans[$productID]) : $oldPlan;
+                $data->plan    = trim($data->plan, ',');
+                $data->plan    = empty($data->plan) ? 0 : ",$data->plan,";
+                $this->dao->insert(TABLE_PROJECTPRODUCT)->data($data)->exec();
+                $existedProducts[$productID][$branchID] = true;
+            }
         }
 
         $oldProductKeys = array_keys($oldProducts);
diff --git a/module/execution/view/create.html.php b/module/execution/view/create.html.php
index 8868df5b4d..9fa8689fa2 100644
--- a/module/execution/view/create.html.php
+++ b/module/execution/view/create.html.php
@@ -130,61 +130,81 @@
         <?php $this->printExtendFields('', 'table', 'columns=3');?>
         <?php $hidden = 'hide'?>
         <?php if(!empty($project->hasProduct)) $hidden = ''?>
+        <?php if($products):?>
+        <?php $i = 0;?>
+        <?php foreach($products as $product):?>
         <tr class="<?php echo $hidden;?>">
-          <th><?php echo $lang->execution->manageProducts;?></th>
-          <td class='text-left' id='productsBox' colspan="3">
+          <th><?php echo $lang->project->manageProductPlan;?></th>
+          <td class='text-left productsBox' colspan="3">
             <div class='row'>
-              <?php $i = 0;?>
-              <?php $class = $division ? '' : 'disabled';?>
-              <?php foreach($products as $product):?>
-              <?php $hasBranch = ($product->type != 'normal' and isset($branchGroups[$product->id]));?>
-              <?php foreach($linkedBranches[$product->id] as $branchID => $branch):?>
-              <div class='col-sm-4'>
-                <div class="input-group<?php if($hasBranch) echo ' has-branch';?>">
-                  <?php echo html::select("products[$i]", $allProducts, $product->id, "class='form-control chosen' $class onchange='loadBranches(this)' data-last='" . $product->id . "'");?>
-                  <?php if($class) echo html::hidden("products[$i]", $product->id);?>
-                  <span class='input-group-addon fix-border'></span>
-                  <?php if($hasBranch) echo html::select("branch[$i]", $branchGroups[$product->id], $branchID, "class='form-control chosen' onchange=\"loadPlans('#products{$i}', this.value)\"");?>
+              <div class="col-sm-6">
+                <div class='table-row'>
+                  <div class='table-col'>
+                    <?php $hasBranch = $product->type != 'normal' and isset($branchGroups[$product->id]);?>
+                    <div class='input-group <?php if($hasBranch) echo ' has-branch';?>'>
+                      <span class='input-group-addon'><?php echo $lang->product->common;?></span> 
+                      <?php echo html::select("products[$i]", $allProducts, $product->id, "class='form-control chosen' onchange='loadBranches(this)' data-last='" . $product->id . "' data-type='" . $product->type . "'");?>
+                    </div>
+                  </div>
+                  <div class='table-col <?php if(!$hasBranch) echo 'hidden';?>'>
+                    <div class='input-group required'>
+                      <span class='input-group-addon fix-border'><?php echo $lang->product->branchName['branch'];?></span>
+                      <?php $branchIdList = join(',', $product->branches);?>
+                      <?php echo html::select("branch[$i][]", isset($branchGroups[$product->id]) ? $branchGroups[$product->id] : array(), $branchIdList, "class='form-control chosen' multiple onchange=\"loadPlans('#products{$i}', this)\"");?>
+                    </div>
+                  </div>
                 </div>
               </div>
-              <?php $i++;?>
-              <?php endforeach;?>
-              <?php endforeach;?>
-              <?php if((isset($project->model) and $project->model == 'scrum') or empty($products)):?>
-              <div class='col-sm-4'>
-                <div class="input-group">
-                  <?php echo html::select("products[$i]", $allProducts, '', "class='form-control chosen' onchange='loadBranches(this)'");?>
-                  <span class='input-group-addon fix-border'></span>
+              <div class="col-sm-6">
+                <div class='input-group' <?php echo "id='plan$i'";?>>
+                  <span class='input-group-addon'><?php echo $lang->product->plan;?></span>
+                  <?php echo html::select("plans[$product->id][]", isset($productPlans[$product->id]) ? $productPlans[$product->id] : array(), $product->plans, "class='form-control chosen' multiple");?>
+                  <div class='input-group-btn'>
+                    <a href='javascript:;' onclick='addNewLine(this)' class='btn btn-link addLine'><i class='icon-plus'></i></a>
+                    <a href='javascript:;' onclick='removeLine(this)' class='btn btn-link removeLine' <?php if($i == 0) echo "style='visibility: hidden'";?>><i class='icon-close'></i></a>
+                  </div>
                 </div>
               </div>
-              <?php endif;?>
             </div>
           </td>
         </tr>
-        <?php if(isset($project->model) and $project->model == 'scrum') $hidden = '';?>
-        <tr class="<?php echo $hidden?>">
-          <th><?php echo $lang->execution->linkPlan;?></th>
-          <td colspan="3" id="plansBox">
+        <?php $i ++;?>
+        <?php endforeach;?>
+        <?php else:?>
+        <tr class='<?php echo $hidden;?>'>
+          <th id='productTitle'><?php echo $lang->project->manageProductPlan;?></th>
+          <td class='text-left productsBox' colspan='3'>
             <div class='row'>
-              <?php if(isset($plan) && !empty($plan->begin)):?>
-              <div class="col-sm-4" id="plan0"><?php echo html::select("plans[{$plan->product}][{$plan->branch}][]", $productPlan, $plan->id, "class='form-control chosen' multiple");?></div>
-              <?php js::set('currentPlanID', $plan->id)?>
-              <?php elseif($copyExecutionID):?>
-              <?php $i = 0;?>
-              <?php foreach($products as $product):?>
-              <?php foreach($linkedBranches[$product->id] as $branchID => $branch):?>
-              <?php $plans = isset($productPlans[$product->id][$branchID]) ? $productPlans[$product->id][$branchID] : array();?>
-              <div class="col-sm-4" id="plan<?php echo $i;?>"><?php echo html::select("plans[{$product->id}][$branchID][]", $plans, $branches[$product->id][$branchID]->plan, "class='form-control chosen' multiple");?></div>
-              <?php $i++;?>
-              <?php endforeach;?>
-              <?php endforeach;?>
-              <?php else:?>
-              <div class="col-sm-4" id="plan0"><?php echo html::select("plans[][][]", $productPlan, '', "class='form-control chosen' multiple");?></div>
-              <?php js::set('currentPlanID', '')?>
-              <?php endif;?>
+              <div class="col-sm-6">
+                <div class='table-row'>
+                  <div class='table-col'>
+                    <div class='input-group'>
+                      <span class='input-group-addon'><?php echo $lang->product->common;?></span>
+                      <?php echo html::select("products[0]", $allProducts, '', "class='form-control chosen' onchange='loadBranches(this)'");?>
+                    </div>
+                  </div>
+                  <div class='table-col hidden'>
+                    <div class='input-group required'>
+                      <span class='input-group-addon fix-border'><?php echo $lang->product->branchName['branch'];?></span>
+                      <?php echo html::select("branch", '', '', "class='form-control chosen' multiple");?>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div class="col-sm-6">
+                <div class='input-group' id='plan0'>
+                  <span class='input-group-addon'><?php echo $lang->product->plan;?></span>
+                  <?php echo html::select("plans[][]", $productPlan, '', "class='form-control chosen' multiple");?>
+                  <div class='input-group-btn'>
+                    <a href='javascript:;' onclick='addNewLine(this)' class='btn btn-link addLine'><i class='icon-plus'></i></a>
+                    <a href='javascript:;' onclick='removeLine(this)' class='btn btn-link removeLine' style='visibility: hidden'><i class='icon-close'></i></a>
+                  </div>
+                </div>
+              </div>
             </div>
           </td>
         </tr>
+        <?php endif;?>
         <tr>
           <th><?php echo $lang->execution->teamname;?></th>
           <td><?php echo html::input('team', $team, "class='form-control'");?></td>
diff --git a/module/execution/view/edit.html.php b/module/execution/view/edit.html.php
index 0f6507834d..5ef11f6ee6 100644
--- a/module/execution/view/edit.html.php
+++ b/module/execution/view/edit.html.php
@@ -141,56 +141,45 @@
         <?php if(!in_array($execution->attribute, array('request', 'design', 'review'))): ?>
         <?php $hidden = 'hide'?>
         <?php if(!empty($project->hasProduct)) $hidden = ''?>
+        <?php $i = 0;?>
+        <?php foreach($linkedProducts as $product):?>
         <tr class="<?php echo $hidden;?>">
-          <th><?php echo $lang->execution->manageProducts;?></th>
-          <td class='text-left' id='productsBox' colspan="2">
-          <?php $class = ($execution->grade == 2 or $execution->type == 'stage') ? "disabled" : '';?>
+          <th><?php if($i == 0) echo $lang->project->manageProductPlan;?></th>
+          <td class='text-left productsBox' colspan="3">
             <div class='row'>
-              <?php $i = 0;?>
-              <?php foreach($linkedProducts as $product):?>
-              <?php $hasBranch = $product->type != 'normal' and isset($branchGroups[$product->id]);?>
-              <?php foreach($linkedBranches[$product->id] as $branchID => $branch):?>
-              <div class='col-sm-4'>
-                <div class="input-group<?php if($hasBranch) echo ' has-branch';?>">
-                  <?php echo html::select("products[$i]", $allProducts, $product->id, "class='form-control chosen' $class onchange='loadBranches(this)' data-last='" . $product->id . "' data-type='". $product->type ."' data-lastBranch='" . $branchID . "'");?>
-                  <span class='input-group-addon fix-border'></span>
-                  <?php if($hasBranch) echo html::select("branch[$i]", $branchGroups[$product->id], $branchID, "class='form-control chosen' $class onchange=\"loadPlans('#products{$i}', this.value)\" data-last='" . $branchID . "'");?>
+              <div class="col-sm-6">
+                <div class='table-row'>
+                  <div class='table-col'>
+                    <?php $hasBranch = $product->type != 'normal' and isset($branchGroups[$product->id]);?>
+                    <div class='input-group <?php if($hasBranch) echo ' has-branch';?>'>
+                      <span class='input-group-addon'><?php echo $lang->product->common;?></span> 
+                      <?php echo html::select("products[$i]", $allProducts, $product->id, "class='form-control chosen' onchange='loadBranches(this)' data-last='" . $product->id . "' data-type='" . $product->type . "'");?>
+                    </div>
+                  </div>
+                  <div class='table-col <?php if(!$hasBranch) echo 'hidden';?>'>
+                    <div class='input-group required'>
+                      <span class='input-group-addon fix-border'><?php echo $lang->product->branchName['branch'];?></span>
+                      <?php $branchIdList = join(',', $product->branches);?>
+                      <?php echo html::select("branch[$i][]", isset($branchGroups[$product->id]) ? $branchGroups[$product->id] : array(), $branchIdList, "class='form-control chosen' multiple onchange=\"loadPlans('#products{$i}', this)\"");?>
+                    </div>
+                  </div>
                 </div>
               </div>
-              <?php $i++; ?>
-              <?php endforeach;?>
-              <?php endforeach;?>
-              <?php if($execution->type != 'stage'):?>
-              <div class='col-sm-4'>
-                <div class="input-group">
-                  <?php echo html::select("products[$i]", $allProducts, '', "class='form-control chosen' onchange='loadBranches(this)'");?>
-                  <span class='input-group-addon fix-border'></span>
+              <div class="col-sm-6">
+                <div class='input-group' <?php echo "id='plan$i'";?>>
+                  <span class='input-group-addon'><?php echo $lang->product->plan;?></span>
+                  <?php echo html::select("plans[$product->id][]", isset($productPlans[$product->id]) ? $productPlans[$product->id] : array(), $product->plans, "class='form-control chosen' multiple");?>
+                  <div class='input-group-btn'>
+                    <a href='javascript:;' onclick='addNewLine(this)' class='btn btn-link addLine'><i class='icon-plus'></i></a>
+                    <a href='javascript:;' onclick='removeLine(this)' class='btn btn-link removeLine' <?php if($i == 0) echo "style='visibility: hidden'";?>><i class='icon-close'></i></a>
+                  </div>
                 </div>
               </div>
-              <?php endif;?>
-            </div>
-          </td>
-        </tr>
-        <?php if(isset($project->model) and $project->model == 'scrum') $hidden = '';?>
-        <tr class="<?php echo $hidden?>">
-          <th><?php echo $lang->execution->linkPlan;?></th>
-          <td id="plansBox" colspan="2">
-            <div class='row'>
-              <?php $i = 0;?>
-              <?php if(empty($linkedProducts)):?>
-              <div class="col-sm-4" id="plan0"><?php echo html::select("plans[][][]", $productPlans, '', "class='form-control chosen' multiple");?></div>
-              <?php else:?>
-              <?php foreach($linkedProducts as $product):?>
-              <?php foreach($linkedBranches[$product->id] as $branchID => $branch):?>
-              <?php $plans = isset($productPlans[$product->id][$branchID]) ? $productPlans[$product->id][$branchID] : array();?>
-              <div class="col-sm-4" id="plan<?php echo $i;?>"><?php echo html::select("plans[{$product->id}][{$branchID}][]", $plans, $branches[$product->id][$branchID]->plan, "class='form-control chosen' multiple");?></div>
-              <?php $i++;?>
-              <?php endforeach;?>
-              <?php endforeach;?>
-              <?php endif;?>
             </div>
           </td>
         </tr>
+        <?php $i ++;?>
+        <?php endforeach;?>
         <?php else: ?>
         <?php echo html::hidden("products[]", key($linkedProducts));?>
         <?php endif; ?>
@@ -232,5 +221,6 @@
 <?php js::set('confirmSync', $lang->execution->confirmSync);?>
 <?php js::set('allProducts', $allProducts);?>
 <?php js::set('branchGroups', $branchGroups);?>
+<?php js::set('projectID', $execution->project);?>
 <?php js::set('unLinkProductTip', $lang->project->unLinkProductTip);?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/css/create.css b/module/project/css/create.css
index 21c3fceddd..9d2c6d922c 100755
--- a/module/project/css/create.css
+++ b/module/project/css/create.css
@@ -16,15 +16,13 @@
 #budgetUnit {border-left: 0px;}
 #projectName {display: inline-block; width: 32%;}
 .productsBox a {border-radius: 2px !important;}
-.productsBox .col-sm-4 {padding-right: 5px;}
 .productsBox .required:after {right: -9.5px !important;}
 .productsBox .addProduct {padding-left: 0px !important;}
 .productsBox .addProduct.required:after {right: -1px !important;}
 .productsBox .input-group-addon > div {display: inline-block !important;}
 .productsBox .required + .text-danger.help-text {position: relative; left: 10px;}
 .productsBox > #productNameLabel {padding-top: 8px;}
-#plansBox .col-sm-4 {float: none; display: inline-block; padding-right: 5px;}
 .futureBox {vertical-align: top !important; padding-top: 13px !important;}
 #projectType {padding-top: 7px !important;}
 .division .icon-help {margin-left: 15px}
-.has-info {border-color: #0c64eb!important;}
\ No newline at end of file
+.has-info {border-color: #0c64eb!important;}
diff --git a/module/project/js/create.js b/module/project/js/create.js
index c4224e113b..ff42309610 100644
--- a/module/project/js/create.js
+++ b/module/project/js/create.js
@@ -397,7 +397,7 @@ function addNewLine(obj)
     newLine.find('.removeLine').css('visibility', 'visible');
     newLine.find('.chosen-container').remove();
     newLine.find('.productsBox .table-col:last').addClass('hidden');
-    newLine.find("select[name^='products']").attr('name', 'products[' + index + ']').attr('id', 'products' + index).chosen();
+    newLine.find("select[name^='products']").attr('name', 'products[' + index + ']').attr('id', 'products' + index).val('').chosen();
     newLine.find("select[name^='plans']").attr('name', 'plans[' + index + '][' + 0 + '][]').chosen();
     newLine.find("div[id^='plan']").attr('id', 'plan' + index);
 
diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php
index 1b8cb9b15f..168d65b784 100755
--- a/module/project/view/create.html.php
+++ b/module/project/view/create.html.php
@@ -228,64 +228,6 @@
           </td>
         </tr>
         <?php endif;?>
-        <!--tr>
-          <th id='productTitle'><?php echo $lang->project->manageProducts;?></th>
-          <td class='text-left' id='productsBox' colspan="3">
-            <div class='row'>
-              <?php $i = 0;?>
-              <?php foreach($products as $product):?>
-              <?php foreach($product->branches as $branch):?>
-              <div class="col-sm-4" style="margin-bottom: 10px; padding-right: 6px;">
-                <?php $hasBranch = $product->type != 'normal' and isset($branchGroups[$product->id]);?>
-                <div class="input-group<?php if($hasBranch) echo ' has-branch';?>">
-                  <?php echo html::select("products[$i]", $allProducts, $product->id, "class='form-control chosen' onchange='loadBranches(this)' data-last='" . $product->id . "'");?>
-                  <span class='input-group-addon fix-border'></span>
-                  <?php if($hasBranch) echo html::select("branch[$i]", $branchGroups[$product->id], $branch, "class='form-control chosen' onchange=\"loadPlans('#products{$i}', this.value)\"");?>
-                </div>
-              </div>
-              <?php $i++;?>
-              <?php endforeach;?>
-              <?php endforeach;?>
-              <div class='col-sm-4 <?php if($programID) echo 'required';?>' style="padding-right: 6px;">
-                <div class='input-group'>
-                  <?php echo html::select("products[$i]", $allProducts, '', "class='form-control chosen' onchange='loadBranches(this)'");?>
-                  <?php if(common::hasPriv('product', 'create')):?>
-                  <span class='input-group-addon'>
-                    <?php echo html::checkBox('newProduct', $lang->project->addProduct, '', "onchange=addNewProduct(this);");?>
-                    <div><icon class='icon icon-help' data-toggle='popover' data-trigger='focus hover' data-placement='left' data-tip-class='text-muted popover-sm' data-content="<?php echo $lang->project->productTip;?>"></icon></div>
-                  </span>
-                  <?php endif;?>
-                </div>
-              </div>
-            </div>
-            <div class="col-sm-4 addProduct hidden <?php if($programID) echo 'required';?>">
-              <div class='input-group'>
-                <?php echo html::input('productName', '', "class='form-control'");?>
-                <span class='input-group-addon'><?php echo html::checkBox('newProduct', $lang->project->addProduct, '', "onchange=addNewProduct(this);");?></span>
-              </div>
-            </div>
-          </td>
-        </tr>
-        <tr>
-          <th id='linkPlan'><?php echo $lang->execution->linkPlan;?></th>
-          <td colspan="3" id="plansBox">
-            <div class='row'>
-              <?php if($copyProjectID):?>
-              <?php $i = 0;?>
-              <?php foreach($products as $product):?>
-              <?php $productPlan = zget($productPlans, $product->id, array(0 => ''));?>
-              <?php foreach($product->branches as $branch):?>
-              <?php $plans = zget($productPlan, $branch, array(0 => ''));?>
-              <div class="col-sm-4" id="plan<?php echo $i;?>"><?php echo html::select('plans[' . $product->id . '][' . $branch . '][]', $plans, '', "class='form-control chosen' multiple");?></div>
-              <?php $i++;?>
-              <?php endforeach;?>
-              <?php endforeach;?>
-              <?php else:?>
-              <div class="col-sm-4" id="plan0" style="padding-right: 6px;"><?php echo html::select("plans[][][]", '', '', "class='form-control chosen' multiple");?></div>
-              <?php endif;?>
-            </div>
-          </td>
-        </tr-->
         <?php if($model == 'waterfall'):?>
         <tr class='hide division'>
           <th><?php echo $lang->project->division;?></th>