Index: branches/RC/core/admin_templates/js/jquery/thickbox/thickbox.js
===================================================================
diff -u -N -r11671 -r11678
--- branches/RC/core/admin_templates/js/jquery/thickbox/thickbox.js	(.../thickbox.js)	(revision 11671)
+++ branches/RC/core/admin_templates/js/jquery/thickbox/thickbox.js	(.../thickbox.js)	(revision 11678)
@@ -68,6 +68,7 @@
 			// increment window counter
 			if (TB.windows.length == 0) {
 				getFrame('head').$FrameResizer.fullScreen();
+				$(window).scroll(TB.position);
 			}
 
 			TB.windows[TB.windows.length] = '#' + TB.getId('TB_window', 1);
Index: branches/RC/core/kernel/nparser/ntags.php
===================================================================
diff -u -N -r11546 -r11678
--- branches/RC/core/kernel/nparser/ntags.php	(.../ntags.php)	(revision 11546)
+++ branches/RC/core/kernel/nparser/ntags.php	(.../ntags.php)	(revision 11678)
@@ -246,6 +246,8 @@
 	var $Single = true;
 	var $OriginalTag;
 
+	var $_lambdaName = '';
+
 	function _Tag_RenderElement($tag)
 	{
 		parent::_Tag_DefineElement($tag);
@@ -285,7 +287,7 @@
 		}
 		$this->Single = false;
 		$this->OriginalTag = $tag;
-		$tag['NP']['name'] = '__lambda';
+		$tag['NP']['name'] = $tag['NP']['design'] . '_' . abs(crc32($tag['file'])) . '_' . $tag['line']; //'__lambda';
 
 		return parent::Open($tag);
 	}
@@ -303,7 +305,7 @@
 			return $this->Parser->Buffers[$this->Parser->Level];
 		}
 		$o = parent::Close($tag);
-		$this->OriginalTag['NP']['name'] = '__lambda';
+		$this->OriginalTag['NP']['name'] = $this->OriginalTag['NP']['design'] . '_' . abs(crc32($this->OriginalTag['file'])) . '_' . $this->OriginalTag['line']; //'__lambda';
 
 		$this->RenderDesignCode($o, $this->OriginalTag['NP']);
 		return $o;
Index: branches/RC/themes/default2009/platform/elements/header.elm.tpl
===================================================================
diff -u -N -r11477 -r11678
--- branches/RC/themes/default2009/platform/elements/header.elm.tpl	(.../header.elm.tpl)	(revision 11477)
+++ branches/RC/themes/default2009/platform/elements/header.elm.tpl	(.../header.elm.tpl)	(revision 11678)
@@ -18,10 +18,10 @@
 							<input type="hidden" name="events[lang][OnChangeLanguage]" value="" />
 							<inp2:m_Phrase label="lu_YourLanguage"/>:
 							<select name="language" class="input-select" onchange="document.getElementById('lang_form').submit()">
-								<inp2:m_DefineElement name="lang_elem">
+								<inp2:m_DefineElement name="lang_elem" no_editing="1">
 									<option value="<inp2:Field name="LanguageId"/>" <inp2:m_if check="SelectedLanguage">selected="selected"</inp2:m_if> ><inp2:Field name="PackName"/></option>
 								</inp2:m_DefineElement>
-								<inp2:lang_ListLanguages render_as="lang_elem" no_table="1" no_editing="1"/>
+								<inp2:lang_ListLanguages render_as="lang_elem" no_table="1"/>
 							</select>
 						</form>
 					</td>
Index: branches/RC/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -N -r11661 -r11678
--- branches/RC/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 11661)
+++ branches/RC/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 11678)
@@ -1,4 +1,4 @@
-<inp2:m_DefineElement name="combined_header" permission_type="view" perm_section="" perm_prefix="" perm_event="" system_permission="1" title_preset="" title_render_as="" tab_preset="" additional_title_render_as="" additional_blue_bar_render_as="" pagination_prefix="" grid="Default">
+<inp2:m_DefineElement name="combined_header" permission_type="view" perm_section="" perm_prefix="" perm_event="" system_permission="1" title_preset="" tab_preset="" additional_title_render_as="" additional_blue_bar_render_as="" pagination_prefix="" grid="Default">
 	<inp2:m_if check="m_Param" name="perm_section" inverse="1">
 		<inp2:adm_SectionInfo section="$section" info="perm_section" result_to_var="perm_section"/>
 	</inp2:m_if>
@@ -51,11 +51,7 @@
 				<inp2:adm_SectionInfo section="$section" info="label" result_to_var="default_title"/>
 				<inp2:adm_SectionInfo section="$section" parent="1" info="label" result_to_var="group_title"/>
 				<span class="tablenav_link" id="blue_bar">
-					<inp2:m_if check="m_Param" name="title_render_as">
-						<inp2:m_RenderElement name="$title_render_as" pass_params="1"/>
-					<inp2:m_else/>
-						<inp2:$prefix_SectionTitle title_preset="$title_preset" section="$section" title="$default_title" group_title="$group_title" cut_first="100" pass_params="true"/>
-					</inp2:m_if>
+					<inp2:$prefix_SectionTitle title_preset="$title_preset" section="$section" title="$default_title" group_title="$group_title" cut_first="100" pass_params="true"/>
 				</span>
 			</td>
 			<td align="right" class="tablenav" style="vertical-align: middle;">
Index: branches/RC/themes/default2009/platform/elements/menu.elm.tpl
===================================================================
diff -u -N -r11539 -r11678
--- branches/RC/themes/default2009/platform/elements/menu.elm.tpl	(.../menu.elm.tpl)	(revision 11539)
+++ branches/RC/themes/default2009/platform/elements/menu.elm.tpl	(.../menu.elm.tpl)	(revision 11678)
@@ -13,7 +13,7 @@
 						<div id="xmlMenuDiv"></div>
 
 				        <script type="text/javascript">
-				        	<inp2:m_DefineElement name="menu_xml">
+				        	<inp2:m_DefineElement name="menu_xml" no_editing="1">
 										<menumgr id="mgr" flowoverformelement="false" defaulteffect="aoslide" icpath="">
 										<!--## USE droponclick="false" TO OPEN MENU ONMOUSE-OVER ##-->
 										  <menubar id="menubar" orient="H" showicon="true" showsubicon="false" stlprf="horz_" droponclick="true" >
@@ -29,7 +29,7 @@
 
 				        	addLoadEvent(
 				        		function() {
-					        	 	var menu_mgr = NlsMenuUtil.createFromXMLString('<inp2:m_RenderElement name="menu_xml" no_editing="1" js_escape="1"/>');
+					        	 	var menu_mgr = NlsMenuUtil.createFromXMLString('<inp2:m_RenderElement name="menu_xml" js_escape="1"/>');
 //						        	menu_mgr.renderMenus();
 						        	menu_mgr.renderMenubar('xmlMenuDiv');
 					        	}
@@ -43,15 +43,15 @@
 								<inp2:c_CategoryLink template="__default__" module="$module" cat_id="Root" result_to_var="link"/>
 								<inp2:m_TemplatesBase module="$module" result_to_var="module_path"/>
 								<inp2:c_Field requery="1" name="Name" result_to_var="title"/>
-								<inp2:m_RenderElement name="menu_element" menu_href="$link" menu_title="$title" menu_icon_src="{$module_path}img/{$icon}" no_editing="1"/>
+								<inp2:m_RenderElement name="menu_element" menu_href="$link" menu_title="$title" menu_icon_src="{$module_path}img/{$icon}"/>
 							</inp2:m_DefineElement>
 
 							<table>
 								<tr>
 									<inp2:m_Link template="index" m_cat_id="0" m_cat_page="1" result_to_var="link"/>
 									<inp2:m_RootCategoryName result_to_var="title"/>
 									<inp2:m_TemplatesBase module="In-portal" result_to_var="module_path"/>
-									<inp2:m_RenderElement name="menu_element" menu_href="$link" menu_title="$title" menu_icon_src="{$module_path}img/menu_home.gif" no_editing="1"/>
+									<inp2:m_RenderElement name="menu_element" menu_href="$link" menu_title="$title" menu_icon_src="{$module_path}img/menu_home.gif"/>
 								</tr>
 							</table>
 				        </noscript>
@@ -66,7 +66,7 @@
 			<table style="width: auto;">
 				<tr>
 					<!-- menu: My Account -->
-					<inp2:m_RenderElement design="menu_element" no_editing="1">
+					<inp2:m_RenderElement design="menu_element">
 						<inp2:m_Capture to_var="menu_href">
 							<inp2:m_Link template="platform/my_account/my_account" m_cat_id="0" m_cat_page="1"/>
 						</inp2:m_Capture>
Index: branches/RC/themes/default2009/platform/elements/menu_subsections.xml.tpl
===================================================================
diff -u -N -r11540 -r11678
--- branches/RC/themes/default2009/platform/elements/menu_subsections.xml.tpl	(.../menu_subsections.xml.tpl)	(revision 11540)
+++ branches/RC/themes/default2009/platform/elements/menu_subsections.xml.tpl	(.../menu_subsections.xml.tpl)	(revision 11678)
@@ -10,7 +10,7 @@
   		orient="V" showicon="true" showsubicon="true" stlprf=""
   		submenuic="['<inp2:m_TemplatesBase module="In-portal"/>img/arrow_white.gif']">
     <items>
-    	<inp2:m_DefineElement name="top_sub_menu_elem">
+    	<inp2:m_DefineElement name="top_sub_menu_elem" no_editing="1">
 				<item id="menu<inp2:m_Param name="page_id"/>" url="<inp2:m_if check="m_Param" name="external_url"><inp2:m_Param name="external_url"/><inp2:m_else/><inp2:m_Link template="$template" m_cat_id="0" m_cat_page="1"/></inp2:m_if>" enb="true"
 					<inp2:m_if inverse="1" check="m_ParamEquals" name="level" value="$max_level">
 						<inp2:m_if check="m_Param" name="has_sub_menu">
@@ -26,7 +26,7 @@
 				><![CDATA[<inp2:m_Param name="title"/>]]></item>
 			</inp2:m_DefineElement>
 
-			<inp2:st_CachedMenu except="index" menu_id="$page_id" category_id="$cat_id" render_as="top_sub_menu_elem" no_editing="1"/>
+			<inp2:st_CachedMenu except="index" menu_id="$page_id" category_id="$cat_id" render_as="top_sub_menu_elem"/>
     </items>
   </menu>
 </menus>
\ No newline at end of file
Index: branches/RC/themes/default2009/platform/template_manager/html_head.tpl
===================================================================
diff -u -N -r11670 -r11678
--- branches/RC/themes/default2009/platform/template_manager/html_head.tpl	(.../html_head.tpl)	(revision 11670)
+++ branches/RC/themes/default2009/platform/template_manager/html_head.tpl	(.../html_head.tpl)	(revision 11678)
@@ -19,7 +19,7 @@
 
 <inp2:m_if check="m_GetConst" name="EDITING_MODE">
 	<div class="extra-toolbar" style="display: none;">
-		<inp2:m_DefineElement name="edit_mode_element" template="" is_last="0">
+		<inp2:m_DefineElement name="edit_mode_element" template="" no_editing="1" is_last="0">
 			<inp2:m_if check="m_GetConst" name="EDITING_MODE" equals_to="$editing_mode">
 				<td class="button-active" style="padding-right: 5px;">
 
@@ -48,10 +48,10 @@
 
 		<table cellpadding="0" cellspacing="0">
 			<tr>
-				<inp2:m_RenderElement name="edit_mode_element" editing_mode="1" image="show_structure" title="Browse Mode" no_editing="1" strip_nl="2"/>
-				<inp2:m_RenderElement name="edit_mode_element" editing_mode="4" image="content_mode" title="Content Mode" no_editing="1" strip_nl="2"/>
-				<inp2:m_RenderElement name="edit_mode_element" editing_mode="2" image="show_all" title="Layout Mode" no_editing="1" strip_nl="2"/>
-				<inp2:m_RenderElement name="edit_mode_element" editing_mode="3" image="show_all" title="Design Mode" no_editing="1" strip_nl="2" is_last="1"/>
+				<inp2:m_RenderElement name="edit_mode_element" editing_mode="1" image="show_structure" title="Browse Mode" strip_nl="2"/>
+				<inp2:m_RenderElement name="edit_mode_element" editing_mode="4" image="content_mode" title="Content Mode" strip_nl="2"/>
+				<inp2:m_RenderElement name="edit_mode_element" editing_mode="2" image="show_all" title="Layout Mode" strip_nl="2"/>
+				<inp2:m_RenderElement name="edit_mode_element" editing_mode="3" image="show_all" title="Design Mode" strip_nl="2" is_last="1"/>
 			</tr>
 		</table>
 	</div>
Index: branches/RC/core/kernel/nparser/nparser.php
===================================================================
diff -u -N -r11610 -r11678
--- branches/RC/core/kernel/nparser/nparser.php	(.../nparser.php)	(revision 11610)
+++ branches/RC/core/kernel/nparser/nparser.php	(.../nparser.php)	(revision 11678)
@@ -472,6 +472,7 @@
 		$f_name = $this->Elements[$params['name']];
 		$ret = $f_name($this, $params);
 		$ret = $m_processor->PostProcess($ret, $flag_values);
+		$block_params = $this->Params; // input parameters, but modified inside rendered block
 		$this->PopParams();
 
 		$this->CheckNoData($ret, $params);
@@ -482,7 +483,7 @@
 			$this->CacheSet($this->FormCacheKey('element_'.$original_params['name']), $ret, $original_params['cache_timeout']);
 		}
 
-		if (array_key_exists('no_editing', $params) && $params['no_editing']) {
+		if (array_key_exists('no_editing', $block_params) && $block_params['no_editing']) {
 			// when individual render element don't want to be edited
 			return $ret;
 		}
Index: branches/RC/themes/default2009/platform/elements/forms.elm.tpl
===================================================================
diff -u -N -r11511 -r11678
--- branches/RC/themes/default2009/platform/elements/forms.elm.tpl	(.../forms.elm.tpl)	(revision 11511)
+++ branches/RC/themes/default2009/platform/elements/forms.elm.tpl	(.../forms.elm.tpl)	(revision 11678)
@@ -39,7 +39,7 @@
 	</tr>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_field_separator" is_last="0">
+<inp2:m_DefineElement name="inp_edit_field_separator" no_editing="1" is_last="0">
 	<inp2:m_if check="m_ParamEquals" name="is_last" value="0">
 	<tr>
 		<td colspan="2">
@@ -49,7 +49,7 @@
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_field_caption" title="">
+<inp2:m_DefineElement name="inp_edit_field_caption" no_editing="1" title="">
 	<inp2:m_inc param="tab_index" by="1"/>
 	<td class="field-name" nowrap>
 		<inp2:m_if check="m_Param" name="title">
@@ -63,7 +63,7 @@
 	</td>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_label" as_label="" currency="" is_last="0">
+<inp2:m_DefineElement name="inp_label" as_label="" currency="" no_editing="1" is_last="0">
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
 		<td valign="top" class="field-value">
@@ -73,7 +73,7 @@
 	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_label" as_label="" currency="" is_last="0">
+<inp2:m_DefineElement name="inp_edit_label" as_label="" currency="" no_editing="1" is_last="0">
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
 		<td valign="top" class="field-value">
@@ -84,7 +84,7 @@
 	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_box" style="" maxlength="" is_last="0" title="">
+<inp2:m_DefineElement name="inp_edit_box" style="" maxlength="" no_editing="1" is_last="0" title="">
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
 		<td class="field-value">
@@ -113,7 +113,7 @@
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_password" style="" is_last="0">
+<inp2:m_DefineElement name="inp_edit_password" style="" no_editing="1" is_last="0">
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
 		<td class="field-value">
@@ -127,7 +127,7 @@
 	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_upload" style="" is_last="0">
+<inp2:m_DefineElement name="inp_edit_upload" style="" no_editing="1" is_last="0">
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
 		<td class="field-value">
@@ -144,7 +144,7 @@
 	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_image_upload" style="" is_last="0">
+<inp2:m_DefineElement name="inp_edit_image_upload" style="" no_editing="1" is_last="0">
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
 		<td class="field-value">
@@ -175,7 +175,7 @@
 	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_file_upload" style="" is_last="0">
+<inp2:m_DefineElement name="inp_edit_file_upload" style="" no_editing="1" is_last="0">
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
 		<td class="field-value">
@@ -210,7 +210,7 @@
 	<input type="hidden" name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field" db="$db"/>" />
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_date" style="" is_last="0">
+<inp2:m_DefineElement name="inp_edit_date" style="" no_editing="1" is_last="0">
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
 		<td class="field-value">
@@ -227,7 +227,7 @@
 	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_time" style="" is_last="0">
+<inp2:m_DefineElement name="inp_edit_time" style="" no_editing="1" is_last="0">
 	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
 		<td class="field-value">
@@ -243,7 +243,7 @@
 	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_date_time" style="" is_last="0">
+<inp2:m_DefineElement name="inp_edit_date_time" style="" no_editing="1" is_last="0">
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
 		<td class="field-value">
@@ -261,7 +261,7 @@
 	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_textarea" style="" is_last="0">
+<inp2:m_DefineElement name="inp_edit_textarea" style="" no_editing="1" is_last="0">
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
 		<td class="field-value">
@@ -297,7 +297,7 @@
 	<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_phrase label="$option"/></option>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_options" style="" has_empty="0" empty_value="" is_last="0">
+<inp2:m_DefineElement name="inp_edit_options" style="" has_empty="0" empty_value="" no_editing="1" is_last="0">
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
 		<td class="field-value">
@@ -324,7 +324,7 @@
 	<input type="radio" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_param name="style"/>" <inp2:m_param name="checked"/> name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>"><label for="<inp2:{$prefix}_InputName field="$field"/>_<inp2:m_param name="key"/>"><inp2:m_phrase label="$option"/></label>&nbsp;
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_radio" style="" pass_tabindex="" onclick="" onchange="" use_phrases="1" is_last="0">
+<inp2:m_DefineElement name="inp_edit_radio" style="" pass_tabindex="" onclick="" onchange="" use_phrases="1" no_editing="1" is_last="0">
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
 		<td class="field-value">
@@ -341,7 +341,7 @@
 	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_captcha" style="" title="lu_fld_Captcha" is_last="0">
+<inp2:m_DefineElement name="inp_edit_captcha" style="" title="lu_fld_Captcha" no_editing="1" is_last="0">
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="Captcha" title="$title"/>
 		<td class="field-value">
@@ -356,7 +356,7 @@
 	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_checkbox" style="" is_last="0">
+<inp2:m_DefineElement name="inp_edit_checkbox" style="" no_editing="1" is_last="0">
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
 		<td>
@@ -371,7 +371,7 @@
 	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_categories" style="" is_last="0">
+<inp2:m_DefineElement name="inp_edit_categories" style="" no_editing="1" is_last="0">
 	<inp2:m_include template="platform/elements/categories.elm"/>
 
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
@@ -424,7 +424,7 @@
 	<inp2:m_RootCategoryName/>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_pr_category_label" is_last="0" editing="0">
+<inp2:m_DefineElement name="inp_pr_category_label" no_editing="1" is_last="0" editing="0">
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
 		<td valign="top" class="field-value">
Index: branches/RC/themes/default2009/platform/elements/menu_sections.xml.tpl
===================================================================
diff -u -N -r11540 -r11678
--- branches/RC/themes/default2009/platform/elements/menu_sections.xml.tpl	(.../menu_sections.xml.tpl)	(revision 11540)
+++ branches/RC/themes/default2009/platform/elements/menu_sections.xml.tpl	(.../menu_sections.xml.tpl)	(revision 11678)
@@ -1,5 +1,5 @@
 <inp2:m_Random result_to_var="rand"/>
-<inp2:m_DefineElement name="top_menu_item">
+<inp2:m_DefineElement name="top_menu_item" no_editing="1">
 	<item id="menu<inp2:m_Param name="page_id"/>"
 		url="<inp2:m_if check="m_Param" name="external_url"><inp2:m_Param name="external_url"/><inp2:m_else/><inp2:m_Link template="$template" m_cat_id="$cat_id" m_cat_page="1"/></inp2:m_if>"
 		<inp2:m_if check="m_Param" name="menu_icon">
@@ -16,4 +16,4 @@
 		 level="0" max_level="4"
 		/>" ><![CDATA[<inp2:m_Param name="title"/>]]></item>
 </inp2:m_DefineElement>
-<inp2:st_CachedMenu level="0" category_id="0" render_as="top_menu_item" no_editing="1"/>
\ No newline at end of file
+<inp2:st_CachedMenu level="0" category_id="0" render_as="top_menu_item"/>
\ No newline at end of file
Index: branches/RC/themes/default2009/platform/elements/content_boxes.elm.tpl
===================================================================
diff -u -N -r11670 -r11678
--- branches/RC/themes/default2009/platform/elements/content_boxes.elm.tpl	(.../content_boxes.elm.tpl)	(revision 11670)
+++ branches/RC/themes/default2009/platform/elements/content_boxes.elm.tpl	(.../content_boxes.elm.tpl)	(revision 11678)
@@ -84,7 +84,7 @@
 </inp2:m_DefineElement>
 <!--## /CONTENT BOX NO-HEADER ELEMENT DESIGN ##-->
 
-<inp2:m_DefineElement name="menu_element" current="">
+<inp2:m_DefineElement name="menu_element" current="" no_editing="1">
 	<inp2:m_if check="m_Param" name="current">
 		<td>
 			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/menu_active_border.gif" width="1" height="37" alt=""/><br />
@@ -114,7 +114,7 @@
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="box_element" prefix="">
+<inp2:m_DefineElement name="box_element" no_editing="1" prefix="">
 	<tr>
 		<td>
 			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/menu-li-2-level.gif" alt="" width="4" height="4" border="0" /><br />