diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Sample/PageController.php b/src/opnsense/mvc/app/controllers/OPNsense/Sample/PageController.php
index c2c2fa80e..1409a054d 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Sample/PageController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Sample/PageController.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  *    Copyright (C) 2015 Deciso B.V.
  *
@@ -26,6 +27,7 @@
  *    POSSIBILITY OF SUCH DAMAGE.
  *
  */
+
 namespace OPNsense\Sample;
 
 use Phalcon\Mvc\Controller;
@@ -151,5 +153,4 @@ class PageController extends ControllerBase
             ));
         }
     }
-
 }
diff --git a/src/opnsense/mvc/app/models/OPNsense/Sample/Sample.xml b/src/opnsense/mvc/app/models/OPNsense/Sample/Sample.xml
index cdcda9440..36209cea1 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Sample/Sample.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Sample/Sample.xml
@@ -33,4 +33,4 @@
             </section1>
         </childnodes1>
     </items>
-</model>
\ No newline at end of file
+</model>
diff --git a/src/opnsense/mvc/app/views/OPNsense/Sample/page.volt b/src/opnsense/mvc/app/views/OPNsense/Sample/page.volt
index 14bfed16d..6acc3a257 100644
--- a/src/opnsense/mvc/app/views/OPNsense/Sample/page.volt
+++ b/src/opnsense/mvc/app/views/OPNsense/Sample/page.volt
@@ -19,7 +19,7 @@
     {% endfor %}
 
     <br/><br/>
-    Edit the data 
+    Edit the data
 
 </div>
 
@@ -73,4 +73,4 @@
         <tr> <td colspan=3><input type="submit" value="save" name="form_action" > </td> </tr>
     </table>
 
-</form>
\ No newline at end of file
+</form>
diff --git a/src/www/firewall_nat_1to1_edit.php b/src/www/firewall_nat_1to1_edit.php
index 55cd9642d..f110439ed 100644
--- a/src/www/firewall_nat_1to1_edit.php
+++ b/src/www/firewall_nat_1to1_edit.php
@@ -507,8 +507,8 @@ include("head.inc");
 													<td><?=gettext("Address:"); ?>&nbsp;&nbsp;</td>
 													<td>
 														<table>
-					                            			<tr>
-							                        			<td width="348px">
+											<tr>
+													<td width="348px">
 																	<input name="dst" type="text" autocomplete="off" class="formfldalias" id="dst" size="20" value="<?php if (!is_specialnet($pconfig['dst'])) echo htmlspecialchars($pconfig['dst']);?>" />
 																</td>
 																<td>
diff --git a/src/www/firewall_nat_edit.php b/src/www/firewall_nat_edit.php
index ad458a2c6..fcf5c2320 100644
--- a/src/www/firewall_nat_edit.php
+++ b/src/www/firewall_nat_edit.php
@@ -716,7 +716,7 @@ include("head.inc");
 											<td>
 												<table>
 													<tr>
-														<td width="348px">	
+														<td width="348px">
 															<input autocomplete='off' name="dst" type="text" class="formfldalias" id="dst" size="20" value="<?php if (!is_specialnet($pconfig['dst'])) echo htmlspecialchars($pconfig['dst']);?>" />
 														</td>
 														<td>
diff --git a/src/www/firewall_nat_npt_edit.php b/src/www/firewall_nat_npt_edit.php
index 1495a0b60..93033ee57 100644
--- a/src/www/firewall_nat_npt_edit.php
+++ b/src/www/firewall_nat_npt_edit.php
@@ -220,13 +220,13 @@ include("head.inc");
 					                                        <tr>
 					                                                <td><?=gettext("Address:"); ?>&nbsp;&nbsp;</td>
 					                                                <td>
-					                                         			<table>
-					                                                		<tr>
-						                                                		<td width="348px">
+													<table>
+													<tr>
+														<td width="348px">
 							                                                        <input name="src" type="text" class="formfldalias" id="src" size="20" value="<?php if (!is_specialnet($pconfig['src'])) echo htmlspecialchars($pconfig['src']);?>" />
-					                                                        	</td>
-					                                                        	<td>
-					                                                        		<select name="srcmask" class="selectpicker" id="srcmask" data-width="auto">
+													</td>
+													<td>
+														<select name="srcmask" class="selectpicker" id="srcmask" data-width="auto">
 																						<?php for ($i = 128; $i > 0; $i--): ?>
 									                                                        <option value="<?=$i;?>" <?php if ($i == $pconfig['srcmask']) echo "selected=\"selected\""; ?>><?=$i;?></option>
 																						<?php endfor; ?>
@@ -256,20 +256,20 @@ include("head.inc");
 					                                        <tr>
 					                                                <td><?=gettext("Address:"); ?>&nbsp;&nbsp;</td>
 					                                                <td>
-					                                                		<table>
-					                                                			<tr>
-					                                                				<td width="348px">
-					                                                        			<input name="dst" type="text" class="formfldalias" id="dst" size="20" value="<?php if (!is_specialnet($pconfig['dst'])) echo htmlspecialchars($pconfig['dst']);?>" />
-					                                                        		</td>
-					                                                        		<td>
-					                                                        			<select name="dstmask" class="selectpicker" id="dstmask" data-width="auto">
+													<table>
+														<tr>
+															<td width="348px">
+															<input name="dst" type="text" class="formfldalias" id="dst" size="20" value="<?php if (!is_specialnet($pconfig['dst'])) echo htmlspecialchars($pconfig['dst']);?>" />
+														</td>
+														<td>
+															<select name="dstmask" class="selectpicker" id="dstmask" data-width="auto">
 																						<?php
 									                                                        for ($i = 128; $i > 0; $i--): ?>
 							                                                                <option value="<?=$i;?>" <?php if ($i == $pconfig['dstmask']) echo "selected=\"selected\""; ?>><?=$i;?></option>
 																						<?php endfor; ?>
 								                                                        </select>
-					                                                				</td>
-					                                                        	</tr>
+															</td>
+													</tr>
 					                                                        </table>
 					                                                </td>
 					                                        </tr>
diff --git a/src/www/firewall_nat_out_edit.php b/src/www/firewall_nat_out_edit.php
index a31e04807..0064548e5 100644
--- a/src/www/firewall_nat_out_edit.php
+++ b/src/www/firewall_nat_out_edit.php
@@ -551,7 +551,7 @@ function poolopts_change() {
 													<td>
 														<table>
 															<tr>
-																<td width="348px">	
+																<td width="348px">
 																	<input name="source" type="text" autocomplete="off" class="formfldalias" id="source" size="20" value="<?=htmlspecialchars($pconfig['source']);?>" />
 																</td>
 																<td>
@@ -611,7 +611,7 @@ function poolopts_change() {
 													<td>
 														<table>
 															<tr>
-																<td width="348px">	
+																<td width="348px">
 																	<input name="destination" type="text" autocomplete="off" class="formfldalias" id="destination" size="20" value="<?=htmlspecialchars($pconfig['destination']);?>" />
 																</td>
 																<td>
diff --git a/src/www/interfaces_gif_edit.php b/src/www/interfaces_gif_edit.php
index c17abdf64..03dc438ac 100644
--- a/src/www/interfaces_gif_edit.php
+++ b/src/www/interfaces_gif_edit.php
@@ -190,13 +190,13 @@ include("head.inc");
 										<tr>
 						                  <td valign="top" class="vncellreq"><?=gettext("gif tunnel remote address "); ?></td>
 						                  <td class="vtable">
-						                  	<table>
-						                  		<tr>
-						                  			<td width="285px">
-						                    			<input name="tunnel-remote-addr" type="text" class="form-control unknown ipv4v6" id="tunnel-remote-addr" size="24" value="<?=htmlspecialchars($pconfig['tunnel-remote-addr']);?>" />
-						                    		</td>
-						                    		<td>
-						                    			<select name="tunnel-remote-net" class="selectpicker ipv4v6" id="tunnel-remote-net" data-width="auto">
+									<table>
+										<tr>
+											<td width="285px">
+											<input name="tunnel-remote-addr" type="text" class="form-control unknown ipv4v6" id="tunnel-remote-addr" size="24" value="<?=htmlspecialchars($pconfig['tunnel-remote-addr']);?>" />
+										</td>
+										<td>
+											<select name="tunnel-remote-net" class="selectpicker ipv4v6" id="tunnel-remote-net" data-width="auto">
 					                                        <?php
 									                                        for ($i = 128; $i > 0; $i--) {
 															echo "<option value=\"{$i}\"";
diff --git a/src/www/interfaces_gre_edit.php b/src/www/interfaces_gre_edit.php
index 5dc361eca..c9bfb3b3f 100644
--- a/src/www/interfaces_gre_edit.php
+++ b/src/www/interfaces_gre_edit.php
@@ -187,12 +187,12 @@ include("head.inc");
 						                  <td valign="top" class="vncellreq"><?=gettext("GRE tunnel remote address ");?></td>
 						                  <td class="vtable">
 						                    <table>
-						                    	<tr>
-						                    		<td width="285px">
-						                    			<input name="tunnel-remote-addr" type="text" class="form-control unknown ipv4v6" id="tunnel-remote-addr" size="16" value="<?=htmlspecialchars($pconfig['tunnel-remote-addr']);?>" />
-						                    		</td>
-						                    		<td>
-						                    			<select name="tunnel-remote-net" class="selectpicker ipv4v6" id="tunnel-remote-net" data-width="auto">
+									<tr>
+										<td width="285px">
+											<input name="tunnel-remote-addr" type="text" class="form-control unknown ipv4v6" id="tunnel-remote-addr" size="16" value="<?=htmlspecialchars($pconfig['tunnel-remote-addr']);?>" />
+										</td>
+										<td>
+											<select name="tunnel-remote-net" class="selectpicker ipv4v6" id="tunnel-remote-net" data-width="auto">
 					                                        <?php
 						                                        for ($i = 128; $i > 0; $i--) {
 															echo "<option value=\"{$i}\"";
diff --git a/src/www/javascript/firewall_nat_edit/firewall_nat_edit.js b/src/www/javascript/firewall_nat_edit/firewall_nat_edit.js
index c3f0028c3..0f4d1e60c 100644
--- a/src/www/javascript/firewall_nat_edit/firewall_nat_edit.js
+++ b/src/www/javascript/firewall_nat_edit/firewall_nat_edit.js
@@ -170,7 +170,7 @@ function typesel_change() {
 			//document.iform.srcmask.disabled = 1;
 			jQuery('#srcmask').selectpicker('val','');
 			jQuery('#srcmask').prop('disabled',true);
-			jQuery('#srcmask').selectpicker('refresh');		
+			jQuery('#srcmask').selectpicker('refresh');
 			break;
 	}
 	if( dstenabled )
diff --git a/src/www/system_crlmanager.php b/src/www/system_crlmanager.php
index 168749444..db8522420 100644
--- a/src/www/system_crlmanager.php
+++ b/src/www/system_crlmanager.php
@@ -490,12 +490,12 @@ include("head.inc");
                         <?php else: ?>
                     <tr>
                     <th colspan="4">
-                    	<?=gettext("Revoke a Certificate"); ?>
-                   	</th>
-                   	</tr>
+			<?=gettext("Revoke a Certificate"); ?>
+			</th>
+			</tr>
 					<tr>
 						<td>
-							<b><?php echo gettext("Choose a Certificate to Revoke"); ?></b>:  
+							<b><?php echo gettext("Choose a Certificate to Revoke"); ?></b>:
 						</td>
 						<td colspan="3" align="left">
 							<select name='certref' id='certref' class="selectpicker" data-style="btn-default" data-live-search="true">
@@ -510,7 +510,7 @@ include("head.inc");
 						</td>
 					</tr>
 					<tr>
-						<td> 
+						<td>
 							<b><?php echo gettext("Reason");?></b>:
 						</td>
 						<td colspan="3" align="left">