diff --git a/module/execution/config.php b/module/execution/config.php
index 10694f9e4f..ae894c97ea 100644
--- a/module/execution/config.php
+++ b/module/execution/config.php
@@ -179,10 +179,14 @@ if(!isset($config->setCode) or $config->setCode == 1)
 {
     $config->execution->datatable->defaultField = array('id', 'name', 'code', 'project', 'PM', 'status', 'progress', 'begin', 'end', 'estimate', 'consumed', 'left', 'burn');
 }
-else
+elseif($config->systemMode == 'new')
 {
     $config->execution->datatable->defaultField = array('id', 'name', 'project', 'PM', 'status', 'progress', 'begin', 'end', 'estimate', 'consumed', 'left', 'burn');
 }
+else
+{
+    $config->execution->datatable->defaultField = array('id', 'name', 'PM', 'status', 'progress', 'begin', 'end', 'estimate', 'consumed', 'left', 'burn');
+}
 
 $config->execution->datatable->fieldList['id']['title']    = 'idAB';
 $config->execution->datatable->fieldList['id']['fixed']    = 'left';
@@ -202,10 +206,13 @@ if(!isset($config->setCode) or $config->setCode == 1)
     $config->execution->datatable->fieldList['code']['required'] = 'no';
 }
 
-$config->execution->datatable->fieldList['project']['title']    = 'project';
-$config->execution->datatable->fieldList['project']['fixed']    = 'no';
-$config->execution->datatable->fieldList['project']['width']    = '100';
-$config->execution->datatable->fieldList['project']['required'] = 'no';
+if($config->systemMode == 'new')
+{
+    $config->execution->datatable->fieldList['project']['title']    = 'project';
+    $config->execution->datatable->fieldList['project']['fixed']    = 'no';
+    $config->execution->datatable->fieldList['project']['width']    = '100';
+    $config->execution->datatable->fieldList['project']['required'] = 'no';
+}
 
 $config->execution->datatable->fieldList['PM']['title']    = 'owner';
 $config->execution->datatable->fieldList['PM']['fixed']    = 'no';
diff --git a/module/product/model.php b/module/product/model.php
index f953febae7..84d41ea26e 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -1077,7 +1077,7 @@ class productModel extends model
                 $modules          = array();
                 $branchList       = $this->loadModel('branch')->getPairs($productID, '', $projectID);
                 $branchModuleList = $this->tree->getOptionMenu($productID, 'story', 0, array_keys($branchList));
-                foreach($branchModuleList as $branchID => $branchModules) $modules[] = $branchModules;
+                foreach($branchModuleList as $branchID => $branchModules) $modules = array_merge($modules, $branchModules);
             }
             else
             {
diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php
index cf0718f6ab..d8ddeac626 100644
--- a/module/story/view/edit.html.php
+++ b/module/story/view/edit.html.php
@@ -288,10 +288,10 @@
                 <td><?php echo html::select('duplicateStory', $productStories, $story->duplicateStory, 'class="form-control"'); ?></td>
               </tr>
               <tr class='text-top'>
-                <th class='thWidth'><?php echo $lang->story->linkStory;?></th>
+                <th class='thWidth'><?php echo $story->type == 'story' ? $lang->requirement->linkStory : $lang->story->linkStory;?></th>
                 <td>
                   <?php if(common::hasPriv('story', 'linkStories') and $story->type == 'story') echo html::a("#", $lang->story->linkStoriesAB, '', "class='btn btn-info' id='linkStoriesLink'");?>
-                  <?php if(common::hasPriv('story', 'linkRequirements') and $story->type == 'requirement') echo html::a("#", $lang->story->linkRequirementsAB, '', "class='btn btn-info' id='linkStoriesLink'");?>
+                  <?php if(common::hasPriv('requirement', 'linkRequirements') and $story->type == 'requirement') echo html::a("#", $lang->story->linkRequirementsAB, '', "class='btn btn-info' id='linkStoriesLink'");?>
                 </td>
               </tr>
               <tr>