diff --git a/src/opnsense/mvc/app/views/layout_partials/form_input_tr.volt b/src/opnsense/mvc/app/views/layout_partials/form_input_tr.volt
index b8b695d7e..c0a474d56 100644
--- a/src/opnsense/mvc/app/views/layout_partials/form_input_tr.volt
+++ b/src/opnsense/mvc/app/views/layout_partials/form_input_tr.volt
@@ -43,7 +43,7 @@ readonly    :   if true, input fields will be readonly
 #}
 
 <tr id="row_{{ id }}" {% if advanced|default(false)=='true' %} data-advanced="true"{% endif %}>
-    <td >
+    <td>
         <div class="control-label" id="control_label_{{ id }}">
             {% if help|default(false) %}
                 <a id="help_for_{{ id }}" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a>
@@ -53,7 +53,7 @@ readonly    :   if true, input fields will be readonly
             <b>{{label}}</b>
         </div>
     </td>
-    <td >
+    <td>
         {% if type == "text" %}
             <input type="text" class="form-control" size="{{size|default("50")}}" id="{{ id }}" {{ readonly ? 'readonly="readonly"' : '' }} >
         {% elseif type == "checkbox" %}
diff --git a/src/www/diag_states_summary.php b/src/www/diag_states_summary.php
index 8b9d84a76..ffe0ab0d5 100644
--- a/src/www/diag_states_summary.php
+++ b/src/www/diag_states_summary.php
@@ -134,9 +134,9 @@ function print_summary_table($label, $iparr, $sort = TRUE) {
         <tr>
           <td colspan="2">&nbsp;</td>
           <td><?=$proto; ?></td>
-          <td ><?=$protoinfo['seen']; ?></td>
-          <td ><span data-toggle="tooltip" title="<?=build_port_info($protoinfo['srcports'], $proto); ?>"><?=count($protoinfo['srcports']); ?></span></td>
-          <td ><span data-toggle="tooltip" title="<?=build_port_info($protoinfo['dstports'], $proto); ?>"><?=count($protoinfo['dstports']); ?></span></td>
+          <td><?=$protoinfo['seen']; ?></td>
+          <td><span data-toggle="tooltip" title="<?=build_port_info($protoinfo['srcports'], $proto); ?>"><?=count($protoinfo['srcports']); ?></span></td>
+          <td><span data-toggle="tooltip" title="<?=build_port_info($protoinfo['dstports'], $proto); ?>"><?=count($protoinfo['dstports']); ?></span></td>
         </tr>
         <?php } ?>
       <?php } ?>
diff --git a/src/www/firewall_nat_edit.php b/src/www/firewall_nat_edit.php
index d648d07f1..f7dd0d191 100644
--- a/src/www/firewall_nat_edit.php
+++ b/src/www/firewall_nat_edit.php
@@ -658,7 +658,7 @@ $( document ).ready(function() {
                       </thead>
                       <tbody>
                         <tr>
-                          <td >
+                          <td>
                             <select id="srcbeginport" name="srcbeginport" class="selectpicker" data-live-search="true" data-size="5" data-width="auto">
                               <option data-other=true value="<?=$pconfig['srcbeginport'];?>">(<?=gettext("other"); ?>)</option>
                               <optgroup label="<?=gettext("Aliases");?>">
@@ -802,7 +802,7 @@ $( document ).ready(function() {
                       </thead>
                       <tbody>
                         <tr>
-                          <td >
+                          <td>
                             <select id="dstbeginport" name="dstbeginport" class="selectpicker" data-live-search="true" data-size="5" data-width="auto">
                               <option data-other=true value="<?=$pconfig['dstbeginport'];?>">(<?=gettext("other"); ?>)</option>
                               <optgroup label="<?=gettext("Aliases");?>">
diff --git a/src/www/firewall_nat_npt_edit.php b/src/www/firewall_nat_npt_edit.php
index 24268abf6..f5c15ca74 100644
--- a/src/www/firewall_nat_npt_edit.php
+++ b/src/www/firewall_nat_npt_edit.php
@@ -199,7 +199,7 @@ include("head.inc");
                           <td style="width:348px">
                             <input name="src" type="text" value="<?=$pconfig['src'];?>" aria-label="<?=gettext("Source address");?>"/>
                           </td>
-                          <td >
+                          <td>
                             <select name="srcmask" class="selectpicker" data-size="5"  data-width="auto">
                               <?php for ($i = 128; $i > 0; $i--): ?>
                                 <option value="<?=$i;?>" <?= $i == $pconfig['srcmask'] ? "selected=\"selected\"" : ""; ?>><?=$i;?></option>
@@ -237,7 +237,7 @@ include("head.inc");
                           <td style="width:348px">
                             <input name="dst" type="text" value="<?=$pconfig['dst'];?>" aria-label="<?=gettext("Source address");?>"/>
                           </td>
-                          <td >
+                          <td>
                             <select name="dstmask" class="selectpicker" data-size="5"  data-width="auto">
                               <?php for ($i = 128; $i > 0; $i--): ?>
                                 <option value="<?=$i;?>" <?= $i == $pconfig['dstmask'] ? "selected=\"selected\"" : ""; ?>><?=$i;?></option>
diff --git a/src/www/firewall_rules_edit.php b/src/www/firewall_rules_edit.php
index 96c5782a6..827c52b4f 100644
--- a/src/www/firewall_rules_edit.php
+++ b/src/www/firewall_rules_edit.php
@@ -952,7 +952,7 @@ include("head.inc");
                         </thead>
                         <tbody>
                           <tr>
-                            <td >
+                            <td>
                               <select <?=!empty($pconfig['associated-rule-id']) ? "disabled" : "";?>  id="srcbeginport" name="srcbeginport" class="selectpicker" data-live-search="true" data-size="5" data-width="auto">
                                 <option data-other=true value="<?=$pconfig['srcbeginport'];?>">(<?=gettext("other"); ?>)</option>
                                 <optgroup label="<?=gettext("Aliases");?>">
@@ -1071,7 +1071,7 @@ include("head.inc");
                         </thead>
                         <tbody>
                           <tr>
-                            <td >
+                            <td>
                               <select <?=!empty($pconfig['associated-rule-id']) ? "disabled" : "";?> id="dstbeginport" name="dstbeginport" class="selectpicker" data-live-search="true" data-size="5" data-width="auto">
                                 <option data-other=true value="<?=$pconfig['dstbeginport'];?>">(<?=gettext("other"); ?>)</option>
                                 <optgroup label="<?=gettext("Aliases");?>">
diff --git a/src/www/firewall_virtual_ip_edit.php b/src/www/firewall_virtual_ip_edit.php
index 75a6c9195..d1f8723cc 100644
--- a/src/www/firewall_virtual_ip_edit.php
+++ b/src/www/firewall_virtual_ip_edit.php
@@ -378,7 +378,7 @@ $( document ).ready(function() {
                             <td style="width:348px">
                               <input name="subnet" type="text" class="form-control" id="subnet" size="28" value="<?=$pconfig['subnet'];?>" />
                             </td>
-                            <td >
+                            <td>
                               <select name="subnet_bits" data-network-id="subnet" class="selectpicker ipv4v6net" data-size="10"  data-width="auto" id="subnet_bits">
                                 <option disabled="disabled"></option> <!-- workaround for selectpicker -->
 <?php
diff --git a/src/www/vpn_ipsec_phase1.php b/src/www/vpn_ipsec_phase1.php
index 5fa09f6e0..254e0d411 100644
--- a/src/www/vpn_ipsec_phase1.php
+++ b/src/www/vpn_ipsec_phase1.php
@@ -637,7 +637,7 @@ include("head.inc");
                     </td>
                   </tr>
                   <tr>
-                    <td ><a id="help_for_interface" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Interface"); ?></td>
+                    <td><a id="help_for_interface" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Interface"); ?></td>
                     <td>
                       <select name="interface">
 <?php
@@ -683,7 +683,7 @@ include("head.inc");
 ?>
 
                   <tr>
-                    <td ><a id="help_for_remotegw" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Remote gateway"); ?></td>
+                    <td><a id="help_for_remotegw" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Remote gateway"); ?></td>
                     <td>
                       <input name="remote-gateway" type="text" class="formfld unknown" id="remotegw" size="28" value="<?=$pconfig['remote-gateway'];?>" />
                       <output class="hidden" for="help_for_remotegw">
@@ -751,7 +751,7 @@ include("head.inc");
                     </td>
                   </tr>
                   <tr>
-                    <td ><i class="fa fa-info-circle text-muted"></i> <?=gettext("My identifier"); ?></td>
+                    <td><i class="fa fa-info-circle text-muted"></i> <?=gettext("My identifier"); ?></td>
                     <td>
                       <select name="myid_type" id="myid_type">
 <?php
@@ -781,7 +781,7 @@ endforeach; ?>
 <?php
                   if (empty($pconfig['mobile'])):?>
                   <tr class="auth_opt auth_eap_tls auth_psk">
-                    <td ><i class="fa fa-info-circle text-muted"></i> <?=gettext("Peer identifier"); ?></td>
+                    <td><i class="fa fa-info-circle text-muted"></i> <?=gettext("Peer identifier"); ?></td>
                     <td>
                       <select name="peerid_type" id="peerid_type">
 <?php
@@ -814,7 +814,7 @@ endforeach; ?>
 <?php
                   endif;?>
                   <tr class="auth_opt auth_psk">
-                    <td ><a id="help_for_psk" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Pre-Shared Key"); ?></td>
+                    <td><a id="help_for_psk" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Pre-Shared Key"); ?></td>
                     <td>
                       <input name="pre-shared-key" type="text" class="formfld unknown" id="pskey" size="40"
                              value="<?= $pconfig['authentication_method'] == "pre_shared_key" || $pconfig['authentication_method'] == "xauth_psk_server" ? $pconfig['pre-shared-key'] : "";?>" />
@@ -824,7 +824,7 @@ endforeach; ?>
                     </td>
                   </tr>
                   <tr class="auth_opt auth_eap_tls">
-                    <td ><a id="help_for_certref" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("My Certificate"); ?></td>
+                    <td><a id="help_for_certref" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("My Certificate"); ?></td>
                     <td>
                       <select name="certref">
 <?php
diff --git a/src/www/vpn_ipsec_settings.php b/src/www/vpn_ipsec_settings.php
index eee6b9201..90268dae3 100644
--- a/src/www/vpn_ipsec_settings.php
+++ b/src/www/vpn_ipsec_settings.php
@@ -147,7 +147,7 @@ if (isset($input_errors) && count($input_errors) > 0) {
                 <div class="table-responsive">
                   <table class="table table-striped opnsense_standard_table_form">
                     <tr>
-                      <td ><strong><?=gettext("IPsec Advanced Settings"); ?></strong></td>
+                      <td><strong><?=gettext("IPsec Advanced Settings"); ?></strong></td>
                       <td style="text-align:right">
                         <small><?=gettext("full help"); ?> </small>
                         <i class="fa fa-toggle-off text-danger"  style="cursor: pointer;" id="show_all_help_page"></i>
diff --git a/src/www/vpn_openvpn_export.php b/src/www/vpn_openvpn_export.php
index 722855e11..a3c6298ae 100644
--- a/src/www/vpn_openvpn_export.php
+++ b/src/www/vpn_openvpn_export.php
@@ -1327,7 +1327,7 @@ if (isset($savemsg)) {
               </tr>
               <tr class="mode_server">
                 <td style="vertical-align:top"><a id="help_for_verify_server_cn" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Verify Server CN");?></td>
-                <td >
+                <td>
                       <select name="verifyservercn" id="verifyservercn">
                         <option value="auto"><?=gettext("Automatic - Use verify-x509-name (OpenVPN 2.3+) where possible");?></option>
                         <option value="tls-remote"><?=gettext("Use tls-remote (deprecated, use only on clients prior to OpenVPN 2.3)");?></option>
@@ -1343,7 +1343,7 @@ if (isset($savemsg)) {
               </tr>
               <tr class="mode_server">
                 <td style="vertical-align:top"><a id="help_for_random_local_port" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Use Random Local Port");?></td>
-                <td >
+                <td>
                       <input name="randomlocalport" id="randomlocalport" type="checkbox" value="yes" checked="CHECKED" />
                       <output class="hidden" for="help_for_random_local_port">
                         <?=gettext("Use a random local source port (lport) for traffic from the client. Without this set, two clients may not run concurrently.");?>
@@ -1353,7 +1353,7 @@ if (isset($savemsg)) {
               </tr>
               <tr class="mode_server">
                 <td style="vertical-align:top"><i class="fa fa-info-circle text-muted"></i> <?=gettext("Certificate Export Options");?></td>
-                <td >
+                <td>
                       <div>
                         <input name="usetoken" id="usetoken" type="checkbox" value="yes" />
                         <?=gettext("Use Microsoft Certificate Storage instead of local files.");?>
@@ -1372,7 +1372,7 @@ if (isset($savemsg)) {
               </tr>
               <tr>
                 <td style="vertical-align:top"><a id="help_for_http_proxy" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Use Proxy");?></td>
-                <td >
+                <td>
                       <input name="useproxy" id="useproxy" type="checkbox" value="yes" />
                       <output class="hidden" for="help_for_http_proxy">
                         <?=gettext("Use a proxy to communicate with the server.");?>
@@ -1408,7 +1408,7 @@ if (isset($savemsg)) {
               </tr>
               <tr class="mode_server">
                 <td style="vertical-align:top"><a id="help_for_openvpnmanager" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Management Interface OpenVPN Manager");?></td>
-                <td >
+                <td>
                       <input name="openvpnmanager" id="openvpnmanager" type="checkbox" value="yes" />
                       <output class="hidden" for="help_for_openvpnmanager">
                         <?=gettext('This will change the generated .ovpn configuration to allow for usage of the management interface. '.
@@ -1419,7 +1419,7 @@ if (isset($savemsg)) {
               </tr>
               <tr class="mode_server">
                 <td style="vertical-align:top"><a id="help_for_advancedoptions" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Additional configuration options");?></td>
-                <td >
+                <td>
                       <textarea rows="6" cols="68" name="advancedoptions" id="advancedoptions"></textarea><br/>
                       <output class="hidden" for="help_for_advancedoptions">
                         <?=gettext("Enter any additional options you would like to add to the OpenVPN client export configuration here, separated by a line break or semicolon"); ?><br/>