diff --git a/module/bug/config.php b/module/bug/config.php
index 3a561f048d..e906790f76 100644
--- a/module/bug/config.php
+++ b/module/bug/config.php
@@ -164,6 +164,7 @@ $config->bug->datatable->fieldList['severity']['title']    = 'severityAB';
 $config->bug->datatable->fieldList['severity']['fixed']    = 'left';
 $config->bug->datatable->fieldList['severity']['width']    = '50';
 $config->bug->datatable->fieldList['severity']['required'] = 'no';
+$config->bug->datatable->fieldList['severity']['name']     = $lang->bug->severity;
 
 $config->bug->datatable->fieldList['pri']['title']    = 'P';
 $config->bug->datatable->fieldList['pri']['fixed']    = 'left';
diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php
index d23b4ea3ae..101bd6b0fb 100644
--- a/module/build/view/view.html.php
+++ b/module/build/view/view.html.php
@@ -244,7 +244,7 @@ tbody tr td:first-child input {display: none;}
             <thead>
               <tr class='text-center'>
                 <th class='c-id text-left'><?php common::printOrderLink('id',       $orderBy, $vars, $lang->idAB);?></th>
-                <th class='c-status'> <?php common::printOrderLink('severity',     $orderBy, $vars, $lang->bug->severityAB);?></th>
+                <th class='c-status' title=<?php echo $lang->bug->severity;?>><?php common::printOrderLink('severity', $orderBy, $vars, $lang->bug->severityAB);?></th>
                 <th class='text-left'><?php common::printOrderLink('title',        $orderBy, $vars, $lang->bug->title);?></th>
                 <th class='c-status'> <?php common::printOrderLink('status',       $orderBy, $vars, $lang->bug->status);?></th>
                 <th class='c-user'>   <?php common::printOrderLink('openedBy',     $orderBy, $vars, $lang->openedByAB);?></th>
diff --git a/module/common/view/querymenu.html.php b/module/common/view/querymenu.html.php
index cf99b2332a..72480f23b6 100644
--- a/module/common/view/querymenu.html.php
+++ b/module/common/view/querymenu.html.php
@@ -5,7 +5,7 @@
   padding:0 7px;
   position: absolute;
   right: -10px;
-  top: -5px;
+  top: -3px;
   display: block;
   width: 20px;
   text-align: center;
diff --git a/module/execution/control.php b/module/execution/control.php
index 0cff1ad421..e445311966 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -2039,6 +2039,9 @@ class execution extends control
             $userList[$account]['realname'] = $users[$account];
             $userList[$account]['avatar']   = $avatar;
         }
+        $userList['closed']['account']  = 'Closed';
+        $userList['closed']['realname'] = 'Closed';
+        $userList['closed']['avatar']   = '';
 
         /* Get execution's product. */
         $productID = 0;
diff --git a/module/execution/view/bug.html.php b/module/execution/view/bug.html.php
index 8a600fa219..471d0160ae 100644
--- a/module/execution/view/bug.html.php
+++ b/module/execution/view/bug.html.php
@@ -79,7 +79,7 @@
             <?php endif;?>
             <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
           </th>
-          <th class='c-severity'><?php common::printOrderLink('severity', $orderBy, $vars, $lang->bug->severityAB);?></th>
+          <th class='c-severity' title=<?php echo $lang->bug->severity;?>><?php common::printOrderLink('severity', $orderBy, $vars, $lang->bug->severityAB);?></th>
           <th class='c-pri' title=<?php echo $lang->execution->pri;?>><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
           <th><?php common::printOrderLink('title', $orderBy, $vars, $lang->bug->title);?></th>
           <th class='c-user'><?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
diff --git a/module/execution/view/importbug.html.php b/module/execution/view/importbug.html.php
index 4eaf81a875..18e8a86bb7 100755
--- a/module/execution/view/importbug.html.php
+++ b/module/execution/view/importbug.html.php
@@ -37,7 +37,7 @@ var browseType = '<?php echo $browseType;?>';
             </div>
             <?php echo $lang->idAB;?>
           </th>
-          <th class='c-severity'> <?php echo $lang->bug->severityAB;?></th>
+          <th class='c-severity' title=<?php echo $lang->bug->severity;?>> <?php echo $lang->bug->severityAB;?></th>
           <th class='c-pri' title=<?php echo $lang->execution->pri;?>><?php echo $lang->priAB;?></th>
           <th><?php echo $lang->bug->title;?></th>
           <th class='c-status'><?php echo $lang->bug->statusAB;?></th>
diff --git a/module/project/view/bug.html.php b/module/project/view/bug.html.php
index bd0167764a..887cfd9180 100644
--- a/module/project/view/bug.html.php
+++ b/module/project/view/bug.html.php
@@ -56,7 +56,7 @@
             <?php endif;?>
             <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
           </th>
-          <th class='c-severity'><?php common::printOrderLink('severity', $orderBy, $vars, $lang->bug->severityAB);?></th>
+          <th class='c-severity' title=<?php echo $lang->bug->severity;?>><?php common::printOrderLink('severity', $orderBy, $vars, $lang->bug->severityAB);?></th>
           <th class='c-pri' title=<?php echo $lang->project->pri;?>><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
           <th><?php common::printOrderLink('title', $orderBy, $vars, $lang->bug->title);?></th>
           <th class='c-user'><?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
diff --git a/module/projectrelease/view/view.html.php b/module/projectrelease/view/view.html.php
index 3dc3c86f29..d131315007 100644
--- a/module/projectrelease/view/view.html.php
+++ b/module/projectrelease/view/view.html.php
@@ -258,7 +258,7 @@
                       <?php endif;?>
                       <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
                     </th>
-                    <th class='w-80px'>    <?php common::printOrderLink('severity',   $orderBy, $vars, $lang->bug->severityAB);?></th>
+                    <th class='w-80px' title=<?php echo $lang->bug->severity;?>><?php common::printOrderLink('severity', $orderBy, $vars, $lang->bug->severityAB);?></th>
                     <th class='text-left'> <?php common::printOrderLink('title',      $orderBy, $vars, $lang->bug->title);?></th>
                     <th class='w-100px'>   <?php common::printOrderLink('status',     $orderBy, $vars, $lang->bug->status);?></th>
                     <th class='c-user'>    <?php common::printOrderLink('openedBy',   $orderBy, $vars, $lang->openedByAB);?></th>
diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php
index 1c41e9bc21..5b8329f584 100644
--- a/module/release/view/view.html.php
+++ b/module/release/view/view.html.php
@@ -258,7 +258,7 @@
                       <?php endif;?>
                       <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
                     </th>
-                    <th class='w-80px'>    <?php common::printOrderLink('severity',   $orderBy, $vars, $lang->bug->severityAB);?></th>
+                    <th class='w-80px' title=<?php echo $lang->bug->severity;?>><?php common::printOrderLink('severity', $orderBy, $vars, $lang->bug->severityAB);?></th>
                     <th class='text-left'> <?php common::printOrderLink('title',      $orderBy, $vars, $lang->bug->title);?></th>
                     <th class='w-100px'>   <?php common::printOrderLink('status',     $orderBy, $vars, $lang->bug->status);?></th>
                     <th class='c-user'>    <?php common::printOrderLink('openedBy',   $orderBy, $vars, $lang->openedByAB);?></th>
diff --git a/module/search/view/buildform.html.php b/module/search/view/buildform.html.php
index 90f2d9043b..0e82ed701b 100644
--- a/module/search/view/buildform.html.php
+++ b/module/search/view/buildform.html.php
@@ -222,7 +222,8 @@ foreach($fieldParams as $fieldName => $param)
         <ul>
           <?php foreach($queries as $queryID => $queryName):?>
           <?php if(empty($queryID)) continue;?>
-          <li><?php echo html::a("javascript:executeQuery($queryID)", $queryName . (common::hasPriv('search', 'deleteQuery') ? '<i class="icon icon-close"></i>' : ''), '', "class='label user-query' data-query-id='$queryID' title='{$queryName}'");?></li>
+          <?php $query = $this->search->getQuery($queryID);?>
+          <li><?php echo html::a("javascript:executeQuery($queryID)", $queryName . ((common::hasPriv('search', 'deleteQuery') and $this->app->user->account == $query->account) ? '<i class="icon icon-close"></i>' : ''), '', "class='label user-query' data-query-id='$queryID' title='{$queryName}'");?></li>
           <?php endforeach;?>
         </ul>
       </td>
@@ -314,7 +315,7 @@ $(function()
             if($('#mainMenu .btn-toolbar.pull-left #query').size() == 0)
             {
                 var html = '<div class="btn-group" id="query"><a href="javascript:;" data-toggle="dropdown" class="btn btn-link " style="border-radius: 2px;">' + searchCustom + ' <span class="caret"></span></a><ul class="dropdown-menu"></ul></div>';
-                html += '<style>#mainMenu #query.btn-group li {position: relative;} #mainMenu #query.btn-group li a{margin-right:20px;} #mainMenu #query.btn-group li .btn-delete{ padding:0 7px; position: absolute; right: -10px; top: -5px; display: block; width: 20px; text-align: center; } </style>';
+                html += '<style>#mainMenu #query.btn-group li {position: relative;} #mainMenu #query.btn-group li a{margin-right:20px;} #mainMenu #query.btn-group li .btn-delete{ padding:0 7px; position: absolute; right: -10px; top: -3px; display: block; width: 20px; text-align: center; } </style>';
                 html += "<script> function removeQueryFromMenu(obj) { var $obj = $(obj); var link = createLink('search', 'ajaxRemoveMenu', 'queryID=' + $obj.data('id')); $.get(link, function() { $obj.closest('li').remove(); if($('#mainMenu #query.btn-group').find('li').length == 0) $('#mainMenu #query.btn-group').remove(); })}<\/script>";
                 $('#mainMenu .btn-toolbar.pull-left #bysearchTab').before(html);
             }
diff --git a/module/user/view/bug.html.php b/module/user/view/bug.html.php
index 08d097a804..5079528866 100644
--- a/module/user/view/bug.html.php
+++ b/module/user/view/bug.html.php
@@ -39,7 +39,7 @@
       <thead>
         <tr class='text-center'>
           <th class='c-id'>        <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
-          <th class='c-severity'>  <?php common::printOrderLink('severity', $orderBy, $vars, $lang->bug->severityAB);?></th>
+          <th class='c-severity' title=<?php echo $lang->bug->severity;?>><?php common::printOrderLink('severity', $orderBy, $vars, $lang->bug->severityAB);?></th>
           <th class='c-pri' title='<?php echo $lang->pri;?>'><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
           <th class='c-type'>      <?php common::printOrderLink('type', $orderBy, $vars, $lang->typeAB);?></th>
           <th class='text-left'>   <?php common::printOrderLink('title', $orderBy, $vars, $lang->bug->title);?></th>
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index 1234d3cb90..e0fbf59763 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -81,7 +81,7 @@ a.showMoreImage:hover {opacity: 1;}
 
 .fixed-head-table{z-index:1000;}
 
-#headerActions {position: absolute; top: 9px; right: 205px; border-right: 2px solid rgba(255, 255, 255, 0.3);}
+#headerActions {position: absolute; top: 9px; right: 230px; border-right: 2px solid rgba(255, 255, 255, 0.3);}
 #headerActions .btn-group > .btn{ color: #fff; margin-right: 8px; border-radius: 4px !important;}
 #headerActions .btn-group > .btn.active, #headerActions .btn:active, #headerActions .open .dropdown-toggle.btn {background: rgba(0,0,0,0.15) !important;}
 #headerActions #kanbanActionMenu {left: 55px}