diff --git a/interface/web/dns/dns_soa_edit.php b/interface/web/dns/dns_soa_edit.php
index e9f0fe19b155f0583f046de7c99bc42f51167eb3..24ff16460bd5bffbf5390c73f8253dacb95c1d59 100644
--- a/interface/web/dns/dns_soa_edit.php
+++ b/interface/web/dns/dns_soa_edit.php
@@ -110,7 +110,7 @@ class page_action extends tform_actions {
 				unset($tmp);
 			// When the record is inserted
 			} else {
-				// set the server ID to the default mailserver of the client
+				// set the server ID to the default dnsserver of the client
 				$this->dataRecord["server_id"] = $client["default_dnsserver"];
 				
 				// Check if the user may add another maildomain.
diff --git a/interface/web/dns/templates/dns_a_edit.htm b/interface/web/dns/templates/dns_a_edit.htm
index 9b7968e1e4ba6b577c14f707408b7b20f14dd01a..7ee7e2e368381eafcef5b48c7e2e638c5787fe22 100644
--- a/interface/web/dns/templates/dns_a_edit.htm
+++ b/interface/web/dns/templates/dns_a_edit.htm
@@ -1,35 +1,35 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-
-<div class="panel panel_dns_a">
-
-  <div class="pnl_formsarea">
-    <fieldset id="wf_area_dns_a"><legend>DNS A</legend>
-      <span class="wf_oneField">
-        <label for="name" class="wf_preField">{tmpl_var name='name_txt'}</label>
-        <input type="text" id="name" name="name" value="{tmpl_var name='name'}" size="30" maxlength="255">
-      </span>
-      <span class="wf_oneField">
-        <label for="data" class="wf_preField">{tmpl_var name='data_txt'}</label>
-        <input type="text" id="data" name="data" value="{tmpl_var name='data'}" size="30" maxlength="255">
-      </span>
-      <span class="wf_oneField">
-        <label for="ttl" class="wf_preField">{tmpl_var name='ttl_txt'}</label>
-        <input type="text" id="ttl" name="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10">
-      </span>
-      <span class="wf_oneField">
-        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    
-        <span class="">{tmpl_var name='active'}</span>
-      </span>
-    </fieldset>
-
-    <input type="hidden" name="id" value="{tmpl_var name='id'}">
-    <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
-    <input type="hidden" name="type" value="{tmpl_var name='type'}">
-
-    <div class="wf_actions buttons">
-      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_a_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
-      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_a_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
-    </div>
-  </div>
-  
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_dns_a">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_dns_a"><legend>DNS A</legend>
+      <span class="wf_oneField">
+        <label for="name" class="wf_preField">{tmpl_var name='name_txt'}</label>
+        <input type="text" id="name" name="name" value="{tmpl_var name='name'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="data" class="wf_preField">{tmpl_var name='data_txt'}</label>
+        <input type="text" id="data" name="data" value="{tmpl_var name='data'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="ttl" class="wf_preField">{tmpl_var name='ttl_txt'}</label>
+        <input type="text" id="ttl" name="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10">
+      </span>
+      <span class="wf_oneField">
+        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    
+        <span class="">{tmpl_var name='active'}</span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+    <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
+    <input type="hidden" name="type" value="{tmpl_var name='type'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_a_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/dns/templates/dns_alias_edit.htm b/interface/web/dns/templates/dns_alias_edit.htm
index e6b593c0701728f7d99e99029ce7c69dec083b31..d28f6be77e133194ddf4031b7a6b995f7e3f65eb 100644
--- a/interface/web/dns/templates/dns_alias_edit.htm
+++ b/interface/web/dns/templates/dns_alias_edit.htm
@@ -1,35 +1,35 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-
-<div class="panel panel_dns_alias">
-
-  <div class="pnl_formsarea">
-    <fieldset id="wf_area_dns_alias"><legend>DNS ALIAS</legend>
-      <span class="wf_oneField">
-        <label for="name" class="wf_preField">{tmpl_var name='name_txt'}</label>
-        <input type="text" id="name" name="name" value="{tmpl_var name='name'}" size="30" maxlength="255">
-      </span>
-      <span class="wf_oneField">
-        <label for="data" class="wf_preField">{tmpl_var name='data_txt'}</label>
-        <input type="text" id="data" name="data" value="{tmpl_var name='data'}" size="30" maxlength="255">
-      </span>
-      <span class="wf_oneField">
-        <label for="ttl" class="wf_preField">{tmpl_var name='ttl_txt'}</label>
-        <input type="text" id="ttl" name="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10">
-      </span>
-      <span class="wf_oneField">
-        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    
-        <span class="">{tmpl_var name='active'}</span>
-      </span>
-    </fieldset>
-
-    <input type="hidden" name="id" value="{tmpl_var name='id'}">
-    <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
-    <input type="hidden" name="type" value="{tmpl_var name='type'}">
-
-    <div class="wf_actions buttons">
-      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_alias_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
-      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_a_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
-    </div>
-  </div>
-  
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_dns_alias">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_dns_alias"><legend>DNS ALIAS</legend>
+      <span class="wf_oneField">
+        <label for="name" class="wf_preField">{tmpl_var name='name_txt'}</label>
+        <input type="text" id="name" name="name" value="{tmpl_var name='name'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="data" class="wf_preField">{tmpl_var name='data_txt'}</label>
+        <input type="text" id="data" name="data" value="{tmpl_var name='data'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="ttl" class="wf_preField">{tmpl_var name='ttl_txt'}</label>
+        <input type="text" id="ttl" name="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10">
+      </span>
+      <span class="wf_oneField">
+        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    
+        <span class="">{tmpl_var name='active'}</span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+    <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
+    <input type="hidden" name="type" value="{tmpl_var name='type'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_alias_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/dns/templates/dns_cname_edit.htm b/interface/web/dns/templates/dns_cname_edit.htm
index f3436bad6149c2cc157ef010e5c92af25c4e72a0..20ff6e36567ddcbc6c0a70adbf7c3b397293db3c 100644
--- a/interface/web/dns/templates/dns_cname_edit.htm
+++ b/interface/web/dns/templates/dns_cname_edit.htm
@@ -1,35 +1,35 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-
-<div class="panel panel_dns_cname">
-
-  <div class="pnl_formsarea">
-    <fieldset id="wf_area_dns_cname"><legend>DNS CNAME</legend>
-      <span class="wf_oneField">
-        <label for="name" class="wf_preField">{tmpl_var name='name_txt'}</label>
-        <input type="text" id="name" name="name" value="{tmpl_var name='name'}" size="30" maxlength="255">
-      </span>
-      <span class="wf_oneField">
-        <label for="data" class="wf_preField">{tmpl_var name='data_txt'}</label>
-        <input type="text" id="data" name="data" value="{tmpl_var name='data'}" size="30" maxlength="255">
-      </span>
-      <span class="wf_oneField">
-        <label for="ttl" class="wf_preField">{tmpl_var name='ttl_txt'}</label>
-        <input type="text" id="ttl" name="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10">
-      </span>
-      <span class="wf_oneField">
-        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    
-        <span class="">{tmpl_var name='active'}</span>
-      </span>
-    </fieldset>
-
-    <input type="hidden" name="id" value="{tmpl_var name='id'}">
-    <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
-    <input type="hidden" name="type" value="{tmpl_var name='type'}">
-
-    <div class="wf_actions buttons">
-      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_cname_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
-      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_a_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
-    </div>
-  </div>
-  
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_dns_cname">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_dns_cname"><legend>DNS CNAME</legend>
+      <span class="wf_oneField">
+        <label for="name" class="wf_preField">{tmpl_var name='name_txt'}</label>
+        <input type="text" id="name" name="name" value="{tmpl_var name='name'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="data" class="wf_preField">{tmpl_var name='data_txt'}</label>
+        <input type="text" id="data" name="data" value="{tmpl_var name='data'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="ttl" class="wf_preField">{tmpl_var name='ttl_txt'}</label>
+        <input type="text" id="ttl" name="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10">
+      </span>
+      <span class="wf_oneField">
+        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    
+        <span class="">{tmpl_var name='active'}</span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+    <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
+    <input type="hidden" name="type" value="{tmpl_var name='type'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_cname_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/dns/templates/dns_hinfo_edit.htm b/interface/web/dns/templates/dns_hinfo_edit.htm
index 92de577dbf4e54a35c5d333f091e749ce8004efc..856d83753274104551718b3df1412f48cc23b71d 100644
--- a/interface/web/dns/templates/dns_hinfo_edit.htm
+++ b/interface/web/dns/templates/dns_hinfo_edit.htm
@@ -1,35 +1,35 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-
-<div class="panel panel_dns_hinfo">
-
-  <div class="pnl_formsarea">
-    <fieldset id="wf_area_dns_hinfo"><legend>DNS HINFO</legend>
-      <span class="wf_oneField">
-        <label for="name" class="wf_preField">{tmpl_var name='name_txt'}</label>
-        <input type="text" id="name" name="name" value="{tmpl_var name='name'}" size="30" maxlength="255">
-      </span>
-      <span class="wf_oneField">
-        <label for="data" class="wf_preField">{tmpl_var name='data_txt'}</label>
-        <input type="text" id="data" name="data" value="{tmpl_var name='data'}" size="30" maxlength="255">
-      </span>
-      <span class="wf_oneField">
-        <label for="ttl" class="wf_preField">{tmpl_var name='ttl_txt'}</label>
-        <input type="text" id="ttl" name="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10">
-      </span>
-      <span class="wf_oneField">
-        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    
-        <span class="">{tmpl_var name='active'}</span>
-      </span>
-    </fieldset>
-
-    <input type="hidden" name="id" value="{tmpl_var name='id'}">
-    <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
-    <input type="hidden" name="type" value="{tmpl_var name='type'}">
-
-    <div class="wf_actions buttons">
-      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_hinfo_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
-      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_a_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
-    </div>
-  </div>
-  
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_dns_hinfo">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_dns_hinfo"><legend>DNS HINFO</legend>
+      <span class="wf_oneField">
+        <label for="name" class="wf_preField">{tmpl_var name='name_txt'}</label>
+        <input type="text" id="name" name="name" value="{tmpl_var name='name'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="data" class="wf_preField">{tmpl_var name='data_txt'}</label>
+        <input type="text" id="data" name="data" value="{tmpl_var name='data'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="ttl" class="wf_preField">{tmpl_var name='ttl_txt'}</label>
+        <input type="text" id="ttl" name="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10">
+      </span>
+      <span class="wf_oneField">
+        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    
+        <span class="">{tmpl_var name='active'}</span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+    <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
+    <input type="hidden" name="type" value="{tmpl_var name='type'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_hinfo_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/dns/templates/dns_mx_edit.htm b/interface/web/dns/templates/dns_mx_edit.htm
index ffc722531f1234732fbb8f1cbfb9cd069537d151..9641444f2a277d792df84fc790bc77c4475a7cf0 100644
--- a/interface/web/dns/templates/dns_mx_edit.htm
+++ b/interface/web/dns/templates/dns_mx_edit.htm
@@ -1,39 +1,39 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-
-<div class="panel panel_dns_mx">
-
-  <div class="pnl_formsarea">
-    <fieldset id="wf_area_dns_mx"><legend>DNS mx</legend>
-      <span class="wf_oneField">
-        <label for="name" class="wf_preField">{tmpl_var name='name_txt'}</label>
-        <input type="text" id="name" name="name" value="{tmpl_var name='name'}" size="30" maxlength="255">
-      </span>
-      <span class="wf_oneField">
-        <label for="data" class="wf_preField">{tmpl_var name='data_txt'}</label>
-        <input type="text" id="data" name="data" value="{tmpl_var name='data'}" size="30" maxlength="255">
-      </span>
-      <span class="wf_oneField">
-        <label for="aux" class="wf_preField">{tmpl_var name='aux_txt'}</label>
-        <input type="text" id="aux" name="aux" value="{tmpl_var name='aux'}" size="10" maxlength="10">
-      </span>
-      <span class="wf_oneField">
-        <label for="ttl" class="wf_preField">{tmpl_var name='ttl_txt'}</label>
-        <input type="text" id="ttl" name="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10">
-      </span>
-      <span class="wf_oneField">
-        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    
-        <span class="">{tmpl_var name='active'}</span>
-      </span>
-    </fieldset>
-
-    <input type="hidden" name="id" value="{tmpl_var name='id'}">
-    <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
-    <input type="hidden" name="type" value="{tmpl_var name='type'}">
-
-    <div class="wf_actions buttons">
-      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_mx_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
-      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_a_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
-    </div>
-  </div>
-  
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_dns_mx">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_dns_mx"><legend>DNS mx</legend>
+      <span class="wf_oneField">
+        <label for="name" class="wf_preField">{tmpl_var name='name_txt'}</label>
+        <input type="text" id="name" name="name" value="{tmpl_var name='name'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="data" class="wf_preField">{tmpl_var name='data_txt'}</label>
+        <input type="text" id="data" name="data" value="{tmpl_var name='data'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="aux" class="wf_preField">{tmpl_var name='aux_txt'}</label>
+        <input type="text" id="aux" name="aux" value="{tmpl_var name='aux'}" size="10" maxlength="10">
+      </span>
+      <span class="wf_oneField">
+        <label for="ttl" class="wf_preField">{tmpl_var name='ttl_txt'}</label>
+        <input type="text" id="ttl" name="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10">
+      </span>
+      <span class="wf_oneField">
+        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    
+        <span class="">{tmpl_var name='active'}</span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+    <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
+    <input type="hidden" name="type" value="{tmpl_var name='type'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_mx_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/dns/templates/dns_ns_edit.htm b/interface/web/dns/templates/dns_ns_edit.htm
index 3f0e49e814b39e0c838474539ee34a3747989080..486c396b77948684e5f909f6c88b0ed4e5395208 100644
--- a/interface/web/dns/templates/dns_ns_edit.htm
+++ b/interface/web/dns/templates/dns_ns_edit.htm
@@ -1,35 +1,35 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-
-<div class="panel panel_dns_ns">
-
-  <div class="pnl_formsarea">
-    <fieldset id="wf_area_dns_ns"><legend>DNS ns</legend>
-      <span class="wf_oneField">
-        <label for="name" class="wf_preField">{tmpl_var name='name_txt'}</label>
-        <input type="text" id="name" name="name" value="{tmpl_var name='name'}" size="30" maxlength="255">
-      </span>
-      <span class="wf_oneField">
-        <label for="data" class="wf_preField">{tmpl_var name='data_txt'}</label>
-        <input type="text" id="data" name="data" value="{tmpl_var name='data'}" size="30" maxlength="255">
-      </span>
-      <span class="wf_oneField">
-        <label for="ttl" class="wf_preField">{tmpl_var name='ttl_txt'}</label>
-        <input type="text" id="ttl" name="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10">
-      </span>
-      <span class="wf_oneField">
-        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    
-        <span class="">{tmpl_var name='active'}</span>
-      </span>
-    </fieldset>
-
-    <input type="hidden" name="id" value="{tmpl_var name='id'}">
-    <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
-    <input type="hidden" name="type" value="{tmpl_var name='type'}">
-
-    <div class="wf_actions buttons">
-      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_ns_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
-      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_a_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
-    </div>
-  </div>
-  
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_dns_ns">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_dns_ns"><legend>DNS ns</legend>
+      <span class="wf_oneField">
+        <label for="name" class="wf_preField">{tmpl_var name='name_txt'}</label>
+        <input type="text" id="name" name="name" value="{tmpl_var name='name'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="data" class="wf_preField">{tmpl_var name='data_txt'}</label>
+        <input type="text" id="data" name="data" value="{tmpl_var name='data'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="ttl" class="wf_preField">{tmpl_var name='ttl_txt'}</label>
+        <input type="text" id="ttl" name="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10">
+      </span>
+      <span class="wf_oneField">
+        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    
+        <span class="">{tmpl_var name='active'}</span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+    <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
+    <input type="hidden" name="type" value="{tmpl_var name='type'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_ns_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/dns/templates/dns_ptr_edit.htm b/interface/web/dns/templates/dns_ptr_edit.htm
index f31fa12cc320e800db4ff38512cb43670bb5ae93..b923ef90c25b41142f499dfdf83e04803ffb76c3 100644
--- a/interface/web/dns/templates/dns_ptr_edit.htm
+++ b/interface/web/dns/templates/dns_ptr_edit.htm
@@ -1,35 +1,35 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-
-<div class="panel panel_dns_ptr">
-
-  <div class="pnl_formsarea">
-    <fieldset id="wf_area_dns_ptr"><legend>DNS ptr</legend>
-      <span class="wf_oneField">
-        <label for="name" class="wf_preField">{tmpl_var name='name_txt'}</label>
-        <input type="text" id="name" name="name" value="{tmpl_var name='name'}" size="30" maxlength="255">
-      </span>
-      <span class="wf_oneField">
-        <label for="data" class="wf_preField">{tmpl_var name='data_txt'}</label>
-        <input type="text" id="data" name="data" value="{tmpl_var name='data'}" size="30" maxlength="255">
-      </span>
-      <span class="wf_oneField">
-        <label for="ttl" class="wf_preField">{tmpl_var name='ttl_txt'}</label>
-        <input type="text" id="ttl" name="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10">
-      </span>
-      <span class="wf_oneField">
-        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    
-        <span class="">{tmpl_var name='active'}</span>
-      </span>
-    </fieldset>
-
-    <input type="hidden" name="id" value="{tmpl_var name='id'}">
-    <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
-    <input type="hidden" name="type" value="{tmpl_var name='type'}">
-
-    <div class="wf_actions buttons">
-      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_ptr_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
-      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_a_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
-    </div>
-  </div>
-  
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_dns_ptr">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_dns_ptr"><legend>DNS ptr</legend>
+      <span class="wf_oneField">
+        <label for="name" class="wf_preField">{tmpl_var name='name_txt'}</label>
+        <input type="text" id="name" name="name" value="{tmpl_var name='name'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="data" class="wf_preField">{tmpl_var name='data_txt'}</label>
+        <input type="text" id="data" name="data" value="{tmpl_var name='data'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="ttl" class="wf_preField">{tmpl_var name='ttl_txt'}</label>
+        <input type="text" id="ttl" name="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10">
+      </span>
+      <span class="wf_oneField">
+        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    
+        <span class="">{tmpl_var name='active'}</span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+    <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
+    <input type="hidden" name="type" value="{tmpl_var name='type'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_ptr_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/dns/templates/dns_rp_edit.htm b/interface/web/dns/templates/dns_rp_edit.htm
index 5795aed925056f5325e3f3783f3e4baf1cb7c9f5..9959e96c25df63c4118b90f1dd583db4e2c645c5 100644
--- a/interface/web/dns/templates/dns_rp_edit.htm
+++ b/interface/web/dns/templates/dns_rp_edit.htm
@@ -1,35 +1,35 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-
-<div class="panel panel_dns_rp">
-
-  <div class="pnl_formsarea">
-    <fieldset id="wf_area_dns_rp"><legend>DNS RP</legend>
-      <span class="wf_oneField">
-        <label for="name" class="wf_preField">{tmpl_var name='name_txt'}</label>
-        <input type="text" id="name" name="name" value="{tmpl_var name='name'}" size="30" maxlength="255">
-      </span>
-      <span class="wf_oneField">
-        <label for="data" class="wf_preField">{tmpl_var name='data_txt'}</label>
-        <input type="text" id="data" name="data" value="{tmpl_var name='data'}" size="30" maxlength="255">
-      </span>
-      <span class="wf_oneField">
-        <label for="ttl" class="wf_preField">{tmpl_var name='ttl_txt'}</label>
-        <input type="text" id="ttl" name="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10">
-      </span>
-      <span class="wf_oneField">
-        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    
-        <span class="">{tmpl_var name='active'}</span>
-      </span>
-    </fieldset>
-
-    <input type="hidden" name="id" value="{tmpl_var name='id'}">
-    <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
-    <input type="hidden" name="type" value="{tmpl_var name='type'}">
-
-    <div class="wf_actions buttons">
-      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_rp_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
-      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_a_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
-    </div>
-  </div>
-  
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_dns_rp">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_dns_rp"><legend>DNS RP</legend>
+      <span class="wf_oneField">
+        <label for="name" class="wf_preField">{tmpl_var name='name_txt'}</label>
+        <input type="text" id="name" name="name" value="{tmpl_var name='name'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="data" class="wf_preField">{tmpl_var name='data_txt'}</label>
+        <input type="text" id="data" name="data" value="{tmpl_var name='data'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="ttl" class="wf_preField">{tmpl_var name='ttl_txt'}</label>
+        <input type="text" id="ttl" name="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10">
+      </span>
+      <span class="wf_oneField">
+        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    
+        <span class="">{tmpl_var name='active'}</span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+    <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
+    <input type="hidden" name="type" value="{tmpl_var name='type'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_rp_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/dns/templates/dns_srv_edit.htm b/interface/web/dns/templates/dns_srv_edit.htm
index 40d71da0df56f407247987f9ff64aa40496e3031..3fe0b28ee0120d41d2d1b880386502139455bd88 100644
--- a/interface/web/dns/templates/dns_srv_edit.htm
+++ b/interface/web/dns/templates/dns_srv_edit.htm
@@ -1,35 +1,35 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-
-<div class="panel panel_dns_srv">
-
-  <div class="pnl_formsarea">
-    <fieldset id="wf_area_dns_srv"><legend>DNS SRV</legend>
-      <span class="wf_oneField">
-        <label for="name" class="wf_preField">{tmpl_var name='name_txt'}</label>
-        <input type="text" id="name" name="name" value="{tmpl_var name='name'}" size="30" maxlength="255">
-      </span>
-      <span class="wf_oneField">
-        <label for="data" class="wf_preField">{tmpl_var name='data_txt'}</label>
-        <input type="text" id="data" name="data" value="{tmpl_var name='data'}" size="30" maxlength="255">
-      </span>
-      <span class="wf_oneField">
-        <label for="ttl" class="wf_preField">{tmpl_var name='ttl_txt'}</label>
-        <input type="text" id="ttl" name="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10">
-      </span>
-      <span class="wf_oneField">
-        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    
-        <span class="">{tmpl_var name='active'}</span>
-      </span>
-    </fieldset>
-
-    <input type="hidden" name="id" value="{tmpl_var name='id'}">
-    <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
-    <input type="hidden" name="type" value="{tmpl_var name='type'}">
-
-    <div class="wf_actions buttons">
-      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_srv_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
-      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_a_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
-    </div>
-  </div>
-  
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_dns_srv">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_dns_srv"><legend>DNS SRV</legend>
+      <span class="wf_oneField">
+        <label for="name" class="wf_preField">{tmpl_var name='name_txt'}</label>
+        <input type="text" id="name" name="name" value="{tmpl_var name='name'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="data" class="wf_preField">{tmpl_var name='data_txt'}</label>
+        <input type="text" id="data" name="data" value="{tmpl_var name='data'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="ttl" class="wf_preField">{tmpl_var name='ttl_txt'}</label>
+        <input type="text" id="ttl" name="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10">
+      </span>
+      <span class="wf_oneField">
+        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    
+        <span class="">{tmpl_var name='active'}</span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+    <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
+    <input type="hidden" name="type" value="{tmpl_var name='type'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_srv_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>
diff --git a/interface/web/dns/templates/dns_txt_edit.htm b/interface/web/dns/templates/dns_txt_edit.htm
index 5c36bf3fcebe1b6839de36e9d932d4084e7af769..4d6b928a94a405d473f299d9bb366fbe17e897ba 100644
--- a/interface/web/dns/templates/dns_txt_edit.htm
+++ b/interface/web/dns/templates/dns_txt_edit.htm
@@ -1,35 +1,35 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-
-<div class="panel panel_dns_txt">
-
-  <div class="pnl_formsarea">
-    <fieldset id="wf_area_dns_txt"><legend>DNS TXT</legend>
-      <span class="wf_oneField">
-        <label for="name" class="wf_preField">{tmpl_var name='name_txt'}</label>
-        <input type="text" id="name" name="name" value="{tmpl_var name='name'}" size="30" maxlength="255">
-      </span>
-      <span class="wf_oneField">
-        <label for="data" class="wf_preField">{tmpl_var name='data_txt'}</label>
-        <input type="text" id="data" name="data" value="{tmpl_var name='data'}" size="30" maxlength="255">
-      </span>
-      <span class="wf_oneField">
-        <label for="ttl" class="wf_preField">{tmpl_var name='ttl_txt'}</label>
-        <input type="text" id="ttl" name="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10">
-      </span>
-      <span class="wf_oneField">
-        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    
-        <span class="">{tmpl_var name='active'}</span>
-      </span>
-    </fieldset>
-
-    <input type="hidden" name="id" value="{tmpl_var name='id'}">
-    <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
-    <input type="hidden" name="type" value="{tmpl_var name='type'}">
-
-    <div class="wf_actions buttons">
-      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_txt_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
-      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_a_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
-    </div>
-  </div>
-  
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_dns_txt">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_dns_txt"><legend>DNS TXT</legend>
+      <span class="wf_oneField">
+        <label for="name" class="wf_preField">{tmpl_var name='name_txt'}</label>
+        <input type="text" id="name" name="name" value="{tmpl_var name='name'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="data" class="wf_preField">{tmpl_var name='data_txt'}</label>
+        <input type="text" id="data" name="data" value="{tmpl_var name='data'}" size="30" maxlength="255">
+      </span>
+      <span class="wf_oneField">
+        <label for="ttl" class="wf_preField">{tmpl_var name='ttl_txt'}</label>
+        <input type="text" id="ttl" name="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10">
+      </span>
+      <span class="wf_oneField">
+        <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>                    
+        <span class="">{tmpl_var name='active'}</span>
+      </span>
+    </fieldset>
+
+    <input type="hidden" name="id" value="{tmpl_var name='id'}">
+    <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
+    <input type="hidden" name="type" value="{tmpl_var name='type'}">
+
+    <div class="wf_actions buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_txt_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>