diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc
index 0bce5bed9..cbb03f59d 100644
--- a/src/etc/inc/system.inc
+++ b/src/etc/inc/system.inc
@@ -278,7 +278,16 @@ function get_firmware_flavours()
 
 function get_zoneinfo()
 {
-    return timezone_identifiers_list(DateTimeZone::ALL ^ DateTimeZone::UTC);
+    $zones = timezone_identifiers_list(DateTimeZone::ALL ^ DateTimeZone::UTC);
+
+    $etcs = glob('/usr/share/zoneinfo/Etc/*');
+    foreach ($etcs as $etc) {
+        $zones[] = ltrim($etc, '/usr/share/zoneinfo/');
+    }
+
+    natsort($zones);
+
+    return $zones;
 }
 
 function get_searchdomains()
diff --git a/src/www/system_advanced_misc.php b/src/www/system_advanced_misc.php
index 4ea4d08b7..844a19b5a 100644
--- a/src/www/system_advanced_misc.php
+++ b/src/www/system_advanced_misc.php
@@ -78,7 +78,6 @@ function thermal_modules()
 
 if ($_SERVER['REQUEST_METHOD'] === 'GET') {
     $pconfig = array();
-    $pconfig['gw_switch_default'] = isset($config['system']['gw_switch_default']);
     $pconfig['powerd_enable'] = isset($config['system']['powerd_enable']);
     $pconfig['crypto_hardware'] = !empty($config['system']['crypto_hardware']) ? $config['system']['crypto_hardware'] : null;
     $pconfig['cryptodev_enable'] = isset($config['system']['cryptodev_enable']);
@@ -109,12 +108,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
     }
 
     if (count($input_errors) == 0) {
-        if (!empty($pconfig['gw_switch_default'])) {
-            $config['system']['gw_switch_default'] = true;
-        } elseif (isset($config['system']['gw_switch_default'])) {
-            unset($config['system']['gw_switch_default']);
-        }
-
         if (!empty($pconfig['powerd_enable'])) {
             $config['system']['powerd_enable'] = true;
         } elseif (isset($config['system']['powerd_enable'])) {
@@ -203,87 +196,12 @@ include("head.inc");
           <form method="post" name="iform" id="iform">
             <table class="table table-striped">
               <tr>
-                <td width="22%"><strong><?= gettext('Load Balancing') ?></strong></td>
+                <td width="22%"><strong><?= gettext('Cryptographic Hardware Acceleration') ?></strong></td>
                 <td width="78%" align="right">
                   <small><?=gettext("full help"); ?> </small>
                   <i class="fa fa-toggle-off text-danger"  style="cursor: pointer;" id="show_all_help_page" type="button"></i>
                 </td>
               </tr>
-              <tr>
-                <td><a id="help_for_gw_switch_default" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Gateway switching");?> </td>
-                <td>
-                  <input name="gw_switch_default" type="checkbox" id="gw_switch_default" value="yes" <?= !empty($pconfig['gw_switch_default']) ? "checked=\"checked\"" : "";?> />
-                  <strong><?=gettext("Allow default gateway switching"); ?></strong><br />
-                  <div class="hidden" for="help_for_gw_switch_default">
-                    <?=gettext("If the link where the default gateway resides fails " .
-                                        "switch the default gateway to another available one."); ?>
-                  </div>
-                </td>
-              </tr>
-              <tr>
-                <th colspan="2" valign="top" class="listtopic"><?=gettext("Power Savings"); ?></th>
-              </tr>
-              <tr>
-                <td><a id="help_for_powerd_enable" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Use PowerD"); ?></td>
-                <td>
-                  <input name="powerd_enable" type="checkbox" id="powerd_enable" value="yes" <?=!empty($pconfig['powerd_enable']) ? "checked=\"checked\"" : "";?> />
-                  <div class="hidden" for="help_for_powerd_enable">
-                    <?=gettext("The powerd utility monitors the system state and sets various power control " .
-                                        "options accordingly.  It offers four modes (maximum, minimum, adaptive " .
-                                        "and hiadaptive) that can be individually selected while on AC power or batteries. " .
-                                        "The modes maximum, minimum, adaptive and hiadaptive may be abbreviated max, " .
-                                        "min, adp, hadp.  Maximum mode chooses the highest performance values.  Minimum " .
-                                        "mode selects the lowest performance values to get the most power savings. " .
-                                        "Adaptive mode attempts to strike a balance by degrading performance when " .
-                                        "the system appears idle and increasing it when the system is busy.  It " .
-                                        "offers a good balance between a small performance loss for greatly " .
-                                        "increased power savings.  Hiadaptive mode is alike adaptive mode, but " .
-                                        "tuned for systems where performance and interactivity are more important " .
-                                        "than power consumption.  It raises frequency faster, drops slower and " .
-                                        "keeps twice lower CPU load."); ?>
-                  </div>
-                </td>
-              </tr>
-              <tr>
-                <td><i class="fa fa-info-circle text-muted"></i>  <?=gettext('On AC Power Mode') ?></td>
-                <td>
-                  <select name="powerd_ac_mode" class="selectpicker" data-style="btn-default" data-width="auto">
-                    <option value="hadp" <?=$pconfig['powerd_ac_mode']=="hadp" ? "selected=\"selected\"" : "";?>>
-                      <?=gettext("Hiadaptive");?>
-                    </option>
-                    <option value="adp" <?=$pconfig['powerd_ac_mode']=="adp" ? "selected=\"selected\"" : "";?>>
-                      <?=gettext("Adaptive");?>
-                    </option>
-                    <option value="min" <?=$pconfig['powerd_ac_mode']=="min" ? "selected=\"selected\"" : "";?>>
-                      <?=gettext("Minimum");?>
-                    </option>
-                    <option value="max" <?=$pconfig['powerd_ac_mode']=="max" ? " selected=\"selected\"" : "";?>>
-                      <?=gettext("Maximum");?>
-                    </option>
-                  </select>
-                </td>
-              <tr>
-                <td><i class="fa fa-info-circle text-muted"></i>  <?=gettext('On Battery Power Mode') ?></td>
-                <td>
-                  <select name="powerd_battery_mode" class="selectpicker" data-style="btn-default" data-width="auto">
-                    <option value="hadp"<?=$pconfig['powerd_battery_mode']=="hadp" ? "selected=\"selected\"" : "";?>>
-                      <?=gettext("Hiadaptive");?>
-                    </option>
-                    <option value="adp" <?=$pconfig['powerd_battery_mode']=="adp" ? "selected=\"selected\"" : "";?>>
-                      <?=gettext("Adaptive");?>
-                    </option>
-                    <option value="min" <?=$pconfig['powerd_battery_mode']=="min" ? "selected=\"selected\"" :"";?>>
-                      <?=gettext("Minimum");?>
-                    </option>
-                    <option value="max" <?=$pconfig['powerd_battery_mode']=="max" ? "selected=\"selected\"" : "";?>>
-                      <?=gettext("Maximum");?>
-                    </option>
-                  </select>
-                </td>
-              </tr>
-              <tr>
-                <th colspan="2" valign="top" class="listtopic"><?=gettext("Cryptographic Hardware Acceleration"); ?></th>
-              </tr>
               <tr>
                 <td><a id="help_for_crypto_hardware" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Hardware");?></td>
                 <td>
@@ -408,6 +326,67 @@ include("head.inc");
                   </div>
                 </td>
               </tr>
+              <tr>
+                <th colspan="2" valign="top" class="listtopic"><?=gettext("Power Savings"); ?></th>
+              </tr>
+              <tr>
+                <td><a id="help_for_powerd_enable" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Use PowerD"); ?></td>
+                <td>
+                  <input name="powerd_enable" type="checkbox" id="powerd_enable" value="yes" <?=!empty($pconfig['powerd_enable']) ? "checked=\"checked\"" : "";?> />
+                  <div class="hidden" for="help_for_powerd_enable">
+                    <?=gettext("The powerd utility monitors the system state and sets various power control " .
+                                        "options accordingly.  It offers four modes (maximum, minimum, adaptive " .
+                                        "and hiadaptive) that can be individually selected while on AC power or batteries. " .
+                                        "The modes maximum, minimum, adaptive and hiadaptive may be abbreviated max, " .
+                                        "min, adp, hadp.  Maximum mode chooses the highest performance values.  Minimum " .
+                                        "mode selects the lowest performance values to get the most power savings. " .
+                                        "Adaptive mode attempts to strike a balance by degrading performance when " .
+                                        "the system appears idle and increasing it when the system is busy.  It " .
+                                        "offers a good balance between a small performance loss for greatly " .
+                                        "increased power savings.  Hiadaptive mode is alike adaptive mode, but " .
+                                        "tuned for systems where performance and interactivity are more important " .
+                                        "than power consumption.  It raises frequency faster, drops slower and " .
+                                        "keeps twice lower CPU load."); ?>
+                  </div>
+                </td>
+              </tr>
+              <tr>
+                <td><i class="fa fa-info-circle text-muted"></i>  <?=gettext('On AC Power Mode') ?></td>
+                <td>
+                  <select name="powerd_ac_mode" class="selectpicker" data-style="btn-default" data-width="auto">
+                    <option value="hadp" <?=$pconfig['powerd_ac_mode']=="hadp" ? "selected=\"selected\"" : "";?>>
+                      <?=gettext("Hiadaptive");?>
+                    </option>
+                    <option value="adp" <?=$pconfig['powerd_ac_mode']=="adp" ? "selected=\"selected\"" : "";?>>
+                      <?=gettext("Adaptive");?>
+                    </option>
+                    <option value="min" <?=$pconfig['powerd_ac_mode']=="min" ? "selected=\"selected\"" : "";?>>
+                      <?=gettext("Minimum");?>
+                    </option>
+                    <option value="max" <?=$pconfig['powerd_ac_mode']=="max" ? " selected=\"selected\"" : "";?>>
+                      <?=gettext("Maximum");?>
+                    </option>
+                  </select>
+                </td>
+              <tr>
+                <td><i class="fa fa-info-circle text-muted"></i>  <?=gettext('On Battery Power Mode') ?></td>
+                <td>
+                  <select name="powerd_battery_mode" class="selectpicker" data-style="btn-default" data-width="auto">
+                    <option value="hadp"<?=$pconfig['powerd_battery_mode']=="hadp" ? "selected=\"selected\"" : "";?>>
+                      <?=gettext("Hiadaptive");?>
+                    </option>
+                    <option value="adp" <?=$pconfig['powerd_battery_mode']=="adp" ? "selected=\"selected\"" : "";?>>
+                      <?=gettext("Adaptive");?>
+                    </option>
+                    <option value="min" <?=$pconfig['powerd_battery_mode']=="min" ? "selected=\"selected\"" :"";?>>
+                      <?=gettext("Minimum");?>
+                    </option>
+                    <option value="max" <?=$pconfig['powerd_battery_mode']=="max" ? "selected=\"selected\"" : "";?>>
+                      <?=gettext("Maximum");?>
+                    </option>
+                  </select>
+                </td>
+              </tr>
               <tr>
                 <th colspan="2" valign="top" class="listtopic"><?=gettext("RAM Disk Settings (Reboot to Apply Changes)"); ?></th>
               </tr>
diff --git a/src/www/system_general.php b/src/www/system_general.php
index 8daf77de9..1282cfeb0 100644
--- a/src/www/system_general.php
+++ b/src/www/system_general.php
@@ -57,6 +57,7 @@ function get_locale_list()
 
 if ($_SERVER['REQUEST_METHOD'] === 'GET') {
     $pconfig = array();
+
     $pconfig['dns1gw'] = null;
     $pconfig['dns2gw'] = null;
     $pconfig['dns3gw'] = null;
@@ -66,10 +67,11 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
     $pconfig['timezone'] = "Etc/UTC";
     $pconfig['mirror'] = 'default';
     $pconfig['flavour'] = 'default';
-
     $pconfig['prefer_ipv4'] = isset($config['system']['prefer_ipv4']);
+    $pconfig['gw_switch_default'] = isset($config['system']['gw_switch_default']);
     $pconfig['hostname'] = $config['system']['hostname'];
     $pconfig['domain'] = $config['system']['domain'];
+
     if (isset($config['system']['dnsserver'])) {
         list($pconfig['dns1'],$pconfig['dns2'],$pconfig['dns3'],$pconfig['dns4']) = $config['system']['dnsserver'];
     } else {
@@ -196,6 +198,12 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
           unset($config['system']['prefer_ipv4']);
       }
 
+      if (!empty($pconfig['gw_switch_default'])) {
+          $config['system']['gw_switch_default'] = true;
+      } elseif (isset($config['system']['gw_switch_default'])) {
+          unset($config['system']['gw_switch_default']);
+      }
+
       $olddnsservers = $config['system']['dnsserver'];
       $config['system']['dnsserver'] = array();
       foreach (array('dns1', 'dns2', 'dns3', 'dns4') as $dnsopt) {
@@ -338,107 +346,13 @@ include("head.inc");
                 </div>
               </td>
             </tr>
-            <tr>
-              <td><a id="help_for_dnsservers" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("DNS servers"); ?></td>
-              <td>
-                <table class="table table-striped table-condensed">
-                  <thead>
-                    <tr>
-                      <th style="width:350px;"><?=gettext("DNS Server"); ?></th>
-                      <th><?=gettext("Use gateway"); ?></th>
-                    </tr>
-                  </thead>
-                  <tbody>
-<?php
-                    for ($dnscounter=1; $dnscounter<5; $dnscounter++):
-                      $dnsgw = "dns{$dnscounter}gw";?>
-                    <tr>
-                      <td>
-                        <input name="dns<?=$dnscounter;?>" type="text" value="<?=$pconfig['dns'.$dnscounter];?>" />
-                      </td>
-                      <td>
-                        <select name='<?="dns{$dnscounter}gw";?>' class='selectpicker' data-size="10" data-width="200px">
-                          <option value="none" <?=$pconfig[$dnsgw] == "none" ? "selected=\"selected\"" :"";?>>
-                            <?=gettext("none");?>
-                          </option>
-<?php
-                          foreach(return_gateways_array() as $gwname => $gwitem):
-                            if(is_ipaddrv4(lookup_gateway_ip_by_name($pconfig[$dnsgw])) && is_ipaddrv6($gwitem['gateway'])) {
-                              continue;
-                            }
-                            if(is_ipaddrv6(lookup_gateway_ip_by_name($pconfig[$dnsgw])) && is_ipaddrv4($gwitem['gateway'])) {
-                              continue;
-                            }?>
-                            <option value="<?=$gwname;?>" <?=$pconfig[$dnsgw] == $gwname ? "selected=\"selected\"" : "" ;?>>
-                              <?=$gwname;?> - <?=$gwitem['friendlyiface'];?> - <?$gwitem['gateway'];?>
-                            </option>
-<?php
-                             endforeach;?>
-
-                          </select>
-                        </td>
-                      </tr>
-<?php
-                    endfor; ?>
-                  </tbody>
-                </table>
-                <div class="hidden" for="help_for_dnsservers">
-                  <?=gettext("Enter IP addresses to be used by the system for DNS resolution. " .
-                  "These are also used for the DHCP service, DNS forwarder and for PPTP VPN clients."); ?>
-                  <br />
-                  <br />
-                  <?=gettext("In addition, optionally select the gateway for each DNS server. " .
-                  "When using multiple WAN connections there should be at least one unique DNS server per gateway."); ?>
-                </div>
-              </td>
-            </tr>
-            <tr>
-              <td><a id="help_for_dnsservers_opt" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("DNS server options"); ?></td>
-              <td>
-                <input name="dnsallowoverride" type="checkbox" value="yes" <?=$pconfig['dnsallowoverride'] ? "checked=\"checked\"" : ""; ;?> />
-                <strong>
-                  <?=gettext("Allow DNS server list to be overridden by DHCP/PPP on WAN"); ?>
-                </strong>
-                <div class="hidden" for="help_for_dnsservers_opt">
-                  <?php printf(gettext("If this option is set, %s will " .
-                  "use DNS servers assigned by a DHCP/PPP server on WAN " .
-                  "for its own purposes (including the DNS forwarder). " .
-                  "However, they will not be assigned to DHCP and PPTP " .
-                  "VPN clients."), $g['product_name']); ?>
-                </div>
-                <br/>
-                <input name="dnslocalhost" type="checkbox" value="yes" <?=$pconfig['dnslocalhost'] ? "checked=\"checked\"" : ""; ?> />
-                <strong>
-                  <?=gettext("Do not use the DNS Forwarder as a DNS server for the firewall"); ?>
-                </strong>
-                <div class="hidden" for="help_for_dnsservers_opt">
-                  <?=gettext("By default localhost (127.0.0.1) will be used as the first DNS server where the DNS Forwarder or DNS Resolver is enabled and set to listen on Localhost, so system can use the local DNS service to perform lookups. ".
-                  "Checking this box omits localhost from the list of DNS servers."); ?>
-                </div>
-              </td>
-            </tr>
-            <tr>
-              <td><a id="help_for_prefer_ipv4" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Prefer IPv4 over IPv6"); ?></td>
-              <td>
-                <input name="prefer_ipv4" type="checkbox" id="prefer_ipv4" value="yes" <?= !empty($pconfig['prefer_ipv4']) ? "checked=\"checked\"" : "";?> />
-                <strong><?=gettext("Prefer to use IPv4 even if IPv6 is available"); ?></strong>
-                <div class="hidden" for="help_for_prefer_ipv4">
-                  <?=gettext("By default, if a hostname resolves IPv6 and IPv4 addresses ".
-                                      "IPv6 will be used, if you check this option, IPv4 will be " .
-                                      "used instead of IPv6."); ?>
-                </div>
-              </td>
-            </tr>
             <tr>
               <td><a id="help_for_timezone" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Time zone"); ?></td>
               <td>
                 <select name="timezone" id="timezone" data-size="10" class="selectpicker" data-style="btn-default" data-live-search="true">
 <?php
-                  foreach (get_zoneinfo() as $value):
-                    if(strstr($value, "GMT")) {
-                      continue;
-                    }?>
-                  <option value="<?=htmlspecialchars($value);?>" <?=$value == $pconfig['timezone'] ? "selected=\"selected\"" :"";?>>
+                  foreach (get_zoneinfo() as $value): ?>
+                  <option value="<?=htmlspecialchars($value);?>" <?= $value == $pconfig['timezone'] ? 'selected="selected"' : '' ?>>
                     <?=htmlspecialchars($value);?>
                   </option>
 <?php
@@ -449,6 +363,9 @@ include("head.inc");
                 </div>
               </td>
             </tr>
+            <tr>
+              <th colspan="2" valign="top" class="listtopic"><?=gettext("Firmware"); ?></th>
+            </tr>
             <tr>
               <td><a id="help_for_language" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Language");?></td>
               <td>
@@ -527,6 +444,114 @@ include("head.inc");
                 </div>
               </td>
             </tr>
+            <tr>
+              <th colspan="2" valign="top" class="listtopic"><?=gettext("Name resolution"); ?></th>
+            </tr>
+            <tr>
+              <td><a id="help_for_dnsservers" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("DNS servers"); ?></td>
+              <td>
+                <table class="table table-striped table-condensed">
+                  <thead>
+                    <tr>
+                      <th style="width:350px;"><?=gettext("DNS Server"); ?></th>
+                      <th><?=gettext("Use gateway"); ?></th>
+                    </tr>
+                  </thead>
+                  <tbody>
+<?php
+                    for ($dnscounter=1; $dnscounter<5; $dnscounter++):
+                      $dnsgw = "dns{$dnscounter}gw";?>
+                    <tr>
+                      <td>
+                        <input name="dns<?=$dnscounter;?>" type="text" value="<?=$pconfig['dns'.$dnscounter];?>" />
+                      </td>
+                      <td>
+                        <select name='<?="dns{$dnscounter}gw";?>' class='selectpicker' data-size="10" data-width="200px">
+                          <option value="none" <?=$pconfig[$dnsgw] == "none" ? "selected=\"selected\"" :"";?>>
+                            <?=gettext("none");?>
+                          </option>
+<?php
+                          foreach(return_gateways_array() as $gwname => $gwitem):
+                            if(is_ipaddrv4(lookup_gateway_ip_by_name($pconfig[$dnsgw])) && is_ipaddrv6($gwitem['gateway'])) {
+                              continue;
+                            }
+                            if(is_ipaddrv6(lookup_gateway_ip_by_name($pconfig[$dnsgw])) && is_ipaddrv4($gwitem['gateway'])) {
+                              continue;
+                            }?>
+                            <option value="<?=$gwname;?>" <?=$pconfig[$dnsgw] == $gwname ? "selected=\"selected\"" : "" ;?>>
+                              <?=$gwname;?> - <?=$gwitem['friendlyiface'];?> - <?$gwitem['gateway'];?>
+                            </option>
+<?php
+                             endforeach;?>
+
+                          </select>
+                        </td>
+                      </tr>
+<?php
+                    endfor; ?>
+                  </tbody>
+                </table>
+                <div class="hidden" for="help_for_dnsservers">
+                  <?=gettext("Enter IP addresses to be used by the system for DNS resolution. " .
+                  "These are also used for the DHCP service, DNS forwarder and for PPTP VPN clients."); ?>
+                  <br />
+                  <br />
+                  <?=gettext("In addition, optionally select the gateway for each DNS server. " .
+                  "When using multiple WAN connections there should be at least one unique DNS server per gateway."); ?>
+                </div>
+              </td>
+            </tr>
+            <tr>
+              <td><a id="help_for_dnsservers_opt" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("DNS server options"); ?></td>
+              <td>
+                <input name="dnsallowoverride" type="checkbox" value="yes" <?=$pconfig['dnsallowoverride'] ? "checked=\"checked\"" : ""; ;?> />
+                <strong>
+                  <?=gettext("Allow DNS server list to be overridden by DHCP/PPP on WAN"); ?>
+                </strong>
+                <div class="hidden" for="help_for_dnsservers_opt">
+                  <?php printf(gettext("If this option is set, %s will " .
+                  "use DNS servers assigned by a DHCP/PPP server on WAN " .
+                  "for its own purposes (including the DNS forwarder). " .
+                  "However, they will not be assigned to DHCP and PPTP " .
+                  "VPN clients."), $g['product_name']); ?>
+                </div>
+                <br/>
+                <input name="dnslocalhost" type="checkbox" value="yes" <?=$pconfig['dnslocalhost'] ? "checked=\"checked\"" : ""; ?> />
+                <strong>
+                  <?=gettext("Do not use the DNS Forwarder as a DNS server for the firewall"); ?>
+                </strong>
+                <div class="hidden" for="help_for_dnsservers_opt">
+                  <?=gettext("By default localhost (127.0.0.1) will be used as the first DNS server where the DNS Forwarder or DNS Resolver is enabled and set to listen on Localhost, so system can use the local DNS service to perform lookups. ".
+                  "Checking this box omits localhost from the list of DNS servers."); ?>
+                </div>
+              </td>
+            </tr>
+            <tr>
+              <th colspan="2" valign="top" class="listtopic"><?=gettext("Networking"); ?></th>
+            </tr>
+            <tr>
+              <td><a id="help_for_prefer_ipv4" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Prefer IPv4 over IPv6"); ?></td>
+              <td>
+                <input name="prefer_ipv4" type="checkbox" id="prefer_ipv4" value="yes" <?= !empty($pconfig['prefer_ipv4']) ? "checked=\"checked\"" : "";?> />
+                <strong><?=gettext("Prefer to use IPv4 even if IPv6 is available"); ?></strong>
+                <div class="hidden" for="help_for_prefer_ipv4">
+                  <?=gettext("By default, if a hostname resolves IPv6 and IPv4 addresses ".
+                                      "IPv6 will be used, if you check this option, IPv4 will be " .
+                                      "used instead of IPv6."); ?>
+                </div>
+              </td>
+            </tr>
+            <tr>
+              <td><a id="help_for_gw_switch_default" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Gateway switching");?> </td>
+              <td>
+                <input name="gw_switch_default" type="checkbox" id="gw_switch_default" value="yes" <?= !empty($pconfig['gw_switch_default']) ? "checked=\"checked\"" : "";?> />
+                <strong><?=gettext("Allow default gateway switching"); ?></strong><br />
+                <div class="hidden" for="help_for_gw_switch_default">
+                  <?=gettext("If the link where the default gateway resides fails " .
+                                      "switch the default gateway to another available one."); ?>
+                </div>
+              </td>
+            </tr>
             <tr>
               <td></td>
               <td>