diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php
index ecf6794235..f0c097b004 100644
--- a/module/bug/view/edit.html.php
+++ b/module/bug/view/edit.html.php
@@ -81,7 +81,19 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
           <tr>
             <th><?php echo $lang->bug->module;?></th>
             <td>
-              <div class='input-group' id='moduleIdBox'><?php echo html::select('module', $moduleOptionMenu, $currentModuleID, "onchange='loadModuleRelated()' class='form-control chosen'");?></div>
+              <div class='input-group' id='moduleIdBox'>
+              <?php 
+              echo html::select('module', $moduleOptionMenu, $currentModuleID, "onchange='loadModuleRelated()' class='form-control chosen'");
+              if(count($moduleOptionMenu) == 1)
+              {
+                  echo "<span class='input-group-addon'>";
+                  echo html::a($this->createLink('tree', 'browse', "rootID=$productID&view=bug&currentModuleID=0&branch=$bug->branch"), $lang->tree->manage, '_blank');
+                  echo '&nbsp; ';
+                  echo html::a("javascript:loadProductModules($productID)", $lang->refresh);
+                  echo '</span>';
+              }
+              ?>
+              </div>
             </td>
           </tr>
           <tr>
diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php
index e4d52b31a4..28309dc82e 100644
--- a/module/story/view/edit.html.php
+++ b/module/story/view/edit.html.php
@@ -67,11 +67,12 @@
             <td>
               <div class='input-group' id='moduleIdBox'>
               <?php
-              echo html::select('module', $moduleOptionMenu, $story->module, 'class="form-control chosen"');
+              echo html::select('module', $moduleOptionMenu, $story->module, "class='form-control chosen'");
               if(count($moduleOptionMenu) == 1)
               {
-                  echo "<span class='inpug-group-addon'>";
-                  echo html::a($this->createLink('tree', 'browse', "rootID=$story->product&view=story&branch=$story->branch"), $lang->tree->manage, '_blank');
+                  echo "<span class='input-group-addon'>";
+                  echo html::a($this->createLink('tree', 'browse', "rootID=$story->product&view=story&currentModuleID=0&branch=$story->branch"), $lang->tree->manage, '_blank');
+                  echo '&nbsp; ';
                   echo html::a("javascript:loadProductModules($story->product)", $lang->refresh);
                   echo '</span>';
               }
diff --git a/module/testcase/view/edit.html.php b/module/testcase/view/edit.html.php
index 27cf70443c..327489b2d1 100644
--- a/module/testcase/view/edit.html.php
+++ b/module/testcase/view/edit.html.php
@@ -100,7 +100,17 @@
             <th><?php echo $lang->testcase->module;?></th>
             <td>
               <div class='input-group' id='moduleIdBox'>
-                <?php echo html::select('module', $moduleOptionMenu, $currentModuleID, "onchange='loadModuleRelated()' class='form-control chosen'");?>
+              <?php 
+              echo html::select('module', $moduleOptionMenu, $currentModuleID, "onchange='loadModuleRelated()' class='form-control chosen'");
+              if(count($moduleOptionMenu) == 1)
+              {
+                  echo "<span class='input-group-addon'>";
+                  echo html::a($this->createLink('tree', 'browse', "rootID=$productID&view=case&currentModuleID=0&branch=$case->branch"), $lang->tree->manage, '_blank');
+                  echo '&nbsp; ';
+                  echo html::a("javascript:loadProductModules($productID)", $lang->refresh);
+                  echo '</span>';
+              }
+              ?>
               </div>
             </td>
           </tr>
diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php
index 4baa880e43..4ee7eafd72 100644
--- a/module/testcase/view/view.html.php
+++ b/module/testcase/view/view.html.php
@@ -52,7 +52,7 @@
         echo "<div class='btn-group'>";
         common::printIcon('testcase', 'edit',"caseID=$case->id");
         common::printCommentIcon('testcase');
-        common::printIcon('testcase', 'create', "productID=$case->product&branch=$branch&moduleID=$case->module&from=testcase&param=$case->id", '', 'button', 'copy');
+        common::printIcon('testcase', 'create', "productID=$case->product&branch=$case->branch&moduleID=$case->module&from=testcase&param=$case->id", '', 'button', 'copy');
         common::printIcon('testcase', 'delete', "caseID=$case->id", '', 'button', '', 'hiddenwin');
         echo '</div>';