diff --git a/templates/dhcp/general.php b/templates/dhcp/general.php
index 45b01c64..e2782cf4 100644
--- a/templates/dhcp/general.php
+++ b/templates/dhcp/general.php
@@ -3,13 +3,7 @@
   <div class="row">
     <div class="form-group col-md-6">
       <label for="code">Interface</label>
-      <select class="form-control" name="interface">
-        <?php foreach ($interfaces as $if) : ?>
-          <?php $if_quoted = htmlspecialchars($if, ENT_QUOTES) ?>
-          <?php $selected  = $if === $conf['interface'] ? ' selected="selected"' : '' ?>
-          <option value="<?php echo $if_quoted ?>"<?php echo $selected ?>><?php echo $if_quoted ?></option>
-        <?php endforeach ?>
-      </select>
+        <?php SelectorOptions('interface', $interfaces, $conf['interface'], 'cbxdhcpiface', 'loadInterfaceDHCPSelect', $DHCPDisabled); ?>
     </div>
   </div>
 
@@ -22,7 +16,7 @@
           <label class="custom-control-label" for="dhcp-iface"><?php echo _("Enable DHCP for this interface") ?></label>
         </div>
         <p id="dhcp-iface-description">
-          <small><?php echo _("Enable this option if you want RaspAP assign IP addresses on the selected interface.") ?></small>
+          <small><?php echo _("Enable this option if you want RaspAP to assign IP addresses on the selected interface.") ?></small>
         </p>
       </div>
      </div>
@@ -31,29 +25,29 @@
   <div class="row">
     <div class="form-group col-md-6">
       <label for="code"><?php echo _("Starting IP Address"); ?></label>
-      <input type="text" class="form-control"name="RangeStart" value="<?php echo htmlspecialchars($RangeStart, ENT_QUOTES); ?>" />
+      <input type="text" class="form-control" id="txtrangestart" name="RangeStart" value="<?php echo htmlspecialchars($RangeStart, ENT_QUOTES); ?>" />
     </div>
   </div>
 
   <div class="row">
     <div class="form-group col-md-6">
       <label for="code"><?php echo _("Ending IP Address"); ?></label>
-      <input type="text" class="form-control" name="RangeEnd" value="<?php echo htmlspecialchars($RangeEnd, ENT_QUOTES); ?>" />
+      <input type="text" class="form-control" id="txtrangeend" name="RangeEnd" value="<?php echo htmlspecialchars($RangeEnd, ENT_QUOTES); ?>" />
     </div>
   </div>
 
   <div class="row">
     <div class="form-group col-xs-3 col-sm-3">
       <label for="code"><?php echo _("Lease Time"); ?></label>
-      <input type="text" class="form-control" name="RangeLeaseTime" value="<?php echo htmlspecialchars($arrRangeLeaseTime[1], ENT_QUOTES); ?>" />
+      <input type="text" class="form-control" id="txtrangeleasetime" name="RangeLeaseTime" value="<?php echo htmlspecialchars($arrRangeLeaseTime[1], ENT_QUOTES); ?>" />
     </div>
     <div class="col-xs-3 col-sm-3">
       <label for="code"><?php echo _("Interval"); ?></label>
-      <select name="RangeLeaseTimeUnits" class="form-control" >
-        <option value="m"<?php echo $mselected; ?>><?php echo _("Minute(s)"); ?></option>
-        <option value="h"<?php echo $hselected; ?>><?php echo _("Hour(s)"); ?></option>
-        <option value="d"<?php echo $dselected; ?>><?php echo _("Day(s)"); ?></option>
-        <option value="infinite"<?php echo $infiniteselected; ?>><?php echo _("Infinite"); ?></option>
+      <select id="cbxrangeleasetimeunits" name="RangeLeaseTimeUnits" class="form-control" >
+        <option value="m"><?php echo _("Minute(s)"); ?></option>
+        <option value="h"><?php echo _("Hour(s)"); ?></option>
+        <option value="d"><?php echo _("Day(s)"); ?></option>
+        <option value="infinite"><?php echo _("Infinite"); ?></option>
       </select>
     </div>
   </div>
@@ -61,14 +55,14 @@
   <div class="row">
     <div class="form-group col-md-6">
       <label for="code"><?php echo _("DNS Server"); ?> 1</label>
-      <input type="text" class="form-control"name="DNS1" value="<?php echo htmlspecialchars($DNS1, ENT_QUOTES); ?>" />
+      <input type="text" class="form-control" id="txtdns1" name="DNS1" value="<?php echo htmlspecialchars($DNS1, ENT_QUOTES); ?>" />
     </div>
   </div>
 
   <div class="row">
     <div class="form-group col-md-6">
       <label for="code"><?php echo _("DNS Server"); ?> 2</label>
-      <input type="text" class="form-control" name="DNS2" value="<?php echo htmlspecialchars($DNS2, ENT_QUOTES); ?>" />
+      <input type="text" class="form-control" id="txtdns2" name="DNS2" value="<?php echo htmlspecialchars($DNS2, ENT_QUOTES); ?>" />
     </div>
   </div>