Index: branches/RC/core/admin_templates/stylesheets/base_style_edit.tpl
===================================================================
diff -u -N -r11098 -r11428
--- branches/RC/core/admin_templates/stylesheets/base_style_edit.tpl	(.../base_style_edit.tpl)	(revision 11098)
+++ branches/RC/core/admin_templates/stylesheets/base_style_edit.tpl	(.../base_style_edit.tpl)	(revision 11428)
@@ -1,3 +1,4 @@
+<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"/>
 
Index: branches/RC/core/admin_templates/stylesheets/block_style_edit.tpl
===================================================================
diff -u -N -r11098 -r11428
--- branches/RC/core/admin_templates/stylesheets/block_style_edit.tpl	(.../block_style_edit.tpl)	(revision 11098)
+++ branches/RC/core/admin_templates/stylesheets/block_style_edit.tpl	(.../block_style_edit.tpl)	(revision 11428)
@@ -1,3 +1,4 @@
+<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"/>
 
Index: branches/RC/core/admin_templates/js/frame_resizer.js
===================================================================
diff -u -N -r11396 -r11428
--- branches/RC/core/admin_templates/js/frame_resizer.js	(.../frame_resizer.js)	(revision 11396)
+++ branches/RC/core/admin_templates/js/frame_resizer.js	(.../frame_resizer.js)	(revision 11428)
@@ -70,4 +70,16 @@
 		this.SubFrameset.setAttribute('cols', this.OpenWidth+',*');
 		this.SetStatus(0, $ajax_save);
 	}
+}
+
+FrameResizer.prototype.fullScreen = function ($restore) {
+	if ($restore === undefined) {
+		$restore = false;
+	}
+
+	if (!$restore) {
+		this.lastMenuVisible = this.MenuVisible();
+	}
+
+	this.setFullscreenMode($restore ? !this.lastMenuVisible : true, false);
 }
\ No newline at end of file
Index: branches/RC/core/admin_templates/stylesheets/style_editor.tpl
===================================================================
diff -u -N -r11096 -r11428
--- branches/RC/core/admin_templates/stylesheets/style_editor.tpl	(.../style_editor.tpl)	(revision 11096)
+++ branches/RC/core/admin_templates/stylesheets/style_editor.tpl	(.../style_editor.tpl)	(revision 11428)
@@ -1,3 +1,4 @@
+<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"/>
 
Index: branches/RC/core/units/general/helpers/template_helper.php
===================================================================
diff -u -N -r11336 -r11428
--- branches/RC/core/units/general/helpers/template_helper.php	(.../template_helper.php)	(revision 11336)
+++ branches/RC/core/units/general/helpers/template_helper.php	(.../template_helper.php)	(revision 11428)
@@ -234,6 +234,8 @@
 				unlink( $this->_getTemplateFile(false, '.tpl.bak') );
 			}
 
+			define('DBG_SKIP_REPORTING', 1);
+			$this->Application->Redirect($this->Application->GetVar('source'));
 			echo 1; // were changes
 
 			return true;
Index: branches/RC/core/units/general/inp_ses_storage.php
===================================================================
diff -u -N -r10580 -r11428
--- branches/RC/core/units/general/inp_ses_storage.php	(.../inp_ses_storage.php)	(revision 10580)
+++ branches/RC/core/units/general/inp_ses_storage.php	(.../inp_ses_storage.php)	(revision 11428)
@@ -48,8 +48,9 @@
 			$this->Storage->DeleteSession($this);
 			$this->Storage->DeleteEditTables();
 			$this->Data = new Params();
-			$this->SID = '';
+			$this->SID = $this->CachedSID = '';
 			if ($this->CookiesEnabled) $this->SetSessionCookie(); //will remove the cookie due to value (sid) is empty
+
 			$this->SetSession(); //will create a new session
 		}
 
Index: branches/RC/core/admin_templates/stylesheets/stylesheets_edit_base.tpl
===================================================================
diff -u -N -r11098 -r11428
--- branches/RC/core/admin_templates/stylesheets/stylesheets_edit_base.tpl	(.../stylesheets_edit_base.tpl)	(revision 11098)
+++ branches/RC/core/admin_templates/stylesheets/stylesheets_edit_base.tpl	(.../stylesheets_edit_base.tpl)	(revision 11428)
@@ -1,3 +1,4 @@
+<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"/>
 
@@ -92,7 +93,7 @@
 </table>
 
 <inp2:m_DefineElement name="grid_description_td" >
-	<td valign="top" class="text"><inp2:{$PrefixSpecial}_field field="$field" grid="$grid" no_special="$no_special" cut_first="100"/></td>
+	<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"/>
Index: branches/RC/core/admin_templates/regional/languages_list.tpl
===================================================================
diff -u -N -r8929 -r11428
--- branches/RC/core/admin_templates/regional/languages_list.tpl	(.../languages_list.tpl)	(revision 8929)
+++ branches/RC/core/admin_templates/regional/languages_list.tpl	(.../languages_list.tpl)	(revision 11428)
@@ -55,6 +55,8 @@
 				a_toolbar.Render();
 			</script>
 		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="lang" grid="Default"/>
 	</tr>
 </tbody>
 </table>
Index: branches/RC/core/admin_templates/incs/image_blocks.tpl
===================================================================
diff -u -N -r10832 -r11428
--- branches/RC/core/admin_templates/incs/image_blocks.tpl	(.../image_blocks.tpl)	(revision 10832)
+++ branches/RC/core/admin_templates/incs/image_blocks.tpl	(.../image_blocks.tpl)	(revision 11428)
@@ -3,12 +3,13 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="thumbnail_section" prefix="" size="" class="">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
-		<td class="text">
-			<inp2:m_phrase label="la_fld_Location"/><br>
-			<span class="error"><inp2:{$prefix}_Error field="ThumbPath"/><inp2:{$prefix}_Error field="ThumbUrl"/></span>&nbsp;
+	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+		<td class="label-cell">
+			<inp2:m_phrase label="la_fld_Location"/><!--<br>
+			<span class="error"><inp2:{$prefix}_Error field="ThumbPath"/><inp2:{$prefix}_Error field="ThumbUrl"/></span>&nbsp;-->
 		</td>
-		<td>
+		<td class="control-mid">&nbsp;</td>
+		<td class="control-cell">
 			<table border="0">
 				<tr>
 					<td>
@@ -38,20 +39,20 @@
 				  	</td>
 				</tr>
 			  </table>
+			  <inp2:{$prefix}_Image block="image_block" Thumbnail="1" DefaultImage="noimage.gif"/>
 		</td>
-		<td>
-			<inp2:{$prefix}_Image block="image_block" Thumbnail="1" DefaultImage="noimage.gif"/>
-		</td>
+		<inp2:m_RenderElement name="inp_edit_error" prefix="$prefix" field="ThumbPath"/>
 	</tr>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="fullsize_section" prefix="" size="" class="">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
-		<td class="text">
-			<inp2:m_phrase label="la_fld_Location"/><br>
-			<span class="error"><inp2:{$prefix}_Error field="LocalPath"/><inp2:{$prefix}_Error field="Url"/></span>&nbsp;
+	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+		<td class="label-cell">
+			<inp2:m_phrase label="la_fld_Location"/><!--<br>
+			<span class="error"><inp2:{$prefix}_Error field="LocalPath"/><inp2:{$prefix}_Error field="Url"/></span>&nbsp;-->
 		</td>
-		<td>
+		<td class="control-mid">&nbsp;</td>
+		<td class="control-cell">
 			<table border="0">
 				<tr>
 					<td>
@@ -81,10 +82,9 @@
 				  	</td>
 				</tr>
 			  </table>
+			  <inp2:{$prefix}_Image block="image_block" DefaultImage="noimage.gif"/>
 		</td>
-		<td>
-			<inp2:{$prefix}_Image block="image_block" DefaultImage="noimage.gif"/>
-		</td>
+		<inp2:m_RenderElement name="inp_edit_error" prefix="$prefix" field="LocalPath"/>
 	</tr>
 </inp2:m_DefineElement>
 
@@ -129,24 +129,14 @@
 	}
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="image_caption_td" >
-	<td valign="top" class="text">
-		<input type="checkbox" name="<inp2:{$PrefixSpecial}_InputName field="$IdField" IdField="$IdField"/>" id="<inp2:{$PrefixSpecial}_InputName field="$IdField" IdField="$IdField"/>">
-		<img src="<inp2:ModulePath module="In-Portal"/>img/itemicons/<inp2:{$PrefixSpecial}_ItemIcon grid="$grid"/>">
-		<inp2:Field field="$field" grid="$grid"/><span class="priority"><inp2:m_if check="{$PrefixSpecial}_fieldequals" field="Priority" value="0"><inp2:m_else/><sup><inp2:{$PrefixSpecial}_field field="Priority" /></sup></inp2:m_if></span>
-	</td>
+<inp2:m_DefineElement name="image_caption_td">
+	<inp2:Field field="$field" grid="$grid"/><span class="priority"><inp2:m_if check="FieldEquals" field="Priority" value="0"><inp2:m_else/><sup><inp2:Field field="Priority" /></sup></inp2:m_if></span>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="image_preview_td">
-	<td>
-		<inp2:Image block="image_block" Thumbnail="1" DefaultImage="noimage.gif" MaxWidth="120" MaxHeight="120"/>
-	</td>
+	<inp2:Image block="image_block" Thumbnail="1" DefaultImage="noimage.gif" MaxWidth="120" MaxHeight="120"/>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="image_url_td">
-	<td valign="top" class="text">
-		<inp2:ImageUrl local_phrase="!la_LocalImage!"/>
-	</td>
-</inp2:m_DefineElement>
-
-
+	<inp2:ImageUrl local_phrase="!la_LocalImage!"/>
+</inp2:m_DefineElement>
\ No newline at end of file
Index: branches/RC/core/admin_templates/stylesheets/stylesheets_edit_block.tpl
===================================================================
diff -u -N -r11098 -r11428
--- branches/RC/core/admin_templates/stylesheets/stylesheets_edit_block.tpl	(.../stylesheets_edit_block.tpl)	(revision 11098)
+++ branches/RC/core/admin_templates/stylesheets/stylesheets_edit_block.tpl	(.../stylesheets_edit_block.tpl)	(revision 11428)
@@ -1,3 +1,4 @@
+<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"/>
 
Index: branches/RC/core/admin_templates/regional/languages_edit_email_events.tpl
===================================================================
diff -u -N -r11298 -r11428
--- branches/RC/core/admin_templates/regional/languages_edit_email_events.tpl	(.../languages_edit_email_events.tpl)	(revision 11298)
+++ branches/RC/core/admin_templates/regional/languages_edit_email_events.tpl	(.../languages_edit_email_events.tpl)	(revision 11428)
@@ -1,3 +1,4 @@
+<inp2:adm_SetPopupSize width="850" height="600"/>
 <inp2:m_RequireLogin permissions="in-portal:configure_lang.view" system="1"/>
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="section_header" icon="icon46_conf_regional" title="!la_title_RegionalSettings!"/>
Index: branches/RC/core/kernel/session/session.php
===================================================================
diff -u -N -r11386 -r11428
--- branches/RC/core/kernel/session/session.php	(.../session.php)	(revision 11386)
+++ branches/RC/core/kernel/session/session.php	(.../session.php)	(revision 11428)
@@ -398,6 +398,8 @@
 
 	var $SID;
 
+	var $CachedSID;
+
 	var $SessionSet = false;
 
 	/**
@@ -641,7 +643,9 @@
 			//If session has expired
 			if ($this->Expiration < adodb_mktime()) {
 				$this->Destroy();
-				return false;
+
+				// when Destory methods calls SetSession inside and new session get created
+				return $this->SessionSet;
 			}
 
 			//Otherwise it's ok
@@ -734,7 +738,7 @@
 	 */
 	function setSID($new_sid)
 	{
-		$this->SID=$new_sid;
+		$this->SID = $this->CachedSID = $new_sid;
 		$this->Application->SetVar($this->GETName,$new_sid);
 	}
 
@@ -853,8 +857,11 @@
 	{
 		$this->Storage->DeleteSession($this);
 		$this->Data = new Params();
-		$this->SID = '';
+		$this->SID = $this->CachedSID = '';
+		$this->SessionSet = false;
+
 		if ($this->CookiesEnabled) $this->SetSessionCookie(); //will remove the cookie due to value (sid) is empty
+
 		$this->SetSession(true); //will create a new session, true to force
 	}
 
Index: branches/RC/core/admin_templates/stylesheets/stylesheets_edit.tpl
===================================================================
diff -u -N -r11098 -r11428
--- branches/RC/core/admin_templates/stylesheets/stylesheets_edit.tpl	(.../stylesheets_edit.tpl)	(revision 11098)
+++ branches/RC/core/admin_templates/stylesheets/stylesheets_edit.tpl	(.../stylesheets_edit.tpl)	(revision 11428)
@@ -1,3 +1,4 @@
+<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"/>
 
Index: branches/RC/core/admin_templates/regional/languages_edit_phrases.tpl
===================================================================
diff -u -N -r8929 -r11428
--- branches/RC/core/admin_templates/regional/languages_edit_phrases.tpl	(.../languages_edit_phrases.tpl)	(revision 8929)
+++ branches/RC/core/admin_templates/regional/languages_edit_phrases.tpl	(.../languages_edit_phrases.tpl)	(revision 11428)
@@ -1,3 +1,4 @@
+<inp2:adm_SetPopupSize width="850" height="600"/>
 <inp2:m_RequireLogin permissions="in-portal:configure_lang.view" system="1"/>
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="section_header" icon="icon46_conf_regional" title="!la_title_RegionalSettings!"/>
Index: branches/RC/core/admin_templates/regional/languages_edit_tabs.tpl
===================================================================
diff -u -N -r8929 -r11428
--- branches/RC/core/admin_templates/regional/languages_edit_tabs.tpl	(.../languages_edit_tabs.tpl)	(revision 8929)
+++ branches/RC/core/admin_templates/regional/languages_edit_tabs.tpl	(.../languages_edit_tabs.tpl)	(revision 11428)
@@ -1,13 +1,7 @@
-<table style="padding: 2px 0px 0px 0px; margin: 0px; border: none; border-collapse: collapse" width="100%">
-<tr>
-	<td align="right" width="100%">
-	  	<table cellpadding="0" cellspacing="0" border="0" height="23">
-			<tr>
-				<inp2:m_RenderElement name="tab" title="la_tab_General" t="regional/languages_edit" main_prefix="lang"/>
-				<inp2:m_RenderElement name="tab" title="la_tab_Labels" t="regional/languages_edit_phrases" main_prefix="lang"/>
-				<inp2:m_RenderElement name="tab" title="la_tab_EmailEvents" t="regional/languages_edit_email_events" main_prefix="lang"/>
-			</tr>
-		</table>
-	</td>
-</tr>
-</table>
\ No newline at end of file
+<inp2:m_DefineElement name="language_tabs">
+	<inp2:m_RenderElement name="tab" title="la_tab_General" t="regional/languages_edit" main_prefix="lang"/>
+	<inp2:m_RenderElement name="tab" title="la_tab_Labels" t="regional/languages_edit_phrases" main_prefix="lang"/>
+	<inp2:m_RenderElement name="tab" title="la_tab_EmailEvents" t="regional/languages_edit_email_events" main_prefix="lang"/>
+</inp2:m_DefineElement>
+
+<inp2:m_RenderElement name="tabs_container" tabs_render_as="language_tabs"/>
\ No newline at end of file