Index: branches/RC/core/units/visits/visits_tag_processor.php
===================================================================
diff -u -N -r8929 -r11546
--- branches/RC/core/units/visits/visits_tag_processor.php	(.../visits_tag_processor.php)	(revision 8929)
+++ branches/RC/core/units/visits/visits_tag_processor.php	(.../visits_tag_processor.php)	(revision 11546)
@@ -1,27 +1,33 @@
 <?php
 
 	class VisitsTagProcessor extends kDBTagProcessor {
-		
+
 		function UserFound($params)
 		{
 			$virtual_users = Array(-1,-2, 0);
 			$object =& $this->Application->recallObject( $this->getPrefixSpecial(), $this->Prefix, $params );
 			return !in_array( $object->GetDBField( $params['user_field'] ) , $virtual_users );
-		}	
-		
-		
+		}
+
+
 		function UserLink($params)
 		{
 			$object =& $this->Application->recallObject( $this->getPrefixSpecial(), $this->Prefix, $params );
 			$user_id = $object->GetDBField( $params['user_field'] );
-			if($user_id)
-			{
-				//return $this->Application->HREF('in-commerce/users/users_edit_general','', Array('u_id' => $user_id) );
-				$resource_id = $this->Conn->GetOne('SELECT ResourceId FROM '.TABLE_PREFIX.'PortalUser WHERE PortalUserId = '.$user_id);
-				return 'javascript:OpenUserEdit('.$resource_id.');';
+
+			if ($user_id) {
+				$url_params =  Array (
+					'm_opener' => 'd',
+					'u_mode' => 't',
+					'u_event' => 'OnEdit',
+					'u_id' => $user_id,
+					'pass' => 'all,u'
+				);
+
+				return $this->Application->HREF($params['edit_template'], '', $url_params);
 			}
 		}
-		
+
 		function getDateLimitClause($field)
 		{
 			$search_filter = $this->Application->RecallVar( $this->getPrefixSpecial().'_search_filter');
@@ -32,37 +38,37 @@
 			}
 			return '';
 		}
-		
+
 		function AffiliateOrderInfo($params)
 		{
 			$list =& $this->GetList($params);
-			
+
 			$date_limit = str_replace($list->TableName, 'vis', $this->getDateLimitClause('VisitDate') );
-			
+
 			$affil_table = $this->Application->getUnitOption('affil', 'TableName');
 			$affil_idfield = $this->Application->getUnitOption('affil', 'IDField');
 			$sql = 'SELECT '.$affil_idfield.' FROM '.$affil_table.' WHERE PortalUserId = '.$this->Application->RecallVar('user_id');
 			$affiliate_id = $this->Conn->GetOne($sql);
-			
+
 			$sql = 'SELECT COUNT(ord.OrderId) AS OrderCount
 					FROM '.$list->TableName.' vis
 					LEFT JOIN '.TABLE_PREFIX.'Orders ord ON ord.VisitId = vis.VisitId
 					WHERE (vis.AffiliateId = '.$affiliate_id.') AND (ord.Status = '.ORDER_STATUS_PROCESSED.')'.($date_limit ? ' AND '.$date_limit : '');
 
 			$result = $this->Conn->GetRow($sql);
-			
+
 			$sql = 'SELECT COUNT(*) FROM '.$list->TableName.' vis
 					WHERE AffiliateId = '.$affiliate_id.($date_limit ? ' AND '.$date_limit : '');
-			
+
 			$result['TotalVisitors'] = $this->Conn->GetOne($sql);
 			$result['OrderTotalAmount'] = $list->getTotal('OrderTotalAmount', 'SUM');
 			$result['OrderAffiliateCommission'] = $list->getTotal('OrderAffiliateCommission', 'SUM');
-			
+
 			$block_params = $this->prepareTagParams($params);
 			$block_params['name'] = $params['render_as'];
 
 			$format_fields = Array('OrderTotalAmount', 'OrderAffiliateCommission');
-			
+
 			if( $this->HasParam($params, 'currency') )
 			{
 				$iso = $this->GetISO($params['currency']);
@@ -74,13 +80,13 @@
 					$result[$format_field] = $value;
 				}
 			}
-			
+
 			$block_params = array_merge_recursive2($block_params, $result);
-			
+
 			return $this->Application->ParseBlock($block_params);
 		}
-		
-		
+
+
 		/*function ShowTotals($params)
 		{
 			$list =& $this->GetList($params);
@@ -89,47 +95,47 @@
 			$block_params['name'] = $this->SelectParam($params, 'render_as,block');
 			return $this->Application->ParseBlock($block_params);
 		}*/
-		
+
 		function ListVisitors($params)
 		{
 			$o = '';
 
 			$params['render_as'] = $params['item_render_as'];
-					
+
 			$o_visitors = $this->PrintList2($params);
-			
+
 			if($o_visitors)
 			{
 				$header = '';
 				$footer = '';
-				
+
 				$block_params = $this->prepareTagParams($params);
-				
+
 				$header_block = getArrayValue($params, 'header_render_as');
 				if($header_block)
 				{
 					$block_params['name'] = $header_block;
 					$header = $this->Application->ParseBlock($block_params);
 				}
-				
+
 				$footer_block = getArrayValue($params, 'footer_render_as');
 				if($footer_block)
 				{
 					$block_params['name'] = $footer_block;
 					$footer = $this->Application->ParseBlock($block_params);
 				}
-				
+
 				$o = $header.$o_visitors.$footer;
 			}
 			else
 			{
 				$visitors_params = array('name' => $params['empty_myvisitors_render_as']);
 				$o = $this->Application->ParseBlock($visitors_params);
 			}
-			
-			return $o;			
-			
-		}	
+
+			return $o;
+
+		}
 		/*
 		function OrderLink($params){
 			$object = &$this->Application->recallObject($this->getPrefixSpecial());
@@ -138,14 +144,14 @@
 			return $main_processor->T($params);
 		}
 		*/
-		
+
 		/**
 		 * Enter description here...
 		 *
 		 * @param unknown_type $params
 		 * @return kDBList
 		 */
-		
+
 		function &GetList($params)
 		{
 			$list_name = $this->SelectParam($params, 'list_name,name');
@@ -159,14 +165,14 @@
 				$names_mapping  = $this->Application->GetVar('NamesToSpecialMapping');
 				$names_mapping[$this->Prefix][$list_name] = $special;
 				$this->Application->SetVar('NamesToSpecialMapping', $names_mapping);
-				
+
 			}
-			
 
+
 			return parent::GetList($params);
 		}
-		
+
 	}
-	
 
+
 ?>
\ No newline at end of file
Index: branches/RC/core/admin_templates/no_permission.tpl
===================================================================
diff -u -N -r11538 -r11546
--- branches/RC/core/admin_templates/no_permission.tpl	(.../no_permission.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/no_permission.tpl	(.../no_permission.tpl)	(revision 11546)
@@ -1,8 +1,7 @@
+<inp2:m_Set m_wid="1"/>
 <inp2:m_include t="incs/header"/>
 <inp2:m_Set skip_last_template="1"/>
 
-<inp2:m_RenderElement name="section_header" icon="icon46_banlist" title="!la_title_NoPermissions!"/>
-
 <inp2:m_RenderElement name="blue_bar" prefix="adm" title_preset="no_permissions" module="in-portal" icon="icon46_banlist"/>
 
 <!-- ToolBar --->
@@ -32,32 +31,40 @@
 						}
 					);
 				</inp2:m_ifnot>
+
+				$(document).ready(
+					function() {
+						Application.removeDebuggerStatistics();
+						maximizeElement('#permission_error');
+
+						$('#permission_error_container').css('background-color', '#F6F6F6');
+					}
+				);
 			</script>
 
 		</td>
 	</tr>
 </tbody>
 </table>
 
-<div id="scroll_container">
-	<table class="edit-table">
-		<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
-			<td height="400" valign="middle" align="left">
-				<center><b><inp2:m_Phrase name="la_text_NoPermission"/></b></center><br />
-				<inp2:m_if check="m_IsDebugMode">
-					<inp2:m_if check="m_GetEquals" name="from_template" value="1">
-						Permissions Checked: <b><inp2:m_get name="perms"/></b><br />
-						Template: <b><inp2:m_get name="next_template"/></b><br />
-						Redirect From Tag: <b>yes</b><br />
-					<inp2:m_else/>
-						Section: <b><inp2:m_get name="section"/></b><br />
-						Event: <b><inp2:m_get name="main_prefix"/>:<inp2:m_get name="event_name"/></b><br />
-						Redirect From Tag: <b>no</b><br />
-					</inp2:m_if></b><br />
-				</inp2:m_if>
-			</td>
-		</tr>
-	</table>
+<div id="permission_error" class="table-color1" style="bottom: 50%; text-align: center; vertical-align: middle;">
+	<br />
+	<strong><inp2:m_Phrase name="la_text_NoPermission"/></strong>
+	<inp2:m_if check="m_IsDebugMode">
+		<br /><br />
+		<div style="text-align: left;">
+			<inp2:m_if check="m_GetEquals" name="from_template" value="1">
+				Permissions Checked: <b><inp2:m_get name="perms"/></b><br />
+				Template: <b><inp2:m_get name="next_template"/></b><br />
+				Redirect From Tag: <b>yes</b><br />
+			<inp2:m_else/>
+				Section: <b><inp2:m_get name="section"/></b><br />
+				Event: <b><inp2:m_get name="main_prefix"/>:<inp2:m_get name="event_name"/></b><br />
+				Redirect From Tag: <b>no</b><br />
+			</inp2:m_if></b>
+		</div>
+	</inp2:m_if>
 </div>
 
+<inp2:m_Set _force_popup="1"/>
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/RC/core/admin_templates/logs/visits/visits_list.tpl
===================================================================
diff -u -N -r11538 -r11546
--- branches/RC/core/admin_templates/logs/visits/visits_list.tpl	(.../visits_list.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/logs/visits/visits_list.tpl	(.../visits_list.tpl)	(revision 11546)
@@ -43,7 +43,7 @@
 
 <inp2:m_DefineElement name="grid_userlink_td">
 	<inp2:m_if check="UserFound" user_field="$user_field">
-		<a href="<inp2:UserLink user_field="$user_field"/>" title="<inp2:m_phrase name="la_Edit_User"/>"><inp2:Field field="$field" grid="$grid"/></a>
+		<a href="<inp2:UserLink edit_template='users/users_edit' user_field="$user_field"/>" onclick="return direct_edit('<inp2:m_Param name="PrefixSpecial"/>', this.href);" title="<inp2:m_phrase name="la_Edit_User"/>"><inp2:Field field="$field" grid="$grid"/></a>
 	<inp2:m_else/>
 		<inp2:Field field="$field" grid="$grid"/>
 	</inp2:m_if>
@@ -61,7 +61,7 @@
 
 <inp2:adm_SaveReturnScript/>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="visits" IdField="VisitId" grid="Default" header_block="grid_column_title" data_block="grid_data_td" search="on" grid_filters="1"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="visits" IdField="VisitId" grid="Default" grid_filters="1"/>
 <script type="text/javascript">
 	Grids['visits'].SetDependantToolbarButtons( new Array('reset') );
 </script>
Index: branches/RC/core/units/statistics/statistics_config.php
===================================================================
diff -u -N -r8929 -r11546
--- branches/RC/core/units/statistics/statistics_config.php	(.../statistics_config.php)	(revision 8929)
+++ branches/RC/core/units/statistics/statistics_config.php	(.../statistics_config.php)	(revision 11546)
@@ -15,26 +15,26 @@
 												3	=>	'event',
 												4	=>	'mode',
 											),
-					
+
 					'IDField' 			=>	'StatItemId',
-					
+
 					'TitleField'		=>	'ListLabel',
-					
+
 					'TitlePresets'		=>	Array(
-												'statistics_list'		=>	Array('prefixes' => Array('stat_List'), 'format' => "!la_title_Statistics! (#stat_recordcount#)"),
+												'statistics_list'		=>	Array('prefixes' => Array('stat_List'), 'format' => "!la_title_Statistics!"),
 											),
-											
+
 					'TableName'			=>	TABLE_PREFIX.'StatItem',
 
 					'ListSQLs'			=>	Array(''	=>	'SELECT %1$s.* %2$s FROM %1$s'),
 					'ItemSQLs'			=>	Array(''	=>	'SELECT %1$s.* %2$s FROM %1$s'),
-											
+
 					'ListSortings'	=> 	Array(
 																'' => Array(
 																	'Sorting' => Array('Priority' => 'asc'),
 																)
 															),
-					
+
 					'Fields' => Array(
 								        'StatItemId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
 							            'Module' => Array('type' => 'string','not_null' => '1','default' => ''),
@@ -45,8 +45,8 @@
 							            'AdminSummary' => Array('type' => 'int','not_null' => 1, 'default' => 0),
 							    ),
 
-					
 
+
 					'Grids'	=> Array(
 										'Default'	=>	Array(
 																'Icons' => Array('default' => 'icon16_custom.gif'),
@@ -56,8 +56,8 @@
 																					'FirstName'		=> Array( 'title'=>'la_col_FirstName'),
 																			),
 														),
-														
-										
+
+
 								),
 
 	);
Index: branches/RC/core/kernel/event_handler.php
===================================================================
diff -u -N -r10098 -r11546
--- branches/RC/core/kernel/event_handler.php	(.../event_handler.php)	(revision 10098)
+++ branches/RC/core/kernel/event_handler.php	(.../event_handler.php)	(revision 11546)
@@ -127,6 +127,7 @@
 			if ($url) {
 				$this->Application->Redirect('external:'.$url);
 			}
+
 			$event->SetRedirectParam('opener', 'u');
 		}
 
Index: branches/RC/core/units/email_queue/email_queue_config.php
===================================================================
diff -u -N -r11319 -r11546
--- branches/RC/core/units/email_queue/email_queue_config.php	(.../email_queue_config.php)	(revision 11319)
+++ branches/RC/core/units/email_queue/email_queue_config.php	(.../email_queue_config.php)	(revision 11546)
@@ -21,7 +21,7 @@
 		'TableName' => TABLE_PREFIX . 'EmailQueue',
 
 		'TitlePresets' => Array (
-			'email_queue_list' => Array ('prefixes' => Array('email-queue_List'), 'format' => '!la_tab_EmailQueue! (#email-queue_recordcount#)',),
+			'email_queue_list' => Array ('prefixes' => Array('email-queue_List'), 'format' => '!la_tab_EmailQueue!',),
 		),
 
 		'PermSection' => Array ('main' => 'in-portal:email_queue'),
Index: branches/RC/core/admin_templates/user_selector.tpl
===================================================================
diff -u -N -r11538 -r11546
--- branches/RC/core/admin_templates/user_selector.tpl	(.../user_selector.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/user_selector.tpl	(.../user_selector.tpl)	(revision 11546)
@@ -24,10 +24,19 @@
 
 					a_toolbar.Render();
 
-					function edit()
-					{
-						submit_event('<inp2:m_Recall name="main_prefix"/>', 'OnSelectUser');
+					function edit() {
+						var $opener = getWindowOpener(window);
+
+						if ( $.isFunction($opener.processUserSelector) ) {
+							$opener.processUserSelector('<inp2:m_Recall name="dst_field"/>', window);
+							window_close();
+						}
+						else {
+							submit_event('<inp2:m_Recall name="main_prefix"/>', 'OnSelectUser');
+						}
 					}
+
+					var $user_logins = {};
 			</script>
 		</td>
 
@@ -36,10 +45,16 @@
 </tbody>
 </table>
 
+<inp2:m_DefineElement name="grid_login_td" format="" no_special="1" nl2br="" first_chars="" td_style="">
+	<inp2:Field field="$field" first_chars="$first_chars" nl2br="$nl2br" grid="$grid" no_special="$no_special" format="$format"/>
+	<script type="text/javascript">
+		$user_logins[ <inp2:Field name="$IdField"/> ] = '<inp2:Field name="Login" js_ecape="1"/>';
+	</script>
+</inp2:m_DefineElement>
+
 <inp2:m_RenderElement name="grid" PrefixSpecial="u" IdField="PortalUserId" grid="UserSelector" menu_filters="yes"/>
 <script type="text/javascript">
 	Grids['u'].SetDependantToolbarButtons( new Array('select') );
-//	Grids['u'].DblClick = function() {return false};
 </script>
 
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/RC/core/admin_templates/stylesheets/stylesheets_edit_block.tpl
===================================================================
diff -u -N -r11538 -r11546
--- branches/RC/core/admin_templates/stylesheets/stylesheets_edit_block.tpl	(.../stylesheets_edit_block.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/stylesheets/stylesheets_edit_block.tpl	(.../stylesheets_edit_block.tpl)	(revision 11546)
@@ -100,7 +100,7 @@
 	<inp2:Field field="$field" grid="$grid" no_special="$no_special" cut_first="100"/>
 </inp2:m_DefineElement>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="selectors.block" IdField="SelectorId" grid="BlockStyles" header_block="grid_column_title" data_block="grid_data_td" search="on"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="selectors.block" IdField="SelectorId" grid="BlockStyles"/>
 <script type="text/javascript">
 	Grids['selectors.block'].SetDependantToolbarButtons( new Array('edit','delete','clone','reset_to_base') );
 </script>
Index: branches/RC/core/admin_templates/custom_fields/custom_fields_list.tpl
===================================================================
diff -u -N -r11538 -r11546
--- branches/RC/core/admin_templates/custom_fields/custom_fields_list.tpl	(.../custom_fields_list.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/custom_fields/custom_fields_list.tpl	(.../custom_fields_list.tpl)	(revision 11546)
@@ -68,7 +68,7 @@
 	<inp2:Field field="$field" grid="$grid" no_special="no_special" as_label="1" />
 </inp2:m_DefineElement>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="cf" IdField="CustomFieldId" grid="Default" header_block="grid_column_title" data_block="grid_data_td" search="on"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="cf" IdField="CustomFieldId" grid="Default"/>
 <script type="text/javascript">
 	Grids['cf'].SetDependantToolbarButtons( new Array('edit','delete', 'clone', 'move_down', 'move_up') );
 </script>
Index: branches/RC/core/admin_templates/categories/categories_edit_permissions.tpl
===================================================================
diff -u -N -r11538 -r11546
--- branches/RC/core/admin_templates/categories/categories_edit_permissions.tpl	(.../categories_edit_permissions.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/categories/categories_edit_permissions.tpl	(.../categories_edit_permissions.tpl)	(revision 11546)
@@ -125,32 +125,21 @@
 
 <br />
 <!-- item tabs: begin -->
-<table cellpadding="0" cellspacing="0">
-	<tr>
-		<inp2:m_DefineElement name="item_tab" title="">
-			<td nowrap="nowrap" width="140">
-				<table id="<inp2:m_param name="prefix"/>_tab" cellpadding="0" cellspacing="0" width="100%" class="catalog-tab-unselected" onclick="$PermManager.switchTab('<inp2:m_param name="prefix"/>');">
-					<tr>
-						<td class="catalog-tab-left">
-							<img src="img/spacer.gif" height="22" width="9" />
-						</td>
-						<td class="catalog-tab-middle" width="100%" valign="middle" nowrap="nowrap">
-							<inp2:m_param name="title"/>
-						</td>
-		       			<td class="catalog-tab-right">
-		     				<img src="img/spacer.gif" height="22" width="9" />
-						</td>
-						<td style="background-color: #FFFFFF;">
-							<img src="img/spacer.gif" height="1" width="5" />
-						</td>
-					</tr>
-				</table>
+<inp2:m_DefineElement name="item_tab" title="" special="">
+	<td class="tab-spacer"><img src="img/spacer.gif" width="3" height="1"/></td>
+	<td id="<inp2:m_param name="prefix"/><inp2:m_param name="special"/>_tab" class="tab">
+		<img src="<inp2:m_TemplatesBase module='$icon_module'/>/img/itemicons/<inp2:m_Param name='icon'/>" width="16" height="16" align="absmiddle" alt=""/>
+		<a href="#" onclick="$PermManager.switchTab('<inp2:m_param name="prefix"/>'); return false;" class="tab-link">
+			<inp2:m_param name="title"/>
+		</a>
+	</td>
+</inp2:m_DefineElement>
 
-			</td>
-		</inp2:m_DefineElement>
-		<inp2:adm_ListCatalogTabs render_as="item_tab" title_property="PermTabText"/>
-	</tr>
-</table>
+<inp2:m_DefineElement name="permission_tabs">
+	<inp2:adm_ListCatalogTabs render_as="item_tab" title_property="PermTabText"/>
+</inp2:m_DefineElement>
+
+<inp2:m_RenderElement name="tabs_container" tabs_render_as="permission_tabs"/>
 <!-- item tabs: end -->
 
 <inp2:c-perm_PrintTabs template="categories/permissions_tab" tab_init="1"/>
@@ -197,5 +186,4 @@
 			$PermManager.Init();
 		}
 	);
-</script>
-
+</script>
\ No newline at end of file
Index: branches/RC/core/units/users/users_config.php
===================================================================
diff -u -N -r11538 -r11546
--- branches/RC/core/units/users/users_config.php	(.../users_config.php)	(revision 11538)
+++ branches/RC/core/units/users/users_config.php	(.../users_config.php)	(revision 11546)
@@ -280,12 +280,12 @@
 						'Default'	=>	Array(
 							'Icons' => Array(0 => 'icon16_user_disabled.gif', 1 => 'icon16_user.gif', 2 => 'icon16_user_pending.gif'),
 							'Fields' => Array(
-									'Login'			=> Array('title' => 'la_col_Username', 'data_block' => 'grid_checkbox_td'),
-									'LastName'		=> Array( 'title'=>'la_col_LastName'),
-									'FirstName'		=> Array( 'title'=>'la_col_FirstName'),
-									'Email'			=> Array( 'title'=>'la_col_Email'),
-									'PrimaryGroup'	=> Array( 'title'=>'la_col_PrimaryGroup'),
-									'CreatedOn_formatted'	=>	Array('title' => 'la_col_CreatedOn', 'sort_field' => 'CreatedOn'),
+									'Login'			=> Array('title' => 'la_col_Username', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter'),
+									'LastName'		=> Array( 'title'=>'la_col_LastName', 'filter_block' => 'grid_like_filter'),
+									'FirstName'		=> Array( 'title'=>'la_col_FirstName', 'filter_block' => 'grid_like_filter'),
+									'Email'			=> Array( 'title'=>'la_col_Email', 'filter_block' => 'grid_like_filter'),
+									'PrimaryGroup'	=> Array( 'title'=>'la_col_PrimaryGroup', 'filter_block' => 'grid_options_filter'),
+									'CreatedOn'	=>	Array('title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter'),
 								),
 						),
 
@@ -294,12 +294,12 @@
 							'Icons' => Array(0 => 'icon16_user_disabled.gif', 1 => 'icon16_user.gif', 2 => 'icon16_user_pending.gif'),
 							'Selector' => 'radio',
 							'Fields' => Array(
-								'Login'			=> Array('title' => 'la_col_Username', 'data_block' => 'grid_radio_td'),
-								'LastName'		=> Array( 'title'=>'la_col_LastName'),
-								'FirstName'		=> Array( 'title'=>'la_col_FirstName'),
-								'Email'			=> Array( 'title'=>'la_col_Email'),
-								'PrimaryGroup'	=> Array( 'title'=>'la_col_PrimaryGroup'),
-								'CreatedOn_formatted'	=>	Array('title' => 'la_col_CreatedOn', 'sort_field' => 'CreatedOn'),
+								'Login'			=> Array('title' => 'la_col_Username', 'data_block' => 'grid_login_td', 'filter_block' => 'grid_like_filter'),
+								'LastName'		=> Array( 'title'=>'la_col_LastName', 'filter_block' => 'grid_like_filter'),
+								'FirstName'		=> Array( 'title'=>'la_col_FirstName', 'filter_block' => 'grid_like_filter'),
+								'Email'			=> Array( 'title'=>'la_col_Email', 'filter_block' => 'grid_like_filter'),
+								'PrimaryGroup'	=> Array( 'title'=>'la_col_PrimaryGroup', 'filter_block' => 'grid_options_filter'),
+								'CreatedOn'	=>	Array('title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter'),
 							),
 						),
 
Index: branches/RC/core/units/general/general_config.php
===================================================================
diff -u -N -r8929 -r11546
--- branches/RC/core/units/general/general_config.php	(.../general_config.php)	(revision 8929)
+++ branches/RC/core/units/general/general_config.php	(.../general_config.php)	(revision 11546)
@@ -15,6 +15,7 @@
 											),
 					'TitleField'		=>	'CachedNavbar',
 					'TitlePhrase'		=>	'la_Text_Category',
+					'CatalogTabIcon' => 'icon16_folder.gif',
 					'ItemType'			=>	1,
 					'TableName'			=>	TABLE_PREFIX.'Category',
 
Index: branches/RC/core/install/upgrades.sql
===================================================================
diff -u -N -r11523 -r11546
--- branches/RC/core/install/upgrades.sql	(.../upgrades.sql)	(revision 11523)
+++ branches/RC/core/install/upgrades.sql	(.../upgrades.sql)	(revision 11546)
@@ -1091,4 +1091,6 @@
   Title VARCHAR(255) NOT NULL DEFAULT '',
   Description text,
   PRIMARY KEY  (FormId)
-);
\ No newline at end of file
+);
+
+DELETE FROM PersistantSessionData WHERE VariableName LIKE '%img%';
\ No newline at end of file
Index: branches/RC/core/units/ban_rules/ban_rules_config.php
===================================================================
diff -u -N -r11538 -r11546
--- branches/RC/core/units/ban_rules/ban_rules_config.php	(.../ban_rules_config.php)	(revision 11538)
+++ branches/RC/core/units/ban_rules/ban_rules_config.php	(.../ban_rules_config.php)	(revision 11546)
@@ -27,7 +27,7 @@
 				'edit_status_labels' => Array ('ban-rule' => '!la_title_EditingBanRule!'),
 			),
 
-			'ban_rule_list' => Array ('prefixes' => Array ('ban-rule_List'), 'format' => "!la_tab_BanList! (#ban-rule_recordcount#)"),
+			'ban_rule_list' => Array ('prefixes' => Array ('ban-rule_List'), 'format' => "!la_tab_BanList!"),
 			'ban_rule_edit' => Array ('prefixes' => Array ('ban-rule'), 'format' => "#ban-rule_status# '#ban-rule_titlefield#'"),
 		),
 
Index: branches/RC/core/admin_templates/categories/permissions_tab.tpl
===================================================================
diff -u -N -r10863 -r11546
--- branches/RC/core/admin_templates/categories/permissions_tab.tpl	(.../permissions_tab.tpl)	(revision 10863)
+++ branches/RC/core/admin_templates/categories/permissions_tab.tpl	(.../permissions_tab.tpl)	(revision 11546)
@@ -6,7 +6,9 @@
 	<inp2:m_Header data="Content-type: text/plain; charset=$charset"/>
 	if ($request_visible) {
 		document.getElementById('<inp2:m_get name="item_prefix"/>_div').setAttribute('group_id', <inp2:m_get name="group_id"/>);
+		maximizeElement( jq('#<inp2:m_get name="item_prefix"/>_div') );
 	}
+
 	<inp2:m_if check="c_SaveWarning">
 		document.getElementById('save_warning').style.display = 'block';
 		$edit_mode = true;
@@ -61,19 +63,15 @@
 		</tr>
 	</inp2:m_DefineElement>
 
-	<div style="overflow: auto; height: 250px;">
-		<div>
-		<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder_full">
-			<inp2:m_set odd_even="table-color1"/>
-			<thead class="subsectiontitle">
-				<td><inp2:m_phrase name="la_col_Description"/></td>
-				<td><inp2:m_phrase name="la_col_Inherited"/></td>
-				<td><inp2:m_phrase name="la_col_InheritedFrom"/></td>
-				<td><inp2:m_phrase name="la_col_Access"/></td>
-				<td><inp2:m_phrase name="la_col_Effective"/></td>
-			</thead>
-			<inp2:c-perm_PrintPermissions render_as="permission_element"/>
-		</table>
-		</div>
-	</div>
+	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder_full">
+		<inp2:m_set odd_even="table-color1"/>
+		<thead class="subsectiontitle">
+			<td><inp2:m_phrase name="la_col_Description"/></td>
+			<td><inp2:m_phrase name="la_col_Inherited"/></td>
+			<td><inp2:m_phrase name="la_col_InheritedFrom"/></td>
+			<td><inp2:m_phrase name="la_col_Access"/></td>
+			<td><inp2:m_phrase name="la_col_Effective"/></td>
+		</thead>
+		<inp2:c-perm_PrintPermissions render_as="permission_element"/>
+	</table>
 </inp2:m_if>
\ No newline at end of file
Index: branches/RC/core/admin_templates/popups/translator.tpl
===================================================================
diff -u -N -r11538 -r11546
--- branches/RC/core/admin_templates/popups/translator.tpl	(.../translator.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/popups/translator.tpl	(.../translator.tpl)	(revision 11546)
@@ -1,10 +1,6 @@
-<inp2:m_RequireLogin perm_event="trans:OnLoad"/>
-<inp2:m_include t="incs/header" nobody="yes"/>
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="trans" perm_event="trans:OnLoad" section="in-portal:root" title_preset="trans_edit"/>
 
-<body style="margin: 0px 8px 0px 8px; background-color: #fff;">
-
-<inp2:m_RenderElement name="blue_bar" prefix="trans" title_preset="trans_edit"/>
-
 <!-- ToolBar --->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
@@ -46,6 +42,8 @@
 			<inp2:m_else/>
 				<inp2:m_RenderElement name="inp_edit_box" prefix="trans" field="Translation" title="!la_fld_Translation!" size="50"/>
 			</inp2:m_if>
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+
 	</table>
 </div>
 
Index: branches/RC/core/admin_templates/stylesheets/stylesheets_edit_base.tpl
===================================================================
diff -u -N -r11538 -r11546
--- branches/RC/core/admin_templates/stylesheets/stylesheets_edit_base.tpl	(.../stylesheets_edit_base.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/stylesheets/stylesheets_edit_base.tpl	(.../stylesheets_edit_base.tpl)	(revision 11546)
@@ -92,7 +92,7 @@
 	<inp2:Field field="$field" grid="$grid" no_special="$no_special" cut_first="100"/>
 </inp2:m_DefineElement>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="selectors.base" IdField="SelectorId" grid="Default" header_block="grid_column_title" data_block="grid_data_td" search="on"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="selectors.base" IdField="SelectorId" grid="Default"/>
 <script type="text/javascript">
 	Grids['selectors.base'].SetDependantToolbarButtons( new Array('edit','delete','clone') );
 </script>
Index: branches/RC/core/admin_templates/agents/agent_edit.tpl
===================================================================
diff -u -N -r11538 -r11546
--- branches/RC/core/admin_templates/agents/agent_edit.tpl	(.../agent_edit.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/agents/agent_edit.tpl	(.../agent_edit.tpl)	(revision 11546)
@@ -87,4 +87,4 @@
 	</table>
 </div>
 
-<inp2:m_include t="incs/footer"/>
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/RC/core/units/mailing_lists/mailing_lists_config.php
===================================================================
diff -u -N -r11319 -r11546
--- branches/RC/core/units/mailing_lists/mailing_lists_config.php	(.../mailing_lists_config.php)	(revision 11319)
+++ branches/RC/core/units/mailing_lists/mailing_lists_config.php	(.../mailing_lists_config.php)	(revision 11546)
@@ -31,7 +31,7 @@
 				'edit_status_labels' => Array ('mailing-list' => '!la_title_ViewingMailingList!'),
 			),
 
-			'mailing_list_list' => Array ('prefixes' => Array ('mailing-list_List'), 'format' => "!la_title_MailingLists! (#mailing-list_recordcount#)"),
+			'mailing_list_list' => Array ('prefixes' => Array ('mailing-list_List'), 'format' => "!la_title_MailingLists!"),
 			'mailing_list_edit' => Array ('prefixes' => Array ('mailing-list'), 'format' => "#mailing-list_status#"),
 		),
 
Index: branches/RC/core/admin_templates/catalog/item_selector/item_selector_catalog.tpl
===================================================================
diff -u -N -r11525 -r11546
--- branches/RC/core/admin_templates/catalog/item_selector/item_selector_catalog.tpl	(.../item_selector_catalog.tpl)	(revision 11525)
+++ branches/RC/core/admin_templates/catalog/item_selector/item_selector_catalog.tpl	(.../item_selector_catalog.tpl)	(revision 11546)
@@ -1,3 +1,5 @@
+<inp2:adm_SetPopupSize width="970" height="580"/>
+
 <inp2:m_include t="incs/header" noform="yes"/>
 <inp2:m_include template="catalog/catalog_elements"/>
 
Index: branches/RC/core/admin_templates/js/application.js
===================================================================
diff -u -N -r11482 -r11546
--- branches/RC/core/admin_templates/js/application.js	(.../application.js)	(revision 11482)
+++ branches/RC/core/admin_templates/js/application.js	(.../application.js)	(revision 11546)
@@ -35,6 +35,17 @@
 	}
 }
 
+kApplication.prototype.removeDebuggerStatistics = function () {
+	var $debug_statistics = $('table.dbg_stats_table:first');
+	if ($debug_statistics.length > 0) {
+		// remove debugger short report and preceeding line break, because
+		// this adds additional vertical scrollbar (no matter what document.style.overflow is)
+		// when used in Opera & Google Chrome
+		$debug_statistics.prev('br').remove();
+		$debug_statistics.remove();
+	}
+}
+
 kApplication.prototype.SetVar = function ($name, $value) {
 	set_hidden_field($name, $value);
 }
Index: branches/RC/core/admin_templates/js/forms.js
===================================================================
diff -u -N -r11482 -r11546
--- branches/RC/core/admin_templates/js/forms.js	(.../forms.js)	(revision 11482)
+++ branches/RC/core/admin_templates/js/forms.js	(.../forms.js)	(revision 11546)
@@ -82,34 +82,39 @@
 Form.ScrollerH = 17;
 Form.HasChanged = false;
 
-Form.Init = function(id)
-{
+Form.Init = function(id) {
 	this.Div = document.getElementById(id);
 
 	for (var i in this.Controls) {
-		dim = getDimensions(document.getElementById(this.Controls[i]));
+		dim = getDimensions( document.getElementById(this.Controls[i]) );
 		options = this.Options[this.Controls[i]];
+
 		if (options.height) { // fixed height
 			options.min_height = options.height;
 			options.max_height = options.height;
 		}
-		if (!options.min_height) options.min_height = dim.innerHeight;
-		this.MinControlsHeight += options.min_height;
+
+		if (!options.min_height) {
+			options.min_height = $( jq('#' + this.Controls[i]) ).outerHeight(); // dim.innerHeight
+		}
+
+//		if ( $( jq('#' + this.Controls[i]) ).parents('tr:first').is(':visible') ) {
+			this.MinControlsHeight += options.min_height;
+//		}
+
 		if (dim.innerHeight < options.min_height) {
 			document.getElementById(this.Controls[i]).style.height = options.min_height+'px';
 		}
 //		alert('adding element '+this.Controls[i]+' height: '+options.min_height+' total: '+this.MinControlsHeight)
 	}
 
-	var a_div = document.createElement('DIV');
-	a_div.style.position = 'relative';
-	a_div.style.overflow = 'auto';
-	a_div.style.width = '100%';
+	// all <script> tags will be executed again after wrap method is called, so remove them to prevent that
+	$('script', this.Div).remove();
+	$(this.Div).wrap('<div id="' + this.Div.id + '_container" style="position: relative; overflow: auto; width: 100%;"></div>');
 
-	a_div.id = this.Div.id + '_container';
-	a_div.appendChild(this.Div.parentNode.replaceChild(a_div, this.Div));
+	Application.removeDebuggerStatistics();
 
-	this.Table = this.Div.getElementsByTagName('table')[0];
+	this.Table = $('table:first', this.Div).get(0);
 	this.Table.style.height = 'auto';
 //	this.Table.style.width = 'auto';
 	this.MinHeight = this.Table.offsetHeight;
@@ -119,7 +124,7 @@
 
 	addEvent(window, 'resize', function() {Form.Resize()})
 
-	this.Resize()
+	this.Resize();
 
 	if (isset(first_error)) {
 		for (var i in first_error) {
@@ -192,49 +197,60 @@
 Form.Resize = function()
 {
 	var h = (document.all ? window.document.body.offsetHeight : window.innerHeight);
-	var pos = findPos(this.Div);
-	var dim = getDimensions(this.Div);
-	h -= pos[1] + dim.padding[0] + dim.padding[2] + dim.borders[0] + dim.borders[2];
 
+	var $div = $(this.Div);
+	var pos = $div.offset();
 
+	h -= pos.top;
+
 	if (this.Div.style.height.length) {
 		// height set for scroll_container overrides automatic container height detection
-		var h = this._parseSize(this.Div.style.height);
+		h = this._parseSize(this.Div.style.height);
 	}
 
+	if ($div.attr('mode') == 'minimal') {
+		// height will become minimal required (when data height is smaller, then window)
+		h = this.MinHeight;
+	}
+
+	h -= ($div.outerHeight() - $div.height());
+
 	//	alert('h after correction is '+h);
 
 	window.document.body.style.width = '100%';
 	var w = (document.all ? window.document.body.offsetWidth : window.innerWidth);
-	w -= pos[0] + dim.padding[1] + dim.padding[3] + dim.borders[1] + dim.borders[3];
 
-	scroller_height = this.MinWidth > w ? this.ScrollerH : 0;
-	scroller_width =  this.MinHeight > h - scroller_height ? this.ScrollerW : 0;
-	scroller_height = this.MinWidth > w - scroller_width ? this.ScrollerH : 0;
+	w -= pos.left + ($div.outerWidth() - $div.width());
 
+	scroller_height = this.MinWidth > w ? this.ScrollerH : 0; // width of 1st table in scroll_container is larger, then window width?
+	scroller_width =  this.MinHeight > h - scroller_height ? this.ScrollerW : 0; // table height > total height - scroller_height -> vertical scroller is found
+	scroller_height = this.MinWidth > w - scroller_width ? this.ScrollerH : 0; // table width > total width - scroller_width -> horizontal scroller is found
+
 	var st = document.getElementById('width_status');
 	if (st) st.innerHTML = 'minWdith: '+this.MinWidth+' minHeight: '+this.MinHeight+' w: '+w+' h: '+h+' scroll_w: '+scroller_width+' scroll_h: '+scroller_height;
 
 //	alert('scroller W x H = '+scroller_width+' x '+scroller_height);
 
 //	alert('resize: '+w+'x'+h)
 
-//	h -= 100;
-
 	this.Table.style.width = (w-scroller_width) + 'px';
 
-	this.Div.parentNode.style.width = (w)+'px';
-	this.Div.style.width = (w-scroller_width)+'px';
-	this.Div.parentNode.style.height = (h)+'px';
+	this.Div.parentNode.style.width = w + 'px';
+	this.Div.style.width = (w-scroller_width) + 'px';
+	this.Div.parentNode.style.height = h + 'px';
 
 	var count = this.Controls.length;
 
 	// -count here is adjustment - 1px for each control
-	var split = h - count*2 - this.MinHeight + this.MinControlsHeight;
-	if (split < this.MinControlsHeight) split = this.MinControlsHeight;
+	var split = h /*- (count * 2)*/ - this.MinHeight + this.MinControlsHeight;
 
+	if (split < this.MinControlsHeight) {
+		split = this.MinControlsHeight;
+	}
+
 	this.ResetHeights();
 	var used = this.SetMinHeights();
+
 	split -= used;
 
 	var cur_diff = 0;
@@ -247,12 +263,13 @@
 	} while (cur_diff != 0 && cur_diff != prev_diff && iterations < 10);
 
 	for (var i in this.Controls) {
-		document.getElementById(this.Controls[i]).style.height = this.Options[this.Controls[i]]['real_height'] + 'px';
+		document.getElementById(this.Controls[i]).style.height = this.Options[ this.Controls[i] ]['real_height'] + 'px';
 //		document.getElementById(this.Controls[i]).value = this.Options[this.Controls[i]]['real_height'];
 	}
 
-//	alert('h is: '+h+' min height is '+this.MinHeight+' MinControlsHeight is '+this.MinControlsHeight+' -> '+split+' to split between '+count+' new height is '+new_height);
+//	alert('h is: '+h+' min height is '+this.MinHeight+' MinControlsHeight is '+this.MinControlsHeight+' -> '+split+' to split between '+count);
 //	print_pre(this.Controls)
+
 	IterateUploaders('syncBrowseButton');
 }
 
@@ -269,40 +286,41 @@
 
 // Enlarge heights when possible
 // Return any not split pixels number
-Form.SplitExtra = function(split)
-{
+Form.SplitExtra = function(split) {
 	var number = 0;
 
 	for (var i in this.Controls) {
-		var options = this.Options[this.Controls[i]]
-		if (options['max_height'] ==0 || options['real_height'] < options.max_height) {
+		var options = this.Options[ this.Controls[i] ];
+		if (options['max_height'] == 0 || options['real_height'] < options.max_height) {
 			number++;
 		}
 	}
 
-	if (number == 0) return 0;
+	if (number == 0) {
+		return 0;
+	}
 
 	var delta = Math.floor(split / number);
 //	alert('splitting '+split+' between '+number+' delta is '+delta)
 	var added = 0;
 	for (var i in this.Controls) {
 		var options = this.Options[this.Controls[i]];
 		var to_add;
-		if (options['max_height'] != 0 && options['real_height']+delta > options['max_height']) {
-			to_add = options['max_height']-options['real_height'];
+		if (options['max_height'] != 0 && options['real_height'] + delta > options['max_height']) {
+			to_add = options['max_height'] - options['real_height'];
 		}
 		else {
 			to_add = delta;
 		}
 //		alert('delta: '+delta+' current real: '+options['real_height']+' min: '+options['min_height']+' max:'+options['max_height']+' to_add: '+to_add)
-		options['real_height'] = options['real_height']+to_add;
+		options['real_height'] = options['real_height'] + to_add;
 		added += to_add;
 	}
 //	alert('added total '+added)
 
 	// removing extra added from the last (any) control
 	if (added > split) {
-		extra = added-split;
+		extra = added - split;
 		options['real_height'] -= extra;
 		added -= extra;
 	}
Index: branches/RC/core/units/groups/groups_config.php
===================================================================
diff -u -N -r11538 -r11546
--- branches/RC/core/units/groups/groups_config.php	(.../groups_config.php)	(revision 11538)
+++ branches/RC/core/units/groups/groups_config.php	(.../groups_config.php)	(revision 11546)
@@ -32,7 +32,7 @@
 
 			'group_list' => Array ('prefixes' => Array ('g.total_List'), 'format' => "!la_title_Groups!"),
 			'groups_edit' => Array ('prefixes' => Array ('g'), 'format' => "#g_status# '#g_titlefield#' - !la_title_General!"),
-			'groups_edit_users' => Array ('prefixes' => Array ('g', 'g-ug_List'), 'format' => "#g_status# '#g_titlefield#' - !la_title_Users! (#g-ug_recordcount#)" ),
+			'groups_edit_users' => Array ('prefixes' => Array ('g', 'g-ug_List'), 'format' => "#g_status# '#g_titlefield#' - !la_title_Users!" ),
 			'groups_edit_permissions' => Array ('prefixes' => Array ('g'), 'format' => "#g_status# '#g_titlefield#' - !la_title_Permissions!" ),
 			'groups_edit_additional_permissions' => Array ('prefixes' => Array ('g'), 'format' => "#g_status# '#g_titlefield#' - !la_title_AdditionalPermissions!" ),
 			'select_group' => Array('prefixes' => Array ('g.user_List'), 'format' => "!la_title_Groups! - !la_title_SelectGroup!"),
Index: branches/RC/core/units/agents/agents_config.php
===================================================================
diff -u -N -r11277 -r11546
--- branches/RC/core/units/agents/agents_config.php	(.../agents_config.php)	(revision 11277)
+++ branches/RC/core/units/agents/agents_config.php	(.../agents_config.php)	(revision 11546)
@@ -44,7 +44,7 @@
 				'new_titlefield' => Array ('agent' => '!la_title_NewAgent!'),
 			),
 
-			'agent_list' => Array ('prefixes' => Array ('agent_List'), 'format' => "!la_title_Agents! (#agent_recordcount#)"),
+			'agent_list' => Array ('prefixes' => Array ('agent_List'), 'format' => "!la_title_Agents!"),
 			'agent_edit' => Array ('prefixes' => Array ('agent'), 'format' => "#agent_status# '#agent_titlefield#'"),
 		),
 
Index: branches/RC/core/units/categories/categories_config.php
===================================================================
diff -u -N -r11538 -r11546
--- branches/RC/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 11538)
+++ branches/RC/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 11546)
@@ -76,7 +76,7 @@
 		'TableName' => TABLE_PREFIX.'Category',
 
 		'ViewMenuPhrase' => 'la_text_Categories',
-		'CatalogTabIcon' => 'icon16_cat.gif',
+		'CatalogTabIcon' => 'icon16_folder.gif',
 
 		'TitlePresets' => Array (
 			'default' => Array (
Index: branches/RC/core/units/themes/themes_config.php
===================================================================
diff -u -N -r11538 -r11546
--- branches/RC/core/units/themes/themes_config.php	(.../themes_config.php)	(revision 11538)
+++ branches/RC/core/units/themes/themes_config.php	(.../themes_config.php)	(revision 11546)
@@ -43,7 +43,7 @@
 
 						'themes_list' => Array('prefixes' => Array('theme_List'), 'format' => "!la_tab_Themes!"),
 						'themes_edit_general' => Array('prefixes' => Array('theme'), 'format' => "#theme_status# '#theme_titlefield#' - !la_title_General!"),
-						'themes_edit_files' => Array('prefixes' => Array('theme', 'theme-file_List'), 'format' => "#theme_status# '#theme_titlefield#' - !la_title_ThemeFiles! (#theme-file_recordcount#)"),
+						'themes_edit_files' => Array('prefixes' => Array('theme', 'theme-file_List'), 'format' => "#theme_status# '#theme_titlefield#' - !la_title_ThemeFiles!"),
 					),
 
 					'EditTabPresets' => Array (
Index: branches/RC/core/admin_templates/stylesheets/block_style_edit.tpl
===================================================================
diff -u -N -r11538 -r11546
--- branches/RC/core/admin_templates/stylesheets/block_style_edit.tpl	(.../block_style_edit.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/stylesheets/block_style_edit.tpl	(.../block_style_edit.tpl)	(revision 11546)
@@ -1,13 +1,8 @@
 <inp2:adm_SetPopupSize width="750" height="400"/>
-<inp2:m_RequireLogin permissions="in-portal:configure_styles.view" system="1"/>
-<inp2:m_include t="incs/header" nobody="yes"/>
 
-<body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
-<inp2:m_RenderElement name="section_header" prefix="css" icon="icon46_style" module="in-portal" title="!la_title_Stylesheets!"/>
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="css" section="in-portal:configure_styles" title_preset="block_style_edit"/>
 
-
-<inp2:m_RenderElement name="blue_bar" prefix="css" title_preset="block_style_edit" module="in-portal" icon="icon46_style"/>
-
 <!-- ToolBar --->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
Index: branches/RC/core/units/stop_words/stop_words_config.php
===================================================================
diff -u -N -r11290 -r11546
--- branches/RC/core/units/stop_words/stop_words_config.php	(.../stop_words_config.php)	(revision 11290)
+++ branches/RC/core/units/stop_words/stop_words_config.php	(.../stop_words_config.php)	(revision 11546)
@@ -28,7 +28,7 @@
 				'edit_status_labels' => Array ('stop-word' => '!la_title_EditingStopWord!'),
 			),
 
-			'stop_word_list' => Array ('prefixes' => Array ('stop-word_List'), 'format' => "!la_title_StopWords! (#stop-word_recordcount#)"),
+			'stop_word_list' => Array ('prefixes' => Array ('stop-word_List'), 'format' => "!la_title_StopWords!"),
 			'stop_word_edit' => Array ('prefixes' => Array ('stop-word'), 'format' => "#stop-word_status# '#stop-word_titlefield#'"),
 		),
 
Index: branches/RC/core/kernel/nparser/ntags.php
===================================================================
diff -u -N -r11399 -r11546
--- branches/RC/core/kernel/nparser/ntags.php	(.../ntags.php)	(revision 11399)
+++ branches/RC/core/kernel/nparser/ntags.php	(.../ntags.php)	(revision 11546)
@@ -511,6 +511,21 @@
 	}
 }
 
+class _Tag_SetParam extends _BlockTag {
+
+	function Open($tag)
+	{
+		$o = '';
+		foreach ($tag['NP'] as $key => $val)	{
+			$code[] = '$params[\'' . $key . '\'] = \'' . $val . '\';';
+			$code[] = '$' . $key . ' = \'' . $val . '\';';
+			$code[] = '$_parser->SetParam(\'' . $key . '\', $' . $key . ');';
+		}
+		$this->AppendCode($o, $code);
+		return $o;
+	}
+}
+
 class _Tag_Cache extends _BlockTag {
 
 	function Open($tag)
Index: branches/RC/core/admin_templates/catalog/item_selector/item_selector_advanced_view.tpl
===================================================================
diff -u -N -r11525 -r11546
--- branches/RC/core/admin_templates/catalog/item_selector/item_selector_advanced_view.tpl	(.../item_selector_advanced_view.tpl)	(revision 11525)
+++ branches/RC/core/admin_templates/catalog/item_selector/item_selector_advanced_view.tpl	(.../item_selector_advanced_view.tpl)	(revision 11546)
@@ -1,3 +1,5 @@
+<inp2:adm_SetPopupSize width="970" height="580"/>
+
 <inp2:m_include t="incs/header" noform="yes"/>
 <inp2:m_include template="catalog/catalog_elements"/>
 
Index: branches/RC/core/admin_templates/popups/editor.tpl
===================================================================
diff -u -N -r11482 -r11546
--- branches/RC/core/admin_templates/popups/editor.tpl	(.../editor.tpl)	(revision 11482)
+++ branches/RC/core/admin_templates/popups/editor.tpl	(.../editor.tpl)	(revision 11546)
@@ -1,10 +1,7 @@
-<inp2:m_RequireLogin/><inp2:m_Set skip_last_template="1"/>
-<inp2:m_include t="incs/header" nobody="yes"/>
+<inp2:m_Set skip_last_template="1"/>
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="trans" section="in-portal:root" title_preset="trans_edit"/>
 
-<body style="margin: 0px">
-
-<inp2:m_RenderElement name="blue_bar" prefix="trans" title_preset="trans_edit" module="in-portal"/>
-
 <!-- ToolBar --->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
Index: branches/RC/core/units/languages/languages_config.php
===================================================================
diff -u -N -r11538 -r11546
--- branches/RC/core/units/languages/languages_config.php	(.../languages_config.php)	(revision 11538)
+++ branches/RC/core/units/languages/languages_config.php	(.../languages_config.php)	(revision 11546)
@@ -75,11 +75,11 @@
 																		'new_titlefield'		=> Array('lang'=>''),
 																),
 
-												'languages_list'			=>	Array(	'prefixes'	=>	Array('lang_List'), 'format' => "!la_title_Configuration! - !la_title_LanguagePacks! (#lang_recordcount#)"),
+												'languages_list'			=>	Array(	'prefixes'	=>	Array('lang_List'), 'format' => "!la_title_Configuration! - !la_title_LanguagePacks!"),
 
 												'languages_edit_general'	=>	Array(	'prefixes'	=> Array('lang'), 'format' => "#lang_status# '#lang_titlefield#' - !la_title_General!"),
 
-												'phrases_list'				=>	Array(	'prefixes'	=> Array('lang','phrases_List'), 'format' => "#lang_status# '#lang_titlefield#' - !la_title_Labels! (#phrases_recordcount#)"),
+												'phrases_list'				=>	Array(	'prefixes'	=> Array('lang','phrases_List'), 'format' => "#lang_status# '#lang_titlefield#' - !la_title_Labels!"),
 
 												'phrase_edit'				=>	Array (
 													'prefixes' 				=>	Array('phrases'),
@@ -96,7 +96,7 @@
 
 												'export_language_results'	=>	Array(	'prefixes'	=> Array(), 'format' => "!la_title_ExportLanguagePackResults!"),
 
-												'events_list'				=>	Array(	'prefixes'	=>	Array('lang','emailevents_List'), 'format'	=>	"#lang_status# '#lang_titlefield#' - !la_title_EmailEvents! (#emailevents_recordcount#)"),
+												'events_list'				=>	Array(	'prefixes'	=>	Array('lang','emailevents_List'), 'format'	=>	"#lang_status# '#lang_titlefield#' - !la_title_EmailEvents!"),
 
 												'event_edit' 				=>	Array(	'prefixes' 				=>	Array('emailevents'),
 																						'edit_status_labels'	=>	Array('emailevents'	=>	'!la_title_Editing_EmailEvent!'),
Index: branches/RC/core/admin_templates/users/user_edit_items.tpl
===================================================================
diff -u -N -r11538 -r11546
--- branches/RC/core/admin_templates/users/user_edit_items.tpl	(.../user_edit_items.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/users/user_edit_items.tpl	(.../user_edit_items.tpl)	(revision 11546)
@@ -122,42 +122,33 @@
 <inp2:u_SaveWarning name="grid_save_warning"/>
 <inp2:u_ErrorWarning name="form_error_warning"/>
 
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
-	<inp2:m_RenderElement name="subsection" title="la_section_General"/>
-		<inp2:m_RenderElement name="inp_id_label" prefix="u" field="PortalUserId" title="!la_fld_Id!"/>
-		<inp2:m_RenderElement name="inp_label" prefix="u" field="Login" title="la_fld_Username"/>
-	<inp2:m_RenderElement name="subsection" title="la_section_Items"/>
-</table>
+<div id="scroll_container" mode="minimal">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="u" field="PortalUserId" title="!la_fld_Id!"/>
+			<inp2:m_RenderElement name="inp_label" prefix="u" field="Login" title="la_fld_Username"/>
+			<inp2:m_RenderElement name="inp_edit_filler"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_Items"/>
+	</table>
+</div>
 <br />
 
 <!-- item tabs: begin -->
-<table cellpadding="0" cellspacing="0">
-	<tr>
-		<inp2:m_DefineElement name="item_tab" title="">
-			<td nowrap="nowrap" width="140">
-				<table id="<inp2:m_param name="prefix"/>.user_tab" cellpadding="0" cellspacing="0" width="100%" class="catalog-tab-unselected" onclick="$Catalog.switchTab('<inp2:m_param name="prefix"/>.user');">
-					<tr>
-						<td class="catalog-tab-left">
-							<img src="img/spacer.gif" height="22" width="9" />
-						</td>
-						<td class="catalog-tab-middle" width="100%" valign="middle" nowrap="nowrap">
-							<inp2:m_Phrase name="$title"/> <span class="cats_stats">(<span id="<inp2:m_param name="prefix"/>.user_item_count">?</span>)</span>
-						</td>
-		       			<td class="catalog-tab-right">
-		     				<img src="img/spacer.gif" height="22" width="9" />
-						</td>
-						<td style="background-color: #FFFFFF;">
-							<img src="img/spacer.gif" height="1" width="5" />
-						</td>
-					</tr>
-				</table>
+<inp2:m_DefineElement name="item_tab" title="" special=".user">
+	<td class="tab-spacer"><img src="img/spacer.gif" width="3" height="1"/></td>
+	<td id="<inp2:m_param name="prefix"/><inp2:m_param name="special"/>_tab" class="tab">
+		<img src="<inp2:m_TemplatesBase module='$icon_module'/>/img/itemicons/<inp2:m_Param name='icon'/>" width="16" height="16" align="absmiddle" alt=""/>
+		<a href="#" onclick="$Catalog.switchTab('<inp2:m_param name="prefix"/><inp2:m_Param name="special"/>'); return false;" class="tab-link">
+			<inp2:m_Phrase name="$title"/> <span class="cats_stats" style="color: inherit;">(<span id="<inp2:m_param name="prefix"/><inp2:m_Param name="special"/>_item_count">?</span>)</span>
+		</a>
+	</td>
+</inp2:m_DefineElement>
 
-			</td>
-		</inp2:m_DefineElement>
+<inp2:m_DefineElement name="permission_tabs">
+	<inp2:m_ModuleInclude template="user_item_tab" tab_init="2" title_property="ViewMenuPhrase" skip_prefixes="m,adm,cms"/>
+</inp2:m_DefineElement>
 
-		<inp2:m_ModuleInclude template="user_item_tab" tab_init="2" title_property="ViewMenuPhrase" skip_prefixes="m,adm,cms"/>
-	</tr>
-</table>
+<inp2:m_RenderElement name="tabs_container" tabs_render_as="permission_tabs"/>
 <!-- item tabs: end -->
 
 <inp2:m_set ts="user"/>
Index: branches/RC/core/kernel/application.php
===================================================================
diff -u -N -r11538 -r11546
--- branches/RC/core/kernel/application.php	(.../application.php)	(revision 11538)
+++ branches/RC/core/kernel/application.php	(.../application.php)	(revision 11546)
@@ -2635,6 +2635,36 @@
 	}
 
 	/**
+	 * Checks, that given prefix is in temp mode
+	 *
+	 * @param string $prefix
+	 * @return bool
+	 */
+	function IsTempMode($prefix, $special = '')
+	{
+		$top_prefix = $this->Application->GetTopmostPrefix($prefix);
+
+		$var_names = Array (
+			$top_prefix,
+			rtrim($top_prefix . '_' . $special, '_'), // from post
+			rtrim($top_prefix . '.' . $special, '.'), // assembled locally
+		);
+
+		$var_names = array_unique($var_names);
+
+		$temp_mode = false;
+		foreach ($var_names as $var_name) {
+			$value = $this->Application->GetVar($var_name . '_mode');
+			if ($value && (substr($value, 0, 1) == 't')) {
+				$temp_mode = true;
+				break;
+			}
+		}
+
+		return $temp_mode;
+	}
+
+	/**
 	 * Return live table name based on temp table name
 	 *
 	 * @param string $temp_table
Index: branches/RC/core/admin_templates/js/script.js
===================================================================
diff -u -N -r11538 -r11546
--- branches/RC/core/admin_templates/js/script.js	(.../script.js)	(revision 11538)
+++ branches/RC/core/admin_templates/js/script.js	(.../script.js)	(revision 11546)
@@ -245,7 +245,6 @@
 {
 //	var $url = getScriptURL('admin/editor/editor_new.php');
 	var $url = getScriptURL('admin/index.php', 'popups/editor');
-//	alert($url);
 	$url = $url+'&TargetForm='+TargetForm+'&TargetField='+TargetField+'&destform=popup';
 	if(extra_env.length>0) $url += extra_env;
 	openwin($url,'html_edit',800,575);
@@ -292,7 +291,6 @@
 {
 
 //	$help_link.match('http://(.*).lv/in-commerce/admin(.*)');
-//	alert(RegExp.$2);
 	openwin($help_link,'HelpPopup',750,400);
 }
 
@@ -416,18 +414,14 @@
 
 	return ;
 
-
-
 	// prevent window from opening larger, then screen resolution on user's computer (to Kostja)
 
-	//	alert('openwin: name = ['+$name+']');
 	var left = Math.round((screen.width - $width)/2);
 	var top = Math.round((screen.height - $height)/2);
 
 	cur_x = is.ie ? window.screenLeft : window.screenX;
 	cur_y = is.ie ? window.screenTop : window.screenY;
 
-//	alert('current X,Y: '+cur_x+','+cur_y+' target x,y: '+left+','+top);
 	var $window_params = 'left='+left+',top='+top+',width='+$width+',height='+$height+',status=yes,resizable=yes,menubar=no,scrollbars=yes,toolbar=no';
 	return window.open($url,$name,$window_params);
 }
@@ -479,11 +473,14 @@
 					// invalid responce was received, may be php fatal error during AJAX request
 					$responce = $default_size;
 				}
+
 				open_popup($prefix_special, $event, $t, $responce, $onAfterOpenPopup);
 			}
+
 			$pm.GetSize($t);
 			return ;
 		}
+
 		$window_size = $default_size;
 	}
 
@@ -568,6 +565,7 @@
 	set_hidden_field('main_prefix', $prefix);
 	set_hidden_field('dst_field', $dst_field);
 
+//	alert('openSelector(' + $prefix + ', ' + $event + ', ' + $t + ', ' + $window_size + ')');
 	open_popup(
 		$prefix, $event, $t, $window_size,
 		function() {
@@ -1371,14 +1369,27 @@
 		try {
 			// will be error, when other site is opened in parent window
 			var $i = 0;
-			while ($main_window.opener) {
+			var $opener;
+
+			do {
 				if ($i == 10) {
 					break;
 				}
 
-				$main_window = $main_window.opener;
+				// get popup opener
+				$opener = $main_window.opener;
+
+				if (!$opener) {
+					// when no opener found, then try parent window
+					$opener = $main_window.parent;
+				}
+
+				if ($opener) {
+					$main_window = $opener;
+				}
+
 				$i++;
-			}
+			} while ($opener);
 		}
 		catch (err) {
 			// catch Access/Permission Denied error
@@ -1539,6 +1550,73 @@
 	return [curleft,curtop];
 }
 
+function scrollbarWidth() {
+	// Scrollbalken im Body ausschalten
+	var $overflow_backup = document.body.style.overflow;
+	document.body.style.overflow = 'hidden';
+
+	var width = document.body.clientWidth;
+
+	// Scrollbalken
+	document.body.style.overflow = 'scroll';
+	width -= document.body.clientWidth;
+
+	// Der IE im Standardmode
+	if (!width) {
+		width = document.body.offsetWidth - document.body.clientWidth;
+	}
+
+	// urspr?ngliche Einstellungen
+	document.body.style.overflow = $overflow_backup;
+
+	return width;
+}
+
+function maximizeElement($selector, $max_height) {
+	if ($max_height === undefined) {
+		$max_height = false;
+	}
+
+	var $element = $($selector);
+	if ($element.length == 0) {
+		return ;
+	}
+
+	$element.width('100%');
+
+	var $container_id = $element.attr('id') + '_container';
+	var $container = $( jq('#' + $container_id) );
+
+	if ($container.length == 0) {
+		// don't create same container twice
+
+		// all <script> tags will be executed again after wrap method is called, so remove them to prevent that
+		$('script', $element).remove();
+		$element.wrap('<div id="' + $container_id + '" style="position: relative; overflow: auto; width: 100%;"></div>');
+		$container = $( jq('#' + $container_id) );
+	}
+
+	var $offset_top = $container.offset().top;
+	var $window_height = $(window).height();
+
+	var $height_left = $window_height - $offset_top;
+
+	if (($max_height !== false) && ($max_height < $height_left)) {
+		$height_left = $max_height;
+	}
+
+	$height_left -= ($element.outerHeight() - $element.height());
+	$container.height($height_left);
+
+	var $element_width = $(window).width() - ($element.outerWidth() - $element.width());
+	if ( $height_left < $element.height() ) {
+		// needs vertical scrolling, so substract vertical scrollbar width
+		$element_width -= scrollbarWidth();
+	}
+
+	$element.width($element_width);
+}
+
 function addEvent(el, evname, func, traditional) {
 	if (traditional) {
 		eval('el.on'+evname+'='+func);
@@ -1582,6 +1660,7 @@
 	    if (window.top.console !== undefined || window.top.firebug) {
 	    	// console is not defined in iframes, so define it here
 	    	window.console = window.top.console;
+	    	window._getFirebugConsoleElement = window.top._getFirebugConsoleElement;
 	    }
 	    else {
 	    	window.console = {};
@@ -1636,7 +1715,7 @@
 }
 
 function jq($selector) {
-	return $selector.replace(/(\[|\])/g, '\\$1');
+	return $selector.replace(/(\[|\]|\.)/g, '\\$1');
 }
 
 function setHelpLink($user_docs_url, $title_preset) {
Index: branches/RC/core/kernel/db/db_event_handler.php
===================================================================
diff -u -N -r11501 -r11546
--- branches/RC/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 11501)
+++ branches/RC/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 11546)
@@ -515,33 +515,14 @@
 		}
 
 		/**
-		 * Enter description here...
+		 * Checks, that object used in event should use temp tables
 		 *
 		 * @param kEvent $event
-		 * @return unknown
+		 * @return bool
 		 */
 		function UseTempTables(&$event)
 		{
-			$object = &$event->getObject();
-			$top_prefix = $this->Application->GetTopmostPrefix($event->Prefix);
-
-			$var_names = 	Array (
-									$top_prefix,
-									rtrim($top_prefix.'_'.$event->Special, '_'),
-									rtrim($top_prefix.'.'.$event->Special, '.'),
-							);
-			$var_names = array_unique($var_names);
-
-			$temp_mode = false;
-			foreach ($var_names as $var_name) {
-				$value = $this->Application->GetVar($var_name.'_mode');
-				if (substr($value, 0, 1) == 't') {
-					$temp_mode = true;
-					break;
-				}
-			}
-
-			return $temp_mode;
+			return $this->Application->IsTempMode($event->Prefix, $event->Special);
 		}
 
 		/**
@@ -2106,8 +2087,7 @@
 		 */
 		function OnExport(&$event)
 		{
-			$this->StoreSelectedIDs($event);
-			$selected_ids = $this->getSelectedIDs($event);
+			$selected_ids = $this->StoreSelectedIDs($event);
 
 			if (implode(',', $selected_ids) == '') {
 				// K4 fix when no ids found bad selected ids array is formed
@@ -2116,20 +2096,20 @@
 
 			$this->Application->StoreVar($event->Prefix.'_export_ids', $selected_ids ? implode(',', $selected_ids) : '' );
 
-			$export_t = $this->Application->GetVar('export_template');
 			$this->Application->LinkVar('export_finish_t');
 			$this->Application->LinkVar('export_progress_t');
 			$this->Application->StoreVar('export_oroginal_special', $event->Special);
+
 			$export_helper =& $this->Application->recallObject('CatItemExportHelper');
-			$event->redirect = $export_t ? $export_t : $export_helper->getModuleFolder($event).'/export';
 
-			list($index_file, $env) = explode('|', $this->Application->RecallVar('last_template'));
+			/*list ($index_file, $env) = explode('|', $this->Application->RecallVar('last_template'));
 			$finish_url = $this->Application->BaseURL('/admin').$index_file.'?'.ENV_VAR_NAME.'='.$env;
-			$this->Application->StoreVar('export_finish_url', $finish_url);
+			$this->Application->StoreVar('export_finish_url', $finish_url);*/
 
-			$redirect_params = Array(
-										$this->Prefix.'.export_event' => 'OnNew',
-										'pass' => 'all,'.$this->Prefix.'.export');
+			$redirect_params = Array (
+				$this->Prefix . '.export_event' => 'OnNew',
+				'pass' => 'all,' . $this->Prefix . '.export'
+			);
 
 			$event->setRedirectParams($redirect_params);
 		}
Index: branches/RC/core/admin_templates/js/catalog.js
===================================================================
diff -u -N -r11541 -r11546
--- branches/RC/core/admin_templates/js/catalog.js	(.../catalog.js)	(revision 11541)
+++ branches/RC/core/admin_templates/js/catalog.js	(.../catalog.js)	(revision 11546)
@@ -238,7 +238,14 @@
 		this.PreviousPrefix = this.ActivePrefix;
 		$( jq('#' + this.PreviousPrefix + '_tab') ).removeClass('tab-active');
 
-		document.getElementById(this.queryTabRegistry('prefix', this.PreviousPrefix, 'tab_id') + '_div').style.display = 'none';
+		var $prev_div_id = this.queryTabRegistry('prefix', this.PreviousPrefix, 'tab_id') + '_div';
+		document.getElementById($prev_div_id).style.display = 'none';
+
+		var $prev_div_container = $( jq('#' + $prev_div_id + '_container') );
+		if ($prev_div_container.length) {
+			$prev_div_container.hide();
+		}
+
 		this.HideDependentButtons(this.PreviousPrefix);
 	}
 
@@ -248,6 +255,12 @@
 
 	var $div_id = this.queryTabRegistry('prefix', this.ActivePrefix, 'tab_id') + '_div'; // destination tab
 	document.getElementById($div_id).style.display = 'block';
+
+	var $div_container = $( jq('#' + $div_id + '_container') );
+	if ($div_container.length) {
+		$div_container.show();
+	}
+
 	this.ShowDependentButtons(this.ActivePrefix);
 
 	this.displaySearch($prefix);
Index: branches/RC/core/admin_templates/js/grid_scroller.js
===================================================================
diff -u -N -r11412 -r11546
--- branches/RC/core/admin_templates/js/grid_scroller.js	(.../grid_scroller.js)	(revision 11412)
+++ branches/RC/core/admin_templates/js/grid_scroller.js	(.../grid_scroller.js)	(revision 11546)
@@ -205,6 +205,8 @@
 
 GridScroller.prototype.Render = function(id)
 {
+	Application.removeDebuggerStatistics();
+
 	ResetStart();
 
 //	var widths = this.PrepareWidths();
@@ -213,7 +215,7 @@
 
 	document.body.style.height = '100%';
 	document.body.style.overflow = 'hidden';
-	document.body.scroll = 'no'
+	document.body.scroll = 'no';
 
 	// this.Html = this.AltHTML();
 //	Profile('Getting HTML',1);
Index: branches/RC/core/admin_templates/popups/column_picker.tpl
===================================================================
diff -u -N -r11538 -r11546
--- branches/RC/core/admin_templates/popups/column_picker.tpl	(.../column_picker.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/popups/column_picker.tpl	(.../column_picker.tpl)	(revision 11546)
@@ -1,7 +1,7 @@
 <inp2:adm_SetPopupSize width="600" height="500"/>
-<inp2:m_RequireLogin login_template="login"/>
+
 <inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="blue_bar" prefix="adm" title_preset="column_picker" module="in-portal"/>
+<inp2:m_RenderElement name="combined_header" prefix="adm" section="in-portal:root" title_preset="column_picker"/>
 
 <!-- ToolBar --->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
@@ -42,49 +42,50 @@
 	</tr>
 </tbody>
 </table>
+
 <div id="scroll_container">
-<table width="100%" border="0" cellspacing="0" cellpadding="4" >
-	<tr>
-		<td>
-			<table style="width: 500px; margin: 5px auto;" >
-				<tr>
-					<td>
-						<strong><inp2:m_phrase label="la_PickedColumns"/></strong>
-					</td>
-					<td>&nbsp;</td>
-					<td>
-						<strong><inp2:m_phrase label="la_AvailableColumns"/></strong>
-					</td>
-				</tr>
-				<tr>
-					<td style="text-align: left">
-						<inp2:m_DefineElement name="a_column">
-							<option value="<inp2:m_param name="_Id"/>"><inp2:m_param name="_Name"/></option>
-						</inp2:m_DefineElement>
+	<table width="100%" border="0" cellspacing="0" cellpadding="4">
+		<tr>
+			<td>
+				<table style="width: 500px; margin: 5px auto;" >
+					<tr>
+						<td>
+							<strong><inp2:m_phrase label="la_PickedColumns"/></strong>
+						</td>
+						<td>&nbsp;</td>
+						<td>
+							<strong><inp2:m_phrase label="la_AvailableColumns"/></strong>
+						</td>
+					</tr>
+					<tr>
+						<td style="text-align: left">
+							<inp2:m_DefineElement name="a_column">
+								<option value="<inp2:m_param name="_Id"/>"><inp2:m_param name="_Name"/></option>
+							</inp2:m_DefineElement>
 
-						<select id="picked_columns" multiple="multiple" size="20" style="width: 230px">
-							<inp2:adm_PrintColumns render_as="a_column"/>
-						</select>
-						<br/><br/>
-					</td>
-					<td style="text-align: center; width: 40px;">
-						<img style="cursor: pointer; border: 0px" src="img/icons/icon_left.gif" onclick="move_selected('available_columns', 'picked_columns');"/><br/>
-						<img style="cursor: pointer; border: 0px" src="img/icons/icon_right.gif" onclick="move_selected('picked_columns', 'available_columns'); select_sort('available_columns');"/><br/>
-					</td>
-					<td style="text-align: left">
-						<select id="available_columns" multiple="multiple" size="20" style="width: 230px">
-							<inp2:adm_PrintColumns hidden="1" render_as="a_column"/>
-						</select>
-						<br/><br/>
-					</td>
-				</tr>
-			</table>
-		</td>
-		<td>&nbsp;</td>
-	</tr>
-</table>
+							<select id="picked_columns" multiple="multiple" size="20" style="width: 230px">
+								<inp2:adm_PrintColumns render_as="a_column"/>
+							</select>
+							<br/><br/>
+						</td>
+						<td style="text-align: center; width: 40px;">
+							<img style="cursor: pointer; border: 0px" src="img/icons/icon_left.gif" onclick="move_selected('available_columns', 'picked_columns');"/><br/>
+							<img style="cursor: pointer; border: 0px" src="img/icons/icon_right.gif" onclick="move_selected('picked_columns', 'available_columns'); select_sort('available_columns');"/><br/>
+						</td>
+						<td style="text-align: left">
+							<select id="available_columns" multiple="multiple" size="20" style="width: 230px">
+								<inp2:adm_PrintColumns hidden="1" render_as="a_column"/>
+							</select>
+							<br/><br/>
+						</td>
+					</tr>
+				</table>
+			</td>
+			<td>&nbsp;</td>
+		</tr>
+	</table>
 </div>
+
 <input type="hidden" name="main_prefix" value="<inp2:m_get var='main_prefix'/>"/>
 
-
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file