diff --git a/src/www/status_openvpn.php b/src/www/status_openvpn.php
index 4e67c7161..a37e85598 100644
--- a/src/www/status_openvpn.php
+++ b/src/www/status_openvpn.php
@@ -129,9 +129,9 @@ $( document ).ready(function() {
         <div class="row">
             <section class="col-xs-12">
 	            <header class="content-box-head container-fluid"> <h3><?=gettext("OpenVPN Status");?></h3>
-				    	</header>
-				    		<div class="content-box-main col-xs-12">
-						    	<form action="status_openvpn.php" method="get" name="iform">
+					</header>
+						<div class="content-box-main col-xs-12">
+							<form action="status_openvpn.php" method="get" name="iform">
 										<div class="table-responsive">
 										<table class="table table-striped">
 											<?php $i = 0; ?>
@@ -161,7 +161,7 @@ $( document ).ready(function() {
 												<td><?=format_bytes($conn['bytes_recv']);?></td>
 												<td></td>
 												<td>
-													<a 	data-client-port="<?=$server['mgmt'];?>"
+													<a	data-client-port="<?=$server['mgmt'];?>"
 															data-client-ip="<?=$conn['remote_host'];?>"
 															title="<?=gettext("Kill client connection from"). " ".  $conn['remote_host'] ; ?>"
 															class="act_kill_client btn btn-default">
@@ -303,7 +303,7 @@ $( document ).ready(function() {
 					    </form>
 				    </div>
           </section>
-      	</div>
+	</div>
 		</div>
 </section>
 
diff --git a/src/www/vpn_ipsec.php b/src/www/vpn_ipsec.php
index b92b36a79..9fcf9470f 100644
--- a/src/www/vpn_ipsec.php
+++ b/src/www/vpn_ipsec.php
@@ -268,18 +268,18 @@ function show_phase2(id, buttonid) {
 							<div class="table-responsive">
 							  <table class="table table-striped">
                   <thead>
-  									<tr>
-  										<td>&nbsp;</td>
-  										<td>&nbsp;</td>
-  										<td><?=gettext("IKE"); ?></td>
-  										<td><?=gettext("Remote Gateway"); ?></td>
-  										<td><?=gettext("Mode"); ?></td>
-  										<td><?=gettext("P1 Protocol"); ?></td>
-  										<td><?=gettext("P1 Transforms"); ?></td>
-  										<td><?=gettext("P1 Description"); ?></td>
-  										<td>
-  										</td>
-  									</tr>
+									<tr>
+										<td>&nbsp;</td>
+										<td>&nbsp;</td>
+										<td><?=gettext("IKE"); ?></td>
+										<td><?=gettext("Remote Gateway"); ?></td>
+										<td><?=gettext("Mode"); ?></td>
+										<td><?=gettext("P1 Protocol"); ?></td>
+										<td><?=gettext("P1 Transforms"); ?></td>
+										<td><?=gettext("P1 Description"); ?></td>
+										<td>
+										</td>
+									</tr>
                   </thead>
                   <tbody>
 <?php
@@ -535,22 +535,22 @@ function show_phase2(id, buttonid) {
 						        <td colspan="8"> </td>
                     <td>
                       <button name="move_<?=$i;?>_x"
-  											type="submit"
-  											title="<?=gettext("move selected phase1 entries to end");?>"
-  											class="btn btn-default btn-xs">
-  											<span class="glyphicon glyphicon-arrow-down"></span>
-  										</button>
+											type="submit"
+											title="<?=gettext("move selected phase1 entries to end");?>"
+											class="btn btn-default btn-xs">
+											<span class="glyphicon glyphicon-arrow-down"></span>
+										</button>
                       <a href="vpn_ipsec_phase1.php" title="<?=gettext("add new phase1");?>" alt="add" class="btn btn-default btn-xs">
-  											<span class="glyphicon glyphicon-plus"></span>
-  										</a>
+											<span class="glyphicon glyphicon-plus"></span>
+										</a>
                       <button
-  											name="del_x"
-  											type="submit"
-  											title="<?=gettext("delete selected phase1 entries");?>"
-  											onclick="return confirm('<?=gettext("Do you really want to delete the selected phase1 entries?");?>')"
-  											class="btn btn-default btn-xs">
-  											<span class="glyphicon glyphicon-remove"></span>
-  										</button>
+											name="del_x"
+											type="submit"
+											title="<?=gettext("delete selected phase1 entries");?>"
+											onclick="return confirm('<?=gettext("Do you really want to delete the selected phase1 entries?");?>')"
+											class="btn btn-default btn-xs">
+											<span class="glyphicon glyphicon-remove"></span>
+										</button>
                     </td>
                   </tr>
 					        <tr>
diff --git a/src/www/vpn_ipsec_phase1.php b/src/www/vpn_ipsec_phase1.php
index b07c54e2a..ca64b31a9 100644
--- a/src/www/vpn_ipsec_phase1.php
+++ b/src/www/vpn_ipsec_phase1.php
@@ -113,7 +113,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
 			$pconfig['remotebits'] = null;
 			$pconfig['remotenet'] = null ;
 			if (isset($a_phase1[$p1index]['remote-subnet']) && strpos($a_phase1[$p1index]['remote-subnet'],'/') !== false) {
-	    	list($pconfig['remotenet'],$pconfig['remotebits']) = explode("/", $a_phase1[$p1index]['remote-subnet']);
+		list($pconfig['remotenet'],$pconfig['remotebits']) = explode("/", $a_phase1[$p1index]['remote-subnet']);
 			} elseif (isset($a_phase1[$p1index]['remote-subnet'])) {
 				$pconfig['remotenet'] = $a_phase1[$p1index]['remote-subnet'];
 			}
@@ -631,7 +631,7 @@ function dpdchkbox_change() {
                         <option value="<?=$kidx;?>" <?= $kidx == $pconfig['iketype'] ? "selected=\"selected\"" : "";?> >
                             <?=$name;?>
                         </option>
-<?php 								endforeach;
+<?php								endforeach;
 ?>
 											</select>
 											<div class="hidden" for="help_for_iketype">
@@ -650,7 +650,7 @@ function dpdchkbox_change() {
 												<option value="<?=$protocol;?>"  <?=$protocol == $pconfig['protocol'] ? "selected=\"selected\"" : "";?> >
 														<?=$name?>
                         </option>
-<?php 								endforeach;
+<?php								endforeach;
 ?>
 											</select>
 											<div class="hidden" for="help_for_protocol">
@@ -690,7 +690,7 @@ function dpdchkbox_change() {
 												<option value="<?=$iface;?>" <?= $iface == $pconfig['interface'] ? "selected=\"selected\"" : "" ?> >
 														<?=htmlspecialchars($ifacename);?>
                         </option>
-<?php 									endforeach;
+<?php									endforeach;
 ?>
 											</select>
 											<div class="hidden" for="help_for_interface">
@@ -710,7 +710,7 @@ function dpdchkbox_change() {
 											</div>
 										</td>
 									</tr>
-<?php 						endif;
+<?php						endif;
 ?>
 									<tr>
 										<td><a id="help_for_remotegw" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Description"); ?></td>
@@ -746,9 +746,9 @@ function dpdchkbox_change() {
                           }
 	                      ?>
 													<option value="<?=$method_type;?>" <?= $method_type == $pconfig['authentication_method'] ? "selected=\"selected\"" : "";?> >
-                          	<?=$method_params['name'];?>
+				<?=$method_params['name'];?>
                           </option>
-<?php 								endforeach;
+<?php								endforeach;
 ?>
 											</select>
 											<div class="hidden" for="help_for_authmethod">
@@ -764,10 +764,10 @@ function dpdchkbox_change() {
                       $modes = array("main" => "Main", "aggressive" => "Aggressive");
                       foreach ($modes as $mode => $mdescr) :
 ?>
-                      	<option value="<?=$mode;?>" <?= $mode == $pconfig['mode'] ? "selected=\"selected\"" : "" ;?> >
+			<option value="<?=$mode;?>" <?= $mode == $pconfig['mode'] ? "selected=\"selected\"" : "" ;?> >
                             <?=$mdescr;?>
 												</option>
-<?php 								endforeach;
+<?php								endforeach;
 ?>
 											</select>
 											<div class="hidden" for="help_for_mode">
@@ -821,9 +821,9 @@ endforeach; ?>
 												}
 ?>
 												<option value="<?=$id_type;?>" <?= $id_type == $pconfig['peerid_type'] ? "selected=\"selected\"" : "";?> >
-                      		<?=$id_params['desc'];?>
+				<?=$id_params['desc'];?>
 												</option>
-<?php 								endforeach;
+<?php								endforeach;
 ?>
 											</select>
 											<input name="peerid_data" type="text" id="peerid_data" size="30" value="<?=$pconfig['peerid_data'];?>" />
@@ -855,7 +855,7 @@ endforeach; ?>
 												<option value="<?=$cert['refid'];?>" <?= isset($pconfig['certref']) && $pconfig['certref'] == $cert['refid'] ? "selected=\"selected\"" : ""?>>
 													<?=$cert['descr'];?>
 												</option>
-<?php     							endforeach;
+<?php								endforeach;
                       endif;
 ?>
 											</select>
@@ -869,7 +869,7 @@ endforeach; ?>
 										<td>
 											<select name="caref" class="formselect">
 											<?php
-					    					$config__ca = isset($config['ca']) ? $config['ca'] : array();
+										$config__ca = isset($config['ca']) ? $config['ca'] : array();
                         foreach ($config__ca as $ca) :
                             $selected = "";
                             if ($pconfig['caref'] == $ca['refid']) {
@@ -879,7 +879,7 @@ endforeach; ?>
 													<option value="<?=$ca['refid'];?>" <?= isset($pconfig['caref']) && $pconfig['caref'] == $ca['refid'] ? "selected=\"selected\"":"";?>>
 														<?=htmlspecialchars($ca['descr']);?>
 													</option>
-<?php      							endforeach;
+<?php								endforeach;
 ?>
 											</select>
 											<div class="hidden" for="help_for_caref">
@@ -926,7 +926,7 @@ endforeach; ?>
 												<option value="<?=$algo;?>" <?= $algo == $pconfig['halgo'] ? "selected=\"selected\"" : "";?>>
 													<?=$algoname;?>
 												</option>
-<?php 								endforeach;
+<?php								endforeach;
 ?>
 											</select>
 											<div class="hidden" for="help_for_halgo">
@@ -957,7 +957,7 @@ endforeach; ?>
 												<option value="<?=$keygroup;?>" <?= $keygroup == $pconfig['dhgroup'] ? "selected=\"selected\"" : "";?>>
 													<?=$keygroupname;?>
 												</option>
-<?php 								endforeach;
+<?php								endforeach;
 ?>
 											</select>
 											<div class="hidden" for="help_for_dhgroup">