diff --git a/src/opnsense/mvc/app/views/OPNsense/TrafficShaper/index.volt b/src/opnsense/mvc/app/views/OPNsense/TrafficShaper/index.volt
index 46700fd84..45532a125 100644
--- a/src/opnsense/mvc/app/views/OPNsense/TrafficShaper/index.volt
+++ b/src/opnsense/mvc/app/views/OPNsense/TrafficShaper/index.volt
@@ -102,4 +102,3 @@ POSSIBILITY OF SUCH DAMAGE.
         <th><button id="test">test</button></th>
     </tfoot>
 </table>
-
diff --git a/src/opnsense/www/css/jquery.bootgrid.css b/src/opnsense/www/css/jquery.bootgrid.css
index 141855afb..7d526748a 100644
--- a/src/opnsense/www/css/jquery.bootgrid.css
+++ b/src/opnsense/www/css/jquery.bootgrid.css
@@ -1,4 +1,4 @@
-/*! 
+/*!
  * jQuery Bootgrid v1.2.0 - 05/02/2015
  * Copyright (c) 2014-2015 Rafael Staib (http://www.jquery-bootgrid.com)
  * Licensed under MIT http://www.opensource.org/licenses/MIT
diff --git a/src/opnsense/www/js/jquery.bootgrid.LICENSE b/src/opnsense/www/js/jquery.bootgrid.LICENSE
index 6c7128534..5d6f1bbb6 100644
--- a/src/opnsense/www/js/jquery.bootgrid.LICENSE
+++ b/src/opnsense/www/js/jquery.bootgrid.LICENSE
@@ -2,20 +2,20 @@ The MIT License (MIT)
 
 Copyright (c) 2014-2015 Rafael J. Staib
 
-Permission is hereby granted, free of charge, to any person obtaining a copy 
-of this software and associated documentation files (the "Software"), to deal 
-in the Software without restriction, including without limitation the rights 
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
-copies of the Software, and to permit persons to whom the Software is 
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in 
+The above copyright notice and this permission notice shall be included in
 all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
-THE SOFTWARE.
\ No newline at end of file
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/src/opnsense/www/js/jquery.bootgrid.js b/src/opnsense/www/js/jquery.bootgrid.js
index 469cc6a1d..9ca95b7ac 100644
--- a/src/opnsense/www/js/jquery.bootgrid.js
+++ b/src/opnsense/www/js/jquery.bootgrid.js
@@ -1,4 +1,4 @@
-/*! 
+/*!
  * jQuery Bootgrid v1.2.0 - 05/02/2015
  * Copyright (c) 2014-2015 Rafael Staib (http://www.jquery-bootgrid.com)
  * Licensed under MIT http://www.opensource.org/licenses/MIT
@@ -126,7 +126,7 @@
                     searchable: !(data.searchable === false), // default: true
                     sortable: !(data.sortable === false), // default: true
                     visible: !(data.visible === false), // default: true
-                    width: ($.isNumeric(data.width)) ? data.width + "px" : 
+                    width: ($.isNumeric(data.width)) ? data.width + "px" :
                         (typeof(data.width) === "string") ? data.width : null
                 };
             that.columns.push(column);
@@ -1082,7 +1082,7 @@
              * @for searchSettings
              **/
             delay: 250,
-            
+
             /**
              * The characters to type before the search gets executed.
              *
@@ -1330,7 +1330,7 @@
              * @for statusMapping
              **/
             2: "warning",
-            
+
             /**
              * Specifies a dangerous or potentially negative action.
              *
@@ -1514,7 +1514,7 @@
     };
 
     /**
-     * Searches in all rows for a specific phrase (but only in visible cells). 
+     * Searches in all rows for a specific phrase (but only in visible cells).
      * The search filter will be reseted, if no argument is provided.
      *
      * @method search
@@ -1659,7 +1659,7 @@
     };
 
     /**
-     * Sorts the rows by a given sort descriptor dictionary. 
+     * Sorts the rows by a given sort descriptor dictionary.
      * The sort filter will be reseted, if no argument is provided.
      *
      * @method sort
@@ -1820,8 +1820,8 @@
 
         _bgBusyAria: function(busy)
         {
-            return (busy == null || busy) ? 
-                this._bgAria("busy", "true") : 
+            return (busy == null || busy) ?
+                this._bgAria("busy", "true") :
                 this._bgAria("busy", "false");
         },
 
@@ -1832,29 +1832,29 @@
 
         _bgEnableAria: function (enable)
         {
-            return (enable == null || enable) ? 
-                this.removeClass("disabled")._bgAria("disabled", "false") : 
+            return (enable == null || enable) ?
+                this.removeClass("disabled")._bgAria("disabled", "false") :
                 this.addClass("disabled")._bgAria("disabled", "true");
         },
 
         _bgEnableField: function (enable)
         {
-            return (enable == null || enable) ? 
-                this.removeAttr("disabled") : 
+            return (enable == null || enable) ?
+                this.removeAttr("disabled") :
                 this.attr("disabled", "disable");
         },
 
         _bgShowAria: function (show)
         {
-            return (show == null || show) ? 
+            return (show == null || show) ?
                 this.show()._bgAria("hidden", "false") :
                 this.hide()._bgAria("hidden", "true");
         },
 
         _bgSelectAria: function (select)
         {
-            return (select == null || select) ? 
-                this.addClass("active")._bgAria("selected", "true") : 
+            return (select == null || select) ?
+                this.addClass("active")._bgAria("selected", "true") :
                 this.removeClass("active")._bgAria("selected", "false");
         },
 
@@ -1944,8 +1944,8 @@
         {
             var skip = (page - 1) * size,
                 end = skip + size;
-            return (this.length > skip) ? 
-                (this.length > end) ? this.slice(skip, end) : 
+            return (this.length > skip) ?
+                (this.length > end) ? this.slice(skip, end) :
                     this.slice(skip) : [];
         };
     }
@@ -2034,4 +2034,4 @@
     // ============
 
 $("[data-toggle=\"bootgrid\"]").bootgrid();
-})(jQuery, window);
\ No newline at end of file
+})(jQuery, window);
diff --git a/src/www/diag_logs_proxy.php b/src/www/diag_logs_proxy.php
index cc7e6178e..72cb540fe 100644
--- a/src/www/diag_logs_proxy.php
+++ b/src/www/diag_logs_proxy.php
@@ -57,9 +57,9 @@ include("head.inc");
                 <div class="tab-content content-box col-xs-12">
                     <div class="container-fluid">
                         <p> <?php printf(gettext("Last %s log entries"), $max_logentries);?></p>
-                        <pre><?php 
+                        <pre><?php
                                 if (file_exists($logfile)) {
-                                        echo trim(implode("", array_slice(file($logfile), -$max_logentries)));  
+                                        echo trim(implode("", array_slice(file($logfile), -$max_logentries)));
                                 }
                         ?></pre>
                         <form method="post">
diff --git a/src/www/diag_logs_vpn.php b/src/www/diag_logs_vpn.php
index 60ff5cba0..3b486673e 100644
--- a/src/www/diag_logs_vpn.php
+++ b/src/www/diag_logs_vpn.php
@@ -80,7 +80,7 @@ function dump_clog_vpn($logfile, $tail) {
 	else
 		exec("/usr/local/sbin/clog " . escapeshellarg($logfile) . " | tail {$sor} -n " . $tail, $logarr);
 
-	foreach ($logarr as $logent) { 
+	foreach ($logarr as $logent) {
 		$logent = preg_split("/\s+/", $logent, 6);
 		$llent = explode(",", $logent[5]);
 		$iftype = substr($llent[1], 0, 4);