Index: admin_templates/incs/header.tpl
===================================================================
--- admin_templates/incs/header.tpl	(revision 14318)
+++ admin_templates/incs/header.tpl	(working copy)
@@ -98,6 +98,14 @@
 </style>
 </inp2:m_if>
 
+<inp2:m_ifnot check="adm_UsePopups">
+	<style type="text/css">
+		table.edit-form {
+			border: 1px solid black;
+		}
+	</style>
+</inp2:m_ifnot>
+
 </head>
 
 <inp2:m_include t="incs/blocks"/>
Index: admin_templates/incs/style_template.css
===================================================================
--- admin_templates/incs/style_template.css	(revision 14318)
+++ admin_templates/incs/style_template.css	(working copy)
@@ -60,7 +60,7 @@
 }
 
 .bordered, table.bordered, .bordered-no-bottom {
-	border: 1px solid #000000;
+	border: 1px solid #000000 !important;
 	border-top-width: 0px;
 	border-collapse: collapse;
 }
@@ -413,7 +413,7 @@
 /* Forms */
 table.edit-form {
 	border: none;
-	border-top-width: 0px;
+	border-top-width: 0px !important;
 	border-collapse: collapse;
 	width: 100%;
 }
Index: admin_templates/js/forms.js
===================================================================
--- admin_templates/js/forms.js	(revision 14318)
+++ admin_templates/js/forms.js	(working copy)
@@ -239,6 +239,11 @@
 
 	//	alert('h after correction is '+h);
 
+	/*
+	// use this 2 lines, instead of next 3 lines, when scrolling without popups needed
+	var w = $(window.document.body).outerWidth(false);
+	w -= ($div.outerWidth() - $div.width());*/
+
 	window.document.body.style.width = '100%';
 	var w = (document.all ? window.document.body.offsetWidth : window.innerWidth);
 
Index: install/upgrades.css
===================================================================
--- install/upgrades.css	(revision 14318)
+++ install/upgrades.css	(working copy)
@@ -673,3 +673,27 @@
 +	padding-bottom: 4px;
  }
 \ No newline at end of file
+
+# ===== v 5.1.3-RC1 =====
+Index: style_template.css
+===================================================================
+--- style_template.css	(revision 14318)
++++ style_template.css	(working copy)
+@@ -60,7 +60,7 @@
+ }
+
+ .bordered, table.bordered, .bordered-no-bottom {
+-	border: 1px solid #000000;
++	border: 1px solid #000000 !important;
+ 	border-top-width: 0px;
+ 	border-collapse: collapse;
+ }
+@@ -413,7 +413,7 @@
+ /* Forms */
+ table.edit-form {
+ 	border: none;
+-	border-top-width: 0px;
++	border-top-width: 0px !important;
+ 	border-collapse: collapse;
+ 	width: 100%;
+ }
Index: kernel/db/cat_event_handler.php
===================================================================
--- kernel/db/cat_event_handler.php	(revision 14321)
+++ kernel/db/cat_event_handler.php	(working copy)
@@ -947,13 +947,13 @@
 			// linking existing images for item with virtual fields
 			$image_helper =& $this->Application->recallObject('ImageHelper');
 			/* @var $image_helper ImageHelper */
-	
+
 			$image_helper->LoadItemImages($object);
-	
+
 			// linking existing files for item with virtual fields
 			$file_helper =& $this->Application->recallObject('FileHelper');
 			/* @var $file_helper FileHelper */
-	
+
 			$file_helper->LoadItemFiles($object);
 		}
 
@@ -1876,14 +1876,11 @@
 		if ($field_values['start_from'] == $field_values['total_records']) {
 			if ($event->Special == 'import') {
 				$this->Application->StoreVar('PermCache_UpdateRequired', 1);
-				$url_params = Array(
-					't' => 'catalog/catalog',
-					'm_cat_id' => $this->Application->RecallVar('ImportCategory'),
-					'anchor' => 'tab-' . $event->Prefix,
-				);
-				$this->Application->EventManager->openerStackChange($url_params);
 
-				$event->SetRedirectParam('opener', 'u');
+				$event->SetRedirectParam('m_cat_id', $this->Application->RecallVar('ImportCategory'));
+				$event->SetRedirectParam('anchor', 'tab-' . $event->Prefix);
+
+				$event->redirect = 'catalog/catalog';
 			}
 			elseif ($event->Special == 'export') {
 				$event->redirect = $export_object->getModuleName($event) . '/' . $event->Special . '_finish';
@@ -2607,7 +2604,7 @@
 		if ( !$this->Application->isAdmin ) {
 			$file_helper =& $this->Application->recallObject('FileHelper');
 			/* @var $file_helper FileHelper */
-	
+
 			$file_helper->createItemFiles($event->Prefix, true); // create image fields
 			$file_helper->createItemFiles($event->Prefix, false); // create file fields
 		}
Index: units/admin/admin_events_handler.php
===================================================================
--- units/admin/admin_events_handler.php	(revision 14402)
+++ units/admin/admin_events_handler.php	(working copy)
@@ -1220,10 +1220,6 @@
 			$section_ajustments['in-portal:user_groups'] = 'remove';
 		}
 
-		if ( $this->Application->ConfigValue('UsePopups') ) { // 1 - pop-up, 2 - modal
-			$section_ajustments['in-portal:main_import'] = Array('onclick' => 'direct_edit(\'adm\', this.href);');
-		}
-
 		$this->Application->setUnitOption($event->Prefix, 'SectionAdjustments', $section_ajustments);
 	}
 
Index: units/helpers/cat_dbitem_export_helper.php
===================================================================
--- units/helpers/cat_dbitem_export_helper.php	(revision 14360)
+++ units/helpers/cat_dbitem_export_helper.php	(working copy)
@@ -697,7 +697,7 @@
 				$this->curItem->CategoryPath[ (int)substr($field_name, 8) - 1 ] = $value;
 			}
 			elseif (substr($field_name, 0, 20) == '__CATEGORY__Category') {
-				$this->curItem->CategoryPath[ (int)substr($field_name, 20) ] = $value;
+				$this->curItem->CategoryPath[ (int)substr($field_name, 20) - 1 ] = $value;
 			}
 			elseif (substr($field_name, 0, 11) == '__VIRTUAL__') {
 				$field_name = substr($field_name, 11);
@@ -726,6 +726,7 @@
 					break;
 			}
 			$this->curItem->Clear();
+			$this->curItem->SetDBField('CategoryId', NULL); // since default value is import root category
 			$this->customFields = $this->Application->getUnitOption($event->Prefix, 'CustomFields');
 
 			if (isset($record_data)) {