diff --git a/module/action/view/trash.html.php b/module/action/view/trash.html.php
index 63467de4c4..8a46d4ed92 100755
--- a/module/action/view/trash.html.php
+++ b/module/action/view/trash.html.php
@@ -11,7 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<div id='featurebar'>
+<div id='titlebar'>
   <div class='heading'>
     <?php echo html::icon($lang->icons['trash']);?> <?php echo $lang->action->trash;?>
   </div>
diff --git a/module/company/css/browse.css b/module/company/css/browse.css
index ccafd3df65..fbcd3f0b94 100644
--- a/module/company/css/browse.css
+++ b/module/company/css/browse.css
@@ -1 +1,3 @@
+#titlebar #querybox {margin-top: -14px;}
+#titlebar > .heading {display: none}
 form {position:relative}
diff --git a/module/company/view/browse.html.php b/module/company/view/browse.html.php
index 68d964babb..58ae091f90 100644
--- a/module/company/view/browse.html.php
+++ b/module/company/view/browse.html.php
@@ -16,7 +16,7 @@ include '../../common/view/treeview.html.php';
 js::set('deptID', $deptID);
 js::set('confirmDelete', $lang->user->confirmDelete);
 ?>
-<div id='featurebar'>
+<div id='titlebar'>
   <div class='heading'><?php echo html::icon($lang->icons['company']);?> <?php echo $lang->company->browse;?></div>
   <div id='querybox' class='show'><?php echo $searchForm?></div>
 </div>
diff --git a/module/company/view/view.html.php b/module/company/view/view.html.php
index 584a96f575..4df4bdf15e 100644
--- a/module/company/view/view.html.php
+++ b/module/company/view/view.html.php
@@ -12,9 +12,9 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <div class='container mw-600px'>
-  <div id='featurebar'>
+  <div id='titlebar'>
     <div class='heading'><?php echo html::icon($lang->icons['company']);?> <?php echo $lang->company->view;?></div>
-    <div class='btn-group pull-right'>
+    <div class='actions'>
       <?php common::printLink('company', 'edit', '', '<i class="icon-pencil"></i> ' . $lang->edit, '', 'id="editCompany" class="btn btn-primary iframe" data-width="580"', true, true);?>
     </div>
   </div>
diff --git a/module/convert/view/index.html.php b/module/convert/view/index.html.php
index 63a6e96cb4..3150b49deb 100644
--- a/module/convert/view/index.html.php
+++ b/module/convert/view/index.html.php
@@ -21,7 +21,7 @@
     <div class='content'>
       <?php echo nl2br($lang->convert->desc);?>
       <div class='text-center pdt-20'>
-        <?php echo html::a($this->createLink('convert', 'selectsource'), '<i class="icon-exchange"></i> ' . $lang->convert->start, '', 'class="btn btn-primary"');?>
+        <?php echo html::a($this->createLink('convert', 'selectsource'), $lang->convert->start, '', 'class="btn btn-primary"');?>
       </div>
     </div>
   </div>
diff --git a/module/dept/view/browse.html.php b/module/dept/view/browse.html.php
index fcce39bcea..6f0bc7448c 100644
--- a/module/dept/view/browse.html.php
+++ b/module/dept/view/browse.html.php
@@ -12,7 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/treeview.html.php';?>
-<div id='featurebar'>
+<div id='titlebar'>
   <div class='heading'><?php echo html::icon($lang->icons['dept']);?> <?php echo $lang->dept->common;?></div>
 </div>
 <div class='main'>
diff --git a/module/group/view/browse.html.php b/module/group/view/browse.html.php
index 1508372244..121a4d7e9f 100644
--- a/module/group/view/browse.html.php
+++ b/module/group/view/browse.html.php
@@ -13,7 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/tablesorter.html.php';?>
 <?php js::set('confirmDelete', $lang->group->confirmDelete);?>
-<div id='featurebar'>
+<div id='titlebar'>
   <div class='heading'><?php echo html::icon($lang->icons['group']);?> <?php echo $lang->group->browse;?></div>
   <div class='actions'>
     <?php common::printIcon('group', 'create', '', '', 'button', '', '', 'iframe', true, "data-width='550'");?>
diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php
index 023ade9b4b..8ab10a72c7 100644
--- a/module/my/view/todo.html.php
+++ b/module/my/view/todo.html.php
@@ -39,7 +39,7 @@
       ?>
       <script>$('#<?php echo $type;?>').addClass('active')</script>
     </ul>  
-    <div class='btn-group pull-right'>
+    <div class='actions'>
       <?php echo html::a(helper::createLink('todo', 'export', "account=$account&orderBy=id_desc"), "<i class='icon-download-alt'></i> " . $lang->todo->export, '', "class='btn iframe'") ?>
       <?php echo html::a(helper::createLink('todo', 'batchCreate'), "<i class='icon-plus-sign'></i> " . $lang->todo->batchCreate, '', "class='btn'") ?>
       <?php echo html::a(helper::createLink('todo', 'create', "date=" . str_replace('-', '', $date)), "<i class='icon-plus'></i> " . $lang->todo->create, '', "class='btn'") ?>
diff --git a/module/product/view/doc.html.php b/module/product/view/doc.html.php
index 9539002400..d8d1249305 100644
--- a/module/product/view/doc.html.php
+++ b/module/product/view/doc.html.php
@@ -13,9 +13,9 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/tablesorter.html.php';?>
 <?php js::set('confirmDelete', $lang->doc->confirmDelete)?>
-<div id='featurebar'>
+<div id='titlebar'>
   <div class='heading'><i class='icon-file-text'></i> <?php echo $lang->product->doc;?>  </div>
-  <div class='btn-group pull-right'>
+  <div class='actions'>
     <?php common::printIcon('doc', 'create', "libID=product&moduleID=0&productID={$product->id}&projectID=0&from=product");?>
   </div>
 </div>
diff --git a/module/product/view/index.html.php b/module/product/view/index.html.php
index 2305ad2527..3915ed8ae8 100644
--- a/module/product/view/index.html.php
+++ b/module/product/view/index.html.php
@@ -14,7 +14,7 @@
 <?php include '../../common/view/colorize.html.php';?>
 <div id='featurebar'>
   <div class='heading'><?php echo html::icon($lang->icons['product']) . ' ' . $lang->product->index;?>  </div>
-  <div class='btn-group pull-right'>
+  <div class='actions'>
     <?php echo html::a($this->createLink('product', 'create'), "<i class='icon-plus'></i> " . $lang->product->create,'', "class='btn'") ?>
   </div>
 </div>
diff --git a/module/product/view/project.html.php b/module/product/view/project.html.php
index 419aa4f62e..7c59fb4483 100644
--- a/module/product/view/project.html.php
+++ b/module/product/view/project.html.php
@@ -11,7 +11,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/sparkline.html.php';?>
-<div id='featurebar'>
+<div id='titlebar'>
   <div class='heading'><i class='icon-folder-close'></i> <?php echo $lang->product->project;?>  </div>
 </div>
 <table class='table'>
diff --git a/module/product/view/roadmap.html.php b/module/product/view/roadmap.html.php
index ed9aa441f3..af0b1f30c1 100644
--- a/module/product/view/roadmap.html.php
+++ b/module/product/view/roadmap.html.php
@@ -12,7 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <div class='container mw-900px'>
-  <div id='featurebar'><div class='heading'><i class='icon-code-fork'></i> <?php echo $lang->product->roadmap;?></div></div>
+  <div id='titlebar'><div class='heading'><i class='icon-code-fork'></i> <?php echo $lang->product->roadmap;?></div></div>
   <table class='table-grid w-p100'>
     <?php 
     $years = array_keys($roadmaps);
diff --git a/module/productplan/view/browse.html.php b/module/productplan/view/browse.html.php
index 0eab9edab1..504cc8504a 100644
--- a/module/productplan/view/browse.html.php
+++ b/module/productplan/view/browse.html.php
@@ -12,9 +12,9 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php js::set('confirmDelete', $lang->productplan->confirmDelete)?>
-<div id='featurebar'>
+<div id='titlebar'>
   <div class='heading'><i class='icon-flag'></i> <?php echo $lang->productplan->browse;?>  </div>
-  <div class='btn-group pull-right'>
+  <div class='actions'>
     <?php common::printIcon('productplan', 'create', "productID=$product->id", '', 'button', 'plus');?>
   </div>
 </div>
diff --git a/module/project/view/bug.html.php b/module/project/view/bug.html.php
index 806c9e4d82..cd3063c4bf 100644
--- a/module/project/view/bug.html.php
+++ b/module/project/view/bug.html.php
@@ -11,7 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<div id='featurebar'>
+<div id='titlebar'>
   <div class='heading'>
     <?php echo html::icon($lang->icons['bug']);?> <?php echo $lang->project->bug;?>
     <?php if($build) echo ' <span class="label label-danger">Build:' . $build->name . '</span>'; ?>
diff --git a/module/project/view/build.html.php b/module/project/view/build.html.php
index ae1061c691..bb136635a9 100644
--- a/module/project/view/build.html.php
+++ b/module/project/view/build.html.php
@@ -13,7 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/tablesorter.html.php';?>
 <?php js::set('confirmDelete', $lang->build->confirmDelete)?>
-<div id='featurebar'>
+<div id='titlebar'>
   <div class='heading'>
     <?php echo html::icon($lang->icons['build']);?> <?php echo $lang->project->build;?>
   </div>
diff --git a/module/project/view/doc.html.php b/module/project/view/doc.html.php
index 34c545b36e..1aa146c37b 100644
--- a/module/project/view/doc.html.php
+++ b/module/project/view/doc.html.php
@@ -14,7 +14,7 @@
 <?php include '../../common/view/tablesorter.html.php';?>
 <?php js::set('confirmDelete', $lang->doc->confirmDelete)?>
 <div class='container'>
-  <div id='featurebar'>
+  <div id='titlebar'>
     <div class='heading'>
       <?php echo html::icon($lang->icons['doc']);?> <?php echo $lang->project->doc;?>
     </div>
diff --git a/module/project/view/index.html.php b/module/project/view/index.html.php
index b13c595573..1238b17f12 100644
--- a/module/project/view/index.html.php
+++ b/module/project/view/index.html.php
@@ -13,7 +13,7 @@
 <?php include '../../common/view/sparkline.html.php';?>
 <div id='featurebar'>
   <div class='heading'><?php echo html::icon($lang->icons['project']) . ' ' . $lang->project->allProject;?>  </div>
-  <div class='btn-group pull-right'>
+  <div class='actions'>
     <?php echo html::a($this->createLink('project', 'create'), "<i class='icon-plus'></i> " . $lang->project->create,'', "class='btn'") ?>
   </div>
   <ul class='nav'>
diff --git a/module/project/view/manageproducts.html.php b/module/project/view/manageproducts.html.php
index 587b431561..f971cffd2c 100644
--- a/module/project/view/manageproducts.html.php
+++ b/module/project/view/manageproducts.html.php
@@ -12,7 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <div class='container mw-700px'>
-  <div id='featurebar'>
+  <div id='titlebar'>
     <div class='heading'>
       <?php echo html::icon($lang->icons['product']);?> <?php echo $lang->project->manageProducts;?>
     </div>
diff --git a/module/project/view/team.html.php b/module/project/view/team.html.php
index 7ca1b93717..9ecc1ca4fe 100644
--- a/module/project/view/team.html.php
+++ b/module/project/view/team.html.php
@@ -14,7 +14,7 @@
 <?php include '../../common/view/tablesorter.html.php';?>
 <?php js::set('confirmUnlinkMember', $lang->project->confirmUnlinkMember)?>
 <div class='container mw-700px'>
-  <div id='featurebar'>
+  <div id='titlebar'>
     <div class='heading'>
       <?php echo html::icon($lang->icons['team']);?> <?php echo $lang->project->team;?>
     </div>
diff --git a/module/project/view/testtask.html.php b/module/project/view/testtask.html.php
index 54afbc2be4..739092b7a3 100644
--- a/module/project/view/testtask.html.php
+++ b/module/project/view/testtask.html.php
@@ -13,7 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/tablesorter.html.php';?>
 <?php js::set('confirmDelete', $lang->testtask->confirmDelete)?>
-<div id='featurebar'>
+<div id='titlebar'>
   <div class='heading'>
     <?php echo html::icon($lang->icons['test']);?> <?php echo $lang->testtask->browse;?>
   </div>
diff --git a/module/release/view/browse.html.php b/module/release/view/browse.html.php
index ac02f750fb..6c14d4343a 100644
--- a/module/release/view/browse.html.php
+++ b/module/release/view/browse.html.php
@@ -14,9 +14,9 @@
 <?php include '../../common/view/tablesorter.html.php';?>
 <?php js::set('confirmDelete', $lang->release->confirmDelete)?>
 <div class='container mw-900px'>
-  <div id='featurebar'>
+  <div id='titlebar'>
     <div class='heading'><i class='icon-tags'></i> <?php echo $lang->release->browse;?>  </div>
-    <div class='btn-group pull-right'>
+    <div class='actions'>
       <?php common::printIcon('release', 'create', "product=$product->id");?>
     </div>
   </div>
diff --git a/module/sso/view/browse.html.php b/module/sso/view/browse.html.php
index e469abdd7f..d81b14ce1f 100644
--- a/module/sso/view/browse.html.php
+++ b/module/sso/view/browse.html.php
@@ -1,6 +1,6 @@
 <?php include '../../common/view/header.html.php';?>
 <div class='container'>
-  <div id='featurebar'>
+  <div id='titlebar'>
     <div class='heading'><i class='icon-globe'></i> <?php echo $lang->sso->browse;?></div>
     <div class='actions'><?php common::printIcon('sso', 'create');?></div>
   </div>
diff --git a/module/testtask/view/browse.html.php b/module/testtask/view/browse.html.php
index e512c8bd35..6aba6f88b3 100644
--- a/module/testtask/view/browse.html.php
+++ b/module/testtask/view/browse.html.php
@@ -13,7 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/colorize.html.php';?>
 <?php js::set('confirmDelete', $lang->testtask->confirmDelete)?>
-<div id='featurebar'>
+<div id='titlebar'>
   <div class='heading'><?php echo html::icon($lang->icons['testtask']);?> <?php echo $lang->testtask->browse;?></div>
   <div class='actions'>
     <?php common::printIcon('testtask', 'create', "product=$productID");?>
diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php
index d59a6208a8..455107f785 100644
--- a/module/tree/view/browse.html.php
+++ b/module/tree/view/browse.html.php
@@ -12,7 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/treeview.html.php';?>
-<div id='featurebar'>
+<div id='titlebar'>
   <div class='heading'><i class='icon-cogs'></i> <?php echo $lang->tree->common;?>  </div>
 </div>
 <div class='row'>
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index 3c03ee7ce1..bbd179a781 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -446,7 +446,7 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;}
 #titlebar #querybox {margin: 5px -20px -10px}
 
 /* Container in outer */
-.outer > .container {margin: 20px auto; padding: 0; border: 1px solid #ddd;}
+.outer > .container {margin: 0 auto 20px; padding: 0; border: 1px solid #ddd;}
 .outer > .container > #featurebar, .outer > .container > #titlebar {margin: 0}
 .outer > .container > form, body > .container > form{padding: 10px 30px 10px 15px}
 .outer > .container > .table-data {margin: 10px 0}