diff --git a/module/build/control.php b/module/build/control.php
index 62094f8cb7..6d61cf67c6 100644
--- a/module/build/control.php
+++ b/module/build/control.php
@@ -235,7 +235,7 @@ class build extends control
         if(!empty($_POST['stories']))
         {
             $this->build->linkStory($buildID);
-            die(js::locate(inlink('view', "buildID=$buildID&type=story&link=true&param=" . helper::safe64Encode("&browseType=$browseType&param=$param")), 'parent'));
+            die(js::locate(inlink('view', "buildID=$buildID&type=story"), 'parent'));
         }
 
         $build = $this->build->getById($buildID);
@@ -250,6 +250,7 @@ class build extends control
         unset($this->config->product->search['fields']['project']);
         $this->config->product->search['actionURL'] = $this->createLink('build', 'view', "buildID=$buildID&type=story&link=true&param=" . helper::safe64Encode("&browseType=bySearch&queryID=myQueryID"));
         $this->config->product->search['queryID']   = $queryID;
+        $this->config->product->search['style']     = 'simple';
         $this->config->product->search['params']['plan']['values'] = $this->loadModel('productplan')->getForProducts(array($build->product => $build->product));
         $this->config->product->search['params']['module']['values']  = $this->tree->getOptionMenu($build->product, $viewType = 'story', $startModuleID = 0);
         $this->config->product->search['params']['status'] = array('operator' => '=', 'control' => 'select', 'values' => $this->lang->story->statusList);
@@ -310,10 +311,10 @@ class build extends control
      * @access public
      * @return void
      */
-    public function batchUnlinkStory($buildID, $link = 'false', $param = '')
+    public function batchUnlinkStory($buildID)
     {
         $this->build->batchUnlinkStory($buildID);
-        die(js::locate($this->createLink('build', 'view', "buildID=$buildID&type=story&link=$link&param=$param"), 'parent'));
+        die(js::locate($this->createLink('build', 'view', "buildID=$buildID&type=story"), 'parent'));
     }
 
     /**
@@ -330,7 +331,7 @@ class build extends control
         if(!empty($_POST['bugs']))
         {
             $this->build->linkBug($buildID);
-            die(js::locate(inlink('view', "buildID=$buildID&type=bug&link=true&param=" . helper::safe64Encode("&browseType=$browseType&param=$param")), 'parent'));
+            die(js::locate(inlink('view', "buildID=$buildID&type=bug"), 'parent'));
         }
 
         /* Set menu. */
@@ -343,6 +344,7 @@ class build extends control
         $this->loadModel('bug');
         $this->config->product->search['actionURL'] = $this->createLink('build', 'view', "buildID=$buildID&type=bug&link=true&param=" . helper::safe64Encode("&browseType=bySearch&queryID=myQueryID"));
         $this->config->bug->search['queryID']   = $queryID;
+        $this->config->bug->search['style']     = 'simple';
         $this->config->bug->search['params']['plan']['values']          = $this->loadModel('productplan')->getForProducts(array($build->product => $build->product));
         $this->config->bug->search['params']['module']['values']        = $this->loadModel('tree')->getOptionMenu($build->product, $viewType = 'bug', $startModuleID = 0);
         $this->config->bug->search['params']['project']['values']       = $this->loadModel('product')->getProjectPairs($build->product);
@@ -419,9 +421,9 @@ class build extends control
      * @access public
      * @return void
      */
-    public function batchUnlinkBug($buildID, $link = 'false', $param = '')
+    public function batchUnlinkBug($buildID)
     {
         $this->build->batchUnlinkBug($buildID);
-        die(js::locate($this->createLink('build', 'view', "buildID=$buildID&type=bug&link=$link&param=$param"), 'parent'));
+        die(js::locate($this->createLink('build', 'view', "buildID=$buildID&type=bug"), 'parent'));
     }
 }
diff --git a/module/build/css/view.css b/module/build/css/view.css
index f33fc07190..2aa81b524f 100644
--- a/module/build/css/view.css
+++ b/module/build/css/view.css
@@ -2,4 +2,3 @@
 .tabs .tab-content .tab-pane .action{position: absolute; right: 0px; top: 0px;}
 .tabs .tab-content .tab-pane #querybox{margin:0px}
 .tabs .tab-content .tab-pane #querybox form{padding-left:0px;}
-.tabs .tab-content .tab-pane #querybox form .btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){display:none;}
diff --git a/module/build/js/view.js b/module/build/js/view.js
index 33f47b5276..1cc5fa943b 100644
--- a/module/build/js/view.js
+++ b/module/build/js/view.js
@@ -5,6 +5,7 @@ function showLink(buildID, type, param)
     {
         var obj = type == 'story' ? '.tab-pane#stories .linkBox' : '.tab-pane#bugs .linkBox';
         $(obj).html(data);
+        $('#' + type + 'List').hide();
     });
 }
 $(function()
diff --git a/module/build/view/linkbug.html.php b/module/build/view/linkbug.html.php
index d4295214f6..0923ed561d 100644
--- a/module/build/view/linkbug.html.php
+++ b/module/build/view/linkbug.html.php
@@ -48,7 +48,7 @@
           {
               echo "<div class='table-actions clearfix'>";
               echo "<div class='btn-group'>" .  html::selectAll('unlinkedBugsForm') . html::selectReverse('unlinkedBugsForm') . '</div>';
-              echo html::submitButton($lang->build->linkBug) . html::a(inlink('view', "buildID={$build->id}&type=bug"), $lang->cancel, '', "class='btn'") . '</div>';
+              echo html::submitButton($lang->build->linkBug) . html::a(inlink('view', "buildID={$build->id}&type=bug"), $lang->goback, '', "class='btn'") . '</div>';
           }
           ?>
         </td>
diff --git a/module/build/view/linkstory.html.php b/module/build/view/linkstory.html.php
index 299717b0eb..197f12e817 100644
--- a/module/build/view/linkstory.html.php
+++ b/module/build/view/linkstory.html.php
@@ -53,7 +53,7 @@
             {
                 echo "<div class='table-actions clearfix'>";
                 echo "<div class='btn-group'>" . html::selectAll('unlinkedStoriesForm') . html::selectReverse('unlinkedStoriesForm') . '</div>';
-                echo html::submitButton($lang->story->linkStory) . html::a(inlink('view', "buildID={$build->id}&type=story"), $lang->cancel, '', "class='btn'") . '</div>';
+                echo html::submitButton($lang->story->linkStory) . html::a(inlink('view', "buildID={$build->id}&type=story"), $lang->goback, '', "class='btn'") . '</div>';
             }
             ?>
           </td>
diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php
index eb70de2b77..1a2f9de257 100644
--- a/module/build/view/view.html.php
+++ b/module/build/view/view.html.php
@@ -52,10 +52,10 @@
         <div class='tab-content'>
           <div class='tab-pane <?php if($type == 'story') echo 'active'?>' id='stories'>
             <?php if(common::hasPriv('build', 'linkStory')):?>
-            <div class='action'><?php echo html::a("javascript:showLink($build->id, \"story\")", '<i class="icon-link"></i> ' . $lang->build->linkStory, '', "class='btn btn-sm'");?></div>
+            <div class='action'><?php echo html::a("javascript:showLink($build->id, \"story\")", '<i class="icon-link"></i> ' . $lang->build->linkStory, '', "class='btn btn-sm btn-primary'");?></div>
             <div class='linkBox'></div>
             <?php endif;?>
-            <form method='post' target='hiddenwin' action='<?php echo inlink('batchUnlinkStory', "buildID={$build->id}" . (($type == 'story' and $link == 'true') ? "&link=true&param=$param" : ''))?>' id='linkedStoriesForm'>
+            <form method='post' target='hiddenwin' action='<?php echo inlink('batchUnlinkStory', "buildID={$build->id}")?>' id='linkedStoriesForm'>
             <table class='table table-hover table-condensed table-striped tablesorter table-fixed' id='storyList'>
               <thead>
                 <tr>
@@ -111,10 +111,10 @@
           </div>
           <div class='tab-pane <?php if($type == 'bug') echo 'active'?>' id='bugs'>
             <?php if(common::hasPriv('build', 'linkBug')):?>
-            <div class='action'><?php echo html::a("javascript:showLink($build->id, \"bug\")", '<i class="icon-bug"></i> ' . $lang->build->linkBug, '', "class='btn btn-sm'");?></div>
+            <div class='action'><?php echo html::a("javascript:showLink($build->id, \"bug\")", '<i class="icon-bug"></i> ' . $lang->build->linkBug, '', "class='btn btn-sm btn-primary'");?></div>
             <div class='linkBox'></div>
             <?php endif;?>
-            <form method='post' target='hiddenwin' action="<?php echo inLink('batchUnlinkBug', "build=$build->id" . (($type == 'bug' and $link == 'true') ? "&link=true&param=$param" : ''));?>" id='linkedBugsForm'>
+            <form method='post' target='hiddenwin' action="<?php echo inLink('batchUnlinkBug', "build=$build->id");?>" id='linkedBugsForm'>
             <table class='table table-hover table-condensed table-striped tablesorter table-fixed' id='bugList'>
               <thead>
                 <tr>
diff --git a/module/productplan/control.php b/module/productplan/control.php
index 305df3119f..eed25f2228 100644
--- a/module/productplan/control.php
+++ b/module/productplan/control.php
@@ -223,7 +223,7 @@ class productplan extends control
         if(!empty($_POST['stories']))
         {
             $this->productplan->linkStory($planID);
-            die(js::locate(inlink('view', "planID=$planID&type=story&orderBy=$orderBy&link=true&parma=" . helper::safe64Encode("&browseType=$browseType&param=$param")), 'parent'));
+            die(js::locate(inlink('view', "planID=$planID&type=story&orderBy=$orderBy"), 'parent'));
         }
 
         $this->loadModel('story');
@@ -237,6 +237,7 @@ class productplan extends control
         unset($this->config->product->search['fields']['product']);
         $this->config->product->search['actionURL'] = $this->createLink('productplan', 'view', "planID=$planID&type=story&orderBy=$orderBy&link=true&param=" . helper::safe64Encode('&browseType=bySearch&queryID=myQueryID'));
         $this->config->product->search['queryID']   = $queryID;
+        $this->config->product->search['style']     = 'simple';
         $this->config->product->search['params']['product']['values'] = $products + array('all' => $this->lang->product->allProductsOfProject);
         $this->config->product->search['params']['plan']['values'] = $this->productplan->getForProducts(array($plan->product => $plan->product));
         $this->config->product->search['params']['module']['values']  = $this->tree->getOptionMenu($plan->product, $viewType = 'story', $startModuleID = 0);
@@ -314,10 +315,10 @@ class productplan extends control
      * @access public
      * @return void
      */
-    public function batchUnlinkStory($planID, $orderBy = 'id_desc', $link = 'false', $param = '')
+    public function batchUnlinkStory($planID, $orderBy = 'id_desc')
     {
         foreach($this->post->unlinkStories as $storyID) $this->productplan->unlinkStory($storyID);
-        die(js::locate($this->createLink('productplan', 'view', "planID=$planID&type=story&orderBy=$orderBy&link=$link&param=$param"), 'parent'));
+        die(js::locate($this->createLink('productplan', 'view', "planID=$planID&type=story&orderBy=$orderBy"), 'parent'));
     }
 
     /**
@@ -337,7 +338,7 @@ class productplan extends control
         if(!empty($_POST['bugs']))
         {
             $this->productplan->linkBug($planID);
-            die(js::locate(inlink('view', "planID=$planID&type=bug&orderBy=$orderBy&link=true&parma=" . helper::safe64Encode("&browseType=$browseType&param=$param")), 'parent'));
+            die(js::locate(inlink('view', "planID=$planID&type=bug&orderBy=$orderBy"), 'parent'));
         }
 
         $this->loadModel('bug');
@@ -350,6 +351,7 @@ class productplan extends control
         /* Build the search form. */
         $this->config->bug->search['actionURL'] = $this->createLink('productplan', 'view', "planID=$planID&type=bug&orderBy=$orderBy&link=true&param=" . helper::safe64Encode('&browseType=bySearch&queryID=myQueryID'));
         $this->config->bug->search['queryID']   = $queryID;
+        $this->config->bug->search['style']     = 'simple';
         $this->config->bug->search['params']['product']['values']       = array($productID => $products[$productID], 'all' => $this->lang->bug->allProduct);
         $this->config->bug->search['params']['plan']['values']          = $this->productplan->getForProducts(array($plan->product => $plan->product));
         $this->config->bug->search['params']['module']['values']        = $this->loadModel('tree')->getOptionMenu($productID, $viewType = 'bug', $startModuleID = 0);
@@ -429,9 +431,9 @@ class productplan extends control
      * @access public
      * @return void
      */
-    public function batchUnlinkBug($planID, $orderBy = 'id_desc', $link = 'false', $param = '')
+    public function batchUnlinkBug($planID, $orderBy = 'id_desc')
     {
         foreach($this->post->unlinkBugs as $bugID) $this->productplan->unlinkBug($bugID);
-        die(js::locate($this->createLink('productplan', 'view', "planID=$planID&type=bug&orderBy=$orderBy&link=$link&param=$param"), 'parent'));
+        die(js::locate($this->createLink('productplan', 'view', "planID=$planID&type=bug&orderBy=$orderBy"), 'parent'));
     }
 }
diff --git a/module/productplan/css/linkbug.css b/module/productplan/css/linkbug.css
index 5176460b53..e69de29bb2 100644
--- a/module/productplan/css/linkbug.css
+++ b/module/productplan/css/linkbug.css
@@ -1,4 +0,0 @@
-#titlebar > .heading {margin-bottom: 15px;}
-#bugList  .table {margin-bottom: 20px;}
-.table > caption {border:1px solid #ddd; border-bottom: none;}
-#linkedBugsForm .table caption {border-top: none}
diff --git a/module/productplan/css/linkstory.css b/module/productplan/css/linkstory.css
index f019c61e89..e69de29bb2 100644
--- a/module/productplan/css/linkstory.css
+++ b/module/productplan/css/linkstory.css
@@ -1,4 +0,0 @@
-#titlebar > .heading {margin-bottom: 15px;}
-#storyList  .table {margin-bottom: 20px;}
-.table > caption {border:1px solid #ddd; border-bottom: none;}
-#linkedStoriesForm .table caption {border-top: none}
diff --git a/module/productplan/css/view.css b/module/productplan/css/view.css
index 45aab7f0ca..77a2c1b4a5 100644
--- a/module/productplan/css/view.css
+++ b/module/productplan/css/view.css
@@ -2,6 +2,5 @@
 .tabs .tab-content .tab-pane .action{position: absolute; right: 0px; top: 0px;}
 .tabs .tab-content .tab-pane #querybox{margin:0px}
 .tabs .tab-content .tab-pane #querybox form{padding-left:0px;}
-.tabs .tab-content .tab-pane #querybox form .btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){display:none;}
 
 #unlinkBugList, #unlinkStoryList{margin-bottom:5px;}
diff --git a/module/productplan/js/view.js b/module/productplan/js/view.js
index d3477bf151..b19e4f3f5e 100644
--- a/module/productplan/js/view.js
+++ b/module/productplan/js/view.js
@@ -5,6 +5,7 @@ function showLink(planID, type, orderBy, param)
     {
         var obj = type == 'story' ? '.tab-pane#stories .linkBox' : '.tab-pane#bugs .linkBox';
         $(obj).html(data);
+        $('#' + type + 'List').hide();
     });
 }
 $(function()
diff --git a/module/productplan/view/linkbug.html.php b/module/productplan/view/linkbug.html.php
index f2b9f8a63a..0d4850ec0b 100644
--- a/module/productplan/view/linkbug.html.php
+++ b/module/productplan/view/linkbug.html.php
@@ -51,7 +51,7 @@
           {
               echo "<div class='table-actions clearfix'>";
               echo "<div class='btn-group'>" .  html::selectAll('unlinkedBugsForm') . html::selectReverse('unlinkedBugsForm') . '</div>';
-              echo html::submitButton($lang->productplan->linkBug) . html::a(inlink('view', "planID=$plan->id&type=bug&orderBy=$orderBy"), $lang->cancel, '', "class='btn'") . '</div>';
+              echo html::submitButton($lang->productplan->linkBug) . html::a(inlink('view', "planID=$plan->id&type=bug&orderBy=$orderBy"), $lang->goback, '', "class='btn'") . '</div>';
           }
           ?>
         </td>
diff --git a/module/productplan/view/linkstory.html.php b/module/productplan/view/linkstory.html.php
index 4faa5174b7..e174abf8ff 100644
--- a/module/productplan/view/linkstory.html.php
+++ b/module/productplan/view/linkstory.html.php
@@ -54,7 +54,7 @@
             {
                 echo "<div class='table-actions clearfix'>";
                 echo "<div class='btn-group'>" . html::selectAll('unlinkedStoriesForm') . html::selectReverse('unlinkedStoriesForm') . '</div>';
-                echo html::submitButton($lang->story->linkStory) . html::a(inlink('view', "planID=$plan->id&type=story&orderBy=$orderBy"), $lang->cancel, '', "class='btn'") . '</div>';
+                echo html::submitButton($lang->story->linkStory) . html::a(inlink('view', "planID=$plan->id&type=story&orderBy=$orderBy"), $lang->goback, '', "class='btn'") . '</div>';
             }
             ?>
           </td>
diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php
index 57265f4014..7ddf3c6861 100644
--- a/module/productplan/view/view.html.php
+++ b/module/productplan/view/view.html.php
@@ -54,10 +54,10 @@
         <div class='tab-content'>
           <div id='stories' class='tab-pane <?php if($type == 'story') echo 'active'?>'>
             <?php if(common::hasPriv('productplan', 'linkStory')):?>
-            <div class='action'><?php echo html::a("javascript:showLink($plan->id, \"story\")", '<i class="icon-link"></i> ' . $lang->productplan->linkStory, '', "class='btn btn-sm'");?></div>
+            <div class='action'><?php echo html::a("javascript:showLink($plan->id, \"story\")", '<i class="icon-link"></i> ' . $lang->productplan->linkStory, '', "class='btn btn-sm btn-primary'");?></div>
             <div class='linkBox'></div>
             <?php endif;?>
-            <form class='form-condensed' method='post' target='hiddenwin' action="<?php echo inlink('batchUnlinkStory', "planID=$plan->id&orderBy=$orderBy" . (($type == 'story' and $link == 'true') ? "&link=true&param=$param" : ''));?>">
+            <form class='form-condensed' method='post' target='hiddenwin' action="<?php echo inlink('batchUnlinkStory', "planID=$plan->id&orderBy=$orderBy");?>">
               <table class='table tablesorter table-condensed table-hover table-striped table-borderless table-fixed' id='storyList'>
                 <?php $vars = "planID={$plan->id}&type=story&orderBy=%s&link=$link&param=$param"; ?>
                 <thead>
@@ -130,10 +130,10 @@
           </div>
           <div id='bugs' class='tab-pane <?php if($type == 'bug') echo 'active';?>'>
             <?php if(common::hasPriv('productplan', 'linkBug')):?>
-            <div class='action'><?php echo html::a("javascript:showLink($plan->id, \"bug\")", '<i class="icon-bug"></i> ' . $lang->productplan->linkBug, '', "class='btn btn-sm'");?></div>
+            <div class='action'><?php echo html::a("javascript:showLink($plan->id, \"bug\")", '<i class="icon-bug"></i> ' . $lang->productplan->linkBug, '', "class='btn btn-sm btn-primary'");?></div>
             <div class='linkBox'></div>
             <?php endif;?>
-            <form method='post' target='hiddenwin' action="<?php echo inLink('batchUnlinkBug', "planID=$plan->id&orderBy=$orderBy" . (($type == 'bug' and $link == 'true') ? "&link=true&param=$param" : ''));?>">
+            <form method='post' target='hiddenwin' action="<?php echo inLink('batchUnlinkBug', "planID=$plan->id&orderBy=$orderBy");?>">
               <table class='table tablesorter table-condensed table-hover table-striped table-borderless table-fixed' id='bugList'>
                 <?php $vars = "planID={$plan->id}&type=bug&orderBy=%s&link=$link&param=$param"; ?>
                 <thead>
diff --git a/module/release/control.php b/module/release/control.php
index ab8f43b67c..2058347435 100644
--- a/module/release/control.php
+++ b/module/release/control.php
@@ -346,7 +346,7 @@ class release extends control
         if(!empty($_POST['stories']))
         {
             $this->release->linkStory($releaseID);
-            die(js::locate(inlink('view', "releaseID=$releaseID&type=story&link=true&parma=" . helper::safe64Encode("&browseType=$browseType&param=$param")), 'parent'));
+            die(js::locate(inlink('view', "releaseID=$releaseID&type=story"), 'parent'));
         }
 
         $release = $this->release->getById($releaseID);
@@ -362,6 +362,7 @@ class release extends control
         unset($this->config->product->search['fields']['project']);
         $this->config->product->search['actionURL'] = $this->createLink('release', 'view', "releaseID=$releaseID&type=story&link=true&param=" . helper::safe64Encode('&browseType=bySearch&queryID=myQueryID'));
         $this->config->product->search['queryID']   = $queryID;
+        $this->config->product->search['style']     = 'simple';
         $this->config->product->search['params']['plan']['values'] = $this->loadModel('productplan')->getForProducts(array($release->product => $release->product));
         $this->config->product->search['params']['module']['values']  = $this->tree->getOptionMenu($release->product, $viewType = 'story', $startModuleID = 0);
         $this->config->product->search['params']['status'] = array('operator' => '=', 'control' => 'select', 'values' => $this->lang->story->statusList);
@@ -422,10 +423,10 @@ class release extends control
      * @access public
      * @return void
      */
-    public function batchUnlinkStory($releaseID, $link = 'false', $param = '')
+    public function batchUnlinkStory($releaseID)
     {
         $this->release->batchUnlinkStory($releaseID);
-        die(js::locate($this->createLink('release', 'view', "releaseID=$releaseID&type=story&link=$link&param=$param"), 'parent'));
+        die(js::locate($this->createLink('release', 'view', "releaseID=$releaseID&type=story"), 'parent'));
     }
 
     /**
@@ -442,7 +443,7 @@ class release extends control
         if(!empty($_POST['bugs']))
         {
             $this->release->linkBug($releaseID);
-            die(js::locate(inlink('view', "releaseID=$releaseID&type=bug&link=true&parma=" . helper::safe64Encode("&browseType=$browseType&param=$param")), 'parent'));
+            die(js::locate(inlink('view', "releaseID=$releaseID&type=bug"), 'parent'));
         }
 
         /* Set menu. */
@@ -456,6 +457,7 @@ class release extends control
         unset($this->config->bug->search['fields']['product']);
         $this->config->bug->search['actionURL'] = $this->createLink('release', 'view', "releaseID=$releaseID&type=bug&link=true&param=" . helper::safe64Encode('&browseType=bySearch&queryID=myQueryID'));
         $this->config->bug->search['queryID']   = $queryID;
+        $this->config->bug->search['style']     = 'simple';
         $this->config->bug->search['params']['plan']['values']          = $this->loadModel('productplan')->getForProducts(array($release->product => $release->product));
         $this->config->bug->search['params']['module']['values']        = $this->loadModel('tree')->getOptionMenu($release->product, $viewType = 'bug', $startModuleID = 0);
         $this->config->bug->search['params']['project']['values']       = $this->loadModel('product')->getProjectPairs($release->product);
@@ -518,9 +520,9 @@ class release extends control
      * @access public
      * @return void
      */
-    public function batchUnlinkBug($releaseID, $link = 'false', $param = '')
+    public function batchUnlinkBug($releaseID)
     {
         $this->release->batchUnlinkBug($releaseID);
-        die(js::locate($this->createLink('release', 'view', "releaseID=$releaseID&type=bug&link=$link&param=$param"), 'parent'));
+        die(js::locate($this->createLink('release', 'view', "releaseID=$releaseID&type=bug"), 'parent'));
     }
 }
diff --git a/module/release/css/view.css b/module/release/css/view.css
index 8913738ab2..83b77b6ce9 100644
--- a/module/release/css/view.css
+++ b/module/release/css/view.css
@@ -2,4 +2,3 @@
 .tabs .tab-content .tab-pane .action{position: absolute; right: 110px; top: 0px;}
 .tabs .tab-content .tab-pane #querybox{margin:0px}
 .tabs .tab-content .tab-pane #querybox form{padding-left:0px;}
-.tabs .tab-content .tab-pane #querybox form .btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){display:none;}
diff --git a/module/release/js/view.js b/module/release/js/view.js
index 71b62f6b2a..f5e6561cf2 100644
--- a/module/release/js/view.js
+++ b/module/release/js/view.js
@@ -5,6 +5,7 @@ function showLink(releaseID, type, param)
     {
         var obj = type == 'story' ? '.tab-pane#stories .linkBox' : '.tab-pane#bugs .linkBox';
         $(obj).html(data);
+        $('#' + type + 'List').hide();
     });
 }
 $(function()
diff --git a/module/release/view/linkbug.html.php b/module/release/view/linkbug.html.php
index 4fc99b1d80..f967d2b54c 100644
--- a/module/release/view/linkbug.html.php
+++ b/module/release/view/linkbug.html.php
@@ -48,7 +48,7 @@
           {
               echo "<div class='table-actions clearfix'>";
               echo "<div class='btn-group'>" .  html::selectAll('unlinkedBugsForm') . html::selectReverse('unlinkedBugsForm') . '</div>';
-              echo html::submitButton($lang->release->linkBug) . html::a(inlink('view', "releaseID=$release->id&type=bug"), $lang->cancel, '', "class='btn'") . '</div>';
+              echo html::submitButton($lang->release->linkBug) . html::a(inlink('view', "releaseID=$release->id&type=bug"), $lang->goback, '', "class='btn'") . '</div>';
           }
           ?>
         </td>
diff --git a/module/release/view/linkstory.html.php b/module/release/view/linkstory.html.php
index be47c3e4b4..1467b8677b 100644
--- a/module/release/view/linkstory.html.php
+++ b/module/release/view/linkstory.html.php
@@ -52,7 +52,7 @@
             {
                 echo "<div class='table-actions clearfix'>";
                 echo "<div class='btn-group'>" . html::selectAll('unlinkedStoriesForm') . html::selectReverse('unlinkedStoriesForm') . '</div>';
-                echo html::submitButton($lang->story->linkStory) . html::a(inlink('view', "releaseID=$release->id&type=story"), $lang->cancel, '', "class='btn'") . '</div>';
+                echo html::submitButton($lang->story->linkStory) . html::a(inlink('view', "releaseID=$release->id&type=story"), $lang->goback, '', "class='btn'") . '</div>';
             }
             ?>
           </td>
diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php
index 9e401b64e4..3c64a8f0f8 100644
--- a/module/release/view/view.html.php
+++ b/module/release/view/view.html.php
@@ -69,10 +69,10 @@
         <div class='tab-content'>
           <div class='tab-pane <?php if($type == 'story') echo 'active'?>' id='stories'>
             <?php if(common::hasPriv('release', 'linkStory')):?>
-            <div class='action'><?php echo html::a("javascript:showLink({$release->id}, \"story\")", '<i class="icon-link"></i> ' . $lang->release->linkStory, '', "class='btn btn-sm'");?></div>
+            <div class='action'><?php echo html::a("javascript:showLink({$release->id}, \"story\")", '<i class="icon-link"></i> ' . $lang->release->linkStory, '', "class='btn btn-sm btn-primary'");?></div>
             <div class='linkBox'></div>
             <?php endif;?>
-            <form method='post' target='hiddenwin' action="<?php echo inLink('batchUnlinkStory', "release=$release->id" . (($type == 'story' and $link == 'true') ? "&link=true&param=$param" : ''));?>" id='linkedStoriesForm'>
+            <form method='post' target='hiddenwin' action="<?php echo inLink('batchUnlinkStory', "release=$release->id");?>" id='linkedStoriesForm'>
             <table class='table table-hover table-condensed table-striped tablesorter table-fixed' id='storyList'>
               <thead>
                 <tr>
@@ -128,10 +128,10 @@
           </div>
           <div class='tab-pane <?php if($type == 'bug') echo 'active'?>' id='bugs'>
             <?php if(common::hasPriv('release', 'linkBug')):?>
-            <div class='action'><?php echo html::a("javascript:showLink({$release->id}, \"bug\")", '<i class="icon-bug"></i> ' . $lang->release->linkBug, '', "class='btn btn-sm'");?></div>
+            <div class='action'><?php echo html::a("javascript:showLink({$release->id}, \"bug\")", '<i class="icon-bug"></i> ' . $lang->release->linkBug, '', "class='btn btn-sm btn-primary'");?></div>
             <div class='linkBox'></div>
             <?php endif;?>
-            <form method='post' target='hiddenwin' action="<?php echo inLink('batchUnlinkBug', "releaseID=$release->id" . (($type == 'bug' and $link == 'true') ? "&link=true&param=$param" : ''));?>" id='linkedBugsForm'>
+            <form method='post' target='hiddenwin' action="<?php echo inLink('batchUnlinkBug', "releaseID=$release->id");?>" id='linkedBugsForm'>
             <table class='table table-hover table-condensed table-striped tablesorter table-fixed' id='bugList'>
               <thead>
                 <tr>
diff --git a/module/search/control.php b/module/search/control.php
index ed3372790e..6f43b121aa 100644
--- a/module/search/control.php
+++ b/module/search/control.php
@@ -29,6 +29,7 @@ class search extends control
         $searchFields = empty($searchFields) ? json_decode($this->session->searchParams['searchFields'], true) : $searchFields;
         $fieldParams  = empty($fieldParams) ?  json_decode($this->session->searchParams['fieldParams'], true)  : $fieldParams;
         $actionURL    = empty($actionURL) ?    $this->session->searchParams['actionURL'] : $actionURL;
+        $style        = $this->session->searchParams['style'];
         $this->search->initSession($module, $searchFields, $fieldParams);
 
         $this->view->module       = $module;
@@ -38,6 +39,7 @@ class search extends control
         $this->view->fieldParams  = $this->search->setDefaultParams($searchFields, $fieldParams);
         $this->view->queries      = $this->search->getQueryPairs($module);
         $this->view->queryID      = $queryID;
+        $this->view->style        = empty($style) ? 'full' : $style;
         $this->display();
     }
 
diff --git a/module/search/model.php b/module/search/model.php
index 36c67d7b4f..ab31b884cc 100644
--- a/module/search/model.php
+++ b/module/search/model.php
@@ -27,6 +27,7 @@ class searchModel extends model
         $searchParams['searchFields'] = json_encode($searchConfig['fields']);
         $searchParams['fieldParams']  = json_encode($searchConfig['params']);
         $searchParams['actionURL']    = $searchConfig['actionURL'];
+        $searchParams['style']        = zget($searchConfig, 'style', 'full');
         $searchParams['queryID']      = isset($searchConfig['queryID']) ? $searchConfig['queryID'] : 0;
 
         /* remove onlybody for url*/
diff --git a/module/search/view/buildform.html.php b/module/search/view/buildform.html.php
index dd16172c12..0f4c541b06 100644
--- a/module/search/view/buildform.html.php
+++ b/module/search/view/buildform.html.php
@@ -362,18 +362,22 @@ foreach($fieldParams as $fieldName => $param)
       ?>
       </table>
     </td>
-    <td class='w-150px'> 
+    <td class='<?php echo $style == 'simple' ? 'w-60px' : 'w-150px'?>'> 
       <?php
       echo html::hidden('module',     $module);
       echo html::hidden('actionURL',  $actionURL);
       echo html::hidden('groupItems', $groupItems);
       echo "<div class='btn-group'>";
       echo html::submitButton($lang->search->common, '', 'btn-primary');
-      echo html::commonButton($lang->search->reset, 'onclick=resetForm(); class=btn');
-      echo html::commonButton($lang->save, 'onclick=saveQuery() class=btn');
+      if($style != 'simple')
+      {
+          echo html::commonButton($lang->search->reset, 'onclick=resetForm(); class=btn');
+          echo html::commonButton($lang->save, 'onclick=saveQuery() class=btn');
+      }
       echo '</div>';
       ?>
     </td>
+    <?php if($style != 'simple'):?>
     <td class='w-120px'>
       <div class='input-group'>
       <?php
@@ -382,6 +386,7 @@ foreach($fieldParams as $fieldName => $param)
       ?>
       </div>
     </td>
+    <?php endif;?>
   </tr>
 </table>
 <div id='moreOrLite'>