diff --git a/templates/admin.php b/templates/admin.php
index 800f553d..8a89bd0a 100755
--- a/templates/admin.php
+++ b/templates/admin.php
@@ -8,25 +8,25 @@
         <form role="form" action="?page=auth_conf" method="POST">
             <?php echo CSRFTokenFieldTag() ?>
           <div class="row">
-            <div class="form-group col-md-4">
+            <div class="form-group col-md-6">
               <label for="username"><?php echo _("Username"); ?></label>
               <input type="text" class="form-control" name="username" value="<?php echo htmlspecialchars($username, ENT_QUOTES); ?>"/>
             </div>
           </div>
           <div class="row">
-            <div class="form-group col-md-4">
+            <div class="form-group col-md-6">
               <label for="password"><?php echo _("Old password"); ?></label>
               <input type="password" class="form-control" name="oldpass"/>
             </div>
           </div>
           <div class="row">
-            <div class="form-group col-md-4">
+            <div class="form-group col-md-6">
               <label for="password"><?php echo _("New password"); ?></label>
               <input type="password" class="form-control" name="newpass"/>
             </div>
           </div>
           <div class="row">
-            <div class="form-group col-md-4">
+            <div class="form-group col-md-6">
               <label for="password"><?php echo _("Repeat new password"); ?></label>
               <input type="password" class="form-control" name="newpassagain"/>
             </div>
diff --git a/templates/dhcp.php b/templates/dhcp.php
index 7103e01f..ac433e57 100755
--- a/templates/dhcp.php
+++ b/templates/dhcp.php
@@ -29,7 +29,7 @@
   <div class="tab-pane active" id="server-settings">
   <h4 class="mt-3">DHCP server settings</h4>
   <div class="row">
-    <div class="form-group col-md-4">
+    <div class="form-group col-md-6">
       <label for="code">Interface</label>
       <select class="form-control" name="interface">
       <?php foreach ($interfaces as $if) : ?>
@@ -41,25 +41,25 @@
     </div>
   </div>
   <div class="row">
-    <div class="form-group col-md-4">
+    <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); ?>" />
     </div>
   </div>
 
   <div class="row">
-    <div class="form-group col-md-4">
+    <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); ?>" />
     </div>
   </div>
 
   <div class="row">
-    <div class="form-group col-xs-2 col-sm-2">
+    <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); ?>" />
     </div>
-    <div class="col-xs-2 col-sm-2">
+    <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>
@@ -71,14 +71,14 @@
   </div>
   
   <div class="row">
-    <div class="form-group col-md-4">
+    <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); ?>" />
     </div>
   </div>
 
   <div class="row">
-    <div class="form-group col-md-4">
+    <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); ?>" />
     </div>
diff --git a/templates/hostapd.php b/templates/hostapd.php
index 43b5029f..53721823 100755
--- a/templates/hostapd.php
+++ b/templates/hostapd.php
@@ -32,7 +32,7 @@
 
             <h4 class="mt-3"><?php echo _("Basic settings") ;?></h4>
             <div class="row">
-              <div class="form-group col-md-4">
+              <div class="form-group col-md-6">
                 <label for="cbxinterface"><?php echo _("Interface") ;?></label>
                 <?php
                   SelectorOptions('interface', $interfaces, $arrConfig['interface'], 'cbxinterface');
@@ -40,13 +40,13 @@
               </div>
             </div>
             <div class="row">
-              <div class="form-group col-md-4">
+              <div class="form-group col-md-6">
                 <label for="txtssid"><?php echo _("SSID"); ?></label>
                 <input type="text" id="txtssid" class="form-control" name="ssid" value="<?php echo htmlspecialchars($arrConfig['ssid'], ENT_QUOTES); ?>" />
               </div>
             </div>
             <div class="row">
-              <div class="form-group col-md-4">
+              <div class="form-group col-md-6">
                 <label for="cbxhwmode"><?php echo _("Wireless Mode") ;?></label>
                 <?php
                 $selectedHwMode = $arrConfig['hw_mode'];
@@ -60,7 +60,7 @@
               </div>
             </div>
             <div class="row">
-              <div class="form-group col-md-4">
+              <div class="form-group col-md-6">
                 <label for="cbxchannel"><?php echo _("Channel"); ?></label>
                 <?php
                 $selectablechannels = range(1, 13);
@@ -88,19 +88,19 @@
           <div class="tab-pane fade" id="security">
             <h4 class="mt-3"><?php echo _("Security settings"); ?></h4>
             <div class="row">
-              <div class="form-group col-md-4">
+              <div class="form-group col-md-6">
                 <label for="cbxwpa"><?php echo _("Security type"); ?></label>
                 <?php SelectorOptions('wpa', $arrSecurity, $arrConfig['wpa'], 'cbxwpa'); ?>
               </div>
             </div>
             <div class="row">
-              <div class="form-group col-md-4">
+              <div class="form-group col-md-6">
                 <label for="cbxwpapairwise"><?php echo _("Encryption Type"); ?></label>
                 <?php SelectorOptions('wpa_pairwise', $arrEncType, $arrConfig['wpa_pairwise'], 'cbxwpapairwise'); ?>
               </div>
             </div>
             <div class="row">
-              <div class="form-group col-md-4">
+              <div class="form-group col-md-6">
                 <label for="txtwpapassphrase"><?php echo _("PSK"); ?></label>
                 <input type="text" class="form-control" id="txtwpapassphrase" name="wpa_passphrase" value="<?php echo htmlspecialchars($arrConfig['wpa_passphrase'], ENT_QUOTES); ?>" />
               </div>
@@ -124,7 +124,7 @@
           <div class="tab-pane fade" id="advanced">
           <h4 class="mt-3"><?php echo _("Advanced settings"); ?></h4>
             <div class="row">
-              <div class="col-md-4 mb-2">
+              <div class="col-md-6 mb-2">
                 <div class="checkbox">
                   <?php
                   $checkedWifiAPEnabled = '';
@@ -138,7 +138,7 @@
               </div>
             </div>
             <div class="row">
-              <div class="col-md-4 mb-2">
+              <div class="col-md-6 mb-2">
                 <div class="checkbox">
                 <?php
                 $checkedLogEnabled = '';
@@ -152,7 +152,7 @@
               </div>
             </div>
             <div class="row">
-              <div class="col-md-4 mb-2">
+              <div class="col-md-6 mb-2">
                 <div class="checkbox">
                 <?php
                 $checkedHiddenSSID = '';
@@ -166,14 +166,14 @@
               </div>
             </div>
             <div class="row">
-              <div class="form-group col-md-4">
+              <div class="form-group col-md-6">
                 <label for="max_num_sta"><?php echo _("Maximum number of clients") ?></label>
                 <input type="text" id="max_num_sta" class="form-control" name="max_num_sta" placeholder="2007" value="<?php echo $arrConfig["max_num_sta"] ?>" aria-describedby="max_num_sta_help">
                 <span id="max_num_sta_help" class="help-block"><?php echo _("Configures the <code>max_num_sta</code> option of hostapd. The default and maximum is 2007. If empty or 0, the default applies.") ?></span>
               </div>
             </div>
             <div class="row">
-              <div class="form-group col-md-4">
+              <div class="form-group col-md-6">
               <label for="cbxcountries"><?php echo _("Country Code"); ?></label>
               <input type="hidden" id="selected_country" value="<?php echo htmlspecialchars($arrConfig['country_code'], ENT_QUOTES); ?>">
               <select  class="form-control" id="cbxcountries" name="country_code">
diff --git a/templates/system.php b/templates/system.php
index f4086729..5932eba5 100755
--- a/templates/system.php
+++ b/templates/system.php
@@ -78,7 +78,7 @@ if ($cpuload > 90) {
 	  <div role="tabpanel" class="tab-pane" id="language">
 	    <h4 class="mt-3"><?php echo _("Language settings") ;?></h4>
 	    <div class="row">
-	      <div class="form-group col-md-4">
+	      <div class="form-group col-md-6">
 		<label for="code"><?php echo _("Select a language"); ?></label>
 		    <?php SelectorOptions('locale', $arrLocales, $_SESSION['locale']); ?>
 	      </div>