Index: branches/unlabeled/unlabeled-1.79.4/core/kernel/db/db_event_handler.php
===================================================================
diff -u -r7073 -r7354
--- branches/unlabeled/unlabeled-1.79.4/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 7073)
+++ branches/unlabeled/unlabeled-1.79.4/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 7354)
@@ -1259,6 +1259,7 @@
 
 			$object->setID(0);
 			$this->Application->SetVar($event->getPrefixSpecial().'_id',0);
+			$this->Application->SetVar($event->getPrefixSpecial().'_PreCreate', 1);
 
 			$event->redirect=false;
 		}
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/popups/translator.tpl
===================================================================
diff -u -r7027 -r7354
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/popups/translator.tpl	(.../translator.tpl)	(revision 7027)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/popups/translator.tpl	(.../translator.tpl)	(revision 7354)
@@ -22,7 +22,6 @@
 <script language="javascript" src="js/in-portal.js"></script>
 <script language="javascript" src="js/toolbar.js"></script>
 <script language="javascript" src="js/grid.js"></script>
-<script language="javascript" src="js/tabs.js"></script>
 <script language="javascript">
 var t = '<inp2:m_get param="t"/>';
 var popups = '1';
@@ -33,6 +32,9 @@
 var $base_path = '<inp2:m_GetConst name="BASE_PATH"/>';
 var img_path = '<inp2:m_TemplatesBase module="#MODULE#"/>/img/';
 
+var $use_popups = <inp2:m_if check="adm_UsePopups">true<inp2:m_else/>false</inp2:m_if>;
+var $use_toolbarlabels = <inp2:m_if check="adm_UseToolbarLabels">true<inp2:m_else/>false</inp2:m_if>;
+
 </script>
 </head>
 
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/grid_blocks.tpl
===================================================================
diff -u -r7283 -r7354
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 7283)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 7354)
@@ -335,6 +335,9 @@
 	grid_filters - show individual filters for each column
 	has_filters  - draw filter section in "View" menu in toolbar
 -->
+
+	<inp2:InitList pass_params="1"/> <!-- this is to avoid recalling prefix as an item in first iterate grid, by col-picker for instance -->
+
 	<inp2:$PrefixSpecial_SaveWarning name="grid_save_warning" main_prefix="$main_prefix" no_toolbar="$no_toolbar"/>
 	<inp2:m_if check="m_RecallEquals" var="{$PrefixSpecial}_search_keyword" value="" inverse="inverse">
 	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="table_border_<inp2:m_if prefix="m" function="ParamEquals" name="no_toolbar" value="no_toolbar"/>nobottom<inp2:m_else/>notop<inp2:m_endif/>">
Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/incs/tab_blocks.tpl
===================================================================
diff -u -r6786 -r7354
--- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/incs/tab_blocks.tpl	(.../tab_blocks.tpl)	(revision 6786)
+++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/incs/tab_blocks.tpl	(.../tab_blocks.tpl)	(revision 7354)
@@ -15,7 +15,7 @@
 <inp2:m_block name="tab"/>
 	<inp2:m_ParseBlock name="prepare_tab" t="$t"/>
 	<td>
-		<table style="background: <inp2:m_get param="bgcolor"/> url(img/tab_<inp2:m_get param="active"/>back.jpg) no-repeat top left;" cellpadding="0" cellspacing="0" border="0">
+		<table style="background: <inp2:m_get param="bgcolor"/> url(img/tab_<inp2:m_get param="active"/>back3.jpg) no-repeat top left;" cellpadding="0" cellspacing="0" border="0">
 			<tr>
         		<td><img alt="" src="img/tab_<inp2:m_get param="active"/>left.gif" width="15" height="23"></td>
         		<td nowrap align="center" style="border-top: 1px solid #000000;">
@@ -30,7 +30,7 @@
 <inp2:m_block name="tab_direct" pass="m"/>
 	<inp2:m_ParseBlock name="prepare_tab" t="$t"/>
 	<td>
-		<table style="background: <inp2:m_get param="bgcolor"/> url(img/tab_<inp2:m_get param="active"/>back.jpg) no-repeat top left;" cellpadding="0" cellspacing="0" border="0">
+		<table style="background: <inp2:m_get param="bgcolor"/> url(img/tab_<inp2:m_get param="active"/>back3.jpg) no-repeat top left;" cellpadding="0" cellspacing="0" border="0">
 			<tr>
         		<td><img alt="" src="img/tab_<inp2:m_get param="active"/>left.gif" width="15" height="23"></td>
         		<td nowrap align="center" style="border-top: 1px solid #000000;">
@@ -45,7 +45,7 @@
 <inp2:m_block name="tab_list"/>
 			<inp2:m_ParseBlock name="prepare_tab" t="$t"/>
 			<td>
-				<table style="background: <inp2:m_get param="bgcolor"/> url(img/tab_<inp2:m_get param="active"/>back.jpg) no-repeat top left;" cellpadding="0" cellspacing="0" border="0">
+				<table style="background: <inp2:m_get param="bgcolor"/> url(img/tab_<inp2:m_get param="active"/>back3.jpg) no-repeat top left;" cellpadding="0" cellspacing="0" border="0">
 				<tr>
         	<td><img alt="" src="img/tab_<inp2:m_get param="active"/>left.gif" width="15" height="23"></td>
         	<td nowrap align="center" <inp2:m_if check="m_getequals" name="active" value="active_">style="border-top: black 1px solid;"</inp2:m_if> background="img/tab_<inp2:m_get param="active"/>back.gif">
Index: branches/unlabeled/unlabeled-1.10.2/core/units/categories/categories_item.php
===================================================================
diff -u -r7090 -r7354
--- branches/unlabeled/unlabeled-1.10.2/core/units/categories/categories_item.php	(.../categories_item.php)	(revision 7090)
+++ branches/unlabeled/unlabeled-1.10.2/core/units/categories/categories_item.php	(.../categories_item.php)	(revision 7354)
@@ -149,7 +149,7 @@
 		function IsRoot()
 		{
 			$category_id = $this->Application->GetVar($this->getPrefixSpecial().'_id');
-			if (is_numeric($category_id) && $category_id == 0) {
+			if (is_numeric($category_id) && $category_id == 0 && !$this->Application->GetVar($this->getPrefixSpecial().'_PreCreate')) {
 				$sql = 'SELECT '.$this->IDField.'
 						FROM '.$this->TableName.'
 						WHERE '.$this->IDField.' = '.$category_id;
Index: branches/unlabeled/unlabeled-1.4.2/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -r7099 -r7354
--- branches/unlabeled/unlabeled-1.4.2/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 7099)
+++ branches/unlabeled/unlabeled-1.4.2/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 7354)
@@ -157,7 +157,7 @@
 
 <inp2:m_block name="inp_edit_date" class="" is_last=""/>
 	<inp2:m_if check="m_GetEquals" name="calendar_included" value="1" inverse="inverse">
-		<script type="text/javascript" src="incs/calendar.js"></script>
+		<script type="text/javascript" src="js/calendar.js"></script>
 		<inp2:m_set calendar_included="1"/>
 	</inp2:m_if>
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
@@ -179,7 +179,7 @@
 
 <inp2:m_block name="inp_edit_date_time" class="" is_last=""/>
 	<inp2:m_if check="m_GetEquals" name="calendar_included" value="1" inverse="inverse">
-		<script type="text/javascript" src="incs/calendar.js"></script>
+		<script type="text/javascript" src="js/calendar.js"></script>
 		<inp2:m_set calendar_included="1"/>
 	</inp2:m_if>
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">