diff --git a/src/www/firewall_aliases_edit.php b/src/www/firewall_aliases_edit.php
index d2923b35a..17168714c 100644
--- a/src/www/firewall_aliases_edit.php
+++ b/src/www/firewall_aliases_edit.php
@@ -469,7 +469,7 @@ endforeach;
                         <?=gettext("Networks")?><br/>
                       </span>
                       <small>
-                        <?=gettext("Networks are specified in CIDR format.  Select the CIDR mask that pertains to each entry. /32 specifies a single IPv4 host, /128 specifies a single IPv6 host, /24 specifies 255.255.255.0, /64 specifies a normal IPv6 network, etc. Hostnames (FQDNs) may also be specified, using a /32 mask for IPv4 or /128 for IPv6.");?>
+                        <?=gettext("Networks are specified in CIDR format. Select the CIDR mask that pertains to each entry. /32 specifies a single IPv4 host, /128 specifies a single IPv6 host, /24 specifies 255.255.255.0, /64 specifies a normal IPv6 network, etc. Hostnames (FQDNs) may also be specified, using a /32 mask for IPv4 or /128 for IPv6.");?>
                         <br/>
                       </small>
                       <span class="text-info">
diff --git a/src/www/firewall_aliases_import.php b/src/www/firewall_aliases_import.php
index d381cec1c..9850b57c8 100644
--- a/src/www/firewall_aliases_import.php
+++ b/src/www/firewall_aliases_import.php
@@ -187,7 +187,7 @@ include("head.inc");
                         <?=gettext("Networks")?><br/>
                       </span>
                       <small>
-                        <?=gettext("Networks are specified in CIDR format.  Select the CIDR mask that pertains to each entry. /32 specifies a single IPv4 host, /128 specifies a single IPv6 host, /24 specifies 255.255.255.0, /64 specifies a normal IPv6 network, etc. Hostnames (FQDNs) may also be specified, using a /32 mask for IPv4 or /128 for IPv6.");?>
+                        <?=gettext("Networks are specified in CIDR format. Select the CIDR mask that pertains to each entry. /32 specifies a single IPv4 host, /128 specifies a single IPv6 host, /24 specifies 255.255.255.0, /64 specifies a normal IPv6 network, etc. Hostnames (FQDNs) may also be specified, using a /32 mask for IPv4 or /128 for IPv6.");?>
                         <br/>
                       </small>
                       <span class="text-info">
diff --git a/src/www/services_router_advertisements.php b/src/www/services_router_advertisements.php
index 69806355e..1af5086aa 100644
--- a/src/www/services_router_advertisements.php
+++ b/src/www/services_router_advertisements.php
@@ -328,8 +328,8 @@ include("head.inc");
                       </table>
                       <div class="hidden" for="help_for_subnets">
                         <?=gettext("Subnets are specified in CIDR format.  " .
-                              "Select the CIDR mask that pertains to each entry.  " .
-                              "/128 specifies a single IPv6 host; /64 specifies a normal IPv6 network; etc.  " .
+                              "Select the CIDR mask that pertains to each entry. " .
+                              "/128 specifies a single IPv6 host; /64 specifies a normal IPv6 network; etc. " .
                               "If no subnets are specified here, the Router Advertisement (RA) Daemon will advertise to the subnet to which the router's interface is assigned.");?>
                       </div>
                     </td>
diff --git a/src/www/services_wol_edit.php b/src/www/services_wol_edit.php
index 255683077..5c714cc26 100644
--- a/src/www/services_wol_edit.php
+++ b/src/www/services_wol_edit.php
@@ -139,7 +139,7 @@ legacy_html_escape_form_data($pconfig);
                     <td>
                       <input name="mac" type="text" value="<?=$pconfig['mac'];?>" />
                       <div class="hidden" for="help_for_mac">
-                        <?=gettext("Enter a MAC address  in the following format: xx:xx:xx:xx:xx:xx");?>
+                        <?=gettext("Enter a MAC address in the following format: xx:xx:xx:xx:xx:xx");?>
                       </div>
                     </td>
                   </tr>
diff --git a/src/www/system_advanced_admin.php b/src/www/system_advanced_admin.php
index 4d1f716da..0c8070b98 100644
--- a/src/www/system_advanced_admin.php
+++ b/src/www/system_advanced_admin.php
@@ -508,7 +508,7 @@ include("head.inc");
                     <input name="enableserial" type="checkbox" id="enableserial" value="yes" <?=!empty($pconfig['enableserial']) ? "checked=\"checked\"" : "";?> />
                     <strong><?=gettext("Enables the first serial port with 115200/8/N/1 by default, or another speed selectable below."); ?></strong>
                     <div class="hidden" for="help_for_enableserial">
-                      <?=gettext("Note:  This will redirect the console output and messages to the serial port. You can still access the console menu from the internal video card/keyboard. A <b>null modem</b> serial cable or adapter is required to use the serial console."); ?>
+                      <?=gettext("Note: This will redirect the console output and messages to the serial port. You can still access the console menu from the internal video card/keyboard. A null modem serial cable or adapter is required to use the serial console."); ?>
                     </div>
                   </td>
                 </tr>
diff --git a/src/www/system_advanced_firewall.php b/src/www/system_advanced_firewall.php
index b0d2a5242..2ac045ba0 100644
--- a/src/www/system_advanced_firewall.php
+++ b/src/www/system_advanced_firewall.php
@@ -485,19 +485,19 @@ include("head.inc");
                       <table class="table table-condensed">
                         <tr>
                           <td><strong><?=gettext("normal");?></strong></td>
-                          <td><?=gettext("as the name says, it is the normal optimization algorithm");?></td>
+                          <td><?=gettext("As the name says, it is the normal optimization algorithm");?></td>
                         </tr>
                         <tr>
                           <td><strong><?=gettext("high-latency");?></strong></td>
-                          <td><?=gettext("used for high latency links, such as satellite links.  Expires idle connections later than default");?></td>
+                          <td><?=gettext("Used for high latency links, such as satellite links. Expires idle connections later than default");?></td>
                         </tr>
                         <tr>
                           <td><strong><?=gettext("aggressive");?></strong></td>
-                          <td><?=gettext("expires idle connections quicker. More efficient use of CPU and memory but can drop legitimate idle connections");?></td>
+                          <td><?=gettext("Expires idle connections quicker. More efficient use of CPU and memory but can drop legitimate idle connections");?></td>
                         </tr>
                         <tr>
                           <td><strong><?=gettext("conservative");?></strong></td>
-                          <td><?=gettext("tries to avoid dropping any legitimate idle connections at the expense of increased memory usage and CPU utilization.");?></td>
+                          <td><?=gettext("Tries to avoid dropping any legitimate idle connections at the expense of increased memory usage and CPU utilization.");?></td>
                         </tr>
                       </table>
                       <hr/>
@@ -555,7 +555,7 @@ include("head.inc");
                       <strong><?=gettext("start");?></strong></br>
                       <?=gettext("When the number of state entries exceeds this value, adaptive scaling begins. All timeout values are scaled linearly with factor (adaptive.end - number of states) / (adaptive.end - adaptive.start).");?><br/>
                       <strong><?=gettext("end");?></strong></br>
-                      <?=gettext("When reaching this number of state entries, all timeout values become zero, effectively purging all state entries immediately.  This value is used to define the scale factor, it should not actually be reached (set a lower state limit, see below).");?>
+                      <?=gettext("When reaching this number of state entries, all timeout values become zero, effectively purging all state entries immediately. This value is used to define the scale factor, it should not actually be reached (set a lower state limit, see below).");?>
                       <br/>
                       <strong><?=gettext("Note: Leave this blank for the default(0).");?></strong>
                     </div>
diff --git a/src/www/system_advanced_notifications.php b/src/www/system_advanced_notifications.php
index 1bedab901..ad156a534 100644
--- a/src/www/system_advanced_notifications.php
+++ b/src/www/system_advanced_notifications.php
@@ -105,12 +105,12 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
             !empty($config['notifications']['growl']['password'])) {
             @unlink('/var/db/growlnotices_lastmsg.txt');
             register_via_growl();
-            notify_via_growl(sprintf(gettext("This is a test message from %s.  It is safe to ignore this message."), $g['product_name']), true);
+            notify_via_growl(sprintf(gettext("This is a test message from %s. It is safe to ignore this message."), $g['product_name']), true);
         }
     } elseif (!empty($pconfig['test_smtp']) && $pconfig['test_smtp'] == gettext("Test SMTP")) {
         // Send test message via smtp
         @unlink('/var/db/notices_lastmsg.txt');
-        notify_via_smtp(sprintf(gettext("This is a test message from %s.  It is safe to ignore this message."), $g['product_name']), true);
+        notify_via_smtp(sprintf(gettext("This is a test message from %s. It is safe to ignore this message."), $g['product_name']), true);
     }
 }
 
diff --git a/src/www/system_advanced_sysctl.php b/src/www/system_advanced_sysctl.php
index 016127db0..07c570d83 100644
--- a/src/www/system_advanced_sysctl.php
+++ b/src/www/system_advanced_sysctl.php
@@ -147,7 +147,7 @@ $( document ).ready(function() {
             print_info_box($savemsg);
         }
         if (is_subsystem_dirty('sysctl') && ($act != "edit" )) {
-            print_info_box_apply(gettext("The firewall tunables have changed.  You must apply the configuration to take affect."));
+            print_info_box_apply(gettext("The firewall tunables have changed. You must apply the configuration to take affect."));
         }
 ?>
       <form method="post" id="iform">
@@ -223,7 +223,7 @@ $( document ).ready(function() {
                     <td>&nbsp;</td>
                     <td>
                       <input name="Submit" type="submit" class="btn btn-primary" value="<?=gettext("Save"); ?>" />
-                      <input type="button" class="btn btn-default" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=(isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/system_advanced_sysctl.php');?>'" />
+                      <input type="button" class="btn btn-default" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=(isset($_SERVER['HTTP_REFERER']) ? html_safe($_SERVER['HTTP_REFERER']) : '/system_advanced_sysctl.php');?>'" />
 
 <?php
                       if (isset($id)) :?>
diff --git a/src/www/system_hasync.php b/src/www/system_hasync.php
index edac78d73..468a6d597 100644
--- a/src/www/system_hasync.php
+++ b/src/www/system_hasync.php
@@ -133,7 +133,7 @@ include("head.inc");
                       <?=gettext('If Synchronize States is enabled, it will utilize this interface for communication.') ?><br/><br/>
                       <div class="well">
                         <lu>
-                        <li><?=gettext('We recommend setting this to a interface other than LAN!  A dedicated interface works the best.') ?></li>
+                        <li><?=gettext('We recommend setting this to a interface other than LAN! A dedicated interface works the best.') ?></li>
                         <li><?=gettext('You must define a IP on each machine participating in this failover group.') ?></li>
                         <li><?=gettext('You must have an IP assigned to the interface on any participating sync nodes.') ?></li>
                         </lu>
@@ -146,7 +146,7 @@ include("head.inc");
                   <td>
                     <input name="pfsyncpeerip" type="text" value="<?=$pconfig['pfsyncpeerip']; ?>" />
                     <div class="hidden" for="help_for_pfsyncpeerip">
-                      <?=gettext('Setting this option will force pfsync to synchronize its state table to this IP address.  The default is directed multicast.') ?>
+                      <?=gettext('Setting this option will force pfsync to synchronize its state table to this IP address. The default is directed multicast.') ?>
                     </div>
                   </td>
                 </tr>
diff --git a/src/www/system_routes.php b/src/www/system_routes.php
index ffb97f009..802208923 100644
--- a/src/www/system_routes.php
+++ b/src/www/system_routes.php
@@ -324,7 +324,7 @@ endif; ?>
                   </tr>
                   <tr>
                     <td colspan="7">
-                      <?=gettext("Do not enter static routes for networks assigned on any interface of this firewall.  Static routes are only used for networks reachable via a different router, and not reachable via your default gateway.");?>
+                      <?=gettext("Do not enter static routes for networks assigned on any interface of this firewall. Static routes are only used for networks reachable via a different router, and not reachable via your default gateway.");?>
                     </td>
                   </tr>
                 </table>
diff --git a/src/www/vpn_openvpn_csc.php b/src/www/vpn_openvpn_csc.php
index 55a81faa4..5afb400d4 100644
--- a/src/www/vpn_openvpn_csc.php
+++ b/src/www/vpn_openvpn_csc.php
@@ -623,8 +623,8 @@ if ($act!="new" && $act!="edit") {
                         Scope ID:&nbsp;
                         <input name="netbios_scope" type="text" id="netbios_scope" value="<?=$pconfig['netbios_scope'];?>" />
                         <div class="hidden" for="help_for_netbios_enable">
-                          <?=gettext("A NetBIOS Scope  ID provides an extended naming " .
-                                                    "service for  NetBIOS over TCP/IP. The NetBIOS " .
+                          <?=gettext("A NetBIOS Scope ID provides an extended naming " .
+                                                    "service for NetBIOS over TCP/IP. The NetBIOS " .
                                                     "scope ID isolates NetBIOS traffic on a single " .
                                                     "network to only those nodes with the same " .
                                                     "NetBIOS scope ID."); ?>
diff --git a/src/www/vpn_openvpn_server.php b/src/www/vpn_openvpn_server.php
index 76a729476..46e9e881f 100644
--- a/src/www/vpn_openvpn_server.php
+++ b/src/www/vpn_openvpn_server.php
@@ -1218,7 +1218,7 @@ endif; ?>
                                                   "communications between this server and client " .
                                                   "hosts expressed using CIDR (eg. 10.0.8.0/24). " .
                                                   "The first network address will be assigned to " .
-                                                  "the  server virtual interface. The remaining " .
+                                                  "the server virtual interface. The remaining " .
                                                   "network addresses can optionally be assigned " .
                                                   "to connecting clients. (see Address Pool)"); ?>
                         </div>
@@ -1603,8 +1603,8 @@ endif; ?>
                           </span>
                           <input name="netbios_scope" type="text" class="form-control unknown" id="netbios_scope" size="30" value="<?=$pconfig['netbios_scope'];?>" />
                           <div class="hidden" for="help_for_netbios_enable">
-                            <?=gettext("A NetBIOS Scope  ID provides an extended naming " .
-                                                        "service for  NetBIOS over TCP/IP. The NetBIOS " .
+                            <?=gettext("A NetBIOS Scope ID provides an extended naming " .
+                                                        "service for NetBIOS over TCP/IP. The NetBIOS " .
                                                         "scope ID isolates NetBIOS traffic on a single " .
                                                         "network to only those nodes with the same " .
                                                         "NetBIOS scope ID."); ?>
diff --git a/src/www/vpn_pppoe_edit.php b/src/www/vpn_pppoe_edit.php
index bb4dda97f..aeb13234c 100644
--- a/src/www/vpn_pppoe_edit.php
+++ b/src/www/vpn_pppoe_edit.php
@@ -112,7 +112,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
             $input_errors[] = sprintf(gettext("No password specified for username %s"), $usr);
         }
         if ($pconfig['users_ip'][$item_idx] <> "" && !is_ipaddr($pconfig['users_ip'][$item_idx])) {
-            $input_errors[] = sprintf(gettext("Incorrect ip address  specified for username %s"), $usr);
+            $input_errors[] = sprintf(gettext("Incorrect ip address specified for username %s"), $usr);
         }
     }