diff --git a/module/block/control.php b/module/block/control.php
index b15959a9c6..fab109b185 100644
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -253,13 +253,13 @@ class block extends control
 
                 /* The list assigned to me jumps to the work page when click more button. */
                 $block->moreLink = $this->createLink($moduleName, $method, $vars);
-                if($moduleName = 'my' and strpos('task|story|requirement|bug|testcase|testtask|issue|risk', $method))
+                if($moduleName == 'my' and strpos('task|story|requirement|bug|testcase|testtask|issue|risk', $method))
                 {
                     $block->moreLink = $this->createLink($moduleName, 'work', 'mode=' . $method . '&' . $vars);
                 }
-                elseif($moduleName = 'project')
+                elseif($moduleName == 'project' and $method == 'dynamic')
                 {
-                    $block->moreLink = $this->createLink('project', 'dynamic', "projectID={$this->session->project}");
+                    $block->moreLink = $this->createLink('project', 'dynamic', "projectID=$projectID&type=all");
                 }
             }
             elseif($block->block == 'dynamic')
diff --git a/module/block/lang/de.php b/module/block/lang/de.php
index 423bfea35f..594e0106f4 100644
--- a/module/block/lang/de.php
+++ b/module/block/lang/de.php
@@ -512,11 +512,11 @@ $lang->block->modules['project']->moreLinkList->cmmireport     = 'weekly|index|'
 $lang->block->modules['project']->moreLinkList->cmmiestimate   = 'workestimation|index|';
 $lang->block->modules['project']->moreLinkList->cmmiissue      = 'issue|browse|';
 $lang->block->modules['project']->moreLinkList->cmmirisk       = 'risk|browse|';
-$lang->block->modules['project']->moreLinkList->scrumlist      = 'project|all|';
+$lang->block->modules['project']->moreLinkList->scrumlist      = 'project|execution|';
 $lang->block->modules['project']->moreLinkList->scrumtest      = 'testtask|browse|';
 $lang->block->modules['project']->moreLinkList->scrumproduct   = 'product|all|';
-$lang->block->modules['project']->moreLinkList->sprint         = 'project|all|';
-$lang->block->modules['project']->moreLinkList->projectdynamic = 'company|dynamic|';
+$lang->block->modules['project']->moreLinkList->sprint         = 'project|execution|';
+$lang->block->modules['project']->moreLinkList->projectdynamic = 'project|dynamic|';
 
 $lang->block->modules['product']->moreLinkList        = new stdclass();
 $lang->block->modules['product']->moreLinkList->list  = 'product|all|';
diff --git a/module/block/lang/en.php b/module/block/lang/en.php
index 3c0238d586..cc303d4cd6 100644
--- a/module/block/lang/en.php
+++ b/module/block/lang/en.php
@@ -512,11 +512,11 @@ $lang->block->modules['project']->moreLinkList->cmmireport     = 'weekly|index|'
 $lang->block->modules['project']->moreLinkList->cmmiestimate   = 'workestimation|index|';
 $lang->block->modules['project']->moreLinkList->cmmiissue      = 'issue|browse|';
 $lang->block->modules['project']->moreLinkList->cmmirisk       = 'risk|browse|';
-$lang->block->modules['project']->moreLinkList->scrumlist      = 'project|all|';
+$lang->block->modules['project']->moreLinkList->scrumlist      = 'project|execution|';
 $lang->block->modules['project']->moreLinkList->scrumtest      = 'testtask|browse|';
 $lang->block->modules['project']->moreLinkList->scrumproduct   = 'product|all|';
-$lang->block->modules['project']->moreLinkList->sprint         = 'project|all|';
-$lang->block->modules['project']->moreLinkList->projectdynamic = 'company|dynamic|';
+$lang->block->modules['project']->moreLinkList->sprint         = 'project|execution|';
+$lang->block->modules['project']->moreLinkList->projectdynamic = 'project|dynamic|';
 
 $lang->block->modules['product']->moreLinkList        = new stdclass();
 $lang->block->modules['product']->moreLinkList->list  = 'product|all|';
diff --git a/module/block/lang/fr.php b/module/block/lang/fr.php
index 3968af561f..f976cbc3b0 100644
--- a/module/block/lang/fr.php
+++ b/module/block/lang/fr.php
@@ -512,11 +512,11 @@ $lang->block->modules['project']->moreLinkList->cmmireport     = 'weekly|index|'
 $lang->block->modules['project']->moreLinkList->cmmiestimate   = 'workestimation|index|';
 $lang->block->modules['project']->moreLinkList->cmmiissue      = 'issue|browse|';
 $lang->block->modules['project']->moreLinkList->cmmirisk       = 'risk|browse|';
-$lang->block->modules['project']->moreLinkList->scrumlist      = 'project|all|';
+$lang->block->modules['project']->moreLinkList->scrumlist      = 'project|execution|';
 $lang->block->modules['project']->moreLinkList->scrumtest      = 'testtask|browse|';
 $lang->block->modules['project']->moreLinkList->scrumproduct   = 'product|all|';
-$lang->block->modules['project']->moreLinkList->sprint         = 'project|all|';
-$lang->block->modules['project']->moreLinkList->projectdynamic = 'company|dynamic|';
+$lang->block->modules['project']->moreLinkList->sprint         = 'project|execution|';
+$lang->block->modules['project']->moreLinkList->projectdynamic = 'project|dynamic|';
 
 $lang->block->modules['product']->moreLinkList        = new stdclass();
 $lang->block->modules['product']->moreLinkList->list  = 'product|all|';
diff --git a/module/block/lang/vi.php b/module/block/lang/vi.php
index 66d2184161..e5c800c9a8 100644
--- a/module/block/lang/vi.php
+++ b/module/block/lang/vi.php
@@ -512,11 +512,11 @@ $lang->block->modules['project']->moreLinkList->cmmireport     = 'weekly|index|'
 $lang->block->modules['project']->moreLinkList->cmmiestimate   = 'workestimation|index|';
 $lang->block->modules['project']->moreLinkList->cmmiissue      = 'issue|browse|';
 $lang->block->modules['project']->moreLinkList->cmmirisk       = 'risk|browse|';
-$lang->block->modules['project']->moreLinkList->scrumlist      = 'project|all|';
+$lang->block->modules['project']->moreLinkList->scrumlist      = 'project|execution|';
 $lang->block->modules['project']->moreLinkList->scrumtest      = 'testtask|browse|';
 $lang->block->modules['project']->moreLinkList->scrumproduct   = 'product|all|';
-$lang->block->modules['project']->moreLinkList->sprint         = 'project|all|';
-$lang->block->modules['project']->moreLinkList->projectdynamic = 'company|dynamic|';
+$lang->block->modules['project']->moreLinkList->sprint         = 'project|execution|';
+$lang->block->modules['project']->moreLinkList->projectdynamic = 'project|dynamic|';
 
 $lang->block->modules['product']->moreLinkList        = new stdclass();
 $lang->block->modules['product']->moreLinkList->list  = 'product|all|';
diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php
index a9ea92108d..f5f495cb7f 100644
--- a/module/block/lang/zh-cn.php
+++ b/module/block/lang/zh-cn.php
@@ -512,11 +512,11 @@ $lang->block->modules['project']->moreLinkList->cmmireport     = 'weekly|index|'
 $lang->block->modules['project']->moreLinkList->cmmiestimate   = 'workestimation|index|';
 $lang->block->modules['project']->moreLinkList->cmmiissue      = 'issue|browse|';
 $lang->block->modules['project']->moreLinkList->cmmirisk       = 'risk|browse|';
-$lang->block->modules['project']->moreLinkList->scrumlist      = 'project|all|';
+$lang->block->modules['project']->moreLinkList->scrumlist      = 'project|execution|';
 $lang->block->modules['project']->moreLinkList->scrumtest      = 'testtask|browse|';
 $lang->block->modules['project']->moreLinkList->scrumproduct   = 'product|all|';
-$lang->block->modules['project']->moreLinkList->sprint         = 'project|all|';
-$lang->block->modules['project']->moreLinkList->projectdynamic = 'company|dynamic|';
+$lang->block->modules['project']->moreLinkList->sprint         = 'project|execution|';
+$lang->block->modules['project']->moreLinkList->projectdynamic = 'project|dynamic|';
 
 $lang->block->modules['product']->moreLinkList        = new stdclass();
 $lang->block->modules['product']->moreLinkList->list  = 'product|all|';
diff --git a/module/block/view/scrumtestblock.html.php b/module/block/view/scrumtestblock.html.php
index 17491ab35e..09a283bba1 100644
--- a/module/block/view/scrumtestblock.html.php
+++ b/module/block/view/scrumtestblock.html.php
@@ -22,7 +22,7 @@
         <th class='text-left'><?php echo $lang->testtask->product;?></th>
         <?php endif;?>
         <?php if($longBlock):?>
-        <th class='text-left'><?php echo $lang->testtask->execution?></th>
+        <th class='text-left'><?php echo $lang->testtask->project?></th>
         <?php endif;?>
         <th class='text-left'><?php echo $lang->testtask->build;?></th>
         <th class='w-date'><?php echo $lang->testtask->status;?></th>
diff --git a/module/project/view/index.html.php b/module/project/view/index.html.php
index f0d0ccdbbb..a21c11d5f4 100644
--- a/module/project/view/index.html.php
+++ b/module/project/view/index.html.php
@@ -10,5 +10,5 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<?php echo $this->fetch('block', 'dashboard', "module=project&type={$project->model}");?>
+<?php echo $this->fetch('block', 'dashboard', "module=project&type={$project->model}&projectID={$project->id}");?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/testtask/lang/de.php b/module/testtask/lang/de.php
index b655403523..66c87a8f9e 100644
--- a/module/testtask/lang/de.php
+++ b/module/testtask/lang/de.php
@@ -57,6 +57,7 @@ $lang->testtask->expandAll        = 'Aufklappen';
 $lang->testtask->id             = 'ID';
 $lang->testtask->common         = 'Testaufgabe';
 $lang->testtask->product        = $lang->productCommon;
+$lang->testtask->project        = 'Project';
 $lang->testtask->execution      = $lang->executionCommon;
 $lang->testtask->build          = 'Build';
 $lang->testtask->owner          = 'Besitzer';
diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php
index 0a5539538e..61b8cdb7e6 100644
--- a/module/testtask/lang/en.php
+++ b/module/testtask/lang/en.php
@@ -57,6 +57,7 @@ $lang->testtask->expandAll        = 'Expand';
 $lang->testtask->id             = 'ID';
 $lang->testtask->common         = 'Request';
 $lang->testtask->product        = $lang->productCommon;
+$lang->testtask->project        = 'Project';
 $lang->testtask->execution      = $lang->executionCommon;
 $lang->testtask->build          = 'Build';
 $lang->testtask->owner          = 'Owner';
diff --git a/module/testtask/lang/fr.php b/module/testtask/lang/fr.php
index e550c5df15..adcdda384f 100644
--- a/module/testtask/lang/fr.php
+++ b/module/testtask/lang/fr.php
@@ -57,6 +57,7 @@ $lang->testtask->expandAll        = 'Déplier';
 $lang->testtask->id             = 'ID';
 $lang->testtask->common         = 'Recette';
 $lang->testtask->product        = $lang->productCommon;
+$lang->testtask->project        = 'Project';
 $lang->testtask->execution      = $lang->executionCommon;
 $lang->testtask->build          = 'Build';
 $lang->testtask->owner          = 'Owner';
diff --git a/module/testtask/lang/vi.php b/module/testtask/lang/vi.php
index 22029492a1..4e41642b55 100644
--- a/module/testtask/lang/vi.php
+++ b/module/testtask/lang/vi.php
@@ -57,6 +57,7 @@ $lang->testtask->expandAll        = 'Mở ra';
 $lang->testtask->id             = 'ID';
 $lang->testtask->common         = 'Yêu cầu';
 $lang->testtask->product        = $lang->productCommon;
+$lang->testtask->project        = 'Project';
 $lang->testtask->execution      = $lang->executionCommon;
 $lang->testtask->build          = 'Bản dựng';
 $lang->testtask->owner          = 'Sở hữu';
diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php
index 8f06e0ec9b..0c66996a4c 100644
--- a/module/testtask/lang/zh-cn.php
+++ b/module/testtask/lang/zh-cn.php
@@ -57,6 +57,7 @@ $lang->testtask->expandAll        = '全部展开';
 $lang->testtask->id             = '编号';
 $lang->testtask->common         = '测试单';
 $lang->testtask->product        = '所属' . $lang->productCommon;
+$lang->testtask->project        = '所属项目';
 $lang->testtask->execution      = '所属' . $lang->executionCommon;
 $lang->testtask->build          = '版本';
 $lang->testtask->owner          = '负责人';