diff --git a/templates/form/field/UserField/edit.php b/templates/form/field/UserField/edit.php
new file mode 100644
index 0000000..e9580fb
--- /dev/null
+++ b/templates/form/field/UserField/edit.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * @var Shell $this
+ * @var DefaultField $field
+ */
+
+use Wt\Core\Entity\UserFieldEntity;
+use Wt\Core\Form\Field\DefaultField;
+use Wt\Core\Templater\Shell;
+
+require_once app()->module()->getDir() . '/templates/admin_bitrix_assets.php';
+
+global $USER_FIELD_MANAGER;
+/** @var UserFieldEntity $propertyEntity */
+$propertyEntity = $field->getPropertyEntity();
+$property_fields = $propertyEntity->getRaw();
+$arUserField['EDIT_FORM_LABEL'] = $property_fields['EDIT_FORM_LABEL']?: $property_fields['FIELD_NAME'];
+$property_fields['USER_TYPE'] = $propertyEntity->getUserTypeBuild();
+$property_fields['VALUE'] = $field->getValue();
+
+if($field->isNew()){
+    $property_fields['VALUE'] = $field->getPropertyEntity()->getDefaultValue();
+}
+$property_fields['ENTITY_VALUE_ID'] = $property_fields['VALUE_ID'] = $field->getParentEntityId();
+
+//$arUserFields = $USER_FIELD_MANAGER->GetUserFields($field->getPropertyEntity()->getRaw('ENTITY_ID'), $property_fields['ENTITY_VALUE_ID'], LANGUAGE_ID);
+//pre($arUserFields[$propertyEntity->getCode()]['VALUE']);
+
+echo $USER_FIELD_MANAGER->GetEditFormHTML(false, $field->getValue(), $property_fields);
diff --git a/templates/form/field/UserField/filter.php b/templates/form/field/UserField/filter.php
new file mode 100644
index 0000000..b3d9bbc
--- /dev/null
+++ b/templates/form/field/UserField/filter.php
@@ -0,0 +1 @@
+<?php
diff --git a/templates/form/field/UserField/view.php b/templates/form/field/UserField/view.php
new file mode 100644
index 0000000..b3d9bbc
--- /dev/null
+++ b/templates/form/field/UserField/view.php
@@ -0,0 +1 @@
+<?php
diff --git a/templates/form/field/iBlockProperty/edit.php b/templates/form/field/iBlockProperty/edit.php
new file mode 100644
index 0000000..4c36aaf
--- /dev/null
+++ b/templates/form/field/iBlockProperty/edit.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * @var Shell $this
+ * @var DefaultField $field
+ * @var PropertyEntity $propertyEntity
+ */
+
+use Wt\Core\Entity\IBlock\PropertyEntity;
+use Wt\Core\Form\Field\DefaultField;
+use Wt\Core\Templater\Shell;
+
+require_once app()->module()->getDir() . '/templates/admin_bitrix_assets.php';
+
+$propertyEntity = $field->getPropertyEntity();
+
+?>
+<tr>
+    <td width="30%" class="adm-detail-content-cell-l"><?=$field->getLabel()?></td>
+    <td class="adm-detail-content-cell-r"><?php
+
+        $restoredValue = $field->getPropertyValue()->getRestoredValue();
+        $extValues = [];
+        if($field->isMultiple()){
+            foreach ($restoredValue['VALUE'] as $k => $v){
+                if($v){
+                    $extValues[$k] = ['VALUE' => $v, 'DESCRIPTION' => (string)$restoredValue['DESCRIPTION'][$k]];
+                }
+            }
+        } else {
+            if($restoredValue['VALUE']){
+                $extValues[] = ['VALUE' => $restoredValue['VALUE'], 'DESCRIPTION' => (string)$restoredValue['DESCRIPTION']];
+            }
+        }
+
+
+        if($field->isMultiple() ){
+            $shortValues = $field->getValue();
+        } else {
+            $shortValues = [];
+            $value = $field->getValue();
+            if(mb_strlen($value)){
+                $shortValues = (array)$value;
+            }
+        }
+
+
+        if($propertyEntity->isWithDescription()) {
+            $values = $extValues;
+        } else {
+            $values = $shortValues;
+        }
+
+        $property_fields = $propertyEntity->getRaw();
+        $property_fields['USER_TYPE_SETTINGS'] = $propertyEntity->getSettings();
+
+        if($propertyEntity->getUserType()){
+            $property_fields['VALUE'] = $shortValues;
+            $property_fields['~VALUE'] = $extValues;
+        }
+        unset($property_fields['USER_TYPE_SETTINGS_LIST']);
+
+        _ShowPropertyField(
+            $field->getName(),
+            $property_fields,
+            $values,
+            $field->isNew(),
+            false,
+            50000,
+            $field->getForm()->getName(),
+            false
+        );
+        ?></td>
+</tr>
diff --git a/templates/form/field/iBlockProperty/filter.php b/templates/form/field/iBlockProperty/filter.php
new file mode 100644
index 0000000..b3d9bbc
--- /dev/null
+++ b/templates/form/field/iBlockProperty/filter.php
@@ -0,0 +1 @@
+<?php
diff --git a/templates/form/field/iBlockProperty/view.php b/templates/form/field/iBlockProperty/view.php
new file mode 100644
index 0000000..b3d9bbc
--- /dev/null
+++ b/templates/form/field/iBlockProperty/view.php
@@ -0,0 +1 @@
+<?php
diff --git a/templates/form/field/iblockproperty.php b/templates/form/field/iblockproperty.php
deleted file mode 100644
index 39541bf..0000000
--- a/templates/form/field/iblockproperty.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * @var \Wt\Core\Templater\Shell $this
- * @var \Wt\Core\Form\Field\DefaultField $field
- */
-
-use Bitrix\Main\Page\Asset;
-use Wt\Core\Templater\Tools;
-\Bitrix\Main\Loader::includeModule('iblock');
-require_once($_SERVER["DOCUMENT_ROOT"]."/bitrix/modules/iblock/prolog.php");
-Bitrix\Main\Page\Asset::getInstance()->addJs('/bitrix/js/iblock/iblock_edit.js');
-Asset::getInstance()->addJs("/bitrix/js/main/core/core.js");
-\Bitrix\Main\UI\Extension::load(array("popup", "ajax", "ui.buttons", "ui.forms", "main.polyfill.core", "color_picker"));
-$bLabel = mb_strlen($field->getLabel());
-$labelAttrs = [];
-if(mb_strlen($field->getId())){
-    $labelAttrs['for'] = $field->getId();
-}
-if($bLabel){?><label <?=Tools::getAttrByArray($labelAttrs)?>><?=$field->getLabel()?></label><?}
-$inputAttributes = $field->getAttributes();
-$inputAttributes['data-dirty'] = $field->isDirty()?'true':'false';
-if($field->isMultiple()){
-    $inputAttributes['name'] = preg_replace('/\[]$/', '', $inputAttributes['name']) . '[]';
-}
-unset($inputAttributes['options']);
-
-_ShowPropertyField($field->getName(), $field->getPropertyEntity()->getRaw(), [], false, false, 50000, $field->getForm()->getName(), false);
-echo "\n\r";
\ No newline at end of file
diff --git a/templates/form/field/input.php b/templates/form/field/input.php
deleted file mode 100644
index e21a9d6..0000000
--- a/templates/form/field/input.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * @var \Wt\Core\Templater\Shell $this
- * @var \Wt\Core\Form\Field\DefaultField $field
- */
-use Wt\Core\Templater\Tools;
-
-$bLabel = mb_strlen($field->getLabel());
-$labelAttrs = [];
-if(mb_strlen($field->getId())){
-    $labelAttrs['for'] = $field->getId();
-}
-if($bLabel){?><label <?=Tools::getAttrByArray($labelAttrs)?>><?=$field->getLabel()?></label><?}
-$inputAttributes = $field->getAttributes();
-$inputAttributes['data-dirty'] = $field->isDirty()?'true':'false';
-
- ?><input <?=Tools::getAttrByArray($inputAttributes)?>><?
-echo "\n\r";
\ No newline at end of file
diff --git a/templates/form/field/input/edit.php b/templates/form/field/input/edit.php
new file mode 100644
index 0000000..17434db
--- /dev/null
+++ b/templates/form/field/input/edit.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * @var \Wt\Core\Templater\Shell $this
+ * @var \Wt\Core\Form\Field\DefaultField $field
+ */
+use Wt\Core\Templater\Tools;
+$bLabel = mb_strlen($field->getLabel());
+$labelAttrs = [];
+if(mb_strlen($field->getId())){
+    $labelAttrs['for'] = $field->getId();
+}
+if($bLabel){?><label <?=Tools::getAttrByArray($labelAttrs)?>><?=$field->getLabel()?></label><?}
+
+if($field->isMultiple()){
+    foreach ($field->getValue() as $value){
+        $inputAttributes = $field->getAttributes();
+        $inputAttributes['name'] .= '[]';
+        $inputAttributes['value'] = $value;
+        ?><input <?=Tools::getAttrByArray($inputAttributes)?>><?
+        echo "\n\r";
+    }
+    $inputAttributes = $field->getAttributes();
+    $inputAttributes['name'] .= '[]';
+    $inputAttributes['value'] = '';
+    ?><input <?=Tools::getAttrByArray($inputAttributes)?>><?
+    echo "\n\r";
+} else {
+    $inputAttributes = $field->getAttributes();
+    $inputAttributes['data-dirty'] = $field->isDirty()?'true':'false';
+    ?><input <?=Tools::getAttrByArray($inputAttributes)?>><?
+    echo "\n\r";
+}
\ No newline at end of file
diff --git a/templates/form/field/input/filter.php b/templates/form/field/input/filter.php
new file mode 100644
index 0000000..b3d9bbc
--- /dev/null
+++ b/templates/form/field/input/filter.php
@@ -0,0 +1 @@
+<?php
diff --git a/templates/form/field/input/view.php b/templates/form/field/input/view.php
new file mode 100644
index 0000000..b3d9bbc
--- /dev/null
+++ b/templates/form/field/input/view.php
@@ -0,0 +1 @@
+<?php
diff --git a/templates/form/field/select.php b/templates/form/field/select/edit.php
similarity index 100%
rename from templates/form/field/select.php
rename to templates/form/field/select/edit.php
diff --git a/templates/form/field/select/filter.php b/templates/form/field/select/filter.php
new file mode 100644
index 0000000..b3d9bbc
--- /dev/null
+++ b/templates/form/field/select/filter.php
@@ -0,0 +1 @@
+<?php
diff --git a/templates/form/field/select/view.php b/templates/form/field/select/view.php
new file mode 100644
index 0000000..b3d9bbc
--- /dev/null
+++ b/templates/form/field/select/view.php
@@ -0,0 +1 @@
+<?php
diff --git a/templates/form/field/textarea.php b/templates/form/field/textarea/edit.php
similarity index 100%
rename from templates/form/field/textarea.php
rename to templates/form/field/textarea/edit.php
diff --git a/templates/form/field/textarea/filter.php b/templates/form/field/textarea/filter.php
new file mode 100644
index 0000000..b3d9bbc
--- /dev/null
+++ b/templates/form/field/textarea/filter.php
@@ -0,0 +1 @@
+<?php
diff --git a/templates/form/field/textarea/view.php b/templates/form/field/textarea/view.php
new file mode 100644
index 0000000..b3d9bbc
--- /dev/null
+++ b/templates/form/field/textarea/view.php
@@ -0,0 +1 @@
+<?php