Index: branches/unlabeled/unlabeled-1.4.2/core/admin_templates/incs/style.css
===================================================================
diff -u -r7652 -r7925
--- branches/unlabeled/unlabeled-1.4.2/core/admin_templates/incs/style.css	(.../style.css)	(revision 7652)
+++ branches/unlabeled/unlabeled-1.4.2/core/admin_templates/incs/style.css	(.../style.css)	(revision 7925)
@@ -112,6 +112,9 @@
 	white-space: nowrap;
 }
 
+.search-box {
+	border: 1px solid #808080;
+}
 
 .button {
 	font-family: arial, verdana;
Index: branches/unlabeled/unlabeled-1.31.2/core/admin_templates/js/catalog.js
===================================================================
diff -u -r7858 -r7925
--- branches/unlabeled/unlabeled-1.31.2/core/admin_templates/js/catalog.js	(.../catalog.js)	(revision 7858)
+++ branches/unlabeled/unlabeled-1.31.2/core/admin_templates/js/catalog.js	(.../catalog.js)	(revision 7925)
@@ -111,6 +111,10 @@
 	}
 }
 
+Catalog.prototype.trim = function ($string) {
+	return $string.replace(/\s*((\S+\s*)*)/, "$1").replace(/((\s*\S+)*)\s*/, "$1");
+}
+
 Catalog.prototype.errorCallback = function($request, $params, $object) {
 //	$Debugger.ShowProps($request, 'req');
 	alert('AJAX Error; class: Catalog; ' + Request.getErrorHtml($request));
Index: branches/unlabeled/unlabeled-1.31.2/kernel/admin_templates/incs/catalog.js
===================================================================
diff -u -r7858 -r7925
--- branches/unlabeled/unlabeled-1.31.2/kernel/admin_templates/incs/catalog.js	(.../catalog.js)	(revision 7858)
+++ branches/unlabeled/unlabeled-1.31.2/kernel/admin_templates/incs/catalog.js	(.../catalog.js)	(revision 7925)
@@ -111,6 +111,10 @@
 	}
 }
 
+Catalog.prototype.trim = function ($string) {
+	return $string.replace(/\s*((\S+\s*)*)/, "$1").replace(/((\s*\S+)*)\s*/, "$1");
+}
+
 Catalog.prototype.errorCallback = function($request, $params, $object) {
 //	$Debugger.ShowProps($request, 'req');
 	alert('AJAX Error; class: Catalog; ' + Request.getErrorHtml($request));
Index: branches/unlabeled/unlabeled-1.28.2/core/admin_templates/catalog/catalog.tpl
===================================================================
diff -u -r7871 -r7925
--- branches/unlabeled/unlabeled-1.28.2/core/admin_templates/catalog/catalog.tpl	(.../catalog.tpl)	(revision 7871)
+++ branches/unlabeled/unlabeled-1.28.2/core/admin_templates/catalog/catalog.tpl	(.../catalog.tpl)	(revision 7925)
@@ -177,17 +177,17 @@
 
 <inp2:m_set t="in-portal/xml/categories_list"/>
 <inp2:m_RenderElement name="kernel_form" form_name="categories_form"/>
-<table class="toolbar" cellspacing="0" cellpadding="2" width="100%" border="0" style="border-top-width: 0px;">
-	<tr bgcolor="#e0e0da" height="20">
+<table class="toolbar" cellspacing="0" cellpadding="0" width="100%" border="0" style="border-top-width: 0px;">
+	<tr bgcolor="#e0e0da">
 		<td valign="middle">
-			<img height="15" src="img/arrow.gif" width="15" align="absmiddle" border="0"><span id="category_path"></span>
+			<img src="img/arrow.gif" width="15" height="15" align="absmiddle" border="0"><span id="category_path"></span>
 		</td>
 		<td align="right" class="search-cell">
 			<table cellspacing="0" cellpadding="0" border="0">
 				<tr>
 					<td>Search:&nbsp;</td>
 					<td>
-						<input type="text" id="c_search_keyword" name="c_search_keyword" value="" onkeydown="search_keydown(event, 'c', 'Default', 1);" style="border: 1px solid grey;" />
+						<input type="text" id="c_search_keyword" name="c_search_keyword" value="" onkeydown="search_keydown(event, 'c', 'Default', 1);" class="search-box"/>
 						<input type="text" style="display: none;" />
 					</td>
 					<td id="search_buttons[c]">
Index: branches/unlabeled/unlabeled-1.3.2/core/admin_templates/incs/grid_blocks.tpl
===================================================================
diff -u -r7821 -r7925
--- branches/unlabeled/unlabeled-1.3.2/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 7821)
+++ branches/unlabeled/unlabeled-1.3.2/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 7925)
@@ -54,15 +54,14 @@
 						<tr>
 							<td><inp2:m_phrase name="la_Search"/>:&nbsp;</td>
 							<td>
-								<input type="text" id="<inp2:m_param name="PrefixSpecial"/>_search_keyword" name="<inp2:m_param name="PrefixSpecial"/>_search_keyword" value="<inp2:m_recall var="{$PrefixSpecial}_search_keyword" no_null="no_null" special="1"/>" onkeydown="search_keydown(event, '<inp2:m_param name="PrefixSpecial"/>', '<inp2:m_param name="grid"/>', <inp2:m_param name="ajax"/>);" style="border: 1px solid grey;" />
-								<input type="text" style="display: none"; />
+								<input type="text" id="<inp2:m_param name="PrefixSpecial"/>_search_keyword" name="<inp2:m_param name="PrefixSpecial"/>_search_keyword" value="<inp2:m_recall var="{$PrefixSpecial}_search_keyword" no_null="no_null" special="1"/>" onkeydown="search_keydown(event, '<inp2:m_param name="PrefixSpecial"/>', '<inp2:m_param name="grid"/>', <inp2:m_param name="ajax"/>);" class="search-box"/>
+								<input type="text" style="display: none;"/>
 							</td>
-							<td style="white-space: nowrap" id="search_buttons[<inp2:m_param name="PrefixSpecial"/>]">
+							<td style="white-space: nowrap;" id="search_buttons[<inp2:m_param name="PrefixSpecial"/>]">
 								<div style="white-space: nowrap;"></div>
-									<script type="text/javascript">
-										<inp2:m_RenderElement name="grid_search_buttons" pass_params="true"/>
-									</script>
-
+								<script type="text/javascript">
+									<inp2:m_RenderElement name="grid_search_buttons" pass_params="true"/>
+								</script>
 							</td>
 						</tr>
 					</table>
Index: branches/unlabeled/unlabeled-1.28.2/kernel/admin_templates/catalog.tpl
===================================================================
diff -u -r7871 -r7925
--- branches/unlabeled/unlabeled-1.28.2/kernel/admin_templates/catalog.tpl	(.../catalog.tpl)	(revision 7871)
+++ branches/unlabeled/unlabeled-1.28.2/kernel/admin_templates/catalog.tpl	(.../catalog.tpl)	(revision 7925)
@@ -177,17 +177,17 @@
 
 <inp2:m_set t="in-portal/xml/categories_list"/>
 <inp2:m_RenderElement name="kernel_form" form_name="categories_form"/>
-<table class="toolbar" cellspacing="0" cellpadding="2" width="100%" border="0" style="border-top-width: 0px;">
-	<tr bgcolor="#e0e0da" height="20">
+<table class="toolbar" cellspacing="0" cellpadding="0" width="100%" border="0" style="border-top-width: 0px;">
+	<tr bgcolor="#e0e0da">
 		<td valign="middle">
-			<img height="15" src="img/arrow.gif" width="15" align="absmiddle" border="0"><span id="category_path"></span>
+			<img src="img/arrow.gif" width="15" height="15" align="absmiddle" border="0"><span id="category_path"></span>
 		</td>
 		<td align="right" class="search-cell">
 			<table cellspacing="0" cellpadding="0" border="0">
 				<tr>
 					<td>Search:&nbsp;</td>
 					<td>
-						<input type="text" id="c_search_keyword" name="c_search_keyword" value="" onkeydown="search_keydown(event, 'c', 'Default', 1);" style="border: 1px solid grey;" />
+						<input type="text" id="c_search_keyword" name="c_search_keyword" value="" onkeydown="search_keydown(event, 'c', 'Default', 1);" class="search-box"/>
 						<input type="text" style="display: none;" />
 					</td>
 					<td id="search_buttons[c]">