diff --git a/src/assets/js/NSyncPluginAsset.js b/src/assets/js/NSyncPluginAsset.js
index d855f9f6..d723675a 100644
--- a/src/assets/js/NSyncPluginAsset.js
+++ b/src/assets/js/NSyncPluginAsset.js
@@ -87,7 +87,7 @@
         addDynamicFormListener: function (event) {
             var that = this;
             $(this.element).find(this.options.dynamicFormWidgetContainer).on('afterDelete afterInsert', function (event) {
-                if (!that.element.find(that.options.inlineFieldSelector).data('touched')) {
+                if (!$(that.element).find(that.options.inlineFieldSelector).data('touched')) {
                     that.updateInlineForm(event);
                 }
             });
diff --git a/src/models/Ns.php b/src/models/Ns.php
index 4d8c94c8..d0e2073c 100644
--- a/src/models/Ns.php
+++ b/src/models/Ns.php
@@ -3,6 +3,7 @@
 namespace hipanel\modules\domain\models;
 
 use hipanel\base\Model;
+use hipanel\modules\dns\validators\DomainPartValidator;
 use Yii;
 
 class Ns extends Model
@@ -13,6 +14,7 @@ public function rules()
     {
         return [
             [['name', 'ip'], 'filter', 'filter' => 'trim'],
+            [['name'],  DomainPartValidator::className()],
         ];
     }
 
diff --git a/src/widgets/views/ns.php b/src/widgets/views/ns.php
index ecc7bef1..2ff51b1b 100644
--- a/src/widgets/views/ns.php
+++ b/src/widgets/views/ns.php
@@ -1,6 +1,7 @@
 <?php
 
 use hipanel\modules\domain\assets\NSyncPluginAsset;
+use hipanel\widgets\Box;
 use hipanel\widgets\Pjax;
 use hiqdev\assets\icheck\iCheckAsset;
 use wbraganca\dynamicform\DynamicFormWidget;
@@ -10,14 +11,12 @@
 
 Yii::$app->assetManager->forceCopy = true;
 
-iCheckAsset::register($this);
 NSyncPluginAsset::register($this);
 
-$this->registerJs("$('#nss-form-pjax').NSync();");
-
 ?>
 
-<?php Pjax::begin(['id' => 'nss-form-pjax', 'enableReplaceState' => false, 'scrollTo' => true]) ?>
+<?php Pjax::begin(['id' => 'nss-form-pjax', 'enablePushState' => false, 'enableReplaceState' => false]) ?>
+<?php $this->registerJs("$('#nss-form-pjax').NSync();"); ?>
 <?php $form = ActiveForm::begin([
     'id' => 'dynamic-form',
     'action' => 'set-nss',
@@ -29,25 +28,20 @@
 <?= Html::activeHiddenInput($model, "id") ?>
 <?= Html::activeHiddenInput($model, "domain") ?>
 
-    <div class="row">
-        <div class="col-md-12 text-right ">
-            <?= Html::submitButton(Yii::t('app', 'Save'), ['class' => 'btn btn-default']) ?>
-        </div>
-    </div>
-
+    <?php Box::begin(); ?>
     <div class="row" style="margin-top: 15pt;">
-        <div class="col-md-12">
-            <div class="panel panel-info">
-                <div class="panel-body inline-form-selector">
-                    <?= $form->field($model, 'nameservers') ?>
-                </div>
-            </div>
+        <div class="col-md-10 inline-form-selector">
+            <?= Html::activeTextInput($model, 'nameservers', ['class' => 'form-control']) ?>
+        </div>
+        <div class="col-md-2 text-right">
+            <?= Html::submitButton(Yii::t('app', 'Save'), ['class' => 'btn btn-default']) ?>
         </div>
     </div>
+    <?php Box::end(); ?>
 
     <div class="row">
         <div class="col-md-12">
-            <div class="panel panel-info">
+            <div class="panel panel-default">
                 <div class="panel-body">
                     <?php DynamicFormWidget::begin([
                         'widgetContainer' => 'dynamicform_wrapper', // required: only alphanumeric characters plus "_" [A-Za-z0-9_]