Index: branches/RC/kernel/admin_templates/categories/categories_edit_permissions.tpl
===================================================================
diff -u -N -r8929 -r10863
--- branches/RC/kernel/admin_templates/categories/categories_edit_permissions.tpl	(.../categories_edit_permissions.tpl)	(revision 8929)
+++ branches/RC/kernel/admin_templates/categories/categories_edit_permissions.tpl	(.../categories_edit_permissions.tpl)	(revision 10863)
@@ -14,7 +14,7 @@
 	<tr>
   	<td>
   		<script type="text/javascript" src="js/ajax.js"></script>
-	  	<script type="text/javascript" src="<inp2:m_TemplatesBase module="in-portal"/>/incs/catalog.js"></script>
+	  	<script type="text/javascript" src="<inp2:m_TemplatesBase module='in-portal'/>/incs/catalog.js"></script>
   		<script type="text/javascript">
   				Request.progressText = '<inp2:m_phrase name="la_title_Loading" escape="1"/>';
 
@@ -117,7 +117,8 @@
 </table>
 
 <inp2:c_SaveWarning name="grid_save_warning"/>
-<inp2:m_RenderElement name="grid" PrefixSpecial="g" IdField="GroupId" per_page="-1" grid="Radio" header_block="grid_column_title_no_sorting"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="g" IdField="GroupId" per_page="-1" grid="Radio" header_block="grid_column_title_no_sorting" grid_height="220" grid_status="0"/>
+
 <br />
 <!-- item tabs: begin -->
 <table cellpadding="0" cellspacing="0">
Index: branches/RC/core/units/users/users_config.php
===================================================================
diff -u -N -r10539 -r10863
--- branches/RC/core/units/users/users_config.php	(.../users_config.php)	(revision 10539)
+++ branches/RC/core/units/users/users_config.php	(.../users_config.php)	(revision 10863)
@@ -256,31 +256,30 @@
 					),
 
 					'Grids'	=> Array(
-										'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'),
-																	),
-														),
+						'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'),
+								),
+						),
 
-										'UserSelector'	=>	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_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'),
-																	),
-														),
-													),
-
+						'UserSelector'	=>	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_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'),
+							),
+						),
+					),
 	);
 
 ?>
\ No newline at end of file
Index: branches/RC/core/admin_templates/js/forms.js
===================================================================
diff -u -N -r10832 -r10863
--- branches/RC/core/admin_templates/js/forms.js	(.../forms.js)	(revision 10832)
+++ branches/RC/core/admin_templates/js/forms.js	(.../forms.js)	(revision 10863)
@@ -94,6 +94,10 @@
 	a_div.style.position = 'relative';
 	a_div.style.overflow = 'auto';
 	a_div.style.width = '100%';
+	a_div.id = this.Div.id + '_container';
+
+//	console.log('scroll_container height: ', this.Div.style.height);
+
 //	a_div.style.height = '100%';
 //	a_div.style.backgroundColor = 'yellow';
 
@@ -188,14 +192,29 @@
 //	print_pre(this.Options[id]);
 }
 
+Form._parseSize = function ($size) {
+	if ($size.toString().match(/^([\d]+)px$/)) {
+		return parseInt(RegExp.$1);
+	}
+
+	return parseInt($size);
+}
+
 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];
-//	alert('h after correction is '+h);
 
+
+	if (this.Div.style.height.length) {
+		// height set for scroll_container overrides automatic container height detection
+		var h = this._parseSize(this.Div.style.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];
Index: branches/RC/core/install/upgrades.sql
===================================================================
diff -u -N -r10856 -r10863
--- branches/RC/core/install/upgrades.sql	(.../upgrades.sql)	(revision 10856)
+++ branches/RC/core/install/upgrades.sql	(.../upgrades.sql)	(revision 10863)
@@ -312,4 +312,6 @@
 # ===== v 4.3.2 =====
 ALTER TABLE CustomField
 	ADD DefaultValue VARCHAR(255) NOT NULL AFTER ValueList,
-	ADD INDEX (DefaultValue);
\ No newline at end of file
+	ADD INDEX (DefaultValue);
+
+UPDATE CustomField SET ValueList = REPLACE(ValueList, ',', '||');
\ No newline at end of file
Index: branches/RC/core/admin_templates/categories/permissions_tab.tpl
===================================================================
diff -u -N -r8929 -r10863
--- branches/RC/core/admin_templates/categories/permissions_tab.tpl	(.../permissions_tab.tpl)	(revision 8929)
+++ branches/RC/core/admin_templates/categories/permissions_tab.tpl	(.../permissions_tab.tpl)	(revision 10863)
@@ -60,15 +60,20 @@
 			</td>
 		</tr>
 	</inp2:m_DefineElement>
-	<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 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>
 </inp2:m_if>
\ No newline at end of file
Index: branches/RC/core/kernel/event_manager.php
===================================================================
diff -u -N -r10080 -r10863
--- branches/RC/core/kernel/event_manager.php	(.../event_manager.php)	(revision 10080)
+++ branches/RC/core/kernel/event_manager.php	(.../event_manager.php)	(revision 10863)
@@ -510,9 +510,12 @@
 						continue;
 					}
 
-					$hook_event = new kEvent( Array('name'=>$hook['DoEvent'],'prefix'=>$hook['DoPrefix'],'special'=>$hook['DoSpecial']) );
-					$hook_event->MasterEvent =& $event;
-					$this->HandleEvent($hook_event);
+					if ($this->Application->prefixRegistred($hook['DoPrefix'])) {
+						// run hook only, when it's config is found
+						$hook_event = new kEvent( Array('name'=>$hook['DoEvent'],'prefix'=>$hook['DoPrefix'],'special'=>$hook['DoSpecial']) );
+						$hook_event->MasterEvent =& $event;
+						$this->HandleEvent($hook_event);
+					}
 				}
 			}
 		}
Index: branches/RC/kernel/admin_templates/categories/permissions_tab.tpl
===================================================================
diff -u -N -r8929 -r10863
--- branches/RC/kernel/admin_templates/categories/permissions_tab.tpl	(.../permissions_tab.tpl)	(revision 8929)
+++ branches/RC/kernel/admin_templates/categories/permissions_tab.tpl	(.../permissions_tab.tpl)	(revision 10863)
@@ -60,15 +60,20 @@
 			</td>
 		</tr>
 	</inp2:m_DefineElement>
-	<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 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>
 </inp2:m_if>
\ No newline at end of file
Index: branches/RC/core/admin_templates/categories/categories_edit.tpl
===================================================================
diff -u -N -r9853 -r10863
--- branches/RC/core/admin_templates/categories/categories_edit.tpl	(.../categories_edit.tpl)	(revision 9853)
+++ branches/RC/core/admin_templates/categories/categories_edit.tpl	(.../categories_edit.tpl)	(revision 10863)
@@ -1,3 +1,4 @@
+<inp2:adm_SetPopupSize width="880" height="680"/>
 <inp2:m_RequireLogin permissions="CATEGORY.VIEW"/>
 <inp2:m_include t="incs/header" nobody="yes"/>
 
@@ -57,31 +58,35 @@
 </table>
 
 <inp2:c_SaveWarning name="grid_save_warning"/>
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
-	<inp2:m_RenderElement name="subsection" title="!la_section_Category!"/>
-		<inp2:m_RenderElement name="inp_id_label" prefix="c" field="CategoryId" title="!la_fld_CategoryId!"/>
-		<inp2:m_RenderElement name="inp_edit_box_ml" prefix="c" field="Name" title="!la_fld_Name!" size="70"/>
-		<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="c" field="Description" title="!la_fld_Description!" rows="7" cols="70"/>
-		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c" field="AutomaticFilename" title="!la_fld_CategoryAutomaticFilename!" onchange="reflect_filename()"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="Filename" title="!la_fld_CategoryFilename!" size="70"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="CategoryTemplate" title="!la_fld_CategoryTemplate!" size="70"/>
-		<inp2:m_RenderElement name="inp_edit_category" prefix="c" field="SymLinkCategoryId" title="la_fld_SymLinkCategoryId"/>
+<inp2:c_ErrorWarning name="form_error_warning"/>
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="subsection" title="!la_section_Category!"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="c" field="CategoryId" title="!la_fld_CategoryId!"/>
+			<inp2:m_RenderElement name="inp_edit_box_ml" prefix="c" field="Name" title="!la_fld_Name!" size="70"/>
+			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="c" field="Description" title="!la_fld_Description!" rows="7" cols="70"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c" field="AutomaticFilename" title="!la_fld_CategoryAutomaticFilename!" onchange="reflect_filename()"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="Filename" title="!la_fld_CategoryFilename!" size="70"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="CategoryTemplate" title="!la_fld_CategoryTemplate!" size="70"/>
+			<inp2:m_RenderElement name="inp_edit_category" prefix="c" field="SymLinkCategoryId" title="la_fld_SymLinkCategoryId"/>
 
-	<inp2:m_RenderElement name="subsection" title="!la_section_Properties!"/>
-		<inp2:m_RenderElement name="inp_edit_radio" prefix="c" field="Status" title="!la_fld_Status!"/>
-		<inp2:m_RenderElement name="inp_edit_radio" prefix="c" field="NewItem" title="!la_fld_New!"/>
-		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c" field="EditorsPick" title="!la_fld_EditorsPick!"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="Priority" title="!la_fld_Priority!" size="4"/>
-		<inp2:m_RenderElement name="inp_edit_date_time" prefix="c" field="CreatedOn" title="!la_fld_CreatedOn!"/>
-		<inp2:m_RenderElement name="inp_edit_textarea" prefix="c" field="MetaKeywords" title="!la_fld_MetaKeywords!" rows="3" cols="70"/>
-		<inp2:m_RenderElement name="inp_edit_textarea" prefix="c" field="MetaDescription" title="!la_fld_MetaDescription!" rows="4" cols="70"/>
+		<inp2:m_RenderElement name="subsection" title="!la_section_Properties!"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="c" field="Status" title="!la_fld_Status!"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="c" field="NewItem" title="!la_fld_New!"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c" field="EditorsPick" title="!la_fld_EditorsPick!"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="Priority" title="!la_fld_Priority!" size="4"/>
+			<inp2:m_RenderElement name="inp_edit_date_time" prefix="c" field="CreatedOn" title="!la_fld_CreatedOn!"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="c" field="MetaKeywords" title="!la_fld_MetaKeywords!" rows="3" cols="70"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="c" field="MetaDescription" title="!la_fld_MetaDescription!" rows="4" cols="70"/>
 
-	<!-- custom fields: begin -->
-	<inp2:m_include t="in-portal/incs/custom_blocks"/>
-	<inp2:cf.general_PrintList render_as="cv_row_block" SourcePrefix="c" value_field="Value" per_page="-1" grid="Default" />
-	<!-- custom fields: end -->
-</table>
+		<!-- custom fields: begin -->
+		<inp2:m_include t="in-portal/incs/custom_blocks"/>
+		<inp2:cf.general_PrintList render_as="cv_row_block" SourcePrefix="c" value_field="Value" per_page="-1" grid="Default" />
+		<!-- custom fields: end -->
 
+		<inp2:m_RenderElement name="inp_edit_filler" />
+	</table>
+</div>
 <script type="text/javascript">
 	function reflect_filename()
     {
Index: branches/RC/kernel/admin_templates/categories/categories_edit.tpl
===================================================================
diff -u -N -r9853 -r10863
--- branches/RC/kernel/admin_templates/categories/categories_edit.tpl	(.../categories_edit.tpl)	(revision 9853)
+++ branches/RC/kernel/admin_templates/categories/categories_edit.tpl	(.../categories_edit.tpl)	(revision 10863)
@@ -1,3 +1,4 @@
+<inp2:adm_SetPopupSize width="880" height="680"/>
 <inp2:m_RequireLogin permissions="CATEGORY.VIEW"/>
 <inp2:m_include t="incs/header" nobody="yes"/>
 
@@ -57,31 +58,35 @@
 </table>
 
 <inp2:c_SaveWarning name="grid_save_warning"/>
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
-	<inp2:m_RenderElement name="subsection" title="!la_section_Category!"/>
-		<inp2:m_RenderElement name="inp_id_label" prefix="c" field="CategoryId" title="!la_fld_CategoryId!"/>
-		<inp2:m_RenderElement name="inp_edit_box_ml" prefix="c" field="Name" title="!la_fld_Name!" size="70"/>
-		<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="c" field="Description" title="!la_fld_Description!" rows="7" cols="70"/>
-		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c" field="AutomaticFilename" title="!la_fld_CategoryAutomaticFilename!" onchange="reflect_filename()"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="Filename" title="!la_fld_CategoryFilename!" size="70"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="CategoryTemplate" title="!la_fld_CategoryTemplate!" size="70"/>
-		<inp2:m_RenderElement name="inp_edit_category" prefix="c" field="SymLinkCategoryId" title="la_fld_SymLinkCategoryId"/>
+<inp2:c_ErrorWarning name="form_error_warning"/>
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="subsection" title="!la_section_Category!"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="c" field="CategoryId" title="!la_fld_CategoryId!"/>
+			<inp2:m_RenderElement name="inp_edit_box_ml" prefix="c" field="Name" title="!la_fld_Name!" size="70"/>
+			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="c" field="Description" title="!la_fld_Description!" rows="7" cols="70"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c" field="AutomaticFilename" title="!la_fld_CategoryAutomaticFilename!" onchange="reflect_filename()"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="Filename" title="!la_fld_CategoryFilename!" size="70"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="CategoryTemplate" title="!la_fld_CategoryTemplate!" size="70"/>
+			<inp2:m_RenderElement name="inp_edit_category" prefix="c" field="SymLinkCategoryId" title="la_fld_SymLinkCategoryId"/>
 
-	<inp2:m_RenderElement name="subsection" title="!la_section_Properties!"/>
-		<inp2:m_RenderElement name="inp_edit_radio" prefix="c" field="Status" title="!la_fld_Status!"/>
-		<inp2:m_RenderElement name="inp_edit_radio" prefix="c" field="NewItem" title="!la_fld_New!"/>
-		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c" field="EditorsPick" title="!la_fld_EditorsPick!"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="Priority" title="!la_fld_Priority!" size="4"/>
-		<inp2:m_RenderElement name="inp_edit_date_time" prefix="c" field="CreatedOn" title="!la_fld_CreatedOn!"/>
-		<inp2:m_RenderElement name="inp_edit_textarea" prefix="c" field="MetaKeywords" title="!la_fld_MetaKeywords!" rows="3" cols="70"/>
-		<inp2:m_RenderElement name="inp_edit_textarea" prefix="c" field="MetaDescription" title="!la_fld_MetaDescription!" rows="4" cols="70"/>
+		<inp2:m_RenderElement name="subsection" title="!la_section_Properties!"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="c" field="Status" title="!la_fld_Status!"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="c" field="NewItem" title="!la_fld_New!"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c" field="EditorsPick" title="!la_fld_EditorsPick!"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="Priority" title="!la_fld_Priority!" size="4"/>
+			<inp2:m_RenderElement name="inp_edit_date_time" prefix="c" field="CreatedOn" title="!la_fld_CreatedOn!"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="c" field="MetaKeywords" title="!la_fld_MetaKeywords!" rows="3" cols="70"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="c" field="MetaDescription" title="!la_fld_MetaDescription!" rows="4" cols="70"/>
 
-	<!-- custom fields: begin -->
-	<inp2:m_include t="in-portal/incs/custom_blocks"/>
-	<inp2:cf.general_PrintList render_as="cv_row_block" SourcePrefix="c" value_field="Value" per_page="-1" grid="Default" />
-	<!-- custom fields: end -->
-</table>
+		<!-- custom fields: begin -->
+		<inp2:m_include t="in-portal/incs/custom_blocks"/>
+		<inp2:cf.general_PrintList render_as="cv_row_block" SourcePrefix="c" value_field="Value" per_page="-1" grid="Default" />
+		<!-- custom fields: end -->
 
+		<inp2:m_RenderElement name="inp_edit_filler" />
+	</table>
+</div>
 <script type="text/javascript">
 	function reflect_filename()
     {
Index: branches/RC/core/admin_templates/js/grid_scroller.js
===================================================================
diff -u -N -r9969 -r10863
--- branches/RC/core/admin_templates/js/grid_scroller.js	(.../grid_scroller.js)	(revision 9969)
+++ branches/RC/core/admin_templates/js/grid_scroller.js	(.../grid_scroller.js)	(revision 10863)
@@ -221,7 +221,7 @@
 	if (!this.UpdateColWidths()) return;
 
 	if (this.Width == 'auto') {
-		this.Resize( this.GetAutoSize() );
+		this.Resize( this.GetAutoSize(this.Height) );
 	}
 	else {
 		this.Resize();
@@ -679,18 +679,22 @@
 	}
 }
 
-GridScroller.prototype.GetAutoSize = function()
+GridScroller.prototype.GetAutoSize = function(h)
 {
 	this.MainOuter.style.width = 'auto'
 	var w = this.MainInner.offsetWidth;
-	var h = document.body.clientHeight;
 
-	var pos = findPos(this.MainOuter);
+	if (h == 'auto') {
+		var h = document.body.clientHeight;
 
-	var dim = getDimensions(this.MainOuter);
+		var pos = findPos(this.MainOuter);
 
-	h -= pos[1] + dim.padding[0] + dim.padding[2] + dim.borders[0] + dim.borders[2] + this.BottomOffset;
-	return [w,h]
+		var dim = getDimensions(this.MainOuter);
+
+		h -= pos[1] + dim.padding[0] + dim.padding[2] + dim.borders[0] + dim.borders[2] + this.BottomOffset;
+	}
+
+	return [w, h];
 }
 
 
@@ -708,6 +712,11 @@
 		}, 300)
 }
 
+GridScroller.prototype.RefreshPos = function() {
+	var dot = document.getElementById('my_measure_'+this.GridId);
+	this.pos = findPos(dot);
+}
+
 GridScroller.prototype.Resize = function(w,h)
 {
 //	alert('-1');
@@ -988,13 +997,13 @@
 	var needs_last = needs_last == null ? (end_col == (source[0].data ? source[0].data.length : source[0].length)) : needs_last;
 	var total_width = 0;
 	var width_printed = false;
-	
+
 	for (var row=start_row; row<end_row; row++) {
 		row_data = source[row].data ? source[row].data : source[row];
-		
+
 		var rh = '';
 		var row_id = this.IDs[row] ? 'id="'+id_prefix+this.IDs[row]+'"' : '';
-		
+
 		var row_class = 'grid-'+class_name+'-row '+(even ? even_class : '')+' grid-'+class_name+'-row-'+row + (source[row].row_class ? ' '+source[row].row_class : '');
 		rh +='<tr '+row_id+' class="'+row_class+'" sequence="'+(row+1)+'">'+"\n"
 		even = !even;
Index: branches/RC/core/admin_templates/categories/categories_edit_permissions.tpl
===================================================================
diff -u -N -r8929 -r10863
--- branches/RC/core/admin_templates/categories/categories_edit_permissions.tpl	(.../categories_edit_permissions.tpl)	(revision 8929)
+++ branches/RC/core/admin_templates/categories/categories_edit_permissions.tpl	(.../categories_edit_permissions.tpl)	(revision 10863)
@@ -14,7 +14,7 @@
 	<tr>
   	<td>
   		<script type="text/javascript" src="js/ajax.js"></script>
-	  	<script type="text/javascript" src="<inp2:m_TemplatesBase module="in-portal"/>/incs/catalog.js"></script>
+	  	<script type="text/javascript" src="<inp2:m_TemplatesBase module='in-portal'/>/incs/catalog.js"></script>
   		<script type="text/javascript">
   				Request.progressText = '<inp2:m_phrase name="la_title_Loading" escape="1"/>';
 
@@ -117,7 +117,8 @@
 </table>
 
 <inp2:c_SaveWarning name="grid_save_warning"/>
-<inp2:m_RenderElement name="grid" PrefixSpecial="g" IdField="GroupId" per_page="-1" grid="Radio" header_block="grid_column_title_no_sorting"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="g" IdField="GroupId" per_page="-1" grid="Radio" header_block="grid_column_title_no_sorting" grid_height="220" grid_status="0"/>
+
 <br />
 <!-- item tabs: begin -->
 <table cellpadding="0" cellspacing="0">