diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index 9462977ade..bfa4fce286 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -53,9 +53,9 @@ js::set('confirmDeleteTemplate', $lang->bug->confirmDeleteTemplate);
                 if(count($moduleOptionMenu) == 1)
                 {
                     echo "<span class='input-group-addon'>";
-                    echo html::a($this->createLink('tree', 'browse', "rootID=$productID&view=bug&currentModuleID=0&branch=$branch"), $lang->tree->manage, '_blank');
+                    echo html::a($this->createLink('tree', 'browse', "rootID=$productID&view=bug&currentModuleID=0&branch=$branch", '', true), $lang->tree->manage, '', "class='text-primary' data-toggle='modal' data-type='iframe' data-width='95%'");
                     echo '&nbsp; ';
-                    echo html::a("javascript:loadProductModules($productID)", $lang->refresh);
+                    echo html::a("#", $lang->refresh, '', "class='refresh' onclick='loadProductModules($productID)'");
                     echo '</span>';
                 }
                 ?>
diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php
index 71354b2282..3ff36b22a4 100644
--- a/module/bug/view/edit.html.php
+++ b/module/bug/view/edit.html.php
@@ -106,9 +106,9 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
                     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 html::a($this->createLink('tree', 'browse', "rootID=$productID&view=bug&currentModuleID=0&branch=$bug->branch", '', true), $lang->tree->manage, '', "class='text-primary' data-toggle='modal' data-type='iframe' data-width='95%'");
                         echo '&nbsp; ';
-                        echo html::a("javascript:loadProductModules($productID)", $lang->refresh);
+                        echo html::a("#", $lang->refresh, '', "class='refresh' onclick='loadProductModules($productID)'");
                         echo '</span>';
                     }
                     ?>
diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php
index 50bb5dea6d..5f7667ad57 100644
--- a/module/testcase/view/create.html.php
+++ b/module/testcase/view/create.html.php
@@ -42,9 +42,9 @@
             echo html::select('module', $moduleOptionMenu, $currentModuleID, "onchange='loadModuleRelated();' class='form-control chosen'");
             if(count($moduleOptionMenu) == 1)
             {
-                echo "<span class='input-group-btn'>";
-                echo html::a($this->createLink('tree', 'browse', "rootID=$productID&view=case&currentModuleID=0&branch=$branch"), "<i class='icon icon-cog'></i>", '_blank', "data-toggle='tooltip' class='btn' title='{$lang->tree->manage}'");
-                echo html::a("javascript:loadProductModules($productID)", "<i class='icon icon-refresh'></i>", '', "data-toggle='tooltip' class='btn' title='{$lang->refresh}'");
+                echo "<span class='input-group-addon'>";
+                echo html::a($this->createLink('tree', 'browse', "rootID=$productID&view=case&currentModuleID=0&branch=$branch", '', true), $lang->tree->manage, '', "class='text-primary' data-toggle='modal' data-type='iframe' data-width='95%'");
+                echo html::a("#", $lang->refresh, '', "class='refresh' onclick='loadProductModules($productID)'");
                 echo '</span>';
             }
             ?>
diff --git a/module/testcase/view/edit.html.php b/module/testcase/view/edit.html.php
index f960e2c40f..054c5f9286 100644
--- a/module/testcase/view/edit.html.php
+++ b/module/testcase/view/edit.html.php
@@ -152,9 +152,9 @@
                   if(count($moduleOptionMenu) == 1)
                   {
                       echo "<span class='input-group-addon'>";
-                      echo html::a($this->createLink('tree', 'browse', "rootID=$libID&view=caselib&currentModuleID=0&branch=$case->branch"), $lang->tree->manage, '_blank');
+                      echo html::a($this->createLink('tree', 'browse', "rootID=$libID&view=caselib&currentModuleID=0&branch=$case->branch", '', true), $lang->tree->manage, '', "class='text-primary' data-toggle='modal' data-type='iframe' data-width='95%'");
                       echo '&nbsp; ';
-                      echo html::a("javascript:loadLibModules($libID)", $lang->refresh);
+                      echo html::a("#", $lang->refresh, '', "class='refresh' onclick='loadLibModules($libID)'");
                       echo '</span>';
                   }
                   ?>
@@ -180,9 +180,9 @@
                   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 html::a($this->createLink('tree', 'browse', "rootID=$productID&view=case&currentModuleID=0&branch=$case->branch", '', true), $lang->tree->manage, '', "class='text-primary' data-toggle='modal' data-type='iframe' data-width='95%'");
                       echo '&nbsp; ';
-                      echo html::a("javascript:loadProductModules($productID)", $lang->refresh);
+                      echo html::a("#", $lang->refresh, '', "class='refresh' onclick='loadProductModules($productID)'");
                       echo '</span>';
                   }
                   ?>