diff --git a/module/search/view/buildform.html.php b/module/search/view/buildform.html.php
index 6a611ed039..de0557e9c4 100644
--- a/module/search/view/buildform.html.php
+++ b/module/search/view/buildform.html.php
@@ -214,7 +214,7 @@ foreach($fieldParams as $fieldName => $param)
 <table class='table table-condensed table-form'>
   <tr>
     <td>
-      <table class='table'>
+      <table class='table active-disabled'>
       <?php
       $formSessionName = $module . 'Form';
       $formSession     = $this->session->$formSessionName;
@@ -260,7 +260,7 @@ foreach($fieldParams as $fieldName => $param)
     </td>
     <td class='text-center nobr'><?php echo html::select('groupAndOr', $lang->search->andor, $formSession['groupAndOr'], "class='form-control w-60px'")?></td>
     <td>
-      <table class='table'>
+      <table class='table active-disabled'>
       <?php
       for($i = 1; $i <= $groupItems; $i ++)
       {
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index 3af031662b..88e89516a2 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -471,8 +471,9 @@ body {font-size: 12px; color:#141414;padding-bottom: 40px;}
 #titlebar #querybox {margin: 5px -20px -10px}
 
 /* Container in outer */
-.outer .container {padding: 20px;}
-.outer .container .table-form, .outer .container .table-data {margin-top: 10px;}
+.outer > .container {margin: 20px auto; padding: 0 15px 20px; border: 1px solid #ddd;}
+.outer > .container > #featurebar, .outer .container > #titlebar{margin: 0 -15px}
+.outer > .container .table-form, .outer .container .table-data {margin-top: 10px;}
 
 /* Main content in outer */
 .outer .row {padding: 15px 20px;}