diff --git a/module/execution/css/batchedit.css b/module/execution/css/batchedit.css
index 5fb6ae17e4..604452605e 100644
--- a/module/execution/css/batchedit.css
+++ b/module/execution/css/batchedit.css
@@ -4,3 +4,4 @@
 .c-method {width: 45px;}
 .c-type > .icon-help {vertical-align: text-top;}
 .c-type > .popover .popover-content {font-weight: 400;}
+#executionForm tbody td {vertical-align: top;}
diff --git a/module/execution/model.php b/module/execution/model.php
index ea425e1b3b..7fad9981f1 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -5229,12 +5229,11 @@ class executionModel extends model
         $class = !empty($execution->children) ? 'disabled' : '';
         common::printIcon('task', 'create', "executionID={$execution->id}", '', 'list', '', '', $class, false, "data-app='execution'");
 
-        if($execution->type == 'stage' or $this->app->tab == 'project')
+        if($execution->type == 'stage')
         {
             $isCreateTask = $this->loadModel('programplan')->isCreateTask($execution->id);
             $disabled     = ($isCreateTask and $execution->type == 'stage') ? '' : ' disabled';
             $title        = !$isCreateTask ? $this->lang->programplan->error->createdTask : $this->lang->programplan->createSubPlan;
-            $title        = (!empty($disabled) and $execution->type != 'stage') ? $this->lang->programplan->error->notStage : $title;
             common::printIcon('programplan', 'create', "program={$execution->project}&productID=$productID&planID=$execution->id", $execution, 'list', 'split', '', $disabled, '', '', $title);
         }
 
diff --git a/module/productplan/model.php b/module/productplan/model.php
index 2c31845d58..54a8f40caf 100644
--- a/module/productplan/model.php
+++ b/module/productplan/model.php
@@ -141,7 +141,7 @@ class productplanModel extends model
                 $planProjects[$planID] = $this->dao->select('t1.project,t2.name')->from(TABLE_PROJECTPRODUCT)->alias('t1')
                     ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id')
                     ->where('1=1')
-                    ->beginIF(strpos($param, 'noproduct') === false or !empty($product))->andWhere('product')->eq($product)->fi()
+                    ->beginIF(strpos($param, 'noproduct') === false or !empty($product))->andWhere('t1.product')->eq($product)->fi()
                     ->andWhere('t2.deleted')->eq(0)
                     ->andWhere('t1.plan')->like(",$planID,")
                     ->andWhere('t2.type')->in('sprint,stage,kanban')
diff --git a/module/project/view/createguide.html.php b/module/project/view/createguide.html.php
index 83a4e2912a..af2ca0be3b 100644
--- a/module/project/view/createguide.html.php
+++ b/module/project/view/createguide.html.php
@@ -5,7 +5,7 @@
 <?php endif;?>
 <div class='modal-dialog' id='guideDialog'>
   <style>
-  #guideDialog {width: 600px}
+  #guideDialog {width: 900px}
   #guideDialog .row {margin-left: 0px;margin-right: 0px;}
   #guideDialog h2 {margin: 0px 0 20px 0; font-size: 16px; font-weight: normal}
   #guideDialog h3 {margin: 5px 0; font-size: 15px;}
@@ -15,10 +15,11 @@
   #guideDialog .project-type {padding: 0 5px}
   #guideDialog .project-type-img {width: 280px; border: 1px solid #CBD0DB; border-radius: 4px; margin-bottom: 10px; cursor: pointer; margin-top: 1px}
   #guideDialog .project-type-img:hover {border-color: #006AF1; box-shadow: 0 0 10px 0 rgba(0,0,0,.25);}
-  #guideDialog .project-type-img.more-type {width: 154px; height: 98px; vertical-align: middle; display: table-cell; cursor:default; font-size: 12px;}
+  #guideDialog .project-type-img.more-type {height: 165px; vertical-align: middle; display: table-cell; cursor:default; font-size: 12px;}
   #guideDialog .project-type-img.more-type:hover {border-color: #CBD0DB; box-shadow:unset;}
   #guideDialog .project-type.active img {border-color: #006AF1; border-width: 2px; margin-top: 0}
   #guideDialog .col:nth-child(-n+3) {margin-bottom: 15px;}
+  @media screen and (max-width: 1366px){#guideDialog {width: 640px} #guideDialog .project-type-img.more-type {height: 108px;}}
   </style>
   <div class='modal-content'>
     <div class='modal-body'>