commit 8cd558b61b9c24ee109993d8e76ddc4870ffa4fa
Author: ayvis <ayvis.infra@gmail.com>
Date:   Fri Mar 14 21:24:03 2014 +0100

    xhtml Compliance
    replaced <br>, <br/> and </br> with <br />

diff --git a/etc/inc/auth.inc b/etc/inc/auth.inc
index c686ff4bfe..cd7934ef03 100644
--- a/etc/inc/auth.inc
+++ b/etc/inc/auth.inc
@@ -104,7 +104,7 @@ if (function_exists("display_error_form") && !isset($config['system']['webgui'][
 
 	if($found_host == false) {
 		if(!security_checks_disabled()) {
-			display_error_form("501", gettext("Potential DNS Rebind attack detected, see http://en.wikipedia.org/wiki/DNS_rebinding<br/>Try accessing the router by IP address instead of by hostname."));
+			display_error_form("501", gettext("Potential DNS Rebind attack detected, see http://en.wikipedia.org/wiki/DNS_rebinding<br />Try accessing the router by IP address instead of by hostname."));
 			exit;
 		}
 		$security_passed = false;
@@ -1206,7 +1206,7 @@ function radius_backed($username, $passwd, $authcfg, &$attributes = array()) {
 		$retvalue['auth_val'] = 1;
 		$retvalue['error'] = $rauth->getError();
 		if ($debug)
-			printf(gettext("Radius start: %s<br>\n"), $retvalue['error']);
+			printf(gettext("Radius start: %s<br />\n"), $retvalue['error']);
 	}
 
 	// XXX - billm - somewhere in here we need to handle securid challenge/response
@@ -1217,18 +1217,18 @@ function radius_backed($username, $passwd, $authcfg, &$attributes = array()) {
 		$retvalue['auth_val'] = 1;
 		$retvalue['error'] = $result->getMessage();
 		if ($debug)
-			printf(gettext("Radius send failed: %s<br>\n"), $retvalue['error']);
+			printf(gettext("Radius send failed: %s<br />\n"), $retvalue['error']);
 	} else if ($result === true) {
 		if ($rauth->getAttributes())
 			$attributes = $rauth->listAttributes();
 		$retvalue['auth_val'] = 2;
 		if ($debug)
-			printf(gettext("Radius Auth succeeded")."<br>\n");
+			printf(gettext("Radius Auth succeeded")."<br />\n");
 		$ret = true;
 	} else {
 		$retvalue['auth_val'] = 3;
 		if ($debug)
-			printf(gettext("Radius Auth rejected")."<br>\n");
+			printf(gettext("Radius Auth rejected")."<br />\n");
 	}
 
 	// close OO RADIUS_AUTHENTICATION
diff --git a/etc/inc/authgui.inc b/etc/inc/authgui.inc
index fe9d2ca8c0..93c9484f76 100644
--- a/etc/inc/authgui.inc
+++ b/etc/inc/authgui.inc
@@ -260,7 +260,7 @@ $have_cookies = isset($_COOKIE["cookie_test"]);
 			<?php 
 				if(is_ipaddr($http_host) && !$local_ip && !isset($config['system']['webgui']['nohttpreferercheck'])) {
 					$nifty_background = "#999";
-					print_info_box(gettext("You are accessing this router by an IP address not configured locally, which may be forwarded by NAT or other means. <br/><br/>If you did not setup this forwarding, you may be the target of a man-in-the-middle attack.")); 
+					print_info_box(gettext("You are accessing this router by an IP address not configured locally, which may be forwarded by NAT or other means. <br /><br />If you did not setup this forwarding, you may be the target of a man-in-the-middle attack.")); 
 				}
 				$noautocomplete = isset($config['system']['webgui']['noautocomplete']) ? 'autocomplete="off"' : '';
 			?>
@@ -287,7 +287,7 @@ $have_cookies = isset($_COOKIE["cookie_test"]);
 					</span>
 
 					<?php if (!$have_cookies && isset($_POST['login'])): ?>
-					<br/><br/>
+					<br /><br />
 					<span style="text-align:center; font-weight: normal ; font-style: italic; color: #ff0000">
 						<?= gettext("Your browser must support cookies to login."); ?>
 					</span>
diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc
index 2cdd180746..ed0dc1d3b5 100644
--- a/etc/inc/captiveportal.inc
+++ b/etc/inc/captiveportal.inc
@@ -91,7 +91,7 @@ function get_default_captive_portal_html() {
 									</b>
 									</font>
 								</div>
-								<br/>
+								<br />
 								<div id='loginbox'>
 								<table>
 									<tr><td colspan="2"><center>Welcome to the {$g['product_name']} Captive Portal!</td></tr>
diff --git a/etc/inc/functions.inc b/etc/inc/functions.inc
index c59d275723..e434228f47 100644
--- a/etc/inc/functions.inc
+++ b/etc/inc/functions.inc
@@ -107,7 +107,7 @@ if(!function_exists("get_menu_messages")) {
 						}
 					$notice_msgs .="</table>";
 						
-					$domtt= "onclick=\"domTT_activate(this, event, 'caption', '{$notice}','content', '<br>{$notice_msgs}', 'trail', false, 'delay', 0, 'fade', 'both', 'fadeMax', 93, 'styleClass', 'niceTitle','width','{$domtt_width}','y',5,'type', 'sticky');\"";					
+					$domtt= "onclick=\"domTT_activate(this, event, 'caption', '{$notice}','content', '<br />{$notice_msgs}', 'trail', false, 'delay', 0, 'fade', 'both', 'fadeMax', 93, 'styleClass', 'niceTitle','width','{$domtt_width}','y',5,'type', 'sticky');\"";					
                     $menu_messages="<div id='alerts' ; >\n";
                     if(count($notices)==1)
                     	$msg= sprintf("%1$02d",count($notices))." ".gettext("unread notice");
diff --git a/etc/inc/pkg-utils.inc b/etc/inc/pkg-utils.inc
index ad53f4a795..bf7342c985 100644
--- a/etc/inc/pkg-utils.inc
+++ b/etc/inc/pkg-utils.inc
@@ -626,7 +626,7 @@ function install_package($package, $pkg_info = "", $force_install = false) {
 			else {
 				$static_output .= gettext("failed!\n\nInstallation aborted.\n");
 				update_output_window($static_output);
-				echo "<br>Show <a href=\"pkg_mgr_install.php?showlog=true\">install log</a></center>";
+				echo "<br />Show <a href=\"pkg_mgr_install.php?showlog=true\">install log</a></center>";
 			}
 			conf_mount_ro();
 			return -1;
diff --git a/etc/inc/radius.inc b/etc/inc/radius.inc
index 51a3bae293..a2ffb4ba8f 100644
--- a/etc/inc/radius.inc
+++ b/etc/inc/radius.inc
@@ -255,7 +255,7 @@ class Auth_RADIUS extends PEAR {
     function dumpAttributes()
     {
         foreach ($this->attributes as $name => $data) {
-            echo "$name:$data<br>\n";
+            echo "$name:$data<br />\n";
         }
     }
 
diff --git a/etc/inc/shaper.inc b/etc/inc/shaper.inc
index 9e06ab9de6..83ab9ee4f3 100644
--- a/etc/inc/shaper.inc
+++ b/etc/inc/shaper.inc
@@ -633,15 +633,15 @@ class altq_root_queue {
 	 * to the user like the traffic wizard does.
 	 */
 	function build_form() {
-		$form = "<tr><td valign=\"middle\" class=\"vncellreq\"><br/>";
+		$form = "<tr><td valign=\"middle\" class=\"vncellreq\"><br />";
 		$form .= gettext("Enable/Disable");
-		$form .= "<br/></td><td class=\"vncellreq\">";
+		$form .= "<br /></td><td class=\"vncellreq\">";
 		$form .= " <input type=\"checkbox\" id=\"enabled\" name=\"enabled\" value=\"on\"";
 		if ($this->GetEnabled() == "on")
 			$form .=  " checked=\"checked\"";
 		$form .= " /><span class=\"vexpl\"> " . gettext("Enable/disable discipline and its children") . "</span>";
 		$form .= "</td></tr>";
-		$form .= "<tr><td valign=\"middle\" class=\"vncellreq\"><br/><span class=\"vexpl\">" . gettext("Name") . "</span></td>";
+		$form .= "<tr><td valign=\"middle\" class=\"vncellreq\"><br /><span class=\"vexpl\">" . gettext("Name") . "</span></td>";
 		$form .= "<td class=\"vncellreq\">";
 		$form .= "<strong>".$this->GetQname()."</strong>";
 		$form .= "</td></tr>";
@@ -670,7 +670,7 @@ class altq_root_queue {
 			$form .= " selected=\"selected\"";
 		$form .= ">PRIQ</option>";
 		$form .= "</select>";
-		$form .= "<br/> <span class=\"vexpl\">";
+		$form .= "<br /> <span class=\"vexpl\">";
 		$form .= gettext("NOTE: Changing this changes all child queues!");
 		$form .= gettext(" Beware you can lose information.");
 		$form .= "</span>";
@@ -709,7 +709,7 @@ class altq_root_queue {
 		$form .= "<br /><input type=\"text\" id=\"tbrconfig\" name=\"tbrconfig\" value=\"";
 		$form .= $this->GetTbrConfig();
 		$form .= "\" />";
-		$form .= "<br/> <span class=\"vexpl\">";
+		$form .= "<br /> <span class=\"vexpl\">";
 		$form .= gettext("Adjusts the size, in bytes, of the token bucket regulator. "
 		      .  "If not specified, heuristics based on the interface "
 		      .  "bandwidth are used to determine the size.");
@@ -1161,9 +1161,9 @@ class priq_queue {
 	 * need to update it.
 	 */
 	function build_form() {
-		$form = "<tr><td valign=\"middle\" class=\"vncellreq\"><br/>";
+		$form = "<tr><td valign=\"middle\" class=\"vncellreq\"><br />";
 		$form .= gettext("Enable/Disable");
-		$form .= "<br/></td><td class=\"vncellreq\">";
+		$form .= "<br /></td><td class=\"vncellreq\">";
 		$form .= " <input type=\"checkbox\" id=\"enabled\" name=\"enabled\" value=\"on\"";
 		if ($this->GetEnabled() == "on")
 			$form .=  " checked=\"checked\"";
@@ -1185,14 +1185,14 @@ class priq_queue {
 		$form .= "<td width=\"78%\" class=\"vtable\"> <input name=\"priority\" type=\"text\" id=\"priority\" size=\"5\" value=\"";
 		$form .= htmlspecialchars($this->GetQpriority());
 		$form .= "\" />";
-		$form .= "<br/> <span class=\"vexpl\">" . gettext("For hfsc, the range is 0 to 7. The default is 1.  Hfsc queues with a higher priority are preferred in the case of overload.") . "</span></td>";
+		$form .= "<br /> <span class=\"vexpl\">" . gettext("For hfsc, the range is 0 to 7. The default is 1.  Hfsc queues with a higher priority are preferred in the case of overload.") . "</span></td>";
 		$form .= "</tr>";
 		$form .= "<tr>";
 		$form .= "<td width=\"22%\" valign=\"middle\" class=\"vncellreq\">" . gettext("Queue limit") . "</td>";
 		$form .= "<td width=\"78%\" class=\"vtable\"> <input name=\"qlimit\" type=\"text\" id=\"qlimit\" size=\"8\" value=\"";
 		$form .= htmlspecialchars($this->GetQlimit());
 		$form .= "\" />";
-		$form .= "<br/> <span class=\"vexpl\">" . gettext("Queue limit in packets.");
+		$form .= "<br /> <span class=\"vexpl\">" . gettext("Queue limit in packets.");
 		$form .= "</span></td></tr>";
 		$form .= "<tr>";
 		$form .= "<td width=\"22%\" valign=\"middle\" class=\"vncell\">" . gettext("Scheduler options") . "</td>";
@@ -1200,33 +1200,33 @@ class priq_queue {
 		if (empty($this->subqueues)) {
 			if ($this->GetDefault()) {
 				$form .= "<input type=\"checkbox\" id=\"default\" checked=\"checked\" name=\"default\" value=\"default\"";
-				$form .= " /> " . gettext("Default queue") . "<br/>";
+				$form .= " /> " . gettext("Default queue") . "<br />";
 			} else {
 				$form .= "<input type=\"checkbox\" id=\"default\" name=\"default\" value=\"default\"";
-				$form .= " /> " . gettext("Default queue") . "<br/>";
+				$form .= " /> " . gettext("Default queue") . "<br />";
 			}
 		}
 		$form .= "<input type=\"checkbox\" id=\"red\" name=\"red\" value=\"red\" ";
 		$tmpvalue = $this->GetRed();
 		if(!empty($tmpvalue))
 			$form .=  " checked=\"checked\"";
-		$form .= " /> <a target=\"_new\" href=\"http://www.openbsd.org/faq/pf/queueing.html#red\">" . gettext("Random Early Detection") . "</a><br/>";
+		$form .= " /> <a target=\"_new\" href=\"http://www.openbsd.org/faq/pf/queueing.html#red\">" . gettext("Random Early Detection") . "</a><br />";
 		$form .= "<input type=\"checkbox\" id=\"rio\" name=\"rio\" value=\"rio\"";
 		$tmpvalue = $this->GetRio();
 		if(!empty($tmpvalue))
 			$form .=  " checked=\"checked\"";
-		$form .= " /> <a target=\"_new\" href=\"http://www.openbsd.org/faq/pf/queueing.html#rio\">" . gettext("Random Early Detection In and Out") . "</a><br/>";
+		$form .= " /> <a target=\"_new\" href=\"http://www.openbsd.org/faq/pf/queueing.html#rio\">" . gettext("Random Early Detection In and Out") . "</a><br />";
 		$form .= "<input type=\"checkbox\" id=\"ecn\" name=\"ecn\" value=\"ecn\"";
 		$tmpvalue = $this->GetEcn();
 		if(!empty($tmpvalue))
 			$form .=  " checked=\"checked\"";
-		$form .= " /> <a target=\"_new\" href=\"http://www.openbsd.org/faq/pf/queueing.html#ecn\">" . gettext("Explicit Congestion Notification") . "</a><br/>";
+		$form .= " /> <a target=\"_new\" href=\"http://www.openbsd.org/faq/pf/queueing.html#ecn\">" . gettext("Explicit Congestion Notification") . "</a><br />";
 		$form .= "<input type=\"checkbox\" id=\"codel\" name=\"codel\" value=\"codel\"";
 		$tmpvalue = $this->GetCodel();
 		if(!empty($tmpvalue))
 			$form .=  " checked=\"checked\"";
-		$form .= " /> <a target=\"_new\" href=\"http://www.bufferbloat.net/projects/codel/wiki\">" . gettext("Codel Active Queue") . "</a><br/>";
-		$form .= "<span class=\"vexpl\"><br/>" . gettext("Select options for this queue");
+		$form .= " /> <a target=\"_new\" href=\"http://www.bufferbloat.net/projects/codel/wiki\">" . gettext("Codel Active Queue") . "</a><br />";
+		$form .= "<span class=\"vexpl\"><br />" . gettext("Select options for this queue");
 		$form .= "</span></td></tr><tr>";
 		$form .= "<td width=\"22%\" class=\"vncellreq\">" . gettext("Description") . "</td>";
 		$form .= "<td width=\"78%\" class=\"vtable\">";
@@ -1934,7 +1934,7 @@ class hfsc_queue extends priq_queue {
 		if ($this->GetBwscale() == "%")
 			$form .= " selected=\"selected\"";
 		$form .= ">%</option>";
-		$form .= "</select> <br/>";
+		$form .= "</select> <br />";
 		$form .= "<span class=\"vexpl\">" . gettext("Choose the amount of bandwidth for this queue");
 		$form .= "</span></td></tr>";
 		$form .= "<tr>";
@@ -1999,7 +1999,7 @@ class hfsc_queue extends priq_queue {
 		if ($this->GetLinkshare() == "")
 			$form .= " disabled=\"disabled\"";
 		$form .= " /></td><td>" . gettext("The bandwidth share of a backlogged queue - this overrides priority.") . "</td></tr>";
-		$form .= "</table><br/>";
+		$form .= "</table><br />";
 		$form .= gettext("The format for service curve specifications is (m1, d, m2).  m2 controls "
 		      .  "the bandwidth assigned to the queue.  m1 and d are optional and can be "
 		      .  "used to control the initial bandwidth assignment.  For the first d milliseconds the queue gets the bandwidth given as m1, afterwards the value "
@@ -2420,14 +2420,14 @@ class cbq_queue extends priq_queue {
 		if ($this->GetBwscale() == "%")
 			$form .= " selected=\"selected\"";
 		$form .= ">%</option>";
-		$form .= "</select> <br/>";
+		$form .= "</select> <br />";
 		$form .= "<span class=\"vexpl\">" . gettext("Choose the amount of bandwidth for this queue");
 		$form .= "</span></td></tr>";
 		$form .= "<tr><td class=\"vncellreq\">" . gettext("Scheduler specific options") . "</td>";
 		$form .= "<td class=\"vtable\"><input type=\"checkbox\" id=\"borrow\" name=\"borrow\"";
 		if($this->GetBorrow() == "on")
 			$form .=  " checked=\"checked\" ";
-		$form .= " /> " . gettext("Borrow from other queues when available") . "<br/></td></tr>";
+		$form .= " /> " . gettext("Borrow from other queues when available") . "<br /></td></tr>";
 
 		return $form;
 	}
@@ -2694,7 +2694,7 @@ class fairq_queue extends priq_queue {
 		if ($this->GetBwscale() == "%")
 			$form .= " selected=\"selected\"";
 		$form .= ">%</option>";
-		$form .= "</select> <br/>";
+		$form .= "</select> <br />";
 		$form .= "<span class=\"vexpl\">" . gettext("Choose the amount of bandwidth for this queue");
 		$form .= "</span></td></tr>";
 		$form .= "<tr><td class=\"vncellreq\">" . gettext("Scheduler specific options") . "</td>";
@@ -2703,12 +2703,12 @@ class fairq_queue extends priq_queue {
 		$tmpvalue = trim($this->GetBuckets());
 		if(!empty($tmpvalue))
 			$form .=  $this->GetBuckets();
-		$form .= "\" /> " . gettext("Number of buckets available.") . "<br/></td></tr>";
+		$form .= "\" /> " . gettext("Number of buckets available.") . "<br /></td></tr>";
 		$form .= "<tr><td class=\"vtable\"><input id=\"hogs\" name=\"hogs\" value=\"";
 		$tmpvalue = trim($this->GetHogs());
 		if(!empty($tmpvalue))
 			$form .=  $this->GetHogs();
-		$form .= "\" /> " . gettext("Bandwidth limit for hosts to not saturate link.") . "<br/></td></tr>";
+		$form .= "\" /> " . gettext("Bandwidth limit for hosts to not saturate link.") . "<br /></td></tr>";
 		$form .= "</table></td></tr>";
 		return $form;
 	}
@@ -3297,7 +3297,7 @@ EOD;
 			}
 		}
 
-		$form = "<tr><td valign=\"middle\" class=\"vncellreq\"><br/>";
+		$form = "<tr><td valign=\"middle\" class=\"vncellreq\"><br />";
 		$form .= gettext("Enable");
 		$form .= "</td><td class=\"vncellreq\">";
 		$form .= " <input type=\"checkbox\" id=\"enabled\" name=\"enabled\" value=\"on\"";
@@ -3305,7 +3305,7 @@ EOD;
 			$form .=  " checked=\"checked\"";
 		$form .= " /><span class=\"vexpl\"> " . gettext("Enable limiter and its children") . "</span>";
 		$form .= "</td></tr>";
-		$form .= "<tr><td valign=\"middle\" class=\"vncellreq\"><br/><span class=\"vexpl\">" . gettext("Name") . "</span></td>";
+		$form .= "<tr><td valign=\"middle\" class=\"vncellreq\"><br /><span class=\"vexpl\">" . gettext("Name") . "</span></td>";
 		$form .= "<td class=\"vncellreq\">";
 		$form .= "<input type=\"text\" id=\"newname\" name=\"newname\" value=\"";
 		$form .= $this->GetQname()."\" />";
@@ -3359,7 +3359,7 @@ EOD;
 		$form .= "</tbody></table>";
 		$form .= "<a onclick=\"javascript:addBwRowTo('maintable'); return false;\" href='#'>";
 		$form .= "<img border='0' src='/themes/{$g['theme']}/images/icons/icon_plus.gif' alt='add' title='" . gettext("add another schedule") . "' /></a>";
-		$form .= "<br/><span class=\"vexpl\">" . gettext("Bandwidth is a rate (e.g. Mbit/s), burst is a total amount of data that will be transferred at full speed after an idle period.") . "</span><br />";
+		$form .= "<br /><span class=\"vexpl\">" . gettext("Bandwidth is a rate (e.g. Mbit/s), burst is a total amount of data that will be transferred at full speed after an idle period.") . "</span><br />";
 		$form .= "</td></tr>";
 		$form .= "<tr><td valign=\"middle\" class=\"vncellreq\">" . gettext("Mask") . "</td>";
 		$form .= "<td class=\"vncellreq\">";
@@ -3378,7 +3378,7 @@ EOD;
 			$form .= " selected=\"selected\"";
 		$form .= ">" . gettext("Destination addresses") . "</option>";
 		$form .= "</select>";
-		$form .= "&nbsp;<br/>";
+		$form .= "&nbsp;<br />";
 		$form .= "<span class=\"vexpl\">" . gettext("If 'source' or 'destination' slots is chosen, \n"
 		      .  "a dynamic pipe with the bandwidth, delay, packet loss and queue size given above will \n"
 		      .  "be created for each source/destination IP address encountered, \n"
@@ -3391,7 +3391,7 @@ EOD;
 		if ($mask['type'] == "none")
 			$form .= " disabled";
 		$form .= " />";
-		$form .= "&nbsp; IPV4 mask bits (1-32)<br/>";
+		$form .= "&nbsp; IPV4 mask bits (1-32)<br />";
 		$form .= "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff/&nbsp;<input type=\"text\" class=\"formfld unknown\" size=\"2\" id=\"maskbitsv6\" name=\"maskbitsv6\" value=\"";
 		if ($mask['type'] <> "none")
 		$form .= $mask['bitsv6'];
@@ -3399,7 +3399,7 @@ EOD;
 		if ($mask['type'] == "none")
 			$form .= " disabled";
 		$form .= " />";
-		$form .= "&nbsp; IPV6 mask bits (1-128)<br/>";
+		$form .= "&nbsp; IPV6 mask bits (1-128)<br />";
 		$form .= "<span class=\"vexpl\">" . gettext("If 'source' or 'destination' slots is chosen, \n"
 		      .  "leaving the mask bits blank will create one pipe per host. Otherwise specify \n"
 		      .  "the number of 'one' bits in the subnet mask used to group multiple hosts \n"
@@ -3410,7 +3410,7 @@ EOD;
 		$form .= "<input type=\"text\" class=\"formfld unknown\" size=\"40\" id=\"description\" name=\"description\" value=\"";
 		$form .= $this->GetDescription();
 		$form .= "\" />";
-		$form .= "<br/> <span class=\"vexpl\">";
+		$form .= "<br /> <span class=\"vexpl\">";
 		$form .= gettext("You may enter a description here for your reference (not parsed).") . "</span>";
 		$form .= "</td></tr>";
 		$form .= "<tr id=\"sprtable4\">";
@@ -3425,15 +3425,15 @@ EOD;
 		$form .= "<td valign=\"middle\" class=\"vncellreq\">";
 		$form .= "<input name=\"delay\" type=\"text\" id=\"delay\" size=\"5\" value=\"";
 		$form .= $this->GetDelay() . "\" />";
-		$form .= "&nbsp;ms<br/> <span class=\"vexpl\">" . gettext("Hint: in most cases, you "
-		      .  "should specify 0 here (or leave the field empty)") . "</span><br/>";
+		$form .= "&nbsp;ms<br /> <span class=\"vexpl\">" . gettext("Hint: in most cases, you "
+		      .  "should specify 0 here (or leave the field empty)") . "</span><br />";
 		$form .= "</td></tr>";
 		$form .= "<tr style=\"display:none\" id=\"sprtable1\">";
 		$form .= "<td valign=\"middle\" class=\"vncellreq\">" . gettext("Packet loss rate") . "</td>";
 		$form .= "<td valign=\"middle\" class=\"vncellreq\">";
 		$form .= "<input name=\"plr\" type=\"text\" id=\"plr\" size=\"5\" value=\"";
 		$form .= $this->GetPlr() . "\" />";
-		$form .= "&nbsp;<br/> <span class=\"vexpl\">" . gettext("Hint: in most cases, you "
+		$form .= "&nbsp;<br /> <span class=\"vexpl\">" . gettext("Hint: in most cases, you "
 		      .  "should specify 0 here (or leave the field empty). "
 		      .  "A value of 0.001 means one packet in 1000 gets dropped") . "</span>";
 		$form .= "</td></tr>";
@@ -3442,7 +3442,7 @@ EOD;
 		$form .= "<td class=\"vncellreq\">";
 		$form .= "<input type=\"text\" id=\"qlimit\" name=\"qlimit\" value=\"";
 		$form .= $this->GetQlimit() . "\" />";
-		$form .= "&nbsp;slots<br/>";
+		$form .= "&nbsp;slots<br />";
 		$form .= "<span class=\"vexpl\">" . gettext("Hint: in most cases, you "
 		      .  "should leave the field empty. All packets in this pipe are placed into a fixed-size queue first, "
 		      .  "then they are delayed by value specified in the Delay field, and then they "
@@ -3453,7 +3453,7 @@ EOD;
 		$form .= "<td class=\"vncellreq\">";
 		$form .= "<input type=\"text\" id=\"buckets\" name=\"buckets\" value=\"";
 		$form .= $this->GetBuckets() . "\" />";
-		$form .= "&nbsp;slots<br/>";
+		$form .= "&nbsp;slots<br />";
 		$form .= "<span class=\"vexpl\">" . gettext("Hint: in most cases, you "
 			.  "should leave the field empty. It increases the hash size set.");
 		$form .= "</span></td></tr>";
@@ -3623,7 +3623,7 @@ class dnqueue_class extends dummynet_class {
 
 
 	function build_form() {
-		$form = "<tr><td valign=\"middle\" class=\"vncellreq\"><br/>";
+		$form = "<tr><td valign=\"middle\" class=\"vncellreq\"><br />";
 		$form .= gettext("Enable/Disable");
 		$form .= "</td><td class=\"vncellreq\">";
 		$form .= " <input type=\"checkbox\" id=\"enabled\" name=\"enabled\" value=\"on\"";
@@ -3631,7 +3631,7 @@ class dnqueue_class extends dummynet_class {
 			$form .=  " checked=\"checked\"";
 		$form .= " /><span class=\"vexpl\"> " . gettext("Enable/Disable queue") . "</span>";
 		$form .= "</td></tr>";
-		$form .= "<tr><td valign=\"middle\" class=\"vncellreq\"><br/><span class=\"vexpl\">" . gettext("Name") . "</span></td>";
+		$form .= "<tr><td valign=\"middle\" class=\"vncellreq\"><br /><span class=\"vexpl\">" . gettext("Name") . "</span></td>";
 		$form .= "<td class=\"vncellreq\">";
 		$form .= "<input type=\"text\" id=\"newname\" name=\"newname\" value=\"";
 		$form .= $this->GetQname()."\" />";
@@ -3659,12 +3659,12 @@ class dnqueue_class extends dummynet_class {
 			$form .= " selected=\"selected\"";
 		$form .= ">" . gettext("Destination addresses") . "</option>";
 		$form .= "</select>";
-		$form .= "&nbsp;slots<br/>";
+		$form .= "&nbsp;slots<br />";
 		$form .= "<span class=\"vexpl\">" . gettext("If 'source' or 'destination' slots is chosen, \n"
 			.  "a dynamic pipe with the bandwidth, delay, packet loss and queue size given above will \n"
 			.  "be created for each source/destination IP address encountered, \n"
 			.  "respectively. This makes it possible to easily specify bandwidth \n"
-			.  "limits per host.") . "</span><br/>";
+			.  "limits per host.") . "</span><br />";
 		$form .= "255.255.255.255/&nbsp;<input type=\"text\" class=\"formfld unknown\" size=\"2\" id=\"maskbits\" name=\"maskbits\" value=\"";
 		if ($mask['type'] <> "none")
 			$form .= $mask['bits'];
@@ -3672,7 +3672,7 @@ class dnqueue_class extends dummynet_class {
 		if ($mask['type'] == "none")
 			$form .= " disabled";
 		$form .= " />";
-		$form .= "&nbsp; IPV4 mask bits (1-32)<br/>";
+		$form .= "&nbsp; IPV4 mask bits (1-32)<br />";
 		$form .= "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff/&nbsp;<input type=\"text\" class=\"formfld unknown\" size=\"2\" id=\"maskbitsv6\" name=\"maskbitsv6\" value=\"";
 		if ($mask['type'] <> "none")
 			$form .= $mask['bitsv6'];
@@ -3680,7 +3680,7 @@ class dnqueue_class extends dummynet_class {
 		if ($mask['type'] == "none")
 			$form .= " disabled";
 		$form .= " />";
-		$form .= "&nbsp; IPV6 mask bits (1-128)<br/>";
+		$form .= "&nbsp; IPV6 mask bits (1-128)<br />";
 		$form .= "<span class=\"vexpl\">" . gettext("If 'source' or 'destination' slots is chosen, \n"
 			.  "leaving the mask bits blank will create one pipe per host. Otherwise specify \n"
 			.  "the number of 'one' bits in the subnet mask used to group multiple hosts \n"
@@ -3691,7 +3691,7 @@ class dnqueue_class extends dummynet_class {
 		$form .= "<input type=\"text\" id=\"description\" class=\"formfld unknown\" size=\"40\" name=\"description\" value=\"";
 		$form .= $this->GetDescription();
 		$form .= "\" />";
-		$form .= "<br/> <span class=\"vexpl\">";
+		$form .= "<br /> <span class=\"vexpl\">";
 		$form .= gettext("You may enter a description here for your reference (not parsed).") . "</span>";
 		$form .= "</td></tr>";
 		$form .= "<tr id=\"sprtable4\">";
@@ -3705,7 +3705,7 @@ class dnqueue_class extends dummynet_class {
 		$form .= "<td valign=\"middle\" class=\"vncellreq\">";
 		$form .= "<input name=\"weight\" type=\"text\" id=\"weight\" size=\"5\" value=\"";
 		$form .= $this->GetWeight() . "\" />";
-		$form .= "&nbsp;<br/> <span class=\"vexpl\">" . gettext("Hint: For queues under the same parent "
+		$form .= "&nbsp;<br /> <span class=\"vexpl\">" . gettext("Hint: For queues under the same parent "
 			.  "this specifies the share that a queue gets(values range from 1 to 100, you can leave it blank otherwise)") . "</span>";
 		$form .= "</td></tr>";
 		$form .= "<tr style=\"display:none\" id=\"sprtable1\">";
@@ -3713,7 +3713,7 @@ class dnqueue_class extends dummynet_class {
 		$form .= "<td valign=\"middle\" class=\"vncellreq\">";
 		$form .= "<input name=\"plr\" type=\"text\" id=\"plr\" size=\"5\" value=\"";
 		$form .= $this->GetPlr() . "\" />";
-		$form .= "&nbsp;<br/> <span class=\"vexpl\">" . gettext("Hint: in most cases, you "
+		$form .= "&nbsp;<br /> <span class=\"vexpl\">" . gettext("Hint: in most cases, you "
 			.  "should specify 0 here (or leave the field empty). "
 			.  "A value of 0.001 means one packet in 1000 gets dropped") . "</span>";
 		$form .= "</td></tr>";
@@ -3722,7 +3722,7 @@ class dnqueue_class extends dummynet_class {
 		$form .= "<td class=\"vncellreq\">";
 		$form .= "<input type=\"text\" id=\"qlimit\" name=\"qlimit\" value=\"";
 		$form .= $this->GetQlimit() . "\" />";
-		$form .= "&nbsp;slots<br/>";
+		$form .= "&nbsp;slots<br />";
 		$form .= "<span class=\"vexpl\">" . gettext("Hint: in most cases, you "
 			.  "should leave the field empty. All packets in this pipe are placed into a fixed-size queue first, "
 			.  "then they are delayed by value specified in the Delay field, and then they "
@@ -3733,7 +3733,7 @@ class dnqueue_class extends dummynet_class {
 		$form .= "<td class=\"vncellreq\">";
 		$form .= "<input type=\"text\" id=\"buckets\" name=\"buckets\" value=\"";
 		$form .= $this->GetBuckets() . "\" />";
-		$form .= "&nbsp;" . gettext("slots") . "<br/>";
+		$form .= "&nbsp;" . gettext("slots") . "<br />";
 		$form .= "<span class=\"vexpl\">" . gettext("Hint: in most cases, you "
 			.  "should leave the field empty. It increases the hash size set.");
 		$form .= "</span></td></tr>";
@@ -3870,7 +3870,7 @@ class layer7 {
 	}
 
 	function build_form() {
-		$form = "<tr><td valign=\"middle\" class=\"vncellreq\"><br/>";
+		$form = "<tr><td valign=\"middle\" class=\"vncellreq\"><br />";
 		$form .= gettext("Enable/Disable");
 		$form .= "</td><td class=\"vncellreq\">";
 		$form .= " <input type=\"checkbox\" id=\"enabled\" name=\"enabled\" value=\"on\" ";
@@ -3879,7 +3879,7 @@ class layer7 {
 		}
 		$form .= " /><span class=\"vexpl\"> " . gettext("Enable/Disable layer7 Container") . "</span>";
 		$form .= "</td></tr>";
-		$form .= "<tr><td valign=\"middle\" class=\"vncellreq\"><br/><span class=\"vexpl\">" . gettext("Name") . "</span></td>";
+		$form .= "<tr><td valign=\"middle\" class=\"vncellreq\"><br /><span class=\"vexpl\">" . gettext("Name") . "</span></td>";
 		$form .= "<td class=\"vncellreq\">";
 		$form .= "<input type=\"text\" id=\"container\" name=\"container\" value=\"";
 		$form .= $this->GetRName()."\" />";
@@ -3889,7 +3889,7 @@ class layer7 {
 		$form .= "<input type=\"text\" class=\"formfld unknown\" size=\"40\" id=\"description\" name=\"description\" value=\"";
 		$form .= $this->GetRDescription();
 		$form .= "\" />";
-		$form .= "<br/> <span class=\"vexpl\">";
+		$form .= "<br /> <span class=\"vexpl\">";
 		$form .= gettext("You may enter a description here for your reference (not parsed).") . "</span>";
 		$form .= "</td></tr>";
 
diff --git a/usr/local/captiveportal/radius_accounting.inc b/usr/local/captiveportal/radius_accounting.inc
index 3d0bc0adad..ed072cfc8e 100644
--- a/usr/local/captiveportal/radius_accounting.inc
+++ b/usr/local/captiveportal/radius_accounting.inc
@@ -114,7 +114,7 @@ function RADIUS_ACCOUNTING_START($ruleno, $username, $sessionid, $radiusservers,
          * $status = $racct->start();
          * if(PEAR::isError($status)) {
          *    if ($debug)
-         *        printf("Radius start: %s<br>\n", $status->getMessage());
+         *        printf("Radius start: %s<br />\n", $status->getMessage());
          *        exit;
          * }
          */
diff --git a/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot b/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot
index 1101b9c5b4..a49e8f620d 100644
--- a/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot
+++ b/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot
@@ -75,7 +75,7 @@ msgstr ""
 #: etc/inc/auth.inc:100 etc/inc/auth.inc:100
 msgid ""
 "Potential DNS Rebind attack detected, see http://en.wikipedia.org/wiki/"
-"DNS_rebinding<br/>Try accessing the router by IP address instead of by "
+"DNS_rebinding<br />Try accessing the router by IP address instead of by "
 "hostname."
 msgstr ""
 
@@ -205,13 +205,13 @@ msgstr ""
 #: etc/inc/auth.inc:1144 etc/inc/auth.inc:1153 etc/inc/auth.inc:1157
 #: etc/inc/auth.inc:1163 etc/inc/auth.inc:1167 etc/inc/auth.inc:1167
 #, php-format
-msgid "Radius start: %s<br>\n"
+msgid "Radius start: %s<br />\n"
 msgstr ""
 
 #: etc/inc/auth.inc:1155 etc/inc/auth.inc:1164 etc/inc/auth.inc:1168
 #: etc/inc/auth.inc:1174 etc/inc/auth.inc:1178 etc/inc/auth.inc:1178
 #, php-format
-msgid "Radius send failed: %s<br>\n"
+msgid "Radius send failed: %s<br />\n"
 msgstr ""
 
 #: etc/inc/auth.inc:1159 etc/inc/auth.inc:1170 etc/inc/auth.inc:1174
@@ -3613,7 +3613,7 @@ msgstr ""
 #: etc/inc/authgui.inc:263
 msgid ""
 "You are accessing this router by an IP address not configured locally, which "
-"may be forwarded by NAT or other means. <br/><br/>If you did not setup this "
+"may be forwarded by NAT or other means. <br /><br />If you did not setup this "
 "forwarding, you may be the target of a man-in-the-middle attack."
 msgstr ""
 
@@ -10878,7 +10878,7 @@ msgstr ""
 #: usr/local/www/load_balancer_relay_action.php:116
 #: usr/local/www/load_balancer_relay_action.php:116
 msgid ""
-"The load balancer configuration has been changed.<br>You must apply the "
+"The load balancer configuration has been changed.<br />You must apply the "
 "changes in order for them to take effect."
 msgstr ""
 
@@ -18116,9 +18116,9 @@ msgstr ""
 msgid ""
 "With automatic outbound NAT enabled, a mapping is automatically created for "
 "each interface's subnet (except WAN-type connections) and the rules on this "
-"page are ignored.<br/><br/> If manual outbound NAT is enabled, outbound NAT "
+"page are ignored.<br /><br /> If manual outbound NAT is enabled, outbound NAT "
 "rules will not be automatically generated and only the mappings you specify "
-"on this page will be used. <br/><br/> If a target address other than a WAN-"
+"on this page will be used. <br /><br /> If a target address other than a WAN-"
 "type interface's IP address is used, then depending on the way the WAN "
 "connection is setup, a "
 msgstr ""
@@ -18742,14 +18742,14 @@ msgstr ""
 #, php-format
 msgid ""
 "The settings have been applied. The firewall rules are now reloading in the "
-"background.<br/>You can also %s monitor %s the reload progress"
+"background.<br />You can also %s monitor %s the reload progress"
 msgstr ""
 
 #: usr/local/www/firewall_rules.php:315 usr/local/www/firewall_rules.php:317
 #: usr/local/www/firewall_rules.php:319 usr/local/www/firewall_rules.php:321
 #: usr/local/www/firewall_rules.php:312 usr/local/www/firewall_rules.php:314
 msgid ""
-"The firewall rule configuration has been changed.<br>You must apply the "
+"The firewall rule configuration has been changed.<br />You must apply the "
 "changes in order for them to take effect."
 msgstr ""
 
@@ -23538,7 +23538,7 @@ msgstr ""
 #: usr/local/www/interfaces_assign.php:384
 #: usr/local/www/interfaces_assign.php:390
 msgid ""
-"The interface configuration has been changed.<br>You must apply the changes "
+"The interface configuration has been changed.<br />You must apply the changes "
 "in order for them to take effect."
 msgstr ""
 
@@ -30478,7 +30478,7 @@ msgstr ""
 #: usr/local/www/services_captiveportal_mac.php:156
 #: usr/local/www/services_captiveportal_mac.php:156
 msgid ""
-"The captive portal MAC address configuration has been changed.<br>You must "
+"The captive portal MAC address configuration has been changed.<br />You must "
 "apply the changes in order for them to take effect."
 msgstr ""
 
@@ -42207,7 +42207,7 @@ msgstr ""
 #: usr/local/www/vpn_openvpn_server.php:1352
 msgid ""
 "Allow multiple concurrent connections from clients using the same Common "
-"Name.<br/>NOTE: This is not generally recommended, but may be needed for "
+"Name.<br />NOTE: This is not generally recommended, but may be needed for "
 "some scenarios."
 msgstr ""
 
@@ -45896,7 +45896,7 @@ msgid ""
 "MS-CHAPv2 which has been compromised. If you continue to use PPTP be aware "
 "that intercepted traffic can be decrypted by a third party, so it should be "
 "considered unencrypted. We advise migrating to another VPN type such as "
-"OpenVPN or IPsec.<br/><br/><a href=\"https://isc.sans.edu/diary/End+of+Days"
+"OpenVPN or IPsec.<br /><br /><a href=\"https://isc.sans.edu/diary/End+of+Days"
 "+for+MS-CHAPv2/13807\">Read More</a>"
 msgstr ""
 
@@ -48233,7 +48233,7 @@ msgstr ""
 #: usr/local/www/firewall_rules.php:311 usr/local/www/firewall_rules.php:313
 #: usr/local/www/firewall_rules.php:311 usr/local/www/firewall_rules.php:313
 msgid ""
-"The firewall rule configuration has been changed.<br/>You must apply the "
+"The firewall rule configuration has been changed.<br />You must apply the "
 "changes in order for them to take effect."
 msgstr ""
 
diff --git a/usr/local/share/locale/ja/LC_MESSAGES/pfSense.po b/usr/local/share/locale/ja/LC_MESSAGES/pfSense.po
index 90cff3a035..de8af4b63e 100644
--- a/usr/local/share/locale/ja/LC_MESSAGES/pfSense.po
+++ b/usr/local/share/locale/ja/LC_MESSAGES/pfSense.po
@@ -77,9 +77,9 @@ msgstr " は配列ではありません"
 #: etc/inc/auth.inc:100 etc/inc/auth.inc:100
 msgid ""
 "Potential DNS Rebind attack detected, see http://en.wikipedia.org/wiki/"
-"DNS_rebinding<br/>Try accessing the router by IP address instead of by "
+"DNS_rebinding<br />Try accessing the router by IP address instead of by "
 "hostname."
-msgstr ""検出された潜在的なDNS再バインド攻撃, 見る http://en.wikipedia.org/wiki/"DNS_rebinding<br/>"IPアドレスでルータにアクセスする代わりにホスト名でみてください。"
+msgstr ""検出された潜在的なDNS再バインド攻撃, 見る http://en.wikipedia.org/wiki/"DNS_rebinding<br />"IPアドレスでルータにアクセスする代わりにホスト名でみてください。"
 
 #: etc/inc/auth.inc:115 etc/inc/auth.inc:115
 msgid "Redirecting..."
@@ -207,14 +207,14 @@ msgstr "DN = %3$sとLDAPサーバー%2$s経由%1$sとして正常にログイン
 #: etc/inc/auth.inc:1144 etc/inc/auth.inc:1153 etc/inc/auth.inc:1157
 #: etc/inc/auth.inc:1163 etc/inc/auth.inc:1167 etc/inc/auth.inc:1167
 #, php-format
-msgid "Radius start: %s<br>\n"
+msgid "Radius start: %s<br />\n"
 msgstr "RADIUSスタート: "
 
 #: etc/inc/auth.inc:1155 etc/inc/auth.inc:1164 etc/inc/auth.inc:1168
 #: etc/inc/auth.inc:1174 etc/inc/auth.inc:1178 etc/inc/auth.inc:1178
 #, php-format
-msgid "Radius send failed: %s<br>\n"
-msgstr "RADIUS送信に失敗しました: %s<br>\n"
+msgid "Radius send failed: %s<br />\n"
+msgstr "RADIUS送信に失敗しました: %s<br />\n"
 
 #: etc/inc/auth.inc:1159 etc/inc/auth.inc:1170 etc/inc/auth.inc:1174
 #: etc/inc/auth.inc:1180 etc/inc/auth.inc:1184 etc/inc/auth.inc:1184
@@ -3623,9 +3623,9 @@ msgstr "ログイン"
 #: etc/inc/authgui.inc:263
 msgid ""
 "You are accessing this router by an IP address not configured locally, which "
-"may be forwarded by NAT or other means. <br/><br/>If you did not setup this "
+"may be forwarded by NAT or other means. <br /><br />If you did not setup this "
 "forwarding, you may be the target of a man-in-the-middle attack."
-msgstr "NATまたはその他の手段によって転送されてもよい」はローカルに設定されていないIPアドレスによって、このルータにアクセスしている」 。セットアップこの「転送しなかった<br/><br/>Ifは、 man-in-the-middle攻撃の標的となる可能性がある。"
+msgstr "NATまたはその他の手段によって転送されてもよい」はローカルに設定されていないIPアドレスによって、このルータにアクセスしている」 。セットアップこの「転送しなかった<br /><br />Ifは、 man-in-the-middle攻撃の標的となる可能性がある。"
 
 #: etc/inc/authgui.inc:251 etc/inc/authgui.inc:249 etc/inc/authgui.inc:272
 #: etc/inc/authgui.inc:272
@@ -10888,7 +10888,7 @@ msgstr "リレー動作"
 #: usr/local/www/load_balancer_relay_action.php:116
 #: usr/local/www/load_balancer_relay_action.php:116
 msgid ""
-"The load balancer configuration has been changed.<br>You must apply the "
+"The load balancer configuration has been changed.<br />You must apply the "
 "changes in order for them to take effect."
 msgstr "それらを有効にするための変更」ロードバランサ設定が変更されています。検索して、適用する必要があります」 。"
 
@@ -18126,12 +18126,12 @@ msgstr "あなたは本当に選択したマッピングを削除しますか？
 msgid ""
 "With automatic outbound NAT enabled, a mapping is automatically created for "
 "each interface's subnet (except WAN-type connections) and the rules on this "
-"page are ignored.<br/><br/> If manual outbound NAT is enabled, outbound NAT "
+"page are ignored.<br /><br /> If manual outbound NAT is enabled, outbound NAT "
 "rules will not be automatically generated and only the mappings you specify "
-"on this page will be used. <br/><br/> If a target address other than a WAN-"
+"on this page will be used. <br /><br /> If a target address other than a WAN-"
 "type interface's IP address is used, then depending on the way the WAN "
 "connection is setup, a "
-msgstr "「自動アウトバウンドでのNATは、有効なマッピングが自動的にのために作成されている「 （WAN型の接続を除く）各インターフェイスのサブネットとこれに関するルールはルール」ページには、手動のアウトバウンドNATが有効になっている場合、アウトバウンドNAT ignored.<br/><br/>です」自動的に生成されることはありませんし、指定したマッピングのみ」このページでは。 <br/><br/>を使用する場合は、WAN以外のターゲットアドレス」タイプのインタフェースのIPアドレスは、次にように、WANに応じて、使用されている「接続セットアップ、 aは"
+msgstr "「自動アウトバウンドでのNATは、有効なマッピングが自動的にのために作成されている「 （WAN型の接続を除く）各インターフェイスのサブネットとこれに関するルールはルール」ページには、手動のアウトバウンドNATが有効になっている場合、アウトバウンドNAT ignored.<br /><br />です」自動的に生成されることはありませんし、指定したマッピングのみ」このページでは。 <br /><br />を使用する場合は、WAN以外のターゲットアドレス」タイプのインタフェースのIPアドレスは、次にように、WANに応じて、使用されている「接続セットアップ、 aは"
 
 #: usr/local/www/firewall_nat_out.php:469
 #: usr/local/www/firewall_nat_out_edit.php:588
@@ -18752,14 +18752,14 @@ msgstr "アドレスマスク応答"
 #, php-format
 msgid ""
 "The settings have been applied. The firewall rules are now reloading in the "
-"background.<br/>You can also %s monitor %s the reload progress"
-msgstr "「設定が適用されています。ファイアウォールのルールは今にリロードされる「 background.<br/>Youこともモニターがリロードの進行状況を%s %sでき"
+"background.<br />You can also %s monitor %s the reload progress"
+msgstr "「設定が適用されています。ファイアウォールのルールは今にリロードされる「 background.<br />Youこともモニターがリロードの進行状況を%s %sでき"
 
 #: usr/local/www/firewall_rules.php:315 usr/local/www/firewall_rules.php:317
 #: usr/local/www/firewall_rules.php:319 usr/local/www/firewall_rules.php:321
 #: usr/local/www/firewall_rules.php:312 usr/local/www/firewall_rules.php:314
 msgid ""
-"The firewall rule configuration has been changed.<br>You must apply the "
+"The firewall rule configuration has been changed.<br />You must apply the "
 "changes in order for them to take effect."
 msgstr "「ファイアウォールルールの設定が変更されています。あなたが適用する必要がありますポスター「それらを有効にするために変更を。"
 
@@ -23548,7 +23548,7 @@ msgstr "ファイアウォールは、その後再起動します。"
 #: usr/local/www/interfaces_assign.php:384
 #: usr/local/www/interfaces_assign.php:390
 msgid ""
-"The interface configuration has been changed.<br>You must apply the changes "
+"The interface configuration has been changed.<br />You must apply the changes "
 "in order for them to take effect."
 msgstr "それらを有効にするために、「インターフェイスの設定が変更されています。検索して、変更を適用する必要があります」 。"
 
@@ -30488,7 +30488,7 @@ msgstr "エントリがこのMACアドレスは存在しません。"
 #: usr/local/www/services_captiveportal_mac.php:156
 #: usr/local/www/services_captiveportal_mac.php:156
 msgid ""
-"The captive portal MAC address configuration has been changed.<br>You must "
+"The captive portal MAC address configuration has been changed.<br />You must "
 "apply the changes in order for them to take effect."
 msgstr "「キャプティブポータルのMACアドレスの設定が変更されています。あなたがしなければならないポスター「それらを有効にするために変更を適用します。"
 
@@ -42217,9 +42217,9 @@ msgstr "接続を復元"
 #: usr/local/www/vpn_openvpn_server.php:1352
 msgid ""
 "Allow multiple concurrent connections from clients using the same Common "
-"Name.<br/>NOTE: This is not generally recommended, but may be needed for "
+"Name.<br />NOTE: This is not generally recommended, but may be needed for "
 "some scenarios."
-msgstr "Name.<br/>NOTE 「同じ共通使用してクライアントからの複数の同時接続を許可する」 ：これは、一般的にはお勧めしませんが、いくつかのシナリオ」のために必要な場合があります。"
+msgstr "Name.<br />NOTE 「同じ共通使用してクライアントからの複数の同時接続を許可する」 ：これは、一般的にはお勧めしませんが、いくつかのシナリオ」のために必要な場合があります。"
 
 #: usr/local/www/vpn_openvpn_server.php:1158
 #: usr/local/www/vpn_openvpn_server.php:1300
@@ -45906,9 +45906,9 @@ msgid ""
 "MS-CHAPv2 which has been compromised. If you continue to use PPTP be aware "
 "that intercepted traffic can be decrypted by a third party, so it should be "
 "considered unencrypted. We advise migrating to another VPN type such as "
-"OpenVPN or IPsec.<br/><br/><a href="https://isc.sans.edu/diary/End+of+Days"
+"OpenVPN or IPsec.<br /><br /><a href="https://isc.sans.edu/diary/End+of+Days"
 "+for+MS-CHAPv2/13807">Read More</a>"
-msgstr "侵害されたMS - CHAPv2を「それが依存しているので、PPTPはもはや安全なVPN技術と見なされていない」 。あなたは、PPTPを意識する使用し続ける場合は、「トラフィックは、第三者によって解読することができます傍受することなので、すべきである」 、暗号化されていないと考えた。私たちは、このような詳細MS-CHAPv2/13807"u003e読むための「 OpenVPNのかDays"のIPsec.<br/><br/>もし、ごhref="https://isc.sans.edu/diary/Endとして別のVPNタイプに移行助言するu003c/ A u003e"
+msgstr "侵害されたMS - CHAPv2を「それが依存しているので、PPTPはもはや安全なVPN技術と見なされていない」 。あなたは、PPTPを意識する使用し続ける場合は、「トラフィックは、第三者によって解読することができます傍受することなので、すべきである」 、暗号化されていないと考えた。私たちは、このような詳細MS-CHAPv2/13807"u003e読むための「 OpenVPNのかDays"のIPsec.<br /><br />もし、ごhref="https://isc.sans.edu/diary/Endとして別のVPNタイプに移行助言するu003c/ A u003e"
 
 #: usr/local/www/status_ntpd.php:185 usr/local/www/status_ntpd.php:191
 #: usr/local/www/status_ntpd.php:191
@@ -48243,9 +48243,9 @@ msgstr "手動アウトバウンドのNATスイッチ"
 #: usr/local/www/firewall_rules.php:311 usr/local/www/firewall_rules.php:313
 #: usr/local/www/firewall_rules.php:311 usr/local/www/firewall_rules.php:313
 msgid ""
-"The firewall rule configuration has been changed.<br/>You must apply the "
+"The firewall rule configuration has been changed.<br />You must apply the "
 "changes in order for them to take effect."
-msgstr "それらを有効にするための変更」ファイアウォールルールの設定はchanged.<br/>Youが適用しなければなりませんでした」 。"
+msgstr "それらを有効にするための変更」ファイアウォールルールの設定はchanged.<br />Youが適用しなければなりませんでした」 。"
 
 #: usr/local/www/system_gateway_groups_edit.php:100
 #: usr/local/www/system_gateway_groups_edit.php:100
diff --git a/usr/local/share/locale/tr/LC_MESSAGES/pfSense.po b/usr/local/share/locale/tr/LC_MESSAGES/pfSense.po
index 8f4d551909..37763b2848 100644
--- a/usr/local/share/locale/tr/LC_MESSAGES/pfSense.po
+++ b/usr/local/share/locale/tr/LC_MESSAGES/pfSense.po
@@ -78,11 +78,11 @@ msgstr "geçerli bir aralık değil"
 #: etc/inc/auth.inc:100 etc/inc/auth.inc:100
 msgid ""
 "Potential DNS Rebind attack detected, see http://en.wikipedia.org/wiki/"
-"DNS_rebinding<br/>Try accessing the router by IP address instead of by "
+"DNS_rebinding<br />Try accessing the router by IP address instead of by "
 "hostname."
 msgstr ""
 "Muhtemel DNS tekrar bağlama saldırısı tesbit edildi, açıklama: "
-"http://en.wikipedia.org/wiki/DNS_rebinding<br/> Router e host adı yerine IP "
+"http://en.wikipedia.org/wiki/DNS_rebinding<br /> Router e host adı yerine IP "
 "adresi ile giriş yapmayı deneyin."
 
 #: etc/inc/auth.inc:115 etc/inc/auth.inc:115
@@ -213,14 +213,14 @@ msgstr ""
 #: etc/inc/auth.inc:1144 etc/inc/auth.inc:1153 etc/inc/auth.inc:1157
 #: etc/inc/auth.inc:1163
 #, php-format
-msgid "Radius start: %s<br>\n"
-msgstr "Radius başladı: %s<br>\n"
+msgid "Radius start: %s<br />\n"
+msgstr "Radius başladı: %s<br />\n"
 
 #: etc/inc/auth.inc:1155 etc/inc/auth.inc:1164 etc/inc/auth.inc:1168
 #: etc/inc/auth.inc:1174
 #, php-format
-msgid "Radius send failed: %s<br>\n"
-msgstr "Radius başarısız gönderme: %s<br>\n"
+msgid "Radius send failed: %s<br />\n"
+msgstr "Radius başarısız gönderme: %s<br />\n"
 
 #: etc/inc/auth.inc:1159 etc/inc/auth.inc:1170 etc/inc/auth.inc:1174
 #: etc/inc/auth.inc:1180
@@ -3220,11 +3220,11 @@ msgstr "Giriş"
 #: etc/inc/authgui.inc:242 etc/inc/authgui.inc:240 etc/inc/authgui.inc:263
 msgid ""
 "You are accessing this router by an IP address not configured locally, which "
-"may be forwarded by NAT or other means. <br/><br/>If you did not setup this "
+"may be forwarded by NAT or other means. <br /><br />If you did not setup this "
 "forwarding, you may be the target of a man-in-the-middle attack."
 msgstr ""
 "Bu yönlendiriciye yerelde ayarlanmamış, NAT veya başka bir yöntemle "
-"yönlendirilmiş olabilecek bir IP adresinden erişiyorsunuz. <br/><br/>Eğer "
+"yönlendirilmiş olabilecek bir IP adresinden erişiyorsunuz. <br /><br />Eğer "
 "böyle bir yönlendirme ayarlamadıysanız, bir MitM (man-in-the-middle / araya "
 "girilmesi) saldırısı altında olabilirsiniz."
 
@@ -9545,10 +9545,10 @@ msgstr "Aktarma Eylemi"
 #: usr/local/www/load_balancer_relay_action.php:116
 #: usr/local/www/load_balancer_relay_action.php:116
 msgid ""
-"The load balancer configuration has been changed.<br>You must apply the "
+"The load balancer configuration has been changed.<br />You must apply the "
 "changes in order for them to take effect."
 msgstr ""
-"Yük dengeleyici yapılandırması değiştirildi.<br>Değişiklikleri uygulayarak "
+"Yük dengeleyici yapılandırması değiştirildi.<br />Değişiklikleri uygulayarak "
 "etkin hale gelmelerini sağlayabilirsiniz."
 
 #: usr/local/www/load_balancer_relay_action.php:128
@@ -15745,17 +15745,17 @@ msgstr "Seçili eşlemeleri silmek istediğinize emin misiniz?"
 msgid ""
 "With automatic outbound NAT enabled, a mapping is automatically created for "
 "each interface's subnet (except WAN-type connections) and the rules on this "
-"page are ignored.<br/><br/> If manual outbound NAT is enabled, outbound NAT "
+"page are ignored.<br /><br /> If manual outbound NAT is enabled, outbound NAT "
 "rules will not be automatically generated and only the mappings you specify "
-"on this page will be used. <br/><br/> If a target address other than a WAN-"
+"on this page will be used. <br /><br /> If a target address other than a WAN-"
 "type interface's IP address is used, then depending on the way the WAN "
 "connection is setup, a "
 msgstr ""
 "Dışa otomatik NAT etkinleştirildiğinde, WAN türü bağlantılar hariç her "
 "arabirimin alt ağı için otomatik olarak bir eşleme oluşturulur ve bu "
-"sayfadaki kurallar gözardı edilir.<br/><br/>Eğer elle NAT "
+"sayfadaki kurallar gözardı edilir.<br /><br />Eğer elle NAT "
 "etkinleştirilmişse, otomatik NAT kuralları oluşturulmaz ve sadece bu sayfada "
-"belirttiğiniz eşlemeler kullanılır.<br/><br/>WAN türü dışındaki bir "
+"belirttiğiniz eşlemeler kullanılır.<br /><br />WAN türü dışındaki bir "
 "arabirimin IP adresi hedef adres olarak kullanılırsa, WAN bağlantı "
 "yapılandırmasına bağlı olarak bir "
 
@@ -16260,20 +16260,20 @@ msgstr "Adres maskesi yanıtı"
 #, php-format
 msgid ""
 "The settings have been applied. The firewall rules are now reloading in the "
-"background.<br/>You can also %s monitor %s the reload progress"
+"background.<br />You can also %s monitor %s the reload progress"
 msgstr ""
 "Yapılandırma uygulandı. Güvenlik duvarı kuralları arka planda "
-"yükleniyor.<br/>Aynı zamanda %2$s yükleme durumunu %1$s izleyebilirsiniz"
+"yükleniyor.<br />Aynı zamanda %2$s yükleme durumunu %1$s izleyebilirsiniz"
 
 #: usr/local/www/firewall_rules.php:315 usr/local/www/firewall_rules.php:317
 #: usr/local/www/firewall_rules.php:319 usr/local/www/firewall_rules.php:321
 #: usr/local/www/firewall_rules.php:312 usr/local/www/firewall_rules.php:314
 #: usr/local/www/firewall_rules.php:312 usr/local/www/firewall_rules.php:314
 msgid ""
-"The firewall rule configuration has been changed.<br>You must apply the "
+"The firewall rule configuration has been changed.<br />You must apply the "
 "changes in order for them to take effect."
 msgstr ""
-"Güvenlik duvarı kuralları değiştirildi.<br/>Değişiklikleri uygulayarak etkin "
+"Güvenlik duvarı kuralları değiştirildi.<br />Değişiklikleri uygulayarak etkin "
 "hale gelmelerini sağlayabilirsiniz."
 
 #: usr/local/www/firewall_rules.php:338 usr/local/www/firewall_rules.php:342
@@ -20265,10 +20265,10 @@ msgstr ""
 #: usr/local/www/interfaces_assign.php:384
 #: usr/local/www/interfaces_assign.php:390
 msgid ""
-"The interface configuration has been changed.<br>You must apply the changes "
+"The interface configuration has been changed.<br />You must apply the changes "
 "in order for them to take effect."
 msgstr ""
-"Arabirim yapılandırması değiştirildi.<br> Değişiklikleri uygulayarak etkin "
+"Arabirim yapılandırması değiştirildi.<br /> Değişiklikleri uygulayarak etkin "
 "hale gelmelerini sağlayabilirsiniz."
 
 #: usr/local/www/interfaces_assign.php:421
@@ -26824,10 +26824,10 @@ msgstr "Bu MAC adresi için kayıt bulunamadı:"
 #: usr/local/www/services_captiveportal_mac.php:146
 #: usr/local/www/services_captiveportal_mac.php:156
 msgid ""
-"The captive portal MAC address configuration has been changed.<br>You must "
+"The captive portal MAC address configuration has been changed.<br />You must "
 "apply the changes in order for them to take effect."
 msgstr ""
-"Hizmet Portalı MAC adres yapılandırması değiştirildi.<br>Değişiklikleri "
+"Hizmet Portalı MAC adres yapılandırması değiştirildi.<br />Değişiklikleri "
 "uygulayarak etkin hale gelmelerini sağlayabilirsiniz."
 
 #: usr/local/www/services_captiveportal_mac.php:180
@@ -37746,11 +37746,11 @@ msgstr "Çift Bağlantı"
 #: usr/local/www/vpn_openvpn_server.php:1352
 msgid ""
 "Allow multiple concurrent connections from clients using the same Common "
-"Name.<br/>NOTE: This is not generally recommended, but may be needed for "
+"Name.<br />NOTE: This is not generally recommended, but may be needed for "
 "some scenarios."
 msgstr ""
 "Aynı Genel Adı kullanan istemcilerin birlikte birden fazla bağlantısına izin "
-"ver.<br/>NOT: Genellikle önerilmez, ancak bazı durumlarda gerekebilir."
+"ver.<br />NOT: Genellikle önerilmez, ancak bazı durumlarda gerekebilir."
 
 #: usr/local/www/vpn_openvpn_server.php:1158
 #: usr/local/www/vpn_openvpn_server.php:1300
@@ -41260,7 +41260,7 @@ msgid ""
 "MS-CHAPv2 which has been compromised. If you continue to use PPTP be aware "
 "that intercepted traffic can be decrypted by a third party, so it should be "
 "considered unencrypted. We advise migrating to another VPN type such as "
-"OpenVPN or IPsec.<br/><br/><a href=\"https://isc.sans.edu/diary/End+of+Days"
+"OpenVPN or IPsec.<br /><br /><a href=\"https://isc.sans.edu/diary/End+of+Days"
 "+for+MS-CHAPv2/13807\">Read More</a>"
 msgstr ""
 
diff --git a/usr/local/www/carp_status.php b/usr/local/www/carp_status.php
old mode 100755
new mode 100644
index 9967484d79..b6ce91467f
--- a/usr/local/www/carp_status.php
+++ b/usr/local/www/carp_status.php
@@ -130,7 +130,7 @@ include("head.inc");
 				</tr>
 <?php
 				if ($carpcount == 0) {
-					echo "</td></tr></table></table></div><center><br>" . gettext("Could not locate any defined CARP interfaces.");
+					echo "</td></tr></table></table></div><center><br />" . gettext("Could not locate any defined CARP interfaces.");
 					echo "</center>";
 
 					include("fend.inc");
@@ -187,7 +187,7 @@ include("head.inc");
 <p/>
 
 <?php
-	echo "<br>" . gettext("pfSync nodes") . ":<br>";
+	echo "<br />" . gettext("pfSync nodes") . ":<br />";
 	echo "<pre>";
 	system("/sbin/pfctl -vvss | /usr/bin/grep creator | /usr/bin/cut -d\" \" -f7 | /usr/bin/sort -u");
 	echo "</pre>";
diff --git a/usr/local/www/classes/maintable.inc b/usr/local/www/classes/maintable.inc
index 77b29f35c8..59404d7074 100644
--- a/usr/local/www/classes/maintable.inc
+++ b/usr/local/www/classes/maintable.inc
@@ -119,7 +119,7 @@ class MainTable {
 				echo "  <td class=\"{$cl}\" onclick=\"fr_toggle({$cur_row})\" id=\"frd{$cur_row}\" ondblclick=\"document.location='{$this->edit_uri}?id={$cur_row}'\">\n";
 				if (is_array($row[$this->cname[$col]])) {
 					foreach ($row[$this->cname[$col]] as $data) {
-						echo "    {$data}<br/>\n";
+						echo "    {$data}<br />\n";
 					}
 				} else {
 					echo "    " . $row[$this->cname[$col]] . "\n";
diff --git a/usr/local/www/code-syntax-highlighter/shCore.js b/usr/local/www/code-syntax-highlighter/shCore.js
index 6ec5915e6f..d21af7267e 100644
--- a/usr/local/www/code-syntax-highlighter/shCore.js
+++ b/usr/local/www/code-syntax-highlighter/shCore.js
@@ -204,17 +204,17 @@ dp.sh.Highlighter.prototype.AddBit = function(str, css)
 	str = str.replace(/&/g, '&amp;');
 	str = str.replace(/ /g, '&nbsp;');
 	str = str.replace(/</g, '&lt;');
-	str = str.replace(/\n/gm, '&nbsp;<br>');
+	str = str.replace(/\n/gm, '&nbsp;<br />');
 
 	// when adding a piece of code, check to see if it has line breaks in it 
 	// and if it does, wrap individual line breaks with span tags
 	if(css != null)
 	{
-		var regex = new RegExp('<br>', 'gi');
+		var regex = new RegExp('<br />', 'gi');
 		
 		if(regex.test(str))
 		{
-			var lines = str.split('&nbsp;<br>');
+			var lines = str.split('&nbsp;<br />');
 			
 			str = '';
 			
@@ -339,7 +339,7 @@ dp.sh.Highlighter.prototype.ProcessSmartTabs = function(code)
 
 dp.sh.Highlighter.prototype.SwitchToTable = function()
 {
-	// Safari fix: for some reason lowercase <br> isn't getting picked up, even though 'i' is set
+	// Safari fix: for some reason lowercase <br /> isn't getting picked up, even though 'i' is set
 	var lines	= this.div.innerHTML.split(/<BR>/gi);
 	var row		= null;
 	var cell	= null;
diff --git a/usr/local/www/code-syntax-highlighter/shCore.uncompressed.js b/usr/local/www/code-syntax-highlighter/shCore.uncompressed.js
index d1045edcb7..9544a8ed6a 100644
--- a/usr/local/www/code-syntax-highlighter/shCore.uncompressed.js
+++ b/usr/local/www/code-syntax-highlighter/shCore.uncompressed.js
@@ -241,17 +241,17 @@ dp.sh.Highlighter.prototype.AddBit = function(str, css)
 	str = str.replace(/&/g, '&amp;');
 	str = str.replace(/ /g, '&nbsp;');
 	str = str.replace(/</g, '&lt;');
-	str = str.replace(/\n/gm, '&nbsp;<br>');
+	str = str.replace(/\n/gm, '&nbsp;<br />');
 
 	// when adding a piece of code, check to see if it has line breaks in it 
 	// and if it does, wrap individual line breaks with span tags
 	if(css != null)
 	{
-		var regex = new RegExp('<br>', 'gi');
+		var regex = new RegExp('<br />', 'gi');
 		
 		if(regex.test(str))
 		{
-			var lines = str.split('&nbsp;<br>');
+			var lines = str.split('&nbsp;<br />');
 			
 			str = '';
 			
@@ -359,7 +359,7 @@ dp.sh.Highlighter.prototype.ProcessSmartTabs = function(code)
 
 dp.sh.Highlighter.prototype.SwitchToList = function()
 {
-	// thanks to Lachlan Donald from SitePoint.com for this <br/> tag fix.
+	// thanks to Lachlan Donald from SitePoint.com for this <br /> tag fix.
 	var html = this.div.innerHTML.replace(/<(br)\/?>/gi, '\n');
 	var lines = html.split('\n');
 	
diff --git a/usr/local/www/crash_reporter.php b/usr/local/www/crash_reporter.php
old mode 100755
new mode 100644
index 92ca317273..e7834c6cac
--- a/usr/local/www/crash_reporter.php
+++ b/usr/local/www/crash_reporter.php
@@ -68,9 +68,9 @@ function output_crash_reporter_html($crash_reports) {
 	echo "<strong>" . gettext("Unfortunately we have detected a programming bug.") . "</strong></p>";
 	echo gettext("Would you like to submit the programming debug logs to the pfSense developers for inspection?") . "</p>";
 	echo "<p>";
-	echo "<i>" . gettext("Please double check the contents to ensure you are comfortable sending this information before clicking Yes.") . "</i><br/>";
+	echo "<i>" . gettext("Please double check the contents to ensure you are comfortable sending this information before clicking Yes.") . "</i><br />";
 	echo "<p>";
-	echo gettext("Contents of crash reports") . ":<br/>";
+	echo gettext("Contents of crash reports") . ":<br />";
 	echo "<textarea readonly rows='40' cols='65' name='crashreports'>{$crash_reports}</textarea>";
 	echo "<p/>";
 	echo "<input name=\"Submit\" type=\"submit\" class=\"formbtn\" value=\"" . gettext("Yes") .  "\">" . gettext(" - Submit this to the developers for inspection");
diff --git a/usr/local/www/diag_arp.php b/usr/local/www/diag_arp.php
old mode 100755
new mode 100644
index 19f74f04ea..0fefc99363
--- a/usr/local/www/diag_arp.php
+++ b/usr/local/www/diag_arp.php
@@ -324,7 +324,7 @@ $mac_man = load_mac_manufacturer_table();
 						$mac=trim($entry['mac']);
 						$mac_hi = strtoupper($mac[0] . $mac[1] . $mac[3] . $mac[4] . $mac[6] . $mac[7]);
 						print $mac;
-						if(isset($mac_man[$mac_hi])){ print "<br/><font size=\"-2\"><i>{$mac_man[$mac_hi]}</i></font>"; }
+						if(isset($mac_man[$mac_hi])){ print "<br /><font size=\"-2\"><i>{$mac_man[$mac_hi]}</i></font>"; }
 						?>
 						</td>
 						<td class="listr">
@@ -339,7 +339,7 @@ $mac_man = load_mac_manufacturer_table();
 		</td>
 	</tr>
 	<tr>
-		<td><br/><?= gettext("NOTE: Local IPv6 peers use") ?> <a href="diag_ndp.php"><?= gettext("NDP") ?></a> <?= gettext("instead of ARP") ?>.</td>
+		<td><br /><?= gettext("NOTE: Local IPv6 peers use") ?> <a href="diag_ndp.php"><?= gettext("NDP") ?></a> <?= gettext("instead of ARP") ?>.</td>
 	</tr>
 </table>
 
diff --git a/usr/local/www/diag_backup.php b/usr/local/www/diag_backup.php
old mode 100755
new mode 100644
index a9ee704d7c..ffe96a2f68
--- a/usr/local/www/diag_backup.php
+++ b/usr/local/www/diag_backup.php
@@ -622,7 +622,7 @@ function backuparea_change(obj) {
 <?php if (is_subsystem_dirty('restore')): ?><p>
 <form action="reboot.php" method="post">
 <input name="Submit" type="hidden" value=" Yes ">
-<?php print_info_box(gettext("The firewall configuration has been changed.") . "<br/>" . gettext("The firewall is now rebooting."));?><br>
+<?php print_info_box(gettext("The firewall configuration has been changed.") . "<br />" . gettext("The firewall is now rebooting."));?><br />
 </form>
 <?php endif; ?>
 <form action="diag_backup.php" method="post" name="iform" enctype="multipart/form-data">
@@ -755,8 +755,8 @@ function backuparea_change(obj) {
 						<?php if ($config['installedpackages']['package'] != "") { ?>
 							<p><?=gettext("Click this button to reinstall all system packages.  This may take a while."); ?> <br /><br />
 							<input name="Submit" type="submit" class="formbtn" id="reinstallpackages" value="<?=gettext("Reinstall packages"); ?>">
-							<br/>
-							<br/>
+							<br />
+							<br />
 						<?php } ?>
 						<?php if (is_subsystem_dirty("packagelock")) { ?>
 							<p><?=gettext("Click this button to clear the package lock if a package fails to reinstall properly after an upgrade."); ?> <br /><br />
diff --git a/usr/local/www/diag_confbak.php b/usr/local/www/diag_confbak.php
old mode 100755
new mode 100644
index ddf4f2d800..3cfae3770b
--- a/usr/local/www/diag_confbak.php
+++ b/usr/local/www/diag_confbak.php
@@ -183,7 +183,7 @@ include("head.inc");
 						<tr>
 							<td colspan="7" class="list">
 							<?= gettext("To view the differences between an older configuration and a newer configuration, select the older configuration using the left column of radio options and select the newer configuration in the right colomn, then press the Diff button."); ?>
-							<br/><br/>
+							<br /><br />
 							</td>
 						</tr>
 						<tr>
diff --git a/usr/local/www/diag_dns.php b/usr/local/www/diag_dns.php
index 07d7b5755f..b85e9ce04c 100644
--- a/usr/local/www/diag_dns.php
+++ b/usr/local/www/diag_dns.php
@@ -196,7 +196,7 @@ include("head.inc"); ?>
 				if(is_array($resolved)) { 
 					foreach($resolved as $hostitem) {
 						if($hostitem <> "") {
-							echo $hostitem . "<br/>";
+							echo $hostitem . "<br />";
 							$found++;
 						}
 					}
@@ -205,12 +205,12 @@ include("head.inc"); ?>
 				} 
 				if($found > 0) {
 					if($alias_exists) {
-						echo "<br/><font size='-2'>An alias already exists for the hostname " . htmlspecialchars($host) . ".  To overwrite, click <a href='diag_dns.php?host=" . trim(urlencode(htmlspecialchars($host))) . "&createalias=true&override=true'>here</a>.";
+						echo "<br /><font size='-2'>An alias already exists for the hostname " . htmlspecialchars($host) . ".  To overwrite, click <a href='diag_dns.php?host=" . trim(urlencode(htmlspecialchars($host))) . "&createalias=true&override=true'>here</a>.";
 					} else { 
 						if(!$createdalias) {
-							echo "<br/><font size='-2'><a href='diag_dns.php?host=" . trim(urlencode(htmlspecialchars($host))) . "&createalias=true'>Create alias</a> out of these entries.";
+							echo "<br /><font size='-2'><a href='diag_dns.php?host=" . trim(urlencode(htmlspecialchars($host))) . "&createalias=true'>Create alias</a> out of these entries.";
 						} else {
-							echo "<br/><font size='-2'>Alias created with name " . htmlspecialchars($newalias['name']);
+							echo "<br /><font size='-2'>Alias created with name " . htmlspecialchars($newalias['name']);
 						}
 					}
 				}
@@ -257,10 +257,10 @@ include("head.inc"); ?>
 		<tr>
 			<td width="22%" valign="top"  class="vncell"><?=gettext("More Information:");?></td>
 			<td width="78%" class="vtable">
-				<a target="_new" href ="/diag_ping.php?host=<?=htmlspecialchars($host)?>&interface=wan&count=3"><?=gettext("Ping");?></a> <br/>
+				<a target="_new" href ="/diag_ping.php?host=<?=htmlspecialchars($host)?>&interface=wan&count=3"><?=gettext("Ping");?></a> <br />
 				<a target="_new" href ="/diag_traceroute.php?host=<?=htmlspecialchars($host)?>&ttl=18"><?=gettext("Traceroute");?></a>
 				<p/>
-				<?=gettext("NOTE: The following links are to external services, so their reliability cannot be guaranteed.");?><br/><br/>
+				<?=gettext("NOTE: The following links are to external services, so their reliability cannot be guaranteed.");?><br /><br />
 				<a target="_new" href="http://private.dnsstuff.com/tools/whois.ch?ip=<?php echo $ipaddr; ?>"><?=gettext("IP WHOIS @ DNS Stuff");?></a><br />
 				<a target="_new" href="http://private.dnsstuff.com/tools/ipall.ch?ip=<?php echo $ipaddr; ?>"><?=gettext("IP Info @ DNS Stuff");?></a>
 			</td>
@@ -269,7 +269,7 @@ include("head.inc"); ?>
 		<tr>
 		  <td width="22%" valign="top">&nbsp;</td>
 		  <td width="78%">
-			<br/>&nbsp;
+			<br />&nbsp;
             <input name="Submit" type="submit" class="formbtn" value="<?=gettext("DNS Lookup");?>">
 		</td>
 		</tr>
diff --git a/usr/local/www/diag_ipsec.php b/usr/local/www/diag_ipsec.php
index ca0eba5a20..b1777dbd95 100644
--- a/usr/local/www/diag_ipsec.php
+++ b/usr/local/www/diag_ipsec.php
@@ -123,7 +123,7 @@ $status = ipsec_smp_dump_status();
 					echo "Unknown";
 				else {
 					if (!empty($ikesa['local']['identification']))
-						echo htmlspecialchars($ikesa['local']['identification']) . '<br/>' . htmlspecialchars($ikesa['local']['spi']);
+						echo htmlspecialchars($ikesa['local']['identification']) . '<br />' . htmlspecialchars($ikesa['local']['spi']);
 					else
 						echo 'Unknown';
 				}
@@ -147,7 +147,7 @@ $status = ipsec_smp_dump_status();
 					echo "Unknown";
 				else {
 					if (!empty($ikesa['remote']['identification']))
-						echo htmlspecialchars($ikesa['remote']['identification']) . '<br/>' . htmlspecialchars($ikesa['remote']['spi']);
+						echo htmlspecialchars($ikesa['remote']['identification']) . '<br />' . htmlspecialchars($ikesa['remote']['spi']);
 					else
 						echo 'Unknown';
 				}
@@ -204,7 +204,7 @@ $status = ipsec_smp_dump_status();
 						<td nowrap class="listlr">
 				<?php	if (is_array($childsa['local']) && is_array($childsa['local']['networks']) && is_array($childsa['local']['networks']['network'])) {
 						foreach ($childsa['local']['networks']['network'] as $lnets) {
-							echo htmlspecialchars($lnets) . "<br/>";	
+							echo htmlspecialchars($lnets) . "<br />";	
 						}
 					} else
 						echo "Unknown";
@@ -223,7 +223,7 @@ $status = ipsec_smp_dump_status();
 						<td nowrap class="listlr">
 				<?php	if (is_array($childsa['remote']) && is_array($childsa['remote']['networks']) && is_array($childsa['remote']['networks']['network'])) {
 						foreach ($childsa['remote']['networks']['network'] as $rnets) {
-							echo htmlspecialchars($rnets) . "<br/>";	
+							echo htmlspecialchars($rnets) . "<br />";	
 						}
 					} else
 						echo "Unknown";
diff --git a/usr/local/www/diag_ipsec_sad.php b/usr/local/www/diag_ipsec_sad.php
old mode 100755
new mode 100644
index ee791dd60d..acafc61e29
--- a/usr/local/www/diag_ipsec_sad.php
+++ b/usr/local/www/diag_ipsec_sad.php
@@ -132,7 +132,7 @@ if ($_GET['act'] == "del") {
 <p/>
 
 <span class="vexpl">
-<span class="red"><strong><?=gettext("Note:");?><br></strong></span>
+<span class="red"><strong><?=gettext("Note:");?><br /></strong></span>
 <?=gettext("You can configure your IPsec");?> <a href="vpn_ipsec.php"><?=gettext("here.");?></a>
 </span>
 
diff --git a/usr/local/www/diag_ipsec_spd.php b/usr/local/www/diag_ipsec_spd.php
old mode 100755
new mode 100644
index 6e8dc6700e..1592d04cfd
--- a/usr/local/www/diag_ipsec_spd.php
+++ b/usr/local/www/diag_ipsec_spd.php
@@ -113,7 +113,7 @@ $spd = ipsec_dump_spd();
 						</tr>
 						<?php endforeach; ?>
 					</table>
-					<br>
+					<br />
 					<table class="tabcont" border="0" cellspacing="0" cellpadding="6">
 						<tr>
 							<td width="16"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_in.gif" width="11" height="11"></td>
@@ -141,7 +141,7 @@ $spd = ipsec_dump_spd();
 
 <p>
 <span class="vexpl">
-<span class="red"><strong><?= gettext("Note:"); ?><br></strong></span>
+<span class="red"><strong><?= gettext("Note:"); ?><br /></strong></span>
 <?= gettext("You can configure your IPsec"); ?> <a href="vpn_ipsec.php"><?= gettext("here."); ?></a>
 </span>
 
diff --git a/usr/local/www/diag_logs_auth.php b/usr/local/www/diag_logs_auth.php
old mode 100755
new mode 100644
index d34bd24811..8983d7d3e7
--- a/usr/local/www/diag_logs_auth.php
+++ b/usr/local/www/diag_logs_auth.php
@@ -86,7 +86,7 @@ include("head.inc");
 			  <?php printf(gettext("Last %s Portal Auth log entries"),$nentries);?></td>
 		  </tr>
 		  <?php dump_clog($portal_logfile, $nentries, true); ?>
-		<tr><td><br/><form action="diag_logs_auth.php" method="post">
+		<tr><td><br /><form action="diag_logs_auth.php" method="post">
 			<input name="clear" type="submit" class="formbtn" value="<?= gettext("Clear log"); ?>"/></form></td></tr>
 		</table>
 	</div>
diff --git a/usr/local/www/diag_logs_dhcp.php b/usr/local/www/diag_logs_dhcp.php
old mode 100755
new mode 100644
index 26465bffdf..9436cd368c
--- a/usr/local/www/diag_logs_dhcp.php
+++ b/usr/local/www/diag_logs_dhcp.php
@@ -91,7 +91,7 @@ include("head.inc");
 			  <?php printf(gettext("Last %s DHCP service log entries"), $nentries);?></td>
 		  </tr>
 		  <?php dump_clog($dhcpd_logfile, $nentries); ?>
-		<tr><td><br/><form action="diag_logs_dhcp.php" method="post">
+		<tr><td><br /><form action="diag_logs_dhcp.php" method="post">
 			<input name="clear" type="submit" class="formbtn" value="<?= gettext("Clear log");?>" /></form</td>
 			<td>NOTE: Clearing the log file will restart the DHCP daemon.</td></tr>
 		</table>
diff --git a/usr/local/www/diag_logs_filter.php b/usr/local/www/diag_logs_filter.php
old mode 100755
new mode 100644
index 0daefcff3a..0f38ce7d9f
--- a/usr/local/www/diag_logs_filter.php
+++ b/usr/local/www/diag_logs_filter.php
@@ -174,9 +174,9 @@ include("head.inc");
 						<td rowspan="2">
 							<div align="center"><?=gettext("Action");?></div>
 							<div align="left">
-							<input id="actpass"   name="actpass"   type="checkbox" value="Pass"   <?php if (in_arrayi('Pass',   $Include_Act)) echo "checked=\"checked\""; ?> /> Pass<br/>
-							<input id="actblock"  name="actblock"  type="checkbox" value="Block"  <?php if (in_arrayi('Block',  $Include_Act)) echo "checked=\"checked\""; ?> /> Block<br/>
-							<input id="actreject" name="actreject" type="checkbox" value="Reject" <?php if (in_arrayi('Reject', $Include_Act)) echo "checked=\"checked\""; ?> /> Reject<br/>
+							<input id="actpass"   name="actpass"   type="checkbox" value="Pass"   <?php if (in_arrayi('Pass',   $Include_Act)) echo "checked=\"checked\""; ?> /> Pass<br />
+							<input id="actblock"  name="actblock"  type="checkbox" value="Block"  <?php if (in_arrayi('Block',  $Include_Act)) echo "checked=\"checked\""; ?> /> Block<br />
+							<input id="actreject" name="actreject" type="checkbox" value="Reject" <?php if (in_arrayi('Reject', $Include_Act)) echo "checked=\"checked\""; ?> /> Reject<br />
 							</div>
 						</td>
 						<td>
@@ -294,7 +294,7 @@ include("head.inc");
 					</form>
 				</div>
 				<div style="float: right; vertical-align:middle">
-					<br/>
+					<br />
 					<?php if (!isset($config['syslog']['rawfilter']) && (isset($config['syslog']['filterdescriptions']) && $config['syslog']['filterdescriptions'] === "2")):?>
 					<a href="#" onclick="toggleListDescriptions()">Show/hide rule descriptions</a>
 					<?php endif;?>
@@ -448,7 +448,7 @@ function resolve_with_ajax(ip_to_resolve) {
 function resolve_ip_callback(transport) {
 	var response = jQuery.parseJSON(transport.responseText);
 	var resolve_class = htmlspecialchars(response.resolve_ip.replace(/[.:]/g, '-'));
-	var resolve_text = '<small><br/>' + htmlspecialchars(response.resolve_text) + '</small>';
+	var resolve_text = '<small><br />' + htmlspecialchars(response.resolve_text) + '</small>';
 	
 	jQuery('span.RESOLVE-' + resolve_class).html(resolve_text);
 	jQuery('img.ICON-' + resolve_class).removeAttr('title');
diff --git a/usr/local/www/diag_logs_ipsec.php b/usr/local/www/diag_logs_ipsec.php
old mode 100755
new mode 100644
index acb4240639..9dae3a78e2
--- a/usr/local/www/diag_logs_ipsec.php
+++ b/usr/local/www/diag_logs_ipsec.php
@@ -146,7 +146,7 @@ include("head.inc");
 				?>
 				<tr>
 					<td>
-						<br/>
+						<br />
 						<form action="diag_logs_ipsec.php" method="post">
 						<input name="clear" type="submit" class="formbtn" value="<?=gettext("Clear log"); ?>" />
 						</form>
diff --git a/usr/local/www/diag_logs_ntpd.php b/usr/local/www/diag_logs_ntpd.php
index da4c6091b6..b8ab796085 100644
--- a/usr/local/www/diag_logs_ntpd.php
+++ b/usr/local/www/diag_logs_ntpd.php
@@ -86,7 +86,7 @@ include("head.inc");
 			  <?php printf(gettext("Last %s NTP log entries"), $nentries);?></td>
 		  </tr>
 		  <?php dump_clog($ntpd_logfile, $nentries); ?>
-		<tr><td><br/>
+		<tr><td><br />
 		<form action="diag_logs_ntpd.php" method="post">
 			<input name="clear" type="submit" class="formbtn" value="<?=gettext("Clear log"); ?>" />
 </form>
diff --git a/usr/local/www/diag_logs_openvpn.php b/usr/local/www/diag_logs_openvpn.php
index a86119ca9b..56dcf518b0 100644
--- a/usr/local/www/diag_logs_openvpn.php
+++ b/usr/local/www/diag_logs_openvpn.php
@@ -92,7 +92,7 @@ include("head.inc");
 				<?php dump_clog($openvpn_logfile, $nentries); ?>
 				<tr>
 					<td>
-						<br/>
+						<br />
 						<form action="diag_logs_openvpn.php" method="post">
 						<input name="clear" type="submit" class="formbtn" value="<?=gettext("Clear log"); ?>" />
 						</form>
diff --git a/usr/local/www/diag_logs_ppp.php b/usr/local/www/diag_logs_ppp.php
old mode 100755
new mode 100644
index 0cd436d175..e9b3279ab2
--- a/usr/local/www/diag_logs_ppp.php
+++ b/usr/local/www/diag_logs_ppp.php
@@ -90,7 +90,7 @@ include("head.inc");
 				<?php dump_clog($ppp_logfile, $nentries); ?>
 				<tr>
 					<td>
-						<br/>
+						<br />
 						<form action="diag_logs_ppp.php" method="post">
 						<input name="clear" type="submit" class="formbtn" value="<?=gettext("Clear log"); ?>" />
 						</form>
diff --git a/usr/local/www/diag_logs_relayd.php b/usr/local/www/diag_logs_relayd.php
old mode 100755
new mode 100644
index ce1d7f7bef..b7430d2208
--- a/usr/local/www/diag_logs_relayd.php
+++ b/usr/local/www/diag_logs_relayd.php
@@ -87,7 +87,7 @@ include("head.inc");
 			  <?php printf(gettext("Last %s Load Balancer log entries"),$nentries);?></td>
 		  </tr>
 		  <?php dump_clog($relayd_logfile, $nentries); ?>
-		<tr><td><br/><form action="diag_logs_relayd.php" method="post">
+		<tr><td><br /><form action="diag_logs_relayd.php" method="post">
 <input name="clear" type="submit" class="formbtn" value="<?=gettext("Clear log"); ?>" /></form></td></tr>
 		</table>
 	</div>
diff --git a/usr/local/www/diag_logs_routing.php b/usr/local/www/diag_logs_routing.php
index 0adc9fa60e..0168e3c41a 100644
--- a/usr/local/www/diag_logs_routing.php
+++ b/usr/local/www/diag_logs_routing.php
@@ -98,7 +98,7 @@ include("head.inc");
 			  <?php printf(gettext("Routing daemon log entries"),$nentries);?></td>
 		  </tr>
 		  <?php dump_clog($routing_logfile, $nentries); ?>
-		<tr><td><br/><form action="diag_logs_routing.php" method="post">
+		<tr><td><br /><form action="diag_logs_routing.php" method="post">
 <input name="clear" type="submit" class="formbtn" value="<?=gettext("Clear log"); ?>" /></form></td></tr>
 		</table>
 	</div>
diff --git a/usr/local/www/diag_logs_settings.php b/usr/local/www/diag_logs_settings.php
old mode 100755
new mode 100644
index b7ba070607..36090ea9d7
--- a/usr/local/www/diag_logs_settings.php
+++ b/usr/local/www/diag_logs_settings.php
@@ -281,15 +281,15 @@ function check_everything() {
 		<tr>
 			<td width="22%" valign="top" class="vtable">GUI Log Entries to Display</td>
 			<td width="78%" class="vtable">
-			<input name="nentries" id="nentries" type="text" class="formfld unknown" size="4" value="<?=htmlspecialchars($pconfig['nentries']);?>" /><br/>
+			<input name="nentries" id="nentries" type="text" class="formfld unknown" size="4" value="<?=htmlspecialchars($pconfig['nentries']);?>" /><br />
 			<?=gettext("Hint: This is only the number of log entries displayed in the GUI. It does not affect how many entries are contained in the actual log files.") ?></td>
 		</tr>
 		<tr>
 			<td width="22%" valign="top" class="vtable">Log File Size</td>
 			<td width="78%" class="vtable">
-			<input name="logfilesize" id="logfilesize" type="text" class="formfld unknown" size="8" value="<?=htmlspecialchars($pconfig['logfilesize']);?>" /><br/>
+			<input name="logfilesize" id="logfilesize" type="text" class="formfld unknown" size="8" value="<?=htmlspecialchars($pconfig['logfilesize']);?>" /><br />
 			<?=gettext("Logs are held in constant-size circular log files. This field controls how large each log file is, and thus how many entries may exist inside the log By default this is approximately 500KB per log file, and there are nearly 20 such log files.") ?>
-			<br/><br/>
+			<br /><br />
 			<?=gettext("NOTE: Log sizes are changed the next time a log file is cleared or deleted. To immediately increase the size of the log files, you must clear all logs using the \"Reset Log Files\" option farther down this page. "); ?>
 			<?=gettext("Be aware that increasing this value increases every log file size, so disk usage will increase significantly."); ?>
 			<?=gettext("Disk space currently used by log files: ") ?><?= exec("/usr/bin/du -sh /var/log | /usr/bin/awk '{print $1;}'"); ?>.
@@ -300,26 +300,26 @@ function check_everything() {
 			<td valign="top" class="vtable">Log Firewall Default Blocks</td>
 			<td class="vtable">
 				<input name="logdefaultblock" type="checkbox" id="logdefaultblock" value="yes" <?php if ($pconfig['logdefaultblock']) echo "checked=\"checked\""; ?> />
-				<strong><?=gettext("Log packets blocked by the default rule");?></strong><br/>
+				<strong><?=gettext("Log packets blocked by the default rule");?></strong><br />
 				<?=gettext("Hint: packets that are blocked by the implicit default block rule will not be logged if you uncheck this option. Per-rule logging options are still respected.");?>
-				<br/>
+				<br />
 				<input name="logbogons" type="checkbox" id="logbogons" value="yes" <?php if ($pconfig['logbogons']) echo "checked=\"checked\""; ?> />
-				<strong><?=gettext("Log packets blocked by 'Block Bogon Networks' rules");?></strong><br/>
-				<br/>
+				<strong><?=gettext("Log packets blocked by 'Block Bogon Networks' rules");?></strong><br />
+				<br />
 				<input name="logprivatenets" type="checkbox" id="logprivatenets" value="yes" <?php if ($pconfig['logprivatenets']) echo "checked=\"checked\""; ?> />
-				<strong><?=gettext("Log packets blocked by 'Block Private Networks' rules");?></strong><br/>
+				<strong><?=gettext("Log packets blocked by 'Block Private Networks' rules");?></strong><br />
 			</td>
 		</tr>
 		<tr>
 			<td valign="top" class="vtable">Web Server Log</td>
 			<td class="vtable"> <input name="loglighttpd" type="checkbox" id="loglighttpd" value="yes" <?php if ($pconfig['loglighttpd']) echo "checked=\"checked\""; ?> />
-			<strong><?=gettext("Log errors from the web server process.");?></strong><br/>
+			<strong><?=gettext("Log errors from the web server process.");?></strong><br />
 			<?=gettext("Hint: If this is checked, errors from the lighttpd web server process for the GUI or Captive Portal will appear in the main system log.");?></td>
 		</tr>
 		<tr>
 			<td valign="top" class="vtable">Raw Logs</td>
 			<td class="vtable"> <input name="rawfilter" type="checkbox" id="rawfilter" value="yes" <?php if ($pconfig['rawfilter']) echo "checked=\"checked\""; ?> />
-			<strong><?=gettext("Show raw filter logs");?></strong><br/>
+			<strong><?=gettext("Show raw filter logs");?></strong><br />
 			<?=gettext("Hint: If this is checked, filter logs are shown as generated by the packet filter, without any formatting. This will reveal more detailed information, but it is more difficult to read.");?></td>
 		</tr>
 		<tr>
@@ -331,7 +331,7 @@ function check_everything() {
 				  <option value="2"<?=($pconfig['filterdescriptions'])==="2"?" selected=\"selected\"":""?>>Display as second row</option>
 				</select>
 				<strong><?=gettext("Show the applied rule description below or in the firewall log rows.");?></strong>
-				<br/>
+				<br />
 				<?=gettext("Displaying rule descriptions for all lines in the log might affect performance with large rule sets.");?>
 			</td>
 		</tr>
@@ -348,7 +348,7 @@ function check_everything() {
 			<td width="22%" valign="top">Reset Logs</td>
 			<td width="78%">
 				<input name="resetlogs" type="submit" class="formbtn" value="<?=gettext("Reset Log Files"); ?>"  onclick="return confirm('<?=gettext('Do you really want to reset the log files? This will erase all local log data.');?>')" />
-				<br/><br/>
+				<br /><br />
 				<?= gettext("Note: Clears all local log files and reinitializes them as empty logs. This also restarts the DHCP daemon."); ?>
 			</td>
 		</tr>
@@ -374,10 +374,10 @@ function check_everything() {
 					</option>
 					<?php endforeach; ?>
 				</select>
-				<br/>
+				<br />
 				<?= gettext("This option will allow the logging daemon to bind to a single IP address, rather than all IP addresses."); ?>
 				<?= gettext("If you pick a single IP, remote syslog severs must all be of that IP type. If you wish to mix IPv4 and IPv6 remote syslog servers, you must bind to all interfaces."); ?>
-				<br/><br/>
+				<br /><br />
 				<?= gettext("NOTE: If an IP address cannot be located on the chosen interface, the daemon will bind to all addresses."); ?>
 			</td>
 		</tr>
@@ -388,7 +388,7 @@ function check_everything() {
 					<option value="ipv4" <?php if ($ipproto == "ipv4") echo 'selected="selected"' ?>>IPv4</option>
 					<option value="ipv6" <?php if ($ipproto == "ipv6") echo 'selected="selected"' ?>>IPv6</option>
 				</select>
-				<br/>
+				<br />
 				<?= gettext("This option is only used when a non-default address is chosen as the source above. This option only expresses a preference; If an IP address of the selected type is not found on the chosen interface, the other type will be tried."); ?>
 			</td>
 		</tr>
@@ -423,23 +423,23 @@ function check_everything() {
 			<td width="22%" valign="top" class="vncell"><?=gettext("Remote Syslog Contents");?></td>
 			<td width="78%" class="vtable">
 				<input name="logall" id="logall" type="checkbox" value="yes" <?php if ($pconfig['logall']) echo "checked=\"checked\""; ?> onclick="check_everything();" />
-				<?=gettext("Everything");?><br/><br/>
+				<?=gettext("Everything");?><br /><br />
 				<input name="system" id="system" type="checkbox" value="yes" onclick="enable_change(false)" <?php if ($pconfig['system']) echo "checked=\"checked\""; ?> />
-				<?=gettext("System events");?><br/>
+				<?=gettext("System events");?><br />
 				<input name="filter" id="filter" type="checkbox" value="yes" <?php if ($pconfig['filter']) echo "checked=\"checked\""; ?> />
-				<?=gettext("Firewall events");?><br/>
+				<?=gettext("Firewall events");?><br />
 				<input name="dhcp" id="dhcp" type="checkbox" value="yes" <?php if ($pconfig['dhcp']) echo "checked=\"checked\""; ?> />
-				<?=gettext("DHCP service events");?><br/>
+				<?=gettext("DHCP service events");?><br />
 				<input name="portalauth" id="portalauth" type="checkbox" value="yes" <?php if ($pconfig['portalauth']) echo "checked=\"checked\""; ?> />
-				<?=gettext("Portal Auth events");?><br/>
+				<?=gettext("Portal Auth events");?><br />
 				<input name="vpn" id="vpn" type="checkbox" value="yes" <?php if ($pconfig['vpn']) echo "checked=\"checked\""; ?> />
-				<?=gettext("VPN (PPTP, IPsec, OpenVPN) events");?><br/>
+				<?=gettext("VPN (PPTP, IPsec, OpenVPN) events");?><br />
 				<input name="apinger" id="apinger" type="checkbox" value="yes" <?php if ($pconfig['apinger']) echo "checked=\"checked\""; ?> />
-				<?=gettext("Gateway Monitor events");?><br/>
+				<?=gettext("Gateway Monitor events");?><br />
 				<input name="relayd" id="relayd" type="checkbox" value="yes" <?php if ($pconfig['relayd']) echo "checked=\"checked\""; ?> />
-				<?=gettext("Server Load Balancer events");?><br/>
+				<?=gettext("Server Load Balancer events");?><br />
 				<input name="hostapd" id="hostapd" type="checkbox" value="yes" <?php if ($pconfig['hostapd']) echo "checked=\"checked\""; ?> />
-				<?=gettext("Wireless events");?><br/>
+				<?=gettext("Wireless events");?><br />
 			</td>
 		</tr>
 		<tr>
@@ -449,7 +449,7 @@ function check_everything() {
 		</tr>
 		<tr>
 			<td width="22%" height="53" valign="top">&nbsp;</td>
-			<td width="78%"><strong><span class="red"><?=gettext("Note:")?></span></strong><br/>
+			<td width="78%"><strong><span class="red"><?=gettext("Note:")?></span></strong><br />
 			<?=gettext("syslog sends UDP datagrams to port 514 on the specified " .
 			"remote syslog server, unless another port is specified. Be sure to set syslogd on the " .
 			"remote server to accept syslog messages from");?> <?=$g['product_name']?>.
diff --git a/usr/local/www/diag_logs_wireless.php b/usr/local/www/diag_logs_wireless.php
index 6dc462e5c9..aa55936859 100644
--- a/usr/local/www/diag_logs_wireless.php
+++ b/usr/local/www/diag_logs_wireless.php
@@ -100,7 +100,7 @@ include("head.inc");
 			  <?php printf(gettext("Wireless (hostapd) log entries"),$nentries);?></td>
 		  </tr>
 		  <?php dump_clog($wireless_logfile, $nentries); ?>
-		<tr><td><br/><form action="diag_logs_wireless.php" method="post">
+		<tr><td><br /><form action="diag_logs_wireless.php" method="post">
 <input name="clear" type="submit" class="formbtn" value="<?=gettext("Clear log"); ?>" /></form></td></tr>
 		</table>
 	</div>
diff --git a/usr/local/www/diag_nanobsd.php b/usr/local/www/diag_nanobsd.php
old mode 100755
new mode 100644
index 804b3b479b..139d7640bb
--- a/usr/local/www/diag_nanobsd.php
+++ b/usr/local/www/diag_nanobsd.php
@@ -136,7 +136,7 @@ if ($savemsg)
 						<strong><?=gettext("NOTE:")?>&nbsp;</strong>
 					</span>
 					<?=gettext("The options on this page are intended for use by advanced users only.")?>
-					<br/>&nbsp;
+					<br />&nbsp;
 				</span>
 				<p/>
 				<table width="100%" border="0" cellpadding="6" cellspacing="0">
@@ -154,8 +154,8 @@ if ($savemsg)
 						<td width="78%" class="vtable">
 							<form action="diag_nanobsd.php" method="post" name="iform">
 								<?=gettext("Bootup slice is currently:");?> <?php echo $ACTIVE_SLICE; ?>
-								<br/><br/><?=gettext("This will switch the bootup slice to the alternate slice.");?>
-								<br/>
+								<br /><br /><?=gettext("This will switch the bootup slice to the alternate slice.");?>
+								<br />
 								<input type='hidden' name='bootslice' value='switch'>
 								<input type='submit' value='Switch Slice'></form>
 						</td>
@@ -180,14 +180,14 @@ if ($savemsg)
 								}
 								echo gettext("Read/Write") . $refdisplay;
 								if (!isset($config['system']['nanobsd_force_rw']))
-									echo "<br/><input type='submit' name='changero' value='" . gettext("Switch to Read-Only") . "'>";
+									echo "<br /><input type='submit' name='changero' value='" . gettext("Switch to Read-Only") . "'>";
 							} else {
 								echo gettext("Read-Only");
 								if (!isset($config['system']['nanobsd_force_rw']))
-									echo "<br/><input type='submit' name='changero' value='" . gettext("Switch to Read/Write") . "'>";
+									echo "<br /><input type='submit' name='changero' value='" . gettext("Switch to Read/Write") . "'>";
 							} ?>
 							</form>
-							<br/><?php echo gettext("NOTE: This setting is only temporary, and can be switched dynamically in the background."); ?>
+							<br /><?php echo gettext("NOTE: This setting is only temporary, and can be switched dynamically in the background."); ?>
 						</td>
 					</tr>
 					<tr>
@@ -195,7 +195,7 @@ if ($savemsg)
 						<td valign="top" class="vncell">
 							<form action="diag_nanobsd.php" method="post" name="iform">
 								<input type="checkbox" name="nanobsd_force_rw" <?php if (isset($config['system']['nanobsd_force_rw'])) echo "checked"; ?>> <?php echo gettext("Keep media mounted read/write at all times.") ?>
-								<br/><input type='submit' name='setrw' value='<?php echo gettext("Save") ?>'>
+								<br /><input type='submit' name='setrw' value='<?php echo gettext("Save") ?>'>
 							</form>
 						</td>
 					</tr>
@@ -215,12 +215,12 @@ if ($savemsg)
 										<?php echo "{$COMPLETE_BOOT_PATH} -> {$TOFLASH}"; ?>
 									</option>
 								</select>
-								<br/>
+								<br />
 								<?=gettext("This will duplicate the bootup slice to the alternate slice.  Use this if you would like to duplicate the known good working boot partition to the alternate.");?>
 						</td>
 					</tr>
 					<tr>
-						<td valign="top" class="">&nbsp;</td><td><br/><input type='submit' value='Duplicate slice'></form></td>
+						<td valign="top" class="">&nbsp;</td><td><br /><input type='submit' value='Duplicate slice'></form></td>
 					</tr>
 					<tr>
 						<td colspan="2" valign="top" class="">&nbsp;</td>
diff --git a/usr/local/www/diag_ndp.php b/usr/local/www/diag_ndp.php
old mode 100755
new mode 100644
index 0f9ef9b4af..99fe5143c2
--- a/usr/local/www/diag_ndp.php
+++ b/usr/local/www/diag_ndp.php
@@ -144,7 +144,7 @@ ob_implicit_flush(1);
 							$mac=trim($entry['mac']);
 							$mac_hi = strtoupper($mac[0] . $mac[1] . $mac[3] . $mac[4] . $mac[6] . $mac[7]);
 							print $mac;
-							if(isset($mac_man[$mac_hi])){ print "<br/><font size=\"-2\"><i>{$mac_man[$mac_hi]}</i></font>"; }
+							if(isset($mac_man[$mac_hi])){ print "<br /><font size=\"-2\"><i>{$mac_man[$mac_hi]}</i></font>"; }
 							?>
 						</td>
 						<td class="listr">
diff --git a/usr/local/www/diag_packet_capture.php b/usr/local/www/diag_packet_capture.php
index 116f3ab5a4..0566e73966 100644
--- a/usr/local/www/diag_packet_capture.php
+++ b/usr/local/www/diag_packet_capture.php
@@ -197,15 +197,15 @@ include("fbegin.inc");
 				</option>
 			<?php endforeach; ?>
 			</select>
-			<br/><?=gettext("Select the interface on which to capture traffic.");?>
+			<br /><?=gettext("Select the interface on which to capture traffic.");?>
 			</td>
 		</tr>
 		<tr>
 			<td width="17%" valign="top" class="vncellreq"><?=gettext("Promiscuous");?></td>
 			<td width="51%" class="vtable">
 			<input name="promiscuous" type="checkbox"<?php if($_POST['promiscuous']) echo " CHECKED"; ?>>
-			<br/><?=gettext("If checked, the");?> <a target="_blank" href="http://www.freebsd.org/cgi/man.cgi?query=tcpdump&amp;apropos=0&amp;sektion=0&amp;manpath=FreeBSD+8.3-stable&amp;arch=default&amp;format=html"><?= gettext("packet capture")?></a> <?= gettext("will be performed using promiscuous mode.");?>
-			<br/><b><?=gettext("Note");?>: </b><?=gettext("Some network adapters do not support or work well in promiscuous mode.");?>
+			<br /><?=gettext("If checked, the");?> <a target="_blank" href="http://www.freebsd.org/cgi/man.cgi?query=tcpdump&amp;apropos=0&amp;sektion=0&amp;manpath=FreeBSD+8.3-stable&amp;arch=default&amp;format=html"><?= gettext("packet capture")?></a> <?= gettext("will be performed using promiscuous mode.");?>
+			<br /><b><?=gettext("Note");?>: </b><?=gettext("Some network adapters do not support or work well in promiscuous mode.");?>
 			</td>
 		</tr>
 		<tr>
@@ -216,7 +216,7 @@ include("fbegin.inc");
 				<option value="ip" <?php if ($fam == "ip") echo "selected"; ?>>IPv4 Only</option>
 				<option value="ip6" <?php if ($fam == "ip6") echo "selected"; ?>>IPv6 Only</option>
 			</select>
-			<br/><?=gettext("Select the type of traffic to be captured, either Any, IPv4 only or IPv6 only.");?>
+			<br /><?=gettext("Select the type of traffic to be captured, either Any, IPv4 only or IPv6 only.");?>
 			</td>
 		</tr>
 		<tr>
@@ -232,38 +232,38 @@ include("fbegin.inc");
 				<option value="carp" <?php if ($proto == "carp") echo "selected"; ?>>CARP (VRRP)</option>
 				<option value="esp" <?php if ($proto == "esp") echo "selected"; ?>>ESP</option>
 			</select>
-			<br/><?=gettext("Select the protocol to capture, or Any.");?>
+			<br /><?=gettext("Select the protocol to capture, or Any.");?>
 			</td>
 		</tr>
 		<tr>
 			<td width="17%" valign="top" class="vncellreq"><?=gettext("Host Address");?></td>
 			<td colspan="2" width="83%" class="vtable">
 			<input name="host" type="text" class="formfld host" id="host" size="20" value="<?=htmlspecialchars($host);?>">
-			<br/><?=gettext("This value is either the Source or Destination IP address or subnet in CIDR notation. The packet capture will look for this address in either field.");?>
-			<br/><?=gettext("This value can be a domain name or IP address, or subnet in CIDR notation.");?>
-			<br/><?=gettext("If you leave this field blank, all packets on the specified interface will be captured.");?>
+			<br /><?=gettext("This value is either the Source or Destination IP address or subnet in CIDR notation. The packet capture will look for this address in either field.");?>
+			<br /><?=gettext("This value can be a domain name or IP address, or subnet in CIDR notation.");?>
+			<br /><?=gettext("If you leave this field blank, all packets on the specified interface will be captured.");?>
 			</td>
 		</tr>
 		<tr>
 			<td width="17%" valign="top" class="vncellreq"><?=gettext("Port");?></td>
 			<td colspan="2" width="83%" class="vtable">
 			<input name="port" type="text" class="formfld unknown" id="port" size="5" value="<?=$port;?>">
-			<br/><?=gettext("The port can be either the source or destination port. The packet capture will look for this port in either field.");?>
-			<br/><?=gettext("Leave blank if you do not want to filter by port.");?>
+			<br /><?=gettext("The port can be either the source or destination port. The packet capture will look for this port in either field.");?>
+			<br /><?=gettext("Leave blank if you do not want to filter by port.");?>
 			</td>
 		</tr>
 		<tr>
 			<td width="17%" valign="top" class="vncellreq"><?=gettext("Packet Length");?></td>
 			<td colspan="2" width="83%" class="vtable">
 			<input name="snaplen" type="text" class="formfld unknown" id="snaplen" size="5" value="<?=$snaplen;?>">
-			<br/><?=gettext("The Packet length is the number of bytes of each packet that will be captured. Default value is 0, which will capture the entire frame regardless of its size.");?>
+			<br /><?=gettext("The Packet length is the number of bytes of each packet that will be captured. Default value is 0, which will capture the entire frame regardless of its size.");?>
 			</td>
 		</tr>
 		<tr>
 			<td width="17%" valign="top" class="vncellreq"><?=gettext("Count");?></td>
 			<td colspan="2" width="83%" class="vtable">
 			<input name="count" type="text" class="formfld unknown" id="count" size="5" value="<?=$count;?>">
-			<br/><?=gettext("This is the number of packets the packet capture will grab. Default value is 100.") . "<br/>" . gettext("Enter 0 (zero) for no count limit.");?>
+			<br /><?=gettext("This is the number of packets the packet capture will grab. Default value is 100.") . "<br />" . gettext("Enter 0 (zero) for no count limit.");?>
 			</td>
 		</tr>
 		<tr>
@@ -275,7 +275,7 @@ include("fbegin.inc");
 				<option value="high"   <?php if ($detail == "high")   echo "selected"; ?>><?=gettext("High");?></option>
 				<option value="full"   <?php if ($detail == "full")   echo "selected"; ?>><?=gettext("Full");?></option>
 			</select>
-			<br/><?=gettext("This is the level of detail that will be displayed after hitting 'Stop' when the packets have been captured.") .  "<br/><b>" .
+			<br /><?=gettext("This is the level of detail that will be displayed after hitting 'Stop' when the packets have been captured.") .  "<br /><b>" .
 					gettext("Note:") . "</b> " .
 					gettext("This option does not affect the level of detail when downloading the packet capture.");?>
 			</td>
@@ -284,8 +284,8 @@ include("fbegin.inc");
 			<td width="17%" valign="top" class="vncellreq"><?=gettext("Reverse DNS Lookup");?></td>
 			<td colspan="2" width="83%" class="vtable">
 			<input name="dnsquery" type="checkbox"<?php if($_POST['dnsquery']) echo " CHECKED"; ?>>
-			<br/><?=gettext("This check box will cause the packet capture to perform a reverse DNS lookup associated with all IP addresses.");?>
-			<br/><b><?=gettext("Note");?>: </b><?=gettext("This option can cause delays for large packet captures.");?>
+			<br /><?=gettext("This check box will cause the packet capture to perform a reverse DNS lookup associated with all IP addresses.");?>
+			<br /><b><?=gettext("Note");?>: </b><?=gettext("This option can cause delays for large packet captures.");?>
 			</td>
 		</tr>
 		<tr>
@@ -309,7 +309,7 @@ include("fbegin.inc");
 			if (file_exists($fp.$fn) and $processisrunning != true) {
 				echo "<input type=\"submit\" name=\"viewbtn\" value=\"" . gettext("View Capture") . "\">&nbsp;";
 				echo "<input type=\"submit\" name=\"downloadbtn\" value=\"" . gettext("Download Capture") . "\">";
-				echo "<br/>" . gettext("The packet capture file was last updated:") . " " . date("F jS, Y g:i:s a.", filemtime($fp.$fn));
+				echo "<br />" . gettext("The packet capture file was last updated:") . " " . date("F jS, Y g:i:s a.", filemtime($fp.$fn));
 			}
 ?>
 			</td>
@@ -322,7 +322,7 @@ include("fbegin.inc");
 <?php
 		echo "<font face='terminal' size='2'>";
 		if ($processisrunning == true)
-			echo("<strong>" . gettext("Packet Capture is running.") . "</strong><br/>");
+			echo("<strong>" . gettext("Packet Capture is running.") . "</strong><br />");
 
 		if ($do_tcpdump) {
 			$matches = array();
@@ -358,11 +358,11 @@ include("fbegin.inc");
 
 			if ($action == gettext("Start")) {
 				$matchstr = implode($matches, " and ");
-				echo("<strong>" . gettext("Packet Capture is running.") . "</strong><br/>");
+				echo("<strong>" . gettext("Packet Capture is running.") . "</strong><br />");
 				mwexec_bg ("/usr/sbin/tcpdump -i $selectedif $disablepromiscuous $searchcount -s $snaplen -w $fp$fn $matchstr");
 			} else {
 				//action = stop
-				echo("<strong>" . gettext("Packet Capture stopped.") . "<br/><br/>" . gettext("Packets Captured:") . "</strong><br/>");
+				echo("<strong>" . gettext("Packet Capture stopped.") . "<br /><br />" . gettext("Packets Captured:") . "</strong><br />");
 ?>
 				<textarea style="width:98%" name="code" rows="15" cols="66" wrap="off" readonly="readonly">
 <?php
diff --git a/usr/local/www/diag_ping.php b/usr/local/www/diag_ping.php
old mode 100755
new mode 100644
index 391d939490..e2e8a85b4f
--- a/usr/local/www/diag_ping.php
+++ b/usr/local/www/diag_ping.php
@@ -145,7 +145,7 @@ include("head.inc"); ?>
 	<td valign="top" colspan="2">
 	<?php if ($do_ping) {
 		echo "<font face='terminal' size='2'>";
-		echo "<strong>" . gettext("Ping output") . ":</strong><br>";
+		echo "<strong>" . gettext("Ping output") . ":</strong><br />";
 		echo('<pre>');
 		$ifscope = '';
 		$command = "/sbin/ping";
diff --git a/usr/local/www/diag_resetstate.php b/usr/local/www/diag_resetstate.php
old mode 100755
new mode 100644
index b5378210cc..15b0c41e5c
--- a/usr/local/www/diag_resetstate.php
+++ b/usr/local/www/diag_resetstate.php
@@ -56,7 +56,7 @@ if ($_POST) {
 	if ($_POST['sourcetracking']) {
 		mwexec("/sbin/pfctl -F Sources");
 		if ($savemsg)
-			$savemsg .= " <br/>";
+			$savemsg .= " <br />";
 		$savemsg .= gettext("The source tracking table has been flushed successfully.");
 	}
 }
@@ -88,18 +88,18 @@ include("head.inc");
                   <td width="22%" valign="top" class="vtable">&nbsp;</td>
                   <td width="78%" class="vtable"> <p>
                       <input name="statetable" type="checkbox" id="statetable" value="yes" checked>
-                      <strong><?= gettext("Firewall state table"); ?></strong><br>
-                      <span class="vexpl"><br>
+                      <strong><?= gettext("Firewall state table"); ?></strong><br />
+                      <span class="vexpl"><br />
                       <?=gettext("Resetting the state tables will remove all entries from " .
                       "the corresponding tables. This means that all open connections " .
                       "will be broken and will have to be re-established. This " . 
                       "may be necessary after making substantial changes to the " .
                       "firewall and/or NAT rules, especially if there are IP protocol " .
-                      "mappings (e.g. for PPTP or IPv6) with open connections."); ?><br>
-                      <br>
+                      "mappings (e.g. for PPTP or IPv6) with open connections."); ?><br />
+                      <br />
                       </span><span class="vexpl"><?=gettext("The firewall will normally leave " .
-                      "the state tables intact when changing rules."); ?><br>
-                      <br>
+                      "the state tables intact when changing rules."); ?><br />
+                      <br />
                       <?=gettext("NOTE: If you reset the firewall state table, the browser " .
                       "session may appear to be hung after clicking &quot;Reset&quot;. " .
                       "Simply refresh the page to continue."); ?></span></p>
@@ -110,13 +110,13 @@ include("head.inc");
 			<td width="22%" valign="top" class="vtable">&nbsp;</td>
 			<td width="78%" class="vtable"><p>
 			<input name="sourcetracking" type="checkbox" id="sourcetracking" value="yes" checked>
-			<strong><?= gettext("Firewall Source Tracking"); ?></strong><br>
-			<span class="vexpl"><br>
+			<strong><?= gettext("Firewall Source Tracking"); ?></strong><br />
+			<span class="vexpl"><br />
 			<?=gettext("Resetting the source tracking table will remove all source/destination associations. " .
 			"This means that the \"sticky\" source/destination association " .
-			"will be cleared for all clients."); ?><br>
-			<br>
-			</span><span class="vexpl"><?=gettext("This does not clear active connection states, only source tracking."); ?><br>
+			"will be cleared for all clients."); ?><br />
+			<br />
+			</span><span class="vexpl"><?=gettext("This does not clear active connection states, only source tracking."); ?><br />
 			</p>
 			</td>
 		</tr>
diff --git a/usr/local/www/diag_sockets.php b/usr/local/www/diag_sockets.php
index 8e6d7cc936..938e2d512a 100644
--- a/usr/local/www/diag_sockets.php
+++ b/usr/local/www/diag_sockets.php
@@ -114,14 +114,14 @@ $showAllOption = $showAll ? "" : "?showAll";
 	} 
 ?>
 </table>
-<br/>
+<br />
 <a name="about"></a>
 <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0" border="1">
 	<tr><td colspan="2" class="listtopic" >Socket information explanation</td></tr>
 <tr><td colspan="2"  class="">
-This page show the output for the commands: "sockstat -4lL" and "sockstat -6lL".<br/>
-Or in case of showing all sockets the output for: "sockstat -4" and "sockstat -6".<br/>
-<br/>
+This page show the output for the commands: "sockstat -4lL" and "sockstat -6lL".<br />
+Or in case of showing all sockets the output for: "sockstat -4" and "sockstat -6".<br />
+<br />
 The information listed for each socket is:</td></tr>
 	<tr><td class="listlr">USER	      </td><td class="listr">The user who owns the socket.</td></tr>
 	<tr><td class="listlr">COMMAND	      </td><td class="listr">The command which holds the socket.</td></tr>
diff --git a/usr/local/www/diag_tables.php b/usr/local/www/diag_tables.php
index 9bbcc461f0..ec022788e0 100644
--- a/usr/local/www/diag_tables.php
+++ b/usr/local/www/diag_tables.php
@@ -160,7 +160,7 @@ include("fbegin.inc");
 	if($count > 0)
 		if( ($tablename == "bogons") || ($tablename == "bogonsv6") ) {
 			$last_updated = exec('/usr/bin/grep -i -m 1 -E "^# last updated" /etc/' . escapeshellarg($tablename));
-			echo "<p/>&nbsp<b>$count</b> " . gettext("entries in this table.") . "&nbsp&nbsp" . "<input name='Download' type='submit' class='formbtn' value='" . gettext("Download") . "'> " . gettext(" the latest bogon data.") . "<br>" . "$last_updated";
+			echo "<p/>&nbsp<b>$count</b> " . gettext("entries in this table.") . "&nbsp&nbsp" . "<input name='Download' type='submit' class='formbtn' value='" . gettext("Download") . "'> " . gettext(" the latest bogon data.") . "<br />" . "$last_updated";
 		}
 		else
 			echo "<p/>" . gettext("Delete") . " <a href='diag_tables.php?deleteall=true&type=" . htmlspecialchars($tablename) . "'>" . gettext("all") . "</a> " . "<b>$count</b> " . gettext("entries in this table.");
diff --git a/usr/local/www/diag_testport.php b/usr/local/www/diag_testport.php
index 67d4d9e76d..064fa7c4d0 100644
--- a/usr/local/www/diag_testport.php
+++ b/usr/local/www/diag_testport.php
@@ -104,9 +104,9 @@ include("head.inc"); ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr><td>
 <?php echo gettext("This page allows you to perform a simple TCP connection test to determine if a host is up and accepting connections on a given port. This test does not function for UDP since there is no way to reliably determine if a UDP port accepts connections in this manner."); ?>
-<br/><br/>
+<br /><br />
 <?php echo gettext("No data is transmitted to the remote host during this test, it will only attempt to open a connection and optionally display the data sent back from the server."); ?>
-<br/><br/><br/>
+<br /><br /><br />
 <?php if ($input_errors) print_input_errors($input_errors); ?>
 	<form action="diag_testport.php" method="post" name="iform" id="iform">
 	<table width="100%" border="0" cellpadding="6" cellspacing="0">
@@ -129,14 +129,14 @@ include("head.inc"); ?>
 			<td width="22%" valign="top" class="vncell"><?= gettext("Source Port"); ?></td>
 			<td width="78%" class="vtable">
 				<input name="srcport" type="text" class="formfld" id="srcport" size="10" value="<?=htmlspecialchars($srcport);?>">
-				<br/><br/><?php echo gettext("This should typically be left blank."); ?>
+				<br /><br /><?php echo gettext("This should typically be left blank."); ?>
 			</td>
 		</tr>
 		<tr>
 			<td width="22%" valign="top" class="vncell"><?= gettext("Show Remote Text"); ?></td>
 			<td width="78%" class="vtable">
 				<input name="showtext" type="checkbox" id="showtext" <?php if ($showtext) echo "checked" ?>>
-				</br><br/><?php echo gettext("Shows the text given by the server when connecting to the port. Will take 10+ seconds to display if checked."); ?>
+				<br /><br /><?php echo gettext("Shows the text given by the server when connecting to the port. Will take 10+ seconds to display if checked."); ?>
 			</td>
 		</tr>
 		<tr>
@@ -171,7 +171,7 @@ include("head.inc"); ?>
 					<?=gettext("IPv6");?>
 				</option>
 			</select>
-			<br/><br/>
+			<br /><br />
 			<?php echo gettext("If you force IPv4 or IPv6 and use a hostname that does not contain a result using that protocol, it will result in an error. For example if you force IPv4 and use a hostname that only returns an AAAA IPv6 IP address, it will not work."); ?>
 			</td>
 		</tr>
@@ -185,7 +185,7 @@ include("head.inc"); ?>
 		<td valign="top" colspan="2">
 		<?php if ($do_testport) {
 			echo "<font face='terminal' size='2'>";
-			echo "<strong>" . gettext("Port Test Results") . ":</strong><br>";
+			echo "<strong>" . gettext("Port Test Results") . ":</strong><br />";
 			echo '<pre>';
 			$result = "";
 			$nc_base_cmd = "/usr/bin/nc";
diff --git a/usr/local/www/diag_traceroute.php b/usr/local/www/diag_traceroute.php
old mode 100755
new mode 100644
index 35b40e15dc..13e6ac31fc
--- a/usr/local/www/diag_traceroute.php
+++ b/usr/local/www/diag_traceroute.php
@@ -160,7 +160,7 @@ if (!isset($do_traceroute)) {
 	<span class="vexpl">
 		<span class="red"><b><?=gettext("Note: ");?></b></span>
 		<?=gettext("Traceroute may take a while to complete. You may hit the Stop button on your browser at any time to see the progress of failed traceroutes.");?>
-		<br/><br/>
+		<br /><br />
 		<?=gettext("Using a source interface/IP address that does not match selected type (IPv4, IPv6) will result in an error or empty output.");?>
 	</span>
 	</td>
diff --git a/usr/local/www/easyrule.php b/usr/local/www/easyrule.php
index 961173d484..90feca6e92 100644
--- a/usr/local/www/easyrule.php
+++ b/usr/local/www/easyrule.php
@@ -72,13 +72,13 @@ include("head.inc"); ?>
 <?php if ($input_errors) print_input_errors($input_errors); ?>
 
 <?php if ($message) { ?>
-<br/>
+<br />
 <?=gettext("Message"); ?>: <?php echo $message; ?>
-<br/>
+<br />
 <?php } else { ?>
 <?=gettext("This is the Easy Rule status page, mainly used to display errors when adding rules. " .
 "If you are seeing this, there apparently was not an error, and you navigated to the " .
-"page directly without telling it what to do"); ?>.<br/><br/>
+"page directly without telling it what to do"); ?>.<br /><br />
 <?=gettext("This page is meant to be called from the block/pass buttons on the Firewall Logs page"); ?>, <a href="diag_logs_filter.php"><?=gettext("Status"); ?> &gt; <?=gettext("System Logs, " .
 "Firewall Tab"); ?></a>.
 <br />
diff --git a/usr/local/www/firewall_aliases.php b/usr/local/www/firewall_aliases.php
old mode 100755
new mode 100644
index fc6909365b..21c5991486
--- a/usr/local/www/firewall_aliases.php
+++ b/usr/local/www/firewall_aliases.php
@@ -165,7 +165,7 @@ include("head.inc");
 <form action="firewall_aliases.php" method="post">
 <?php if ($savemsg) print_info_box($savemsg); ?>
 <?php if (is_subsystem_dirty('aliases')): ?><p>
-<?php print_info_box_np(gettext("The alias list has been changed.") . "<br/>" . gettext("You must apply the changes in order for them to take effect."));?>
+<?php print_info_box_np(gettext("The alias list has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect."));?>
 <?php endif; ?>
 <?php pfSense_handle_custom_code("/usr/local/pkg/firewall_aliases/pre_table"); ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0" summary="firewall aliases">
@@ -231,15 +231,15 @@ include("head.inc");
 						<td class="listr" ondblclick="document.location='firewall_aliases_edit.php?id=<?=$i;?>';">
 						<?php
 						if ($alias["url"]) {
-							echo $alias["url"] . "<br/>";
+							echo $alias["url"] . "<br />";
 						} else {
 							if(is_array($alias["aliasurl"])) {
 								$aliasurls = implode(", ", array_slice($alias["aliasurl"], 0, 10));
 								echo $aliasurls;
 								if(count($aliasurls) > 10) {
-									echo "...<br/>";
+									echo "...<br />";
 								}
-								echo "<br/>\n";
+								echo "<br />\n";
 							}
 							$tmpaddr = explode(" ", $alias['address']);
 							$addresses = implode(", ", array_slice($tmpaddr, 0, 10));
@@ -287,7 +287,7 @@ include("head.inc");
 
 					<tr>
 						<td class="tabcont" colspan="3">
-							<p><span class="vexpl"><span class="red"><strong><?=gettext("Note:"); ?><br/></strong></span></span></p><div style="overflow:hidden; text-align:justify;"><p><span class="vexpl"><?=gettext("Aliases act as placeholders for real hosts, networks or ports. They can be used to minimize the number of changes that have to be made if a host, network or port changes. You can enter the name of an alias instead of the host, network or port in all fields that have a red background. The alias will be resolved according to the list above. If an alias cannot be resolved (e.g. because you deleted it), the corresponding element (e.g. filter/NAT/shaper rule) will be considered invalid and skipped."); ?></span></p></div>
+							<p><span class="vexpl"><span class="red"><strong><?=gettext("Note:"); ?><br /></strong></span></span></p><div style="overflow:hidden; text-align:justify;"><p><span class="vexpl"><?=gettext("Aliases act as placeholders for real hosts, networks or ports. They can be used to minimize the number of changes that have to be made if a host, network or port changes. You can enter the name of an alias instead of the host, network or port in all fields that have a red background. The alias will be resolved according to the list above. If an alias cannot be resolved (e.g. because you deleted it), the corresponding element (e.g. filter/NAT/shaper rule) will be considered invalid and skipped."); ?></span></p></div>
 						</td>
 					</tr>
 				</table>
diff --git a/usr/local/www/firewall_nat.php b/usr/local/www/firewall_nat.php
old mode 100755
new mode 100644
index 8922adc25d..f8f10fc8ea
--- a/usr/local/www/firewall_nat.php
+++ b/usr/local/www/firewall_nat.php
@@ -180,7 +180,7 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript
 <script type="text/javascript" language="javascript" src="/javascript/row_toggle.js"></script>
 <?php if ($savemsg) print_info_box($savemsg); ?>
 <?php if (is_subsystem_dirty('natconf')): ?>
-<?php print_info_box_np(gettext("The NAT configuration has been changed") . ".<br/>" . gettext("You must apply the changes in order for them to take effect."));?><br/>
+<?php print_info_box_np(gettext("The NAT configuration has been changed") . ".<br />" . gettext("You must apply the changes in order for them to take effect."));?><br />
 <?php endif; ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0" summary="firewall nat">
   <tr><td>
diff --git a/usr/local/www/firewall_nat_1to1.php b/usr/local/www/firewall_nat_1to1.php
old mode 100755
new mode 100644
index 8c3e2d9f69..6c0903d3c7
--- a/usr/local/www/firewall_nat_1to1.php
+++ b/usr/local/www/firewall_nat_1to1.php
@@ -156,10 +156,10 @@ if ($savemsg)
 	print_info_box($savemsg);
 if (is_subsystem_dirty('natconf'))
 	print_info_box_np(gettext("The NAT configuration has been changed.") .
-		"<br/>" .
+		"<br />" .
 		gettext("You must apply the changes in order for them to take effect."));
 ?>
-<br/>
+<br />
 <table width="100%" border="0" cellpadding="0" cellspacing="0" summary="firewall nat 1to1">
 	<tr><td>
 <?php
@@ -334,9 +334,9 @@ if (is_subsystem_dirty('natconf'))
 			<tr>
 				<td colspan="7">
 					<p><span class="vexpl">
-						<span class="red"><strong><?=gettext("Note:"); ?><br/></strong></span>
+						<span class="red"><strong><?=gettext("Note:"); ?><br /></strong></span>
 						<?=gettext("Depending on the way your WAN connection is setup, you may also need a"); ?>
-						<a href="firewall_virtual_ip.php"><?=gettext("Virtual IP."); ?></a><br/>
+						<a href="firewall_virtual_ip.php"><?=gettext("Virtual IP."); ?></a><br />
 						<?=gettext("If you add a 1:1 NAT entry for any of the interface IPs on this system, " .
 							"it will make this system inaccessible on that IP address. i.e. if " .
 							"you use your WAN IP address, any services on this system (IPsec, OpenVPN server, etc.) " .
diff --git a/usr/local/www/firewall_nat_1to1_edit.php b/usr/local/www/firewall_nat_1to1_edit.php
old mode 100755
new mode 100644
index 15bfce298f..55d1a3913c
--- a/usr/local/www/firewall_nat_1to1_edit.php
+++ b/usr/local/www/firewall_nat_1to1_edit.php
@@ -324,18 +324,18 @@ if ($input_errors)
 <?php
 					endforeach;
 ?>
-				</select><br/>
-			  <span class="vexpl"><?=gettext("Choose which interface this rule applies to"); ?>.<br/>
+				</select><br />
+			  <span class="vexpl"><?=gettext("Choose which interface this rule applies to"); ?>.<br />
 			  <?=gettext("Hint: in most cases, you'll want to use WAN here"); ?>.</span></td>
 		</tr>
 		<tr>
 			<td width="22%" valign="top" class="vncellreq"><?=gettext("External subnet IP"); ?></td>
 			<td width="78%" class="vtable">
 				<input name="external" type="text" class="formfld" id="external" size="20" value="<?=htmlspecialchars($pconfig['external']);?>" />
-				<br/>
+				<br />
 				<span class="vexpl">
 					<?=gettext("Enter the external (usually on a WAN) subnet's starting address for the 1:1 mapping.  " .
-						"The subnet mask from the internal address below will be applied to this IP address."); ?><br/>
+						"The subnet mask from the internal address below will be applied to this IP address."); ?><br />
 					<?=gettext("Hint: this is generally an address owned by the router itself on the selected interface."); ?>
 				</span>
 			</td>
@@ -410,7 +410,7 @@ if ($input_errors)
 						</td>
 					</tr>
 				</table>
-				<br/>
+				<br />
 				<span class="vexpl"><?=gettext("Enter the internal (LAN) subnet for the 1:1 mapping. The subnet size specified for the internal subnet will be applied to the external subnet."); ?></span>
 			</td>
 		</tr>
@@ -493,9 +493,9 @@ if ($input_errors)
 						</td>
 					</tr>
 				</table>
-				<br/>
+				<br />
 				<span class="vexpl">
-					<?=gettext("The 1:1 mapping will only be used for connections to or from the specified destination."); ?><br/>
+					<?=gettext("The 1:1 mapping will only be used for connections to or from the specified destination."); ?><br />
 					<?=gettext("Hint: this is usually 'any'."); ?>
 				</span>
 			</td>
@@ -504,7 +504,7 @@ if ($input_errors)
 			<td width="22%" valign="top" class="vncell"><?=gettext("Description"); ?></td>
 			<td width="78%" class="vtable">
 				<input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>" />
-				<br/>
+				<br />
 				<span class="vexpl">
 					<?=gettext("You may enter a description here for your reference (not parsed)."); ?>
 				</span>
diff --git a/usr/local/www/firewall_nat_edit.php b/usr/local/www/firewall_nat_edit.php
old mode 100755
new mode 100644
index 811d451dd3..d2fe8bc618
--- a/usr/local/www/firewall_nat_edit.php
+++ b/usr/local/www/firewall_nat_edit.php
@@ -484,7 +484,7 @@ include("fbegin.inc"); ?>
                   <td width="78%" class="vtable">
                     <input type="checkbox" name="nordr" id="nordr" onclick="nordr_change();" <?php if($pconfig['nordr']) echo "checked=\"checked\""; ?> />
                     <span class="vexpl"><?=gettext("Enabling this option will disable redirection for traffic matching this rule."); ?>
-                    <br/><?=gettext("Hint: this option is rarely needed, don't use this unless you know what you're doing."); ?></span>
+                    <br /><?=gettext("Hint: this option is rarely needed, don't use this unless you know what you're doing."); ?></span>
                   </td>
                 </tr>
 		<tr>
@@ -525,8 +525,8 @@ include("fbegin.inc"); ?>
 						<?=htmlspecialchars($ifacename);?>
 						</option>
 						<?php endforeach; ?>
-					</select><br/>
-                     <span class="vexpl"><?=gettext("Choose which interface this rule applies to."); ?><br/>
+					</select><br />
+                     <span class="vexpl"><?=gettext("Choose which interface this rule applies to."); ?><br />
                      <?=gettext("Hint: in most cases, you'll want to use WAN here."); ?></span></td>
                 </tr>
                 <tr>
@@ -536,8 +536,8 @@ include("fbegin.inc"); ?>
                       <?php $protocols = explode(" ", "TCP UDP TCP/UDP GRE ESP ICMP"); foreach ($protocols as $proto): ?>
                       <option value="<?=strtolower($proto);?>" <?php if (strtolower($proto) == $pconfig['proto']) echo "selected=\"selected\""; ?>><?=htmlspecialchars($proto);?></option>
                       <?php endforeach; ?>
-                    </select> <br/> <span class="vexpl"><?=gettext("Choose which IP protocol " .
-                    "this rule should match."); ?><br/>
+                    </select> <br /> <span class="vexpl"><?=gettext("Choose which IP protocol " .
+                    "this rule should match."); ?><br />
                     <?=gettext("Hint: in most cases, you should specify"); ?> <em><?=gettext("TCP"); ?></em> &nbsp;<?=gettext("here."); ?></span></td>
                 </tr>
 		<tr id="showadvancedboxsrc" name="showadvancedboxsrc">
@@ -632,7 +632,7 @@ include("fbegin.inc"); ?>
 					</tr>
 				</table>
 				<br />
-				<span class="vexpl"><?=gettext("Specify the source port or port range for this rule"); ?>. <b><?=gettext("This is usually"); ?> <em><?=gettext("random"); ?></em> <?=gettext("and almost never equal to the destination port range (and should usually be 'any')"); ?>.</b> <br /> <?=gettext("Hint: you can leave the"); ?> <em>'<?=gettext("to"); ?>'</em> <?=gettext("field empty if you only want to filter a single port."); ?></span><br/>
+				<span class="vexpl"><?=gettext("Specify the source port or port range for this rule"); ?>. <b><?=gettext("This is usually"); ?> <em><?=gettext("random"); ?></em> <?=gettext("and almost never equal to the destination port range (and should usually be 'any')"); ?>.</b> <br /> <?=gettext("Hint: you can leave the"); ?> <em>'<?=gettext("to"); ?>'</em> <?=gettext("field empty if you only want to filter a single port."); ?></span><br />
 			</td>
 		</tr>
 		<tr>
@@ -755,8 +755,8 @@ include("fbegin.inc"); ?>
                   <td width="22%" valign="top" class="vncellreq"><?=gettext("Redirect target IP"); ?></td>
                   <td width="78%" class="vtable">
                     <input autocomplete='off' name="localip" type="text" class="formfldalias" id="localip" size="20" value="<?=htmlspecialchars($pconfig['localip']);?>" />
-                    <br/> <span class="vexpl"><?=gettext("Enter the internal IP address of " .
-                    "the server on which you want to map the ports."); ?><br/>
+                    <br /> <span class="vexpl"><?=gettext("Enter the internal IP address of " .
+                    "the server on which you want to map the ports."); ?><br />
                     <?=gettext("e.g."); ?> <em>192.168.1.12</em></span></td>
                 </tr>
                 <tr name="lprtr" id="lprtr">
@@ -773,24 +773,24 @@ include("fbegin.inc"); ?>
 					  </option>
                       <?php endforeach; ?>
                     </select> <input onchange="check_for_aliases();" autocomplete='off' class="formfldalias" name="localbeginport_cust" id="localbeginport_cust" type="text" size="5" value="<?php if (!$bfound) echo htmlspecialchars($pconfig['localbeginport']); ?>" />
-                    <br/>
+                    <br />
                     <span class="vexpl"><?=gettext("Specify the port on the machine with the " .
                     "IP address entered above. In case of a port range, specify " .
                     "the beginning port of the range (the end port will be calculated " .
-                    "automatically)."); ?><br/>
+                    "automatically)."); ?><br />
                     <?=gettext("Hint: this is usually identical to the 'from' port above"); ?></span></td>
                 </tr>
                 <tr>
                   <td width="22%" valign="top" class="vncell"><?=gettext("Description"); ?></td>
                   <td width="78%" class="vtable">
                     <input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>" />
-                    <br/> <span class="vexpl"><?=gettext("You may enter a description here " .
+                    <br /> <span class="vexpl"><?=gettext("You may enter a description here " .
                     "for your reference (not parsed)."); ?></span></td>
                 </tr>
 				<tr>
 					<td width="22%" valign="top" class="vncell"><?=gettext("No XMLRPC Sync"); ?></td>
 					<td width="78%" class="vtable">
-						<input type="checkbox" value="yes" name="nosync"<?php if($pconfig['nosync']) echo " checked=\"checked\""; ?> /><br/>
+						<input type="checkbox" value="yes" name="nosync"<?php if($pconfig['nosync']) echo " checked=\"checked\""; ?> /><br />
 						<?=gettext("Hint: This prevents the rule on Master from automatically syncing to other CARP members. This does NOT prevent the rule from being overwritten on Slave.");?>
 					</td>
 				</tr>
@@ -821,7 +821,7 @@ include("fbegin.inc"); ?>
 									echo "<option value=\"{$filter_rule['associated-rule-id']}\"";
 									if ($filter_rule['associated-rule-id']==$pconfig['associated-rule-id']) {
 										echo " selected=\"selected\"";
-										$linkedrule = "<br /><a href=\"firewall_rules_edit.php?id={$filter_id}\">" . gettext("View the filter rule") . "</a><br/>";
+										$linkedrule = "<br /><a href=\"firewall_rules_edit.php?id={$filter_id}\">" . gettext("View the filter rule") . "</a><br />";
 									}
 									echo ">". htmlspecialchars('Rule ' . $filter_rule['descr']) . "</option>\n";
 
@@ -846,7 +846,7 @@ include("fbegin.inc"); ?>
 						<option value="add-unassociated"><?=gettext("Add unassociated filter rule"); ?></option>
 						<option value="pass"><?=gettext("Pass"); ?></option>
 					</select>
-					<br/><br/><?=gettext("NOTE: The \"pass\" selection does not work properly with Multi-WAN. It will only work on an interface containing the default gateway.")?>
+					<br /><br /><?=gettext("NOTE: The \"pass\" selection does not work properly with Multi-WAN. It will only work on an interface containing the default gateway.")?>
 				  </td>
                 </tr><?php endif; ?>
 <?php
diff --git a/usr/local/www/firewall_nat_npt.php b/usr/local/www/firewall_nat_npt.php
index f85d321524..bc77e40e54 100644
--- a/usr/local/www/firewall_nat_npt.php
+++ b/usr/local/www/firewall_nat_npt.php
@@ -84,7 +84,7 @@ include("head.inc");
 <form action="firewall_nat_npt.php" method="post">
 <?php if ($savemsg) print_info_box($savemsg); ?>
 <?php if (is_subsystem_dirty('natconf')): ?>
-<?php print_info_box_np(gettext("The NAT configuration has been changed") . ".<br/>" . gettext("You must apply the changes in order for them to take effect."));?><br/>
+<?php print_info_box_np(gettext("The NAT configuration has been changed") . ".<br />" . gettext("You must apply the changes in order for them to take effect."));?><br />
 <?php endif; ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0" summary="firewall nat npt">  <tr><td>
 <?php
diff --git a/usr/local/www/firewall_nat_npt_edit.php b/usr/local/www/firewall_nat_npt_edit.php
index 87ccacb966..c2b64fb96a 100644
--- a/usr/local/www/firewall_nat_npt_edit.php
+++ b/usr/local/www/firewall_nat_npt_edit.php
@@ -202,8 +202,8 @@ include("head.inc");
 					<?=htmlspecialchars($ifacename);?>
 					</option>
 					<?php endforeach; ?>
-				</select><br/>
-			  <span class="vexpl"><?=gettext("Choose which interface this rule applies to"); ?>.<br/>
+				</select><br />
+			  <span class="vexpl"><?=gettext("Choose which interface this rule applies to"); ?>.<br />
 			  <?=gettext("Hint: in most cases, you'll want to use WAN here"); ?>.</span></td>
 		</tr>
 		<tr>
@@ -228,7 +228,7 @@ include("head.inc");
                                                 </td>
                                         </tr>
                                 </table>
-			<br/>
+			<br />
                      <span class="vexpl"><?=gettext("Enter the internal (LAN) ULA IPv6 Prefix for the Network Prefix translation. The prefix size specified for the internal IPv6 prefix will be applied to the 
 external prefix."); 
 ?></span>
@@ -258,15 +258,15 @@ external prefix.");
                                                 </td>
                                         </tr>
                                 </table>
-			<br/>
-                     <span class="vexpl"><?=gettext("Enter the Global Unicast routable IPv6 prefix here"); ?><br/></span>
+			<br />
+                     <span class="vexpl"><?=gettext("Enter the Global Unicast routable IPv6 prefix here"); ?><br /></span>
                      </td>
                 </tr>
                 <tr> 
                   <td width="22%" valign="top" class="vncell"><?=gettext("Description"); ?></td>
                   <td width="78%" class="vtable"> 
                     <input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>" />
-                    <br/> <span class="vexpl"><?=gettext("You may enter a description here " .
+                    <br /> <span class="vexpl"><?=gettext("You may enter a description here " .
                     "for your reference (not parsed)."); ?></span></td>
                 </tr>
                 <tr> 
diff --git a/usr/local/www/firewall_nat_out.php b/usr/local/www/firewall_nat_out.php
old mode 100755
new mode 100644
index 7ed846a0ed..cf5b4ebd03
--- a/usr/local/www/firewall_nat_out.php
+++ b/usr/local/www/firewall_nat_out.php
@@ -218,9 +218,9 @@ include("head.inc");
 if ($savemsg)
 	print_info_box($savemsg);
 if (is_subsystem_dirty('natconf'))
-	print_info_box_np(gettext("The NAT configuration has been changed.")."<br/>".gettext("You must apply the changes in order for them to take effect."));
+	print_info_box_np(gettext("The NAT configuration has been changed.")."<br />".gettext("You must apply the changes in order for them to take effect."));
 ?>
-<br/>
+<br />
 <table width="100%" border="0" cellpadding="0" cellspacing="0" summary="firewall nat outbound">
 	<tr><td>
 <?php
@@ -243,7 +243,7 @@ if (is_subsystem_dirty('natconf'))
 					</td>
 					<td>
 						<strong>
-							<?=gettext("Automatic outbound NAT rule generation"); ?><br/>
+							<?=gettext("Automatic outbound NAT rule generation"); ?><br />
 							<?=gettext("(IPsec passthrough included)");?>
 						</strong>
 					</td>
@@ -252,7 +252,7 @@ if (is_subsystem_dirty('natconf'))
 					</td>
 					<td>
 						<strong>
-							<?=gettext("Hybrid Outbound NAT rule generation"); ?><br/>
+							<?=gettext("Hybrid Outbound NAT rule generation"); ?><br />
 							<?=gettext("(Automatic Outbound NAT + rules below)");?>
 						</strong>
 					</td>
@@ -271,7 +271,7 @@ if (is_subsystem_dirty('natconf'))
 					</td>
 					<td>
 						<strong>
-							<?=gettext("Manual Outbound NAT rule generation"); ?><br/>
+							<?=gettext("Manual Outbound NAT rule generation"); ?><br />
 							<?=gettext("(AON - Advanced Outbound NAT)");?>
 						</strong>
 					</td>
@@ -280,7 +280,7 @@ if (is_subsystem_dirty('natconf'))
 					</td>
 					<td>
 						<strong>
-							<?=gettext("Disable Outbound NAT rule generation"); ?><br/>
+							<?=gettext("Disable Outbound NAT rule generation"); ?><br />
 							<?=gettext("(No Outbound NAT rules)");?>
 						</strong>
 					</td>
@@ -625,16 +625,16 @@ if (is_subsystem_dirty('natconf'))
 				<tr>
 					<td colspan="12">
 						<p><span class="vexpl">
-							<span class="red"><strong><?=gettext("Note:"); ?><br/></strong></span>
+							<span class="red"><strong><?=gettext("Note:"); ?><br /></strong></span>
 							<?=gettext("If automatic outbound NAT selected, a mapping is automatically created " .
 								"for each interface's subnet (except WAN-type connections) and the rules " .
-								"on \"Mappings\" section of this page are ignored.<br/><br/> " .
+								"on \"Mappings\" section of this page are ignored.<br /><br /> " .
 								"If manual outbound NAT is selected, outbound NAT rules will not be " .
 								"automatically generated and only the mappings you specify on this page " .
-								"will be used. <br/><br/> " .
+								"will be used. <br /><br /> " .
 								"If hybrid outbound NAT is selected, mappings you specify on this page will " .
-								"be used, followed by the automatically generated ones. <br/><br/>" .
-								"If disable outbound NAT is selected, no rules will be used. <br/><br/>" .
+								"be used, followed by the automatically generated ones. <br /><br />" .
+								"If disable outbound NAT is selected, no rules will be used. <br /><br />" .
 								"If a target address other than a WAN-type interface's IP address is used, " .
 								"then depending on the way the WAN connection is setup, a "); ?>
 								<a href="firewall_virtual_ip.php"><?=gettext("Virtual IP"); ?></a>
diff --git a/usr/local/www/firewall_nat_out_edit.php b/usr/local/www/firewall_nat_out_edit.php
old mode 100755
new mode 100644
index 1d2e79d727..98255d047c
--- a/usr/local/www/firewall_nat_out_edit.php
+++ b/usr/local/www/firewall_nat_out_edit.php
@@ -454,7 +454,7 @@ function poolopts_change() {
 			<td width="78%" class="vtable">
 				<input type="checkbox" name="nonat" id="nonat" onclick="nonat_change();" <?php if(isset($pconfig['nonat'])) echo " checked=\"checked\""; ?> />
 				<span class="vexpl"><?=gettext("Enabling this option will disable NAT for traffic matching this rule and stop processing Outbound NAT rules.");?>
-				<br/><?=gettext("Hint: in most cases, you won't use this option.");?></span>
+				<br /><?=gettext("Hint: in most cases, you won't use this option.");?></span>
 			</td>
 		</tr>
 		<tr>
@@ -495,8 +495,8 @@ function poolopts_change() {
 <?php
 					endforeach;
 ?>
-				</select><br/>
-				<span class="vexpl"><?=gettext("Choose which interface this rule applies to.");?><br/>
+				</select><br />
+				<span class="vexpl"><?=gettext("Choose which interface this rule applies to.");?><br />
 					<?=gettext("Hint: in most cases, you'll want to use WAN here.");?>
 				</span>
 			</td>
@@ -513,7 +513,7 @@ function poolopts_change() {
 <?php
 				endforeach;
 ?>
-				</select><br/>
+				</select><br />
 				<span class="vexpl"><?=gettext("Choose which protocol this rule should match.");?><br />
 <?php
 					printf(gettext("Hint: in most cases, you should specify %s any %s here."),"<em>","</em>&nbsp;");
@@ -569,9 +569,9 @@ function poolopts_change() {
 			<td width="22%" valign="top" class="vncellreq"><?=gettext("Destination");?></td>
 			<td width="78%" class="vtable">
 				<input name="destination_not" type="checkbox" id="destination_not" value="yes" <?php if ($pconfig['destination_not']) echo "checked=\"checked\""; ?> />
-				<strong><?=gettext("not");?></strong><br/>
-				<?=gettext("Use this option to invert the sense of the match.");?><br/>
-				<br/>
+				<strong><?=gettext("not");?></strong><br />
+				<?=gettext("Use this option to invert the sense of the match.");?><br />
+				<br />
 				<table border="0" cellspacing="1" cellpadding="1" summary="destination">
 					<tr>
 						<td><?=gettext("Type:");?>&nbsp;&nbsp;</td>
@@ -697,12 +697,12 @@ function poolopts_change() {
 					<tr>
 						<td>&nbsp;</td>
 						<td>
-							<span class="vexpl"><?=gettext("Packets matching this rule will be mapped to the IP address given here.");?><br/>
+							<span class="vexpl"><?=gettext("Packets matching this rule will be mapped to the IP address given here.");?><br />
 								<?=gettext("If you want this rule to apply to another IP address rather than the IP address of the interface chosen above, ".
 								"select it here (you will need to define ");?>
 								<a href="firewall_virtual_ip.php"><?=gettext("Virtual IP");?></a>
 								<?=gettext("addresses on the interface first).");?>
-							</span><br/>
+							</span><br />
 						</td>
 					</tr>
 					<tr id="poolopts_tr">
@@ -731,15 +731,15 @@ function poolopts_change() {
 									<?=htmlspecialchars("Bitmask");?>
 								</option>
 							</select>
-							<br/>
+							<br />
 							<span class="vexpl">
-								<?=gettext("Only Round Robin types work with Host Aliases. Any type can be used with a Subnet.");?><br/>
-								* <?=gettext("Round Robin: Loops through the translation addresses.");?><br/>
-								* <?=gettext("Random: Selects an address from the translation address pool at random.");?><br/>
-								* <?=gettext("Source Hash: Uses a hash of the source address to determine the translation address, ensuring that the redirection address is always the same for a given source.");?><br/>
-								* <?=gettext("Bitmask: Applies the subnet mask and keeps the last portion identical; 10.0.1.50 -&gt; x.x.x.50.");?><br/>
-								* <?=gettext("Sticky Address: The Sticky Address option can be used with the Random and Round Robin pool types to ensure that a particular source address is always mapped to the same translation address.");?><br/>
-							</span><br/>
+								<?=gettext("Only Round Robin types work with Host Aliases. Any type can be used with a Subnet.");?><br />
+								* <?=gettext("Round Robin: Loops through the translation addresses.");?><br />
+								* <?=gettext("Random: Selects an address from the translation address pool at random.");?><br />
+								* <?=gettext("Source Hash: Uses a hash of the source address to determine the translation address, ensuring that the redirection address is always the same for a given source.");?><br />
+								* <?=gettext("Bitmask: Applies the subnet mask and keeps the last portion identical; 10.0.1.50 -&gt; x.x.x.50.");?><br />
+								* <?=gettext("Sticky Address: The Sticky Address option can be used with the Random and Round Robin pool types to ensure that a particular source address is always mapped to the same translation address.");?><br />
+							</span><br />
 						</td>
 					</tr>
 					<tr name="tport_tr" id="tport_tr">
@@ -764,7 +764,7 @@ function poolopts_change() {
 		<tr>
 			<td width="22%" valign="top" class="vncell"><?=gettext("No XMLRPC Sync");?></td>
 			<td width="78%" class="vtable">
-				<input value="yes" name="nosync" type="checkbox" class="formfld" id="nosync"<?php if($pconfig['nosync']) echo " checked=\"checked\""; ?> /><br/>
+				<input value="yes" name="nosync" type="checkbox" class="formfld" id="nosync"<?php if($pconfig['nosync']) echo " checked=\"checked\""; ?> /><br />
 				<?=gettext("Hint: This prevents the rule on Master from automatically syncing to other CARP members. This does NOT prevent the rule from being overwritten on Slave.");?>
 			</td>
 		</tr>
@@ -772,7 +772,7 @@ function poolopts_change() {
 			<td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td>
 			<td width="78%" class="vtable">
 				<input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>" />
-				<br/>
+				<br />
 				<span class="vexpl"><?=gettext("You may enter a description here for your reference (not parsed).");?></span>
 			</td>
 		</tr>
diff --git a/usr/local/www/firewall_rules.php b/usr/local/www/firewall_rules.php
old mode 100755
new mode 100644
index fb9807edfe..f02054eca8
--- a/usr/local/www/firewall_rules.php
+++ b/usr/local/www/firewall_rules.php
@@ -200,7 +200,7 @@ if ($_POST) {
 
 		pfSense_handle_custom_code("/usr/local/pkg/firewall_rules/apply");
 
-		$savemsg = sprintf(gettext("The settings have been applied. The firewall rules are now reloading in the background.<br/>You can also %s monitor %s the reload progress"),"<a href='status_filter_reload.php'>","</a>");
+		$savemsg = sprintf(gettext("The settings have been applied. The firewall rules are now reloading in the background.<br />You can also %s monitor %s the reload progress"),"<a href='status_filter_reload.php'>","</a>");
 	}
 }
 
@@ -308,12 +308,12 @@ include("head.inc");
 if($_REQUEST['undodrag']) {
 	foreach($_REQUEST['dragtable'] as $dt)
 		$dragtable .= "&dragtable[]={$dt}";
-	print_info_box_np_undo(gettext("The firewall rule configuration has been changed.<br/>You must apply the changes in order for them to take effect."), "apply" , gettext("Apply changes") , "firewall_rules.php?if={$_REQUEST['if']}&dragdroporder=true&{$dragtable}");
+	print_info_box_np_undo(gettext("The firewall rule configuration has been changed.<br />You must apply the changes in order for them to take effect."), "apply" , gettext("Apply changes") , "firewall_rules.php?if={$_REQUEST['if']}&dragdroporder=true&{$dragtable}");
 } else {
-	print_info_box_np(gettext("The firewall rule configuration has been changed.<br/>You must apply the changes in order for them to take effect."));
+	print_info_box_np(gettext("The firewall rule configuration has been changed.<br />You must apply the changes in order for them to take effect."));
 }
 ?>
-<br/>
+<br />
 <?php endif; ?>
 <div id="loading" style="visibity:hidden">
     <img src="/themes/<?=$g['theme']?>/images/misc/loader.gif" alt="loader" /> <?php echo gettext("Loading, please wait..."); ?>
@@ -397,7 +397,7 @@ if($_REQUEST['undodrag']) {
 					(((count($config['interfaces']) > 1) && ($if == 'lan'))
 					|| ((count($config['interfaces']) == 1) && ($if == 'wan')))):
 
-					$alports = implode('<br/>', filter_get_antilockout_ports(true));
+					$alports = implode('<br />', filter_get_antilockout_ports(true));
 			?>
 			<tr valign="top" id="antilockout">
 			<td class="list">&nbsp;</td>
@@ -528,7 +528,7 @@ if($_REQUEST['undodrag']) {
 				if (isset($filterent['disabled']))
 					$iconfnlog .= "_d";
 			?>
-			<br/><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_<?=$iconfnlog;?>.gif" width="11" height="15" border="0" alt="icon" />
+			<br /><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_<?=$iconfnlog;?>.gif" width="11" height="15" border="0" alt="icon" />
 <?php endif; ?>
 			</td>
 			<?php
@@ -652,7 +652,7 @@ if($_REQUEST['undodrag']) {
 									}
 									$timeFriendly = $starttime . " - " . $stoptime;
 									$description = $timerange['rangedescr'];
-									$sched_content .= $dayFriendly . "; " . $timeFriendly . "<br/>";
+									$sched_content .= $dayFriendly . "; " . $timeFriendly . "<br />";
 								}
 							}
 							$sched_caption_escaped = str_replace("'", "\'", $schedule['descr']);
@@ -781,10 +781,10 @@ if($_REQUEST['undodrag']) {
 			<td class="listlr" colspan="10" align="center" valign="middle">
 			<span class="gray">
 	<?php if ($_REQUEST['if'] == "FloatingRules"): ?>
-				<?=gettext("No floating rules are currently defined."); ?><br/><br/>
+				<?=gettext("No floating rules are currently defined."); ?><br /><br />
 	<?php else: ?>
-				<?=gettext("No rules are currently defined for this interface"); ?><br/>
-				<?=gettext("All incoming connections on this interface will be blocked until you add pass rules."); ?><br/><br/>
+				<?=gettext("No rules are currently defined for this interface"); ?><br />
+				<?=gettext("All incoming connections on this interface will be blocked until you add pass rules."); ?><br /><br />
 	<?php endif; ?>
 				<?=gettext("Click the"); ?> <a href="firewall_rules_edit.php?if=<?=htmlspecialchars($if);?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("add new rule");?>" border="0" width="17" height="17" align="middle" alt="add" /></a><?=gettext(" button to add a new rule.");?></span>
 			</td>
@@ -858,7 +858,7 @@ if($_REQUEST['undodrag']) {
 					<p>&nbsp;</p>
 					<strong>
 						<span class="red"><?=gettext("Hint:");?></span>
-					</strong><br/>
+					</strong><br />
 					<ul>
 					<?php if ("FloatingRules" != $if): ?>
 						<li><?=gettext("Rules are evaluated on a first-match basis (i.e. " .
diff --git a/usr/local/www/firewall_rules_edit.php b/usr/local/www/firewall_rules_edit.php
old mode 100755
new mode 100644
index 769c540077..3a53bb782e
--- a/usr/local/www/firewall_rules_edit.php
+++ b/usr/local/www/firewall_rules_edit.php
@@ -811,9 +811,9 @@ include("head.inc");
 					<option value="match" <?php if ("match" == strtolower($pconfig['type'])) echo "selected=\"selected\""; ?>>Match</option>
 <?php endif; ?>
 				</select>
-				<br/>
+				<br />
 				<span class="vexpl">
-					<?=gettext("Choose what to do with packets that match the criteria specified below.");?> <br/>
+					<?=gettext("Choose what to do with packets that match the criteria specified below.");?> <br />
 					<?=gettext("Hint: the difference between block and reject is that with reject, a packet (TCP RST or ICMP port unreachable for UDP) is returned to the sender, whereas with block the packet is dropped silently. In either case, the original packet is discarded.");?>
 				</span>
 			</td>
@@ -851,7 +851,7 @@ include("head.inc");
 					if (is_array($config['nat']['rule'])) {
 						foreach( $config['nat']['rule'] as $index => $nat_rule ) {
 							if( isset($nat_rule['associated-rule-id']) && $nat_rule['associated-rule-id']==$pconfig['associated-rule-id'] ) {
-								echo "<a href=\"firewall_nat_edit.php?id={$index}\">" . gettext("View the NAT rule") . "</a><br/>";
+								echo "<a href=\"firewall_nat_edit.php?id={$index}\">" . gettext("View the NAT rule") . "</a><br />";
 								break;
 							}
 						}
@@ -1092,7 +1092,7 @@ include("head.inc");
 					</tr>
 				</table>
 				<br />
-				<span class="vexpl"><?=gettext("Specify the source port or port range for this rule."); ?> <b><?=gettext("This is usually"); ?> <em><?=gettext("random"); ?></em> <?=gettext("and almost never equal to the destination port range (and should usually be"); ?> &quot;<?=gettext("any"); ?>&quot;).</b><br /><?=gettext("Hint: you can leave the"); ?> <em><?=gettext("'to'"); ?></em> <?=gettext("field empty if you only want to filter a single port.");?></span><br/>
+				<span class="vexpl"><?=gettext("Specify the source port or port range for this rule."); ?> <b><?=gettext("This is usually"); ?> <em><?=gettext("random"); ?></em> <?=gettext("and almost never equal to the destination port range (and should usually be"); ?> &quot;<?=gettext("any"); ?>&quot;).</b><br /><?=gettext("Hint: you can leave the"); ?> <em><?=gettext("'to'"); ?></em> <?=gettext("field empty if you only want to filter a single port.");?></span><br />
 			</td>
 		</tr>
 		<tr>
@@ -1218,7 +1218,7 @@ $i--): ?>
 		<tr>
 			<td width="22%" valign="top">&nbsp;</td>
 			<td width="78%">
-				&nbsp;<br/>&nbsp;
+				&nbsp;<br />&nbsp;
 				<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" />  <input type="button" class="formbtn" value="<?=gettext("Cancel"); ?>" onclick="history.back()" />
 <?php			if (isset($id) && $a_filter[$id]): ?>
 					<input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
@@ -1291,10 +1291,10 @@ $i--): ?>
 			</div>
 			<div id="aodivmain" <?php if (!is_aoadv_used($pconfig)) echo "style='display:none'"; ?>>
 				<input type="checkbox" id="allowopts" value="yes" name="allowopts"<?php if($pconfig['allowopts'] == true) echo " checked=\"checked\""; ?> />
-				<br/><span class="vexpl"><?=gettext("This allows packets with IP options to pass. Otherwise they are blocked by default. This is usually only seen with multicast traffic.");?>
+				<br /><span class="vexpl"><?=gettext("This allows packets with IP options to pass. Otherwise they are blocked by default. This is usually only seen with multicast traffic.");?>
 				</span><p>
 				<input type="checkbox" id="disablereplyto" value="yes" name="disablereplyto"<?php if($pconfig['disablereplyto'] == true) echo " checked=\"checked\""; ?> />
-				<br/><span class="vexpl"><?=gettext("This will disable auto generated reply-to for this rule.");?>
+				<br /><span class="vexpl"><?=gettext("This will disable auto generated reply-to for this rule.");?>
 				</span></p><p>
 				<input name="tag" id="tag" value="<?=htmlspecialchars($pconfig['tag']);?>" />
 				<br /><span class="vexpl"><?=gettext("You can mark a packet matching this rule and use this mark to match on other NAT/filter rules. It is called"); ?> <b><?=gettext("Policy filtering"); ?></b>
@@ -1302,10 +1302,10 @@ $i--): ?>
 				<input name="tagged" id="tagged" value="<?=htmlspecialchars($pconfig['tagged']);?>" />
 				<br /><span class="vexpl"><?=gettext("You can match packet on a mark placed before on another rule.")?>
 				</span></p><p>
-				<input name="max" id="max" value="<?php echo htmlspecialchars($pconfig['max']) ?>" /><br/><?=gettext(" Maximum state entries this rule can create");?></p><p>
-				<input name="max-src-nodes" id="max-src-nodes" value="<?php echo htmlspecialchars($pconfig['max-src-nodes']) ?>" /><br/><?=gettext(" Maximum number of unique source hosts");?></p><p>
-				<input name="max-src-conn" id="max-src-conn" value="<?php echo htmlspecialchars($pconfig['max-src-conn']) ?>" /><br/><?=gettext(" Maximum number of established connections per host (TCP only)");?></p><p>
-				<input name="max-src-states" id="max-src-states" value="<?php echo htmlspecialchars($pconfig['max-src-states']) ?>" /><br/><?=gettext(" Maximum state entries per host");?></p><p>
+				<input name="max" id="max" value="<?php echo htmlspecialchars($pconfig['max']) ?>" /><br /><?=gettext(" Maximum state entries this rule can create");?></p><p>
+				<input name="max-src-nodes" id="max-src-nodes" value="<?php echo htmlspecialchars($pconfig['max-src-nodes']) ?>" /><br /><?=gettext(" Maximum number of unique source hosts");?></p><p>
+				<input name="max-src-conn" id="max-src-conn" value="<?php echo htmlspecialchars($pconfig['max-src-conn']) ?>" /><br /><?=gettext(" Maximum number of established connections per host (TCP only)");?></p><p>
+				<input name="max-src-states" id="max-src-states" value="<?php echo htmlspecialchars($pconfig['max-src-states']) ?>" /><br /><?=gettext(" Maximum state entries per host");?></p><p>
 				<input name="max-src-conn-rate" id="max-src-conn-rate" value="<?php echo htmlspecialchars($pconfig['max-src-conn-rate']) ?>" /> /
 				<select name="max-src-conn-rates" id="max-src-conn-rates">
 					<option value=""<?php if(intval($pconfig['max-src-conn-rates']) < 1) echo " selected=\"selected\""; ?>></option>
@@ -1316,7 +1316,7 @@ $i--): ?>
 				</select><br />
 				<?=gettext("Maximum new connections per host / per second(s) (TCP only)");?>
 				</p><p>
-				<input name="statetimeout" value="<?php echo htmlspecialchars($pconfig['statetimeout']) ?>" /><br/>
+				<input name="statetimeout" value="<?php echo htmlspecialchars($pconfig['statetimeout']) ?>" /><br />
 				<?=gettext("State Timeout in seconds (TCP only)");?>
 				</p>
 				<p><strong><?=gettext("Note: Leave fields blank to disable that feature.");?></strong></p>
@@ -1355,9 +1355,9 @@ $i--): ?>
 			?>
 			</table>
 			</div>
-			<br/><center>
-			<input onclick='tcpflags_anyclick(this);' type='checkbox' name='tcpflags_any' value='on' <?php if ($pconfig['tcpflags_any']) echo "checked=\"checked\""; ?> /><strong><?=gettext("Any flags.");?></strong><br/></center>
-			<br/>
+			<br /><center>
+			<input onclick='tcpflags_anyclick(this);' type='checkbox' name='tcpflags_any' value='on' <?php if ($pconfig['tcpflags_any']) echo "checked=\"checked\""; ?> /><strong><?=gettext("Any flags.");?></strong><br /></center>
+			<br />
 			<span class="vexpl"><?=gettext("Use this to choose TCP flags that must ".
 			"be set or cleared for this rule to match.");?></span>
 			</div>
@@ -1372,15 +1372,15 @@ $i--): ?>
 				<div id="showstateadv" <?php if (empty($pconfig['nopfsync']) && (empty($pconfig['statetype']) || $pconfig['statetype'] == "keep state")) echo "style='display:none'"; ?>>
 					<input name="nopfsync" type="checkbox" id="nopfsync" value="yes" <?php if ($pconfig['nopfsync']) echo "checked=\"checked\""; ?> />
 					<span class="vexpl">
-						NO pfsync<br/>
-						<?=gettext("Hint: This prevents states created by this rule to be sync'ed over pfsync.");?><br/>
-					</span><br/>
+						NO pfsync<br />
+						<?=gettext("Hint: This prevents states created by this rule to be sync'ed over pfsync.");?><br />
+					</span><br />
 					<select name="statetype">
 						<option value="keep state" <?php if(!isset($pconfig['statetype']) or $pconfig['statetype'] == "keep state") echo "selected=\"selected\""; ?>><?=gettext("keep state");?></option>
 						<option value="sloppy state" <?php if($pconfig['statetype'] == "sloppy state") echo "selected=\"selected\""; ?>><?=gettext("sloppy state");?></option>
 						<option value="synproxy state"<?php if($pconfig['statetype'] == "synproxy state")  echo "selected=\"selected\""; ?>><?=gettext("synproxy state");?></option>
 						<option value="none"<?php if($pconfig['statetype'] == "none") echo "selected=\"selected\""; ?>><?=gettext("none");?></option>
-					</select><br/>
+					</select><br />
 					<span class="vexpl">
 						<?=gettext("Hint: Select which type of state tracking mechanism you would like to use.  If in doubt, use keep state.");?>
 					</span>
@@ -1400,7 +1400,7 @@ $i--): ?>
 					<input type="button" onclick="show_advanced_noxmlrpc()" value="<?=gettext("Advanced"); ?>" /> - <?=gettext("Show advanced option");?>
 				</div>
 				<div id="shownoxmlrpcadv" <?php if (empty($pconfig['nosync'])) echo "style='display:none'"; ?>>
-					<input type="checkbox" name="nosync"<?php if($pconfig['nosync']) echo " checked=\"checked\""; ?> /><br/>
+					<input type="checkbox" name="nosync"<?php if($pconfig['nosync']) echo " checked=\"checked\""; ?> /><br />
 					<?=gettext("Hint: This prevents the rule on Master from automatically syncing to other CARP members. This does NOT prevent the rule from being overwritten on Slave.");?>
 				</div>
 			</td>
@@ -1581,7 +1581,7 @@ $i--): ?>
 ?>
 				</select>
 				<br />
-				<span class="vexpl"><?=gettext("Choose the Out queue/Virtual interface only if you have also selected In.")."<br/>".gettext("The Out selection is applied to traffic leaving the interface where the rule is created, In is applied to traffic coming into the chosen interface.")."<br/>".gettext("If you are creating a floating rule, if the direction is In then the same rules apply, if the direction is out the selections are reverted Out is for incoming and In is for outgoing.");?></span>
+				<span class="vexpl"><?=gettext("Choose the Out queue/Virtual interface only if you have also selected In.")."<br />".gettext("The Out selection is applied to traffic leaving the interface where the rule is created, In is applied to traffic coming into the chosen interface.")."<br />".gettext("If you are creating a floating rule, if the direction is In then the same rules apply, if the direction is out the selections are reverted Out is for incoming and In is for outgoing.");?></span>
 				</div>
 			</td>
 		</tr>
@@ -1663,7 +1663,7 @@ $i--): ?>
 						}
 ?>
 						</select>
-						<br/>
+						<br />
 						<span class="vexpl">
 							<?=gettext("Choose a Layer7 container to apply application protocol inspection rules. " .
 							"These are valid for TCP and UDP protocols only.");?>
@@ -1706,7 +1706,7 @@ $has_updated_time = (isset($a_filter[$id]['updated']) && is_array($a_filter[$id]
 		<tr>
 			<td width="22%" valign="top">&nbsp;</td>
 			<td width="78%">
-				&nbsp;<br/>&nbsp;
+				&nbsp;<br />&nbsp;
 				<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" />  <input type="button" class="formbtn" value="<?=gettext("Cancel"); ?>" onclick="history.back()" />
 <?php			if (isset($id) && $a_filter[$id]): ?>
 					<input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
diff --git a/usr/local/www/firewall_schedule.php b/usr/local/www/firewall_schedule.php
index 4c4577898b..bc7ebc40b3 100644
--- a/usr/local/www/firewall_schedule.php
+++ b/usr/local/www/firewall_schedule.php
@@ -157,7 +157,7 @@ include("head.inc");
 									$currentDay++;
 									if (($currentDay != $nextDay) || ($tempmontharray[$arraycounter] != $tempmontharray[$arraycounter+1])){
 										if ($firstPrint)
-											$dayFriendly .= "<br/>";
+											$dayFriendly .= "<br />";
 										$currentDay--;
 										if ($currentDay != $firstDay)
 											$dayFriendly .= $monthArray[$firstmonth-1] . " " . $firstDay . " - " . $currentDay ;
@@ -191,7 +191,7 @@ include("head.inc");
 										$currentDay++;
 										if ($currentDay != $nextDay){
 											if ($firstprint)
-												$dayFriendly .= "<br/>";
+												$dayFriendly .= "<br />";
 											$currentDay--;
 											if ($currentDay != $firstDay)
 												$dayFriendly .= $dayArray[$firstDay-1] . " - " . $dayArray[$currentDay-1];
@@ -237,7 +237,7 @@ include("head.inc");
 </tr>
 <tr>
   <td class="tabcont" colspan="3">
-   <p><span class="vexpl"><span class="red"><strong><?=gettext("Note:");?><br/></strong></span><?=gettext("Schedules act as placeholders for time ranges to be used in Firewall Rules.");?></span></p>
+   <p><span class="vexpl"><span class="red"><strong><?=gettext("Note:");?><br /></strong></span><?=gettext("Schedules act as placeholders for time ranges to be used in Firewall Rules.");?></span></p>
   </td>
 </tr>
 </table>
diff --git a/usr/local/www/firewall_schedule_edit.php b/usr/local/www/firewall_schedule_edit.php
index 5cc6870b81..41235ea66a 100644
--- a/usr/local/www/firewall_schedule_edit.php
+++ b/usr/local/www/firewall_schedule_edit.php
@@ -781,7 +781,7 @@ EOD;
 						        <span class="vexpl"><?=gettext("NOTE: This schedule is in use so the name may not be modified!");?></span>
 						      </p>
 				<?php else: ?>
-				  <input name="name" type="text" id="name" size="40" maxlength="40" class="formfld unknown" value="<?=htmlspecialchars($pconfig['name']);?>" /><br/>
+				  <input name="name" type="text" id="name" size="40" maxlength="40" class="formfld unknown" value="<?=htmlspecialchars($pconfig['name']);?>" /><br />
 				      	<span class="vexpl">
      					   <?=gettext("The name of the alias may only consist of the characters a-z, A-Z and 0-9");?>
       					</span>
@@ -790,7 +790,7 @@ EOD;
 				</tr>
 				<tr>
 					<td width="15%" valign="top" class="vncell"><?=gettext("Description");?></td>
-					<td width="85%" class="vtable"><input name="descr" type="text" id="descr" size="40" maxlength="40" class="formfld unknown" value="<?=htmlspecialchars($pconfig['descr']);?>" /><br/>
+					<td width="85%" class="vtable"><input name="descr" type="text" id="descr" size="40" maxlength="40" class="formfld unknown" value="<?=htmlspecialchars($pconfig['descr']);?>" /><br />
  						<span class="vexpl">
 				        	<?=gettext("You may enter a description here for your reference (not parsed).");?>
 				      	</span>
@@ -820,7 +820,7 @@ EOD;
 								$monthcounter++;
 							}	
 						} ?>      	
-                    </select><br/><br/>
+                    </select><br /><br />
             		<?php
             		$firstmonth = TRUE;
             		$monthcounter = date("n");
@@ -901,7 +901,7 @@ EOD;
 						}					
 					} //end for loop
 					?>
-							<br/>
+							<br />
 					<?=gettext("Click individual date to select that date only. Click the appropriate weekday Header to select all occurences of that weekday.");?>
 	                 </td>
 				</tr>
@@ -958,13 +958,13 @@ EOD;
 				  				</select>&nbsp;<?=gettext("Min");?>
 				  			</td>
 				  		</tr>
-				  	</table><br/>
+				  	</table><br />
                    <?=gettext("Select the time range for the day(s) selected on the Month(s) above. A full day is 0:00-23:59.")?>
 					</td>
 				</tr>
 				<tr>
 					<td width="15%" valign="top" class="vncell"><?=gettext("Time Range Description")?></td>
-					<td width="85%" class="vtable"><input name="timerangedescr" type="text" class="formfld unknown" id="timerangedescr" size="40" maxlength="40" /><br/>
+					<td width="85%" class="vtable"><input name="timerangedescr" type="text" class="formfld unknown" id="timerangedescr" size="40" maxlength="40" /><br />
  						<span class="vexpl">
 				        	<?=gettext("You may enter a description here for your reference (not parsed).")?>
 				      	</span>     
diff --git a/usr/local/www/firewall_virtual_ip.php b/usr/local/www/firewall_virtual_ip.php
old mode 100755
new mode 100644
index 7d17938c71..ff94e94d90
--- a/usr/local/www/firewall_virtual_ip.php
+++ b/usr/local/www/firewall_virtual_ip.php
@@ -208,9 +208,9 @@ include("head.inc");
 		print_info_box($savemsg); 
 	else
 	if (is_subsystem_dirty('vip'))
-		print_info_box_np(gettext("The VIP configuration has been changed.")."<br/>".gettext("You must apply the changes in order for them to take effect."));
+		print_info_box_np(gettext("The VIP configuration has been changed.")."<br />".gettext("You must apply the changes in order for them to take effect."));
 ?>
-<br/>
+<br />
 <table width="100%" border="0" cellpadding="0" cellspacing="0" summary="virtual ip">
   <tr><td class="tabnavtbl">
   <?php
@@ -292,8 +292,8 @@ include("head.inc");
                 </tr>
 		<tr>
 		  <td colspan="5">
-		      <p><span class="vexpl"><span class="red"><strong><?=gettext("Note:");?><br/>
-                      </strong></span><?=gettext("The virtual IP addresses defined on this page may be used in");?><a href="firewall_nat.php"> <?=gettext("NAT"); ?> </a><?=gettext("mappings.");?><br/>
+		      <p><span class="vexpl"><span class="red"><strong><?=gettext("Note:");?><br />
+                      </strong></span><?=gettext("The virtual IP addresses defined on this page may be used in");?><a href="firewall_nat.php"> <?=gettext("NAT"); ?> </a><?=gettext("mappings.");?><br />
                       <?=gettext("You can check the status of your CARP Virtual IPs and interfaces ");?><a href="carp_status.php"><?=gettext("here");?></a>.</span></p>
 		  </td>
 		</tr>
diff --git a/usr/local/www/firewall_virtual_ip_edit.php b/usr/local/www/firewall_virtual_ip_edit.php
old mode 100755
new mode 100644
index 3a9fe94dbf..c65f6a5c09
--- a/usr/local/www/firewall_virtual_ip_edit.php
+++ b/usr/local/www/firewall_virtual_ip_edit.php
@@ -415,7 +415,7 @@ function typesel_change() {
 				<tr valign="top">
 				  <td width="22%" class="vncellreq"><?=gettext("Virtual IP Password");?></td>
 				  <td class="vtable"><input type='password'  name='password' value="<?=htmlspecialchars($pconfig['password']);?>" />
-					<br/><?=gettext("Enter the VHID group password.");?>
+					<br /><?=gettext("Enter the VHID group password.");?>
 				  </td>
 				</tr>
 				<tr valign="top">
@@ -427,7 +427,7 @@ function typesel_change() {
                       </option>
                             <?php endfor; ?>
                       </select>
-					<br/><?=gettext("Enter the VHID group that the machines will share");?>
+					<br /><?=gettext("Enter the VHID group that the machines will share");?>
 				  </td>
 				</tr>
 				<tr valign="top">
@@ -447,7 +447,7 @@ function typesel_change() {
                       			</option>
                             <?php endfor; ?>
                       		</select>
-				<br/><br/>
+				<br /><br />
 				<?=gettext("The frequency that this machine will advertise.  0 means usually master. Otherwise the lowest combination of both values in the cluster determines the master.");?>
 				  </td>
 				</tr>
@@ -455,7 +455,7 @@ function typesel_change() {
                   <td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td>
                   <td width="78%" class="vtable">
                     <input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>" />
-                    <br/> <span class="vexpl"><?=gettext("You may enter a description here for your reference (not parsed).");?></span></td>
+                    <br /> <span class="vexpl"><?=gettext("You may enter a description here for your reference (not parsed).");?></span></td>
                 </tr>
                 <tr>
                   <td width="22%" valign="top">&nbsp;</td>
@@ -470,10 +470,10 @@ function typesel_change() {
 				  <td colspan="4">
 				      	<span class="vexpl">
 				      		<span class="red">
-							<b><?=gettext("Note:");?><br/></b>
+							<b><?=gettext("Note:");?><br /></b>
 				      		</span>&nbsp;&nbsp;
 				      		<?=gettext("Proxy ARP and Other type Virtual IPs cannot be bound to by anything running on the firewall, such as IPsec, OpenVPN, etc.  Use a CARP or IP Alias type address for these cases.");?>
-				      		<br/><br/>&nbsp;&nbsp;&nbsp;<?=gettext("For more information on CARP and the above values, visit the OpenBSD ");?><a href='http://www.openbsd.org/faq/pf/carp.html'> <?=gettext("CARP FAQ"); ?></a>.
+				      		<br /><br />&nbsp;&nbsp;&nbsp;<?=gettext("For more information on CARP and the above values, visit the OpenBSD ");?><a href='http://www.openbsd.org/faq/pf/carp.html'> <?=gettext("CARP FAQ"); ?></a>.
 						</span>
 				  </td>
 				</tr>
diff --git a/usr/local/www/guiconfig.inc b/usr/local/www/guiconfig.inc
old mode 100755
new mode 100644
index 3648c21b8a..300dc18abe
--- a/usr/local/www/guiconfig.inc
+++ b/usr/local/www/guiconfig.inc
@@ -450,7 +450,7 @@ function get_std_save_message($ok) {
 		if(stristr($_SERVER['SCRIPT_FILENAME'], $fp))
 			$filter_related = true;
 	if($filter_related)
-		$to_return .= "<br/>" . gettext("You can also <a href=\"status_filter_reload.php\">monitor</a> the filter reload progress.");
+		$to_return .= "<br />" . gettext("You can also <a href=\"status_filter_reload.php\">monitor</a> the filter reload progress.");
 	return $to_return;
 }
 
diff --git a/usr/local/www/index.php b/usr/local/www/index.php
old mode 100755
new mode 100644
index 3e9782d1b0..da4853f114
--- a/usr/local/www/index.php
+++ b/usr/local/www/index.php
@@ -532,9 +532,9 @@ pfSense_handle_custom_code("/usr/local/pkg/dashboard/pre_dashboard");
 			</div>
 			<div style="clear:both;"></div>
 			<p>
-			<?=gettext("This page allows you to customize the information you want to be displayed!");?><br/>
-			<?=gettext("To get started click the");?> <img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" alt="plus" /> <?=gettext("icon to add widgets.");?><br/>
-			<br/>
+			<?=gettext("This page allows you to customize the information you want to be displayed!");?><br />
+			<?=gettext("To get started click the");?> <img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" alt="plus" /> <?=gettext("icon to add widgets.");?><br />
+			<br />
 			<?=gettext("You can move any widget around by clicking and dragging the title.");?>
 			</p>
 	</div>
diff --git a/usr/local/www/installer/installer.php b/usr/local/www/installer/installer.php
index 11109927c5..629652b747 100644
--- a/usr/local/www/installer/installer.php
+++ b/usr/local/www/installer/installer.php
@@ -619,7 +619,7 @@ echo <<<EOFAMB
 						<input type="button" value="Cancel" onClick="javascript:document.location='installer.php?state=custominstall';"> &nbsp;&nbsp;
 EOFAMB;
 						if(!$error_txt) 
-						echo "<input type=\"submit\" value=\"Begin installation\"> <br/>&nbsp;";
+						echo "<input type=\"submit\" value=\"Begin installation\"> <br />&nbsp;";
 echo <<<EOFAMBASDF
 
 					</center>
@@ -670,7 +670,7 @@ function installing_gui() {
 													</table>
 												</div>
 												<div id='pbdiv'>
-													<br/>
+													<br />
 													<center>
 													<table id='pbtable' height='15' width='640' border='0' colspacing='0' cellpadding='0' cellspacing='0'>
 														<tr>
@@ -687,7 +687,7 @@ function installing_gui() {
 															</td>
 														</tr>
 													</table>
-													<br/>
+													<br />
 												</div>
 												<textarea name='installeroutput' id='installeroutput' rows="31" cols="90">
 												</textarea>
@@ -716,7 +716,7 @@ function page_table_start($pgtitle = "") {
 		$pgtitle = "{$g['product_name']} installer";
 	echo <<<EOF
 	<center>
-		<img border="0" src="/themes/{$g['theme']}/images/logo.gif"></a><br/>
+		<img border="0" src="/themes/{$g['theme']}/images/logo.gif"></a><br />
 		<table cellpadding="6" cellspacing="0" width="550" style="border:1px solid #000000">
 		<tr height="10" bgcolor="#990000">
 			<td style="border-bottom:1px solid #000000">
@@ -977,7 +977,7 @@ EOF;
 		if(file_exists("/tmp/webInstaller_disk_layout.txt")) {
 			$disks_restored = unserialize(file_get_contents("/tmp/webInstaller_disk_layout.txt"));
 			$restored_layout_from_file = true;
-			$restored_layout_txt = "<br/>* The previous disk layout was restored from a previous session";
+			$restored_layout_txt = "<br />* The previous disk layout was restored from a previous session";
 		}
 
 		// If we restored disk layout(s) from a file then build the rows
@@ -1045,8 +1045,8 @@ EOF;
 											NOTES:
 										</strong>
 									</span>
-									<br/>* Sizes are in megabytes.
-									<br/>* Mount points named /conf are not allowed.  Use /cf if you want to make a configuration slice/mount.
+									<br />* Sizes are in megabytes.
+									<br />* Mount points named /conf are not allowed.  Use /cf if you want to make a configuration slice/mount.
 									{$restored_layout_txt}
 								</span>
 								</strong>
@@ -1091,7 +1091,7 @@ function installer_main() {
 			    		<td>
 							<center>
 							<div id="mainarea">
-								<br/>
+								<br />
 								<center>
 								Please select an installer option to begin:
 								<p/>
diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php
old mode 100755
new mode 100644
index 244f7e84ba..4f6f31c193
--- a/usr/local/www/interfaces.php
+++ b/usr/local/www/interfaces.php
@@ -1578,7 +1578,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 							<td width="22%" valign="top" class="vncell"><?=gettext("Description"); ?></td>
 							<td width="78%" class="vtable">
 								<input name="descr" type="text" class="formfld unknown" id="descr" size="30" value="<?=htmlspecialchars($pconfig['descr']);?>" />
-								<br/><span class="vexpl"><?= gettext("Enter a description (name) for the interface here."); ?></span>
+								<br /><span class="vexpl"><?= gettext("Enter a description (name) for the interface here."); ?></span>
 							</td>
 						</tr>
 						<tr>
@@ -1625,10 +1625,10 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 								?>
 									<a onclick="document.forms[0].spoofmac.value='<?=$mac?>';" href="#"><?=gettext("Insert my local MAC address"); ?></a>
 								<?php endif; ?>
-								<br/>
+								<br />
 								<?=gettext("This field can be used to modify (\"spoof\") the MAC " .
-								"address of this interface"); ?><br/>
-								<?=gettext("(may be required with some cable connections)"); ?><br/>
+								"address of this interface"); ?><br />
+								<?=gettext("(may be required with some cable connections)"); ?><br />
 								<?=gettext("Enter a MAC address in the following format: xx:xx:xx:xx:xx:xx " .
 								"or leave blank"); ?>
 							</td>
@@ -1637,7 +1637,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 							<td valign="top" class="vncell"><?=gettext("MTU"); ?></td>
 							<td class="vtable">
 								<input name="mtu" type="text" class="formfld unknown" id="mtu" size="8" value="<?=htmlspecialchars($pconfig['mtu']);?>" />
-								<br/>
+								<br />
 								<?php
 									print gettext("If you leave this field blank, the adapter's default MTU will " .
 									"be used. This is typically 1500 bytes but can vary in some circumstances.");
@@ -1648,7 +1648,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 							<td valign="top" class="vncell"><?=gettext("MSS"); ?></td>
 							<td class="vtable">
 								<input name="mss" type="text" class="formfld unknown" id="mss" size="8" value="<?=htmlspecialchars($pconfig['mss']);?>" />
-								<br/>
+								<br />
 								<?=gettext("If you enter a value in this field, then MSS clamping for " .
 								"TCP connections to the value entered above minus 40 (TCP/IP " .
 								"header size) will be in effect."); ?>
@@ -1678,7 +1678,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 										print "<option value=\"$mediaopt\" selected=\"selected\">" . gettext("$mediaopt") . "</option>";
 									}
 								}
-								echo '</select><br/>';
+								echo '</select><br />';
 								echo gettext("Here you can explicitly set speed and duplex mode for this interface. WARNING: You MUST leave this set to autoselect (automatically negotiate speed) unless the port this interface connects to has its speed and duplex forced.");
 						echo '</div>';
 							echo '</td>';
@@ -1734,9 +1734,9 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 													?>
 											</select>
 											- or  <strong><a onclick="show_add_gateway();" href="#gatewaysection"><?=gettext("add a new one."); ?></a></strong>
-											<br/>
+											<br />
 											<div id='addgwbox'>
-												<?=gettext("If this interface is an Internet connection, select an existing Gateway from the list or add a new one using the link above."); ?><br/>
+												<?=gettext("If this interface is an Internet connection, select an existing Gateway from the list or add a new one using the link above."); ?><br />
 												<?=gettext("On local LANs the upstream gateway should be \"none\"."); ?>
 											</div>
 											<div id='notebox'>
@@ -1840,9 +1840,9 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 													?>
 											</select>
 											- or <strong><a onclick="show_add_gateway_v6();" href="#gatewayv6section"><?=gettext("add a new one."); ?></a></strong>
-											<br/>
+											<br />
 											<div id='addgwboxv6'>
-												<?=gettext("If this interface is an Internet connection, select an existing Gateway from the list or add a new one using the link above."); ?><br/>
+												<?=gettext("If this interface is an Internet connection, select an existing Gateway from the list or add a new one using the link above."); ?><br />
 												<?=gettext("On local LANs the upstream gateway should be \"none\"."); ?>
 											</div>
 											<div id='noteboxv6'>
@@ -1918,7 +1918,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 										<td width="78%" class="vtable">
 											<input name="dhcp_plus" type="checkbox" value="yes" <?php if ($pconfig['dhcp_plus'] == true) echo "checked=\"checked\""; ?> />
 										<strong><?=gettext("Enable DHCP+L2TP or DHCP+PPTP."); ?></strong>
-										<br/>
+										<br />
 										<?=gettext("Status changes on this interface will trigger reconfiguration (if necessary) of the associated PPTP/L2TP link."); ?>
 										</td>
 									</tr>
@@ -1927,7 +1927,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 										<td width="22%" valign="top" class="vncell"><?=gettext("Hostname"); ?></td>
 										<td width="78%" class="vtable">
 											<input name="dhcphostname" type="text" class="formfld unknown" id="dhcphostname" size="40" value="<?=htmlspecialchars($pconfig['dhcphostname']);?>" />
-											<br/>
+											<br />
 											<?=gettext("The value in this field is sent as the DHCP client identifier " .
 											"and hostname when requesting a DHCP lease. Some ISPs may require " .
 											"this (for client identification)."); ?>
@@ -1956,7 +1956,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 										<td width="22%" valign="top" class="vncell"><?=gettext("Reject Leases From"); ?></td>
 										<td width="78%" class="vtable">
 											<input name="dhcprejectfrom" type="text" class="formfld unknown" id="dhcprejectfrom" size="20" value="<?=htmlspecialchars($pconfig['dhcprejectfrom']);?>" />
-											<br/>
+											<br />
 											<?=gettext("If there is a certain upstream DHCP server that should be ignored, place the IP address or subnet of the DHCP server to be ignored here."); ?>
 											<?=gettext("This is useful for rejecting leases from cable modems that offer private IPs when they lose upstream sync."); ?>
 										</td>
@@ -1974,7 +1974,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 											<input name="adv_dhcp_pt_values" type="radio" value="DHCP"	id="customdhcpptdhcpdefaults"	onclick="customdhcpptsetvalues(this, iform);" />FreeBSD Default &nbsp; 
 											<input name="adv_dhcp_pt_values" type="radio" value="Clear"	id="customdhcpptclear"		onclick="customdhcpptsetvalues(this, iform);" />Clear
 
-											<br/>
+											<br />
 											Reboot: <input name="adv_dhcp_pt_reboot" type="text" class="formfld unknown" id="adv_dhcp_pt_reboot" size="2" value="<?=htmlspecialchars($pconfig['adv_dhcp_pt_reboot']);?>" onchange="customdhcpptcheckradiobuton(document.iform.adv_dhcp_pt_values, '');" />
 											Backoff Cutoff:   <input name="adv_dhcp_pt_backoff_cutoff"   type="text" class="formfld unknown" id="adv_dhcp_pt_backoff_cutoff"   size="2" value="<?=htmlspecialchars($pconfig['adv_dhcp_pt_backoff_cutoff']);?>"   onchange="customdhcpptcheckradiobuton(document.iform.adv_dhcp_pt_values, '');" />
 											Initial Interval: <input name="adv_dhcp_pt_initial_interval" type="text" class="formfld unknown" id="adv_dhcp_pt_initial_interval" size="2" value="<?=htmlspecialchars($pconfig['adv_dhcp_pt_initial_interval']);?>" onchange="customdhcpptcheckradiobuton(document.iform.adv_dhcp_pt_values, '');" />
@@ -1983,8 +1983,8 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 											<input name="adv_dhcp_pt_values" type="radio" value="pfSense"	id="customdhcpptpfsensedefaults"	onclick="customdhcpptsetvalues(this, iform);" />pfSense Default &nbsp; 
 											<input name="adv_dhcp_pt_values" type="radio" value="SavedCfg" checked="checked"	id="customdhcpptsavedcfg"		onclick="customdhcpptsetvalues(this, iform);" />Saved Cfg 
 
-											<br/>
-											<?=gettext("The values in these fields are DHCP protocol timings used when requesting a lease. <br/> " ); ?>
+											<br />
+											<?=gettext("The values in these fields are DHCP protocol timings used when requesting a lease. <br /> " ); ?>
 
 											<script type="text/javascript">
 											//<![CDATA[
@@ -2027,23 +2027,23 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 									<tr style='display:none' id="show_adv_dhcp_lease_requirements_and_requests">
 										<td width="22%" valign="top" class="vncell"><?=gettext("<a target=\"FreeBSD_DHCP\" href=\"http://www.freebsd.org/cgi/man.cgi?query=dhclient.conf&amp;sektion=5#LEASE_REQUIREMENTS_AND_REQUESTS\">Lease Requirements and Requests</a>"); ?></td>
 										<td width="78%" class="vtable">
-											<?=gettext("<a target=\"FreeBSD_DHCP\" href=\"http://www.freebsd.org/cgi/man.cgi?query=dhclient.conf&amp;sektion=5#LEASE_REQUIREMENTS_AND_REQUESTS\">Send</a> <a target=\"FreeBSD_DHCP\" href=\"http://www.freebsd.org/cgi/man.cgi?query=dhcp-options&amp;sektion=5\">Options</a>"); ?><br/>
+											<?=gettext("<a target=\"FreeBSD_DHCP\" href=\"http://www.freebsd.org/cgi/man.cgi?query=dhclient.conf&amp;sektion=5#LEASE_REQUIREMENTS_AND_REQUESTS\">Send</a> <a target=\"FreeBSD_DHCP\" href=\"http://www.freebsd.org/cgi/man.cgi?query=dhcp-options&amp;sektion=5\">Options</a>"); ?><br />
 											<input name="adv_dhcp_send_options" type="text" class="formfld unknown" id="adv_dhcp_send_options" size="86" value="<?=htmlspecialchars($pconfig['adv_dhcp_send_options']);?>" />
-											<br/>
-											<?=gettext("The values in this field are DHCP options to be sent when requesting a DHCP lease.  [option declaration [, ...]] <br/>" .
-											"Value Substitutions: {interface}, {hostname}, {mac_addr_asciiCD}, {mac_addr_hexCD} <br/>" .
-											"Where C is U(pper) or L(ower) Case, and D is \" :-.\" Delimiter (space, colon, hyphen, or period) (omitted for none). <br/>" .
+											<br />
+											<?=gettext("The values in this field are DHCP options to be sent when requesting a DHCP lease.  [option declaration [, ...]] <br />" .
+											"Value Substitutions: {interface}, {hostname}, {mac_addr_asciiCD}, {mac_addr_hexCD} <br />" .
+											"Where C is U(pper) or L(ower) Case, and D is \" :-.\" Delimiter (space, colon, hyphen, or period) (omitted for none). <br />" .
 											"Some ISPs may require certain options be or not be sent. "); ?>
 											<hr/>
-											<?=gettext("<a target=\"FreeBSD_DHCP\" href=\"http://www.freebsd.org/cgi/man.cgi?query=dhclient.conf&amp;sektion=5#LEASE_REQUIREMENTS_AND_REQUESTS\">Request</a> <a target=\"FreeBSD_DHCP\" href=\"http://www.freebsd.org/cgi/man.cgi?query=dhcp-options&amp;sektion=5\">Options</a>"); ?><br/>
+											<?=gettext("<a target=\"FreeBSD_DHCP\" href=\"http://www.freebsd.org/cgi/man.cgi?query=dhclient.conf&amp;sektion=5#LEASE_REQUIREMENTS_AND_REQUESTS\">Request</a> <a target=\"FreeBSD_DHCP\" href=\"http://www.freebsd.org/cgi/man.cgi?query=dhcp-options&amp;sektion=5\">Options</a>"); ?><br />
 											<input name="adv_dhcp_request_options" type="text" class="formfld unknown" id="adv_dhcp_request_options" size="86" value="<?=htmlspecialchars($pconfig['adv_dhcp_request_options']);?>" />
-											<br/>
-											<?=gettext("The values in this field are DHCP option 55 to be sent when requesting a DHCP lease.  [option [, ...]] <br/>" .
+											<br />
+											<?=gettext("The values in this field are DHCP option 55 to be sent when requesting a DHCP lease.  [option [, ...]] <br />" .
 											"Some ISPs may require certain options be or not be requested. "); ?>
 											<hr/>
-											<?=gettext("<a target=\"FreeBSD_DHCP\" href=\"http://www.freebsd.org/cgi/man.cgi?query=dhclient.conf&amp;sektion=5#LEASE_REQUIREMENTS_AND_REQUESTS\">Require</a> <a target=\"FreeBSD_DHCP\" href=\"http://www.freebsd.org/cgi/man.cgi?query=dhcp-options&amp;sektion=5\">Options</a>"); ?><br/>
+											<?=gettext("<a target=\"FreeBSD_DHCP\" href=\"http://www.freebsd.org/cgi/man.cgi?query=dhclient.conf&amp;sektion=5#LEASE_REQUIREMENTS_AND_REQUESTS\">Require</a> <a target=\"FreeBSD_DHCP\" href=\"http://www.freebsd.org/cgi/man.cgi?query=dhcp-options&amp;sektion=5\">Options</a>"); ?><br />
 											<input name="adv_dhcp_required_options" type="text" class="formfld unknown" id="adv_dhcp_required_options" size="86" value="<?=htmlspecialchars($pconfig['adv_dhcp_required_options']);?>" />
-											<br/>
+											<br />
 											<?=gettext("The values in this field are DHCP options required by the client when requesting a DHCP lease.  [option [, ...]] "); ?>
 										</td>
 									</tr>
@@ -2052,8 +2052,8 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 										<td width="22%" valign="top" class="vncell"><?=gettext("<a target=\"FreeBSD_DHCP\" href=\"http://www.freebsd.org/cgi/man.cgi?query=dhcp-options&amp;sektion=5\">Option</a> <a target=\"FreeBSD_DHCP\" href=\"http://www.freebsd.org/cgi/man.cgi?query=dhclient.conf&amp;sektion=5#OPTION_MODIFIERS\">Modifiers</a>"); ?></td>
 										<td width="78%" class="vtable">
 											<input name="adv_dhcp_option_modifiers" type="text" class="formfld unknown" id="adv_dhcp_option_modifiers" size="86" value="<?=htmlspecialchars($pconfig['adv_dhcp_option_modifiers']);?>" />
-											<br/>
-											<?=gettext("The values in this field are DHCP option modifiers applied to obtained DHCP lease.  [modifier option declaration [, ...]] <br/> " .
+											<br />
+											<?=gettext("The values in this field are DHCP option modifiers applied to obtained DHCP lease.  [modifier option declaration [, ...]] <br /> " .
 											"modifiers: (default, supersede, prepend, append)"); ?>
 										</td>
 									</tr>
@@ -2062,10 +2062,10 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 										<td width="22%" valign="top" class="vncell"><?=gettext("<a target=\"FreeBSD_DHCP\" href=\"http://www.freebsd.org/cgi/man.cgi?query=dhclient.conf&amp;sektion=5\">Configuration File</a> Override"); ?></td>
 										<td width="78%" class="vtable">
  											<input name="adv_dhcp_config_file_override_path"   type="text" class="formfld unknown" id="adv_dhcp_config_file_override_path"  size="86" value="<?=htmlspecialchars($pconfig['adv_dhcp_config_file_override_path']);?>" />
-											<br/>
-											<?=gettext("The value in this field is the full absolute path to a DHCP client configuration file.  [/[dirname/[.../]]filename[.ext]] <br/> " .
-											"Value Substitutions in Config File: {interface}, {hostname}, {mac_addr_asciiCD}, {mac_addr_hexCD} <br/>" .
-											"Where C is U(pper) or L(ower) Case, and D is \" :-.\" Delimiter (space, colon, hyphen, or period) (omitted for none). <br/>" .
+											<br />
+											<?=gettext("The value in this field is the full absolute path to a DHCP client configuration file.  [/[dirname/[.../]]filename[.ext]] <br /> " .
+											"Value Substitutions in Config File: {interface}, {hostname}, {mac_addr_asciiCD}, {mac_addr_hexCD} <br />" .
+											"Where C is U(pper) or L(ower) Case, and D is \" :-.\" Delimiter (space, colon, hyphen, or period) (omitted for none). <br />" .
 											"Some ISPs may require certain options be or not be sent. "); ?>
 										</td>
 									</tr>
@@ -2129,7 +2129,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 										<td width="22%" valign="top" class="vncell"><?=gettext("DHCPv6 Unique Identifier (DUID)"); ?></td>
 										<td width="78%" class="vtable">
 											<input name="dhcp6-duid" type="text" class="formfld unknown" id="dhcp6-duid" size="40" value="<?=htmlspecialchars($pconfig['dhcp6-duid']);?>" />
-											<br/>
+											<br />
 											<?=gettext("The value in this field is sent as the DHCPv6 client identifier " .
 											"when requesting a DHCPv6 lease."); ?><br />
 											<?php	if(is_readable("/var/db/dhcp6c_duid")) {
@@ -2168,7 +2168,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 												}
 												?>
 											</select>
-											<br/>
+											<br />
 											<?=gettext("The value in this field is the delegated prefix length provided by the DHCPv6 server. Normally specified by the ISP."); ?>
 										</td>
 									</tr>
@@ -2183,31 +2183,31 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 									<tr style='display:none' id="show_adv_dhcp6_interface_statement">
 										<td width="22%" valign="top" class="vncell">
 											<?=gettext("<a target=\"FreeBSD_DHCP\" href=\"http://www.freebsd.org/cgi/man.cgi?query=dhcp6c.conf&amp;sektion=5&amp;apropos=0&amp;manpath=FreeBSD+Ports#Interface_statement\">Interface Statement</a>"); ?>
-											<br/><br/>
+											<br /><br />
 											<input name="adv_dhcp6_interface_statement_information_only_enable" type="checkbox" id="adv_dhcp6_interface_statement_information_only_enable" value="" onclick="show_adv_dhcp6_config(this)" />
 											<?=gettext("Information Only"); ?>
 										</td>
 										<td width="78%" class="vtable">
-											<?=gettext("Send Options"); ?><br/>
+											<?=gettext("Send Options"); ?><br />
 											<input name="adv_dhcp6_interface_statement_send_options" type="text" class="formfld unknown" id="adv_dhcp6_interface_statement_send_options" size="86" value="<?=htmlspecialchars($pconfig['adv_dhcp6_interface_statement_send_options']);?>" />
-											<br/>
-											<?=gettext("The values in this field are DHCP send options to be sent when requesting a DHCP lease.  [option declaration [, ...]] <br/>" .
-											"Value Substitutions: {interface}, {hostname}, {mac_addr_asciiCD}, {mac_addr_hexCD} <br/>" .
-											"Where C is U(pper) or L(ower) Case, and D is \" :-.\" Delimiter (space, colon, hyphen, or period) (omitted for none). <br/>" .
+											<br />
+											<?=gettext("The values in this field are DHCP send options to be sent when requesting a DHCP lease.  [option declaration [, ...]] <br />" .
+											"Value Substitutions: {interface}, {hostname}, {mac_addr_asciiCD}, {mac_addr_hexCD} <br />" .
+											"Where C is U(pper) or L(ower) Case, and D is \" :-.\" Delimiter (space, colon, hyphen, or period) (omitted for none). <br />" .
 											"Some DHCP services may require certain options be or not be sent. "); ?>
-											<br/>
-											<br/>
-											<?=gettext("Request Options"); ?><br/>
+											<br />
+											<br />
+											<?=gettext("Request Options"); ?><br />
 											<input name="adv_dhcp6_interface_statement_request_options" type="text" class="formfld unknown" id="adv_dhcp6_interface_statement_request_options" size="86" value="<?=htmlspecialchars($pconfig['adv_dhcp6_interface_statement_request_options']);?>" />
-											<br/>
-											<?=gettext("The values in this field are DHCP request options to be sent when requesting a DHCP lease.  [option [, ...]] <br/>" .
+											<br />
+											<?=gettext("The values in this field are DHCP request options to be sent when requesting a DHCP lease.  [option [, ...]] <br />" .
 											"Some DHCP services may require certain options be or not be requested. "); ?>
-											<br/>
-											<br/>
-											<?=gettext("Script"); ?><br/>
+											<br />
+											<br />
+											<?=gettext("Script"); ?><br />
 											<input name="adv_dhcp6_interface_statement_script" type="text" class="formfld unknown" id="adv_dhcp6_interface_statement_script" size="86" value="<?=htmlspecialchars($pconfig['adv_dhcp6_interface_statement_script']);?>" />
-											<br/>
-											<?=gettext("The value in this field is the absolute path to a script invoked on certain conditions including when a reply message is received. <br/>" .
+											<br />
+											<?=gettext("The value in this field is the absolute path to a script invoked on certain conditions including when a reply message is received. <br />" .
 											"[/[dirname/[.../]]filename[.ext]] "); ?>
 										</td>
 									</tr>
@@ -2224,7 +2224,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 											<?=gettext("id-assoc na"); ?>
 											<?=gettext("<i>ID</i>"); ?>
 											<input name="adv_dhcp6_id_assoc_statement_address_id" type="text" class="formfld unknown" id="adv_dhcp6_id_assoc_statement_address_id" size="3" value="<?=htmlspecialchars($pconfig['adv_dhcp6_id_assoc_statement_address_id']);?>" />
-											<br/>
+											<br />
 											<?=gettext("Address"); ?>
 											<?=gettext("<i>ipv6-address</i>"); ?>
 											<input name="adv_dhcp6_id_assoc_statement_address" type="text" class="formfld unknown" id="adv_dhcp6_id_assoc_statement_address" size="34" value="<?=htmlspecialchars($pconfig['adv_dhcp6_id_assoc_statement_address']);?>" />
@@ -2241,7 +2241,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 											<?=gettext("id-assoc pd"); ?>
 											<?=gettext("<i>ID</i>"); ?>
 											<input name="adv_dhcp6_id_assoc_statement_prefix_id" type="text" class="formfld unknown" id="adv_dhcp6_id_assoc_statement_prefix_id" size="3" value="<?=htmlspecialchars($pconfig['adv_dhcp6_id_assoc_statement_prefix_id']);?>" />
-											<br/>
+											<br />
 											<?=gettext("Prefix"); ?>
 											<?=gettext("<i>ipv6-prefix</i>"); ?>
 											<input name="adv_dhcp6_id_assoc_statement_prefix" type="text" class="formfld unknown" id="adv_dhcp6_id_assoc_statement_prefix" size="37" value="<?=htmlspecialchars($pconfig['adv_dhcp6_id_assoc_statement_prefix']);?>" />
@@ -2291,7 +2291,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 											<input name="adv_dhcp6_key_info_statement_keyname" type="text" class="formfld unknown" id="adv_dhcp6_key_info_statement_keyname" size="27" value="<?=htmlspecialchars($pconfig['adv_dhcp6_key_info_statement_keyname']);?>" />
 											<?=gettext("<i>realm</i>"); ?>
 											<input name="adv_dhcp6_key_info_statement_realm" type="text" class="formfld unknown" id="adv_dhcp6_key_info_statement_realm" size="37" value="<?=htmlspecialchars($pconfig['adv_dhcp6_key_info_statement_realm']);?>" />
-											<br/>
+											<br />
 											<?=gettext("<i>keyid</i>"); ?>
 											<input name="adv_dhcp6_key_info_statement_keyid" type="text" class="formfld unknown" id="adv_dhcp6_key_info_statement_keyid" size="2" value="<?=htmlspecialchars($pconfig['adv_dhcp6_key_info_statement_keyid']);?>" />
 											<?=gettext("<i>secret</i>"); ?>
@@ -2307,10 +2307,10 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 										</td>
 										<td width="78%" class="vtable">
  											<input name="adv_dhcp6_config_file_override_path"   type="text" class="formfld unknown" id="adv_dhcp6_config_file_override_path"  size="86" value="<?=htmlspecialchars($pconfig['adv_dhcp6_config_file_override_path']);?>" />
-											<br/>
-											<?=gettext("The value in this field is the full absolute path to a DHCP client configuration file.  [/[dirname/[.../]]filename[.ext]] <br/> " .
-											"Value Substitutions in Config File: {interface}, {hostname}, {mac_addr_asciiCD}, {mac_addr_hexCD} <br/>" .
-											"Where C is U(pper) or L(ower) Case, and D is \" :-.\" Delimiter (space, colon, hyphen, or period) (omitted for none). <br/>" .
+											<br />
+											<?=gettext("The value in this field is the full absolute path to a DHCP client configuration file.  [/[dirname/[.../]]filename[.ext]] <br /> " .
+											"Value Substitutions in Config File: {interface}, {hostname}, {mac_addr_asciiCD}, {mac_addr_hexCD} <br />" .
+											"Where C is U(pper) or L(ower) Case, and D is \" :-.\" Delimiter (space, colon, hyphen, or period) (omitted for none). <br />" .
 											"Some ISPs may require certain options be or not be sent. "); ?>
 										</td>
 									</tr>
@@ -2395,7 +2395,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 										<td width="22%" valign="top" class="vncell"><?=gettext("6RD prefix"); ?></td>
 										<td width="78%" class="vtable">
 											<input name="prefix-6rd" type="text" class="formfld unknown" id="prefix-6rd" size="40" value="<?=htmlspecialchars($pconfig['prefix-6rd']);?>" />
-											<br/>
+											<br />
 											<?=gettext("The value in this field is the 6RD IPv6 prefix assigned by your ISP. e.g. '2001:db8::/32'") ?><br />
 										</td>
 									</tr>
@@ -2403,7 +2403,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 										<td width="22%" valign="top" class="vncell"><?=gettext("6RD Border Relay"); ?></td>
 										<td width="78%" class="vtable">
 											<input name="gateway-6rd" type="text" class="formfld unknown" id="gateway-6rd" size="40" value="<?=htmlspecialchars($pconfig['gateway-6rd']);?>" />
-											<br/>
+											<br />
 											<?=gettext("The value in this field is 6RD IPv4 gateway address assigned by your ISP") ?><br />
 										</td>
 									</tr>
@@ -2419,7 +2419,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 												}
 												?>
 											</select>
-											<br/>
+											<br />
 											<?=gettext("The value in this field is the 6RD IPv4 prefix length. Normally specified by the ISP. A value of 0 means we embed the entire IPv4 address in the 6RD prefix."); ?>
 										</td>
 									</tr>
@@ -2464,8 +2464,8 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 											if ($rowIndex == 0)
 												echo "<option></option>";
 										?>
-										</select> <br/>
-											<br/>
+										</select> <br />
+											<br />
 											<?=gettext("This selects the dynamic IPv6 WAN interface to track for configuration") ?><br />
 										</td>
 									</tr>
@@ -2525,7 +2525,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 													</td>
 												</tr>
 											</table>
-											<br/><span class="vexpl"><?=gettext("Select to fill in data for your service provider."); ?></span>
+											<br /><span class="vexpl"><?=gettext("Select to fill in data for your service provider."); ?></span>
 										</td>
 									</tr>
 									<tr>
@@ -2617,21 +2617,21 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 									<tr>
 										<td width="22%" valign="top" class="vncell"><?=gettext("Service name"); ?></td>
 										<td width="78%" class="vtable"><input name="provider" type="text" class="formfld unknown" id="provider" size="20" value="<?=htmlspecialchars($pconfig['provider']);?>" />
-											<br/> <span class="vexpl"><?=gettext("Hint: this field can usually be left empty"); ?></span>
+											<br /> <span class="vexpl"><?=gettext("Hint: this field can usually be left empty"); ?></span>
 										</td>
 									</tr>
 									<tr>
 										<td width="22%" valign="top" class="vncell"><?=gettext("Dial on demand"); ?></td>
 										<td width="78%" class="vtable">
 											<input name="pppoe_dialondemand" type="checkbox" id="pppoe_dialondemand" value="enable" <?php if ($pconfig['pppoe_dialondemand']) echo "checked=\"checked\""; ?> />
-											<strong><?=gettext("Enable Dial-On-Demand mode"); ?></strong><br/>
+											<strong><?=gettext("Enable Dial-On-Demand mode"); ?></strong><br />
 											<?=gettext("This option causes the interface to operate in dial-on-demand mode, allowing you to have a "); ?><i><?=gettext("virtual full time"); ?></i> <?=gettext("connection. The interface is configured, but the actual connection of the link is delayed until qualifying outgoing traffic is detected."); ?>
 										</td>
 									</tr>
 									<tr>
 										<td width="22%" valign="top" class="vncell"><?=gettext("Idle timeout"); ?></td>
 										<td width="78%" class="vtable">
-											<input name="pppoe_idletimeout" type="text" class="formfld unknown" id="pppoe_idletimeout" size="8" value="<?=htmlspecialchars($pconfig['pppoe_idletimeout']);?>" /> <?=gettext("seconds"); ?><br/><?=gettext("If no qualifying outgoing packets are transmitted for the specified number of seconds, the connection is brought down. An idle timeout of zero disables this feature."); ?>
+											<input name="pppoe_idletimeout" type="text" class="formfld unknown" id="pppoe_idletimeout" size="8" value="<?=htmlspecialchars($pconfig['pppoe_idletimeout']);?>" /> <?=gettext("seconds"); ?><br /><?=gettext("If no qualifying outgoing packets are transmitted for the specified number of seconds, the connection is brought down. An idle timeout of zero disables this feature."); ?>
 										</td>
 									</tr>
 									<tr>
@@ -2746,14 +2746,14 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 										<td width="22%" valign="top" class="vncell"><?=gettext("Dial on demand"); ?></td>
 										<td width="78%" class="vtable">
 											<input name="pptp_dialondemand" type="checkbox" id="pptp_dialondemand" value="enable" <?php if ($pconfig['pptp_dialondemand']) echo "checked=\"checked\""; ?> />
-											<strong><?=gettext("Enable Dial-On-Demand mode"); ?></strong><br/>
+											<strong><?=gettext("Enable Dial-On-Demand mode"); ?></strong><br />
 											<?=gettext("This option causes the interface to operate in dial-on-demand mode, allowing you to have a"); ?> <i><?=gettext("virtual full time"); ?></i> <?=gettext("connection. The interface is configured, but the actual connection of the link is delayed until qualifying outgoing traffic is detected."); ?>
 										</td>
 									</tr>
 									<tr>
 										<td width="22%" valign="top" class="vncell"><?=gettext("Idle timeout"); ?></td>
 										<td width="78%" class="vtable">
-											<input name="pptp_idletimeout" type="text" class="formfld unknown" id="pptp_idletimeout" size="8" value="<?=htmlspecialchars($pconfig['pptp_idletimeout']);?>" /> <?=gettext("seconds"); ?><br/><?=gettext("If no qualifying outgoing packets are transmitted for the specified number of seconds, the connection is brought down. An idle timeout of zero disables this feature."); ?>
+											<input name="pptp_idletimeout" type="text" class="formfld unknown" id="pptp_idletimeout" size="8" value="<?=htmlspecialchars($pconfig['pptp_idletimeout']);?>" /> <?=gettext("seconds"); ?><br /><?=gettext("If no qualifying outgoing packets are transmitted for the specified number of seconds, the connection is brought down. An idle timeout of zero disables this feature."); ?>
 										</td>
 									</tr>
 									<tr>
@@ -2787,7 +2787,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 							<td valign="top" class="vncell"><?=gettext("Persist common settings");?></td>
 							<td class="vtable">
 								<input name="persistcommonwireless" type="checkbox" value="yes"  class="formfld" id="persistcommonwireless" <?php if ($pconfig['persistcommonwireless']) echo "checked=\"checked\"";?> />
-								<br/><?=gettext("Enabling this preserves the common wireless configuration through interface deletions and reassignments.");?>
+								<br /><?=gettext("Enabling this preserves the common wireless configuration through interface deletions and reassignments.");?>
 							</td>
 						</tr>
 						<tr>
@@ -2818,9 +2818,9 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 									<option <?php if ($pconfig['protmode'] == 'cts') echo "selected=\"selected\"";?> value="cts"><?=gettext("Protection mode CTS to self"); ?></option>
 									<option <?php if ($pconfig['protmode'] == 'rtscts') echo "selected=\"selected\"";?> value="rtscts"><?=gettext("Protection mode RTS and CTS"); ?></option>
 								</select>
-								<br/>
+								<br />
 								<?=gettext("For IEEE 802.11g, use the specified technique for protecting OFDM frames in a mixed 11b/11g network."); ?>
-								<br/>
+								<br />
 							</td>
 						</tr>
 						<?php else: ?>
@@ -2839,7 +2839,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 										echo "<option {$SELECTED}>{$x}</option>\n";
 									}
 									?>
-								</select><br/>
+								</select><br />
 								<?=gettext("Note: Typically only a few discreet power settings are available and the driver will use the setting closest to the specified value.  Not all adapters support changing the transmit power setting."); ?>
 							</td>
 						</tr>
@@ -2866,9 +2866,9 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 									}
 									?>
 								</select>
-								<br/>
+								<br />
 								<?=gettext("Legend: wireless standards - channel # (frequency @ max TX power / TX power allowed in reg. domain)"); ?>
-								<br/>
+								<br />
 								<?=gettext("Note: Not all channels may be supported by your card.  Auto may override the wireless standard selected above."); ?>
 							</td>
 						</tr>
@@ -2880,7 +2880,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 									<tr>
 										<?php if (isset($wl_sysctl["{$wl_sysctl_prefix}.diversity"])): ?>
 										<td>
-											<?=gettext("Diversity"); ?><br/>
+											<?=gettext("Diversity"); ?><br />
 											<select name="diversity" class="formselect" id="diversity">
 												<option <?php if (!isset($pconfig['diversity'])) echo "selected=\"selected\""; ?> value=""><?=gettext("Default"); ?></option>
 												<option <?php if ($pconfig['diversity'] === '0') echo "selected=\"selected\""; ?> value="0"><?=gettext("Off"); ?></option>
@@ -2891,7 +2891,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 										<?php endif; ?>
 										<?php if (isset($wl_sysctl["{$wl_sysctl_prefix}.txantenna"])): ?>
 										<td>
-											<?=gettext("Transmit antenna"); ?><br/>
+											<?=gettext("Transmit antenna"); ?><br />
 											<select name="txantenna" class="formselect" id="txantenna">
 												<option <?php if (!isset($pconfig['txantenna'])) echo "selected=\"selected\""; ?> value=""><?=gettext("Default"); ?></option>
 												<option <?php if ($pconfig['txantenna'] === '0') echo "selected=\"selected\""; ?> value="0"><?=gettext("Auto"); ?></option>
@@ -2903,7 +2903,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 										<?php endif; ?>
 										<?php if (isset($wl_sysctl["{$wl_sysctl_prefix}.rxantenna"])): ?>
 										<td>
-											<?=gettext("Receive antenna"); ?><br/>
+											<?=gettext("Receive antenna"); ?><br />
 											<select name="rxantenna" class="formselect" id="rxantenna">
 												<option <?php if (!isset($pconfig['rxantenna'])) echo "selected=\"selected\""; ?> value=""><?=gettext("Default"); ?></option>
 												<option <?php if ($pconfig['rxantenna'] === '0') echo "selected=\"selected\""; ?> value="0"><?=gettext("Auto"); ?></option>
@@ -2914,7 +2914,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 										<?php endif; ?>
 									</tr>
 								</table>
-								<br/>
+								<br />
 								<?=gettext("Note: The antenna numbers do not always match up with the labels on the card."); ?>
 							</td>
 						</tr>
@@ -2924,8 +2924,8 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 							<td valign="top" class="vncell"><?=gettext("Distance setting"); ?></td>
 							<td class="vtable">
 								<input name="distance" type="text" class="formfld unknown" id="distance" size="5" value="<?=htmlspecialchars($pconfig['distance']);?>" />
-								<br/>
-								<?=gettext("Note: This field can be used to tune ACK/CTS timers to fit the distance between AP and Client"); ?><br/>
+								<br />
+								<?=gettext("Note: This field can be used to tune ACK/CTS timers to fit the distance between AP and Client"); ?><br />
 								<?=gettext("(measured in Meters and works only for Atheros based cards !)"); ?>
 							</td>
 						</tr>
@@ -2933,7 +2933,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 						<tr>
 							<td valign="top" class="vncell"><?=gettext("Regulatory settings"); ?></td>
 							<td class="vtable">
-								<?=gettext("Regulatory domain"); ?><br/>
+								<?=gettext("Regulatory domain"); ?><br />
 								<select name="regdomain" class="formselect" id="regdomain">
 									<option <?php if (empty($pconfig['regdomain'])) echo "selected=\"selected\""; ?> value=""><?=gettext("Default"); ?></option>
 									<?php
@@ -2946,10 +2946,10 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 									}
 									?>
 								</select>
-								<br/>
+								<br />
 								<?=gettext("Note: Some cards have a default that is not recognized and require changing the regulatory domain to one in this list for the changes to other regulatory settings to work."); ?>
-								<br/><br/>
-								<?=gettext("Country (listed with country code and regulatory domain)"); ?><br/>
+								<br /><br />
+								<?=gettext("Country (listed with country code and regulatory domain)"); ?><br />
 								<select name="regcountry" class="formselect" id="regcountry">
 									<option <?php if (empty($pconfig['regcountry'])) echo "selected=\"selected\""; ?> value=""><?=gettext("Default"); ?></option>
 									<?php
@@ -2962,19 +2962,19 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 									}
 									?>
 								</select>
-								<br/>
+								<br />
 								<?=gettext("Note: Any country setting other than \"Default\" will override the regulatory domain setting"); ?>.
-								<br/><br/>
-								<?=gettext("Location"); ?><br/>
+								<br /><br />
+								<?=gettext("Location"); ?><br />
 								<select name="reglocation" class="formselect" id="reglocation">
 									<option <?php if (empty($pconfig['reglocation'])) echo "selected=\"selected\""; ?> value=""><?=gettext("Default"); ?></option>
 									<option <?php if ($pconfig['reglocation'] == 'indoor') echo "selected=\"selected\""; ?> value="indoor"><?=gettext("Indoor"); ?></option>
 									<option <?php if ($pconfig['reglocation'] == 'outdoor') echo "selected=\"selected\""; ?> value="outdoor"><?=gettext("Outdoor"); ?></option>
 									<option <?php if ($pconfig['reglocation'] == 'anywhere') echo "selected=\"selected\""; ?> value="anywhere"><?=gettext("Anywhere"); ?></option>
 								</select>
-								<br/><br/>
+								<br /><br />
 								<?=gettext("These settings may affect which channels are available and the maximum transmit power allowed on those channels.  Using the correct settings to comply with local regulatory requirements is recommended."); ?>
-								<br/>
+								<br />
 								<?=gettext("Note: All wireless networks on this interface will be temporarily brought down when changing regulatory settings.  Some of the regulatory domains or country codes may not be allowed by some cards.  These settings may not be able to add additional channels that are not already supported."); ?>
 							</td>
 						</tr>
@@ -2998,7 +2998,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 							<td valign="top" class="vncellreq"><?=gettext("SSID"); ?></td>
 							<td class="vtable">
 								<input name="ssid" type="text" class="formfld unknown" id="ssid" size="20" value="<?=htmlspecialchars($pconfig['ssid']); ?>" />
-								<br/>
+								<br />
 								<?=gettext("Note: Only required in Access Point mode. If left blank in Ad-hoc or Infrastructure mode, this interface will connect to any available SSID"); ?>
 							</td>
 						</tr>
@@ -3013,7 +3013,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 									<?php endif; ?>
 									<option <?php if ($pconfig['puremode'] == '11n') echo "selected=\"selected\"";?> value="11n"><?=gettext("802.11n"); ?></option>
 								</select>
-								<br/>
+								<br />
 								<?=gettext("When operating as an access point, allow only stations capable of the selected wireless standard to associate (stations not capable are not permitted to associate)."); ?>
 							</td>
 						</tr>
@@ -3022,7 +3022,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 							<td valign="top" class="vncell"><?=gettext("802.11g only"); ?></td>
 							<td class="vtable">
 								<input name="puremode" type="checkbox" value="11g"  class="formfld" id="puremode" <?php if ($pconfig['puremode'] == '11g') echo "checked=\"checked\"";?> />
-								<br/><?=gettext("When operating as an access point in 802.11g mode, allow only 11g-capable stations to associate (11b-only stations are not permitted to associate)."); ?>
+								<br /><?=gettext("When operating as an access point in 802.11g mode, allow only 11g-capable stations to associate (11b-only stations are not permitted to associate)."); ?>
 							</td>
 						</tr>
 						<?php endif; ?>
@@ -3030,9 +3030,9 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 							<td valign="top" class="vncell"><?=gettext("Allow intra-BSS communication"); ?></td>
 							<td class="vtable">
 								<input name="apbridge_enable" type="checkbox" value="yes"  class="formfld" id="apbridge_enable" <?php if ($pconfig['apbridge_enable']) echo "checked=\"checked\"";?> />
-								<br/>
+								<br />
 								<?=gettext("When operating as an access point, enable this if you want to pass packets between wireless clients directly."); ?>
-								<br/>
+								<br />
 								<?=gettext("Disabling the internal bridging is useful when traffic is to be processed with packet filtering."); ?>
 							</td>
 						</tr>
@@ -3040,16 +3040,16 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 							<td valign="top" class="vncell"><?=gettext("Enable WME"); ?></td>
 							<td class="vtable">
 								<input name="wme_enable" type="checkbox" class="formfld" id="wme_enable" value="yes" <?php if ($pconfig['wme_enable']) echo "checked=\"checked\"";?> />
-								<br/><?=gettext("Setting this option will force the card to use WME (wireless QoS)."); ?>
+								<br /><?=gettext("Setting this option will force the card to use WME (wireless QoS)."); ?>
 							</td>
 						</tr>
 						<tr>
 							<td valign="top" class="vncell"><?=gettext("Enable Hide SSID"); ?></td>
 							<td class="vtable">
 								<input name="hidessid_enable" type="checkbox" class="formfld" id="hidessid_enable" value="yes" <?php if ($pconfig['hidessid_enable']) echo "checked=\"checked\"";?> />
-								<br/>
+								<br />
 								<?=gettext("Setting this option will force the card to NOT broadcast its SSID"); ?>
-								<br/>
+								<br />
 								<?=gettext("(this might create problems for some clients)."); ?>
 							</td>
 						</tr>
@@ -3101,8 +3101,8 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 										</td>
 									</tr>
 								</table>
-								<br/>
-								<?=gettext("40 (64) bit keys may be entered as 5 ASCII characters or 10 hex digits preceded by '0x'."); ?><br/>
+								<br />
+								<?=gettext("40 (64) bit keys may be entered as 5 ASCII characters or 10 hex digits preceded by '0x'."); ?><br />
 								<?=gettext("104 (128) bit keys may be entered as 13 ASCII characters or 26 hex digits preceded by '0x'."); ?>
 							</td>
 						</tr>
@@ -3111,7 +3111,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 							<td class="vtable">
 								<input name="wpa_enable" type="checkbox" class="formfld" id="wpa_enable" value="yes" <?php if ($pconfig['wpa_enable']) echo "checked=\"checked\""; ?> />
 								<strong><?=gettext("Enable WPA"); ?></strong>
-								<br/><br/>
+								<br /><br />
 								<table border="0" cellspacing="0" cellpadding="0" summary="wpa">
 									<tr>
 										<td>&nbsp;</td>
@@ -3124,7 +3124,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 										</td>
 									</tr>
 								</table>
-								<br/><?=gettext("Passphrase must be from 8 to 63 characters."); ?>
+								<br /><?=gettext("Passphrase must be from 8 to 63 characters."); ?>
 							</td>
 						</tr>
 						<tr>
@@ -3155,7 +3155,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 									<option <?php if ($pconfig['auth_algs'] == '2') echo "selected=\"selected\"";?> value="2"><?=gettext("Shared Key Authentication"); ?></option>
 									<option <?php if ($pconfig['auth_algs'] == '3') echo "selected=\"selected\"";?> value="3"><?=gettext("Both"); ?></option>
 								</select>
-								<br/><?=gettext("Note: Shared Key Authentication requires WEP."); ?></br>
+								<br /><?=gettext("Note: Shared Key Authentication requires WEP."); ?><br />
 							</td>
 						</tr>
 						<tr>
@@ -3172,78 +3172,78 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 							<td valign="top" class="vncell"><?=gettext("Key Rotation"); ?></td>
 							<td class="vtable">
 								<input name="wpa_group_rekey" type="text" class="formfld unknown" id="wpa_group_rekey" size="30" value="<?php echo $pconfig['wpa_group_rekey'] ? $pconfig['wpa_group_rekey'] : "60";?>" />
-								<br/><?=gettext("Allowed values are 1-9999 but should not be longer than Master Key Regeneration time."); ?>
+								<br /><?=gettext("Allowed values are 1-9999 but should not be longer than Master Key Regeneration time."); ?>
 							</td>
 						</tr>
 						<tr>
 							<td valign="top" class="vncell"><?=gettext("Master Key Regeneration"); ?></td>
 							<td class="vtable">
 								<input name="wpa_gmk_rekey" type="text" class="formfld" id="wpa_gmk_rekey" size="30" value="<?php echo $pconfig['wpa_gmk_rekey'] ? $pconfig['wpa_gmk_rekey'] : "3600";?>" />
-								<br/><?=gettext("Allowed values are 1-9999 but should not be shorter than Key Rotation time."); ?>
+								<br /><?=gettext("Allowed values are 1-9999 but should not be shorter than Key Rotation time."); ?>
 							</td>
 						</tr>
 						<tr>
 							<td valign="top" class="vncell"><?=gettext("Strict Key Regeneration"); ?></td>
 							<td class="vtable">
 								<input name="wpa_strict_rekey" type="checkbox" value="yes"  class="formfld" id="wpa_strict_rekey" <?php if ($pconfig['wpa_strict_rekey']) echo "checked=\"checked\""; ?> />
-								<br/><?=gettext("Setting this option will force the AP to rekey whenever a client disassociates."); ?>
+								<br /><?=gettext("Setting this option will force the AP to rekey whenever a client disassociates."); ?>
 							</td>
 						</tr>
 						<tr>
 							<td valign="top" class="vncell"><?=gettext("Enable IEEE802.1X Authentication"); ?></td>
 							<td class="vtable">
 								<input name="ieee8021x" type="checkbox" value="yes"  class="formfld" id="ieee8021x" <?php if ($pconfig['ieee8021x']) echo "checked=\"checked\"";?> />
-								<br/><?=gettext("Setting this option will enable 802.1x authentication."); ?>
-								<br/><span class="red"><strong><?=gettext("NOTE"); ?>:</strong></span> <?=gettext("this option requires checking the \"Enable WPA box\"."); ?>
+								<br /><?=gettext("Setting this option will enable 802.1x authentication."); ?>
+								<br /><span class="red"><strong><?=gettext("NOTE"); ?>:</strong></span> <?=gettext("this option requires checking the \"Enable WPA box\"."); ?>
 							</td>
 						</tr>
 						<tr>
 							<td valign="top" class="vncell"><?=gettext("802.1X Authentication Server IP Address"); ?></td>
 							<td class="vtable">
 								<input name="auth_server_addr" id="auth_server_addr" type="text" class="formfld unknown" size="66" value="<?=htmlspecialchars($pconfig['auth_server_addr']);?>" />
-								<br/><?=gettext("Enter the IP address of the 802.1X Authentication Server.  This is commonly a Radius server (FreeRadius, Internet Authentication Services, etc.)"); ?>
+								<br /><?=gettext("Enter the IP address of the 802.1X Authentication Server.  This is commonly a Radius server (FreeRadius, Internet Authentication Services, etc.)"); ?>
 							</td>
 						</tr>
 						<tr>
 							<td valign="top" class="vncell"><?=gettext("802.1X Authentication Server Port"); ?></td>
 							<td class="vtable">
 								<input name="auth_server_port" id="auth_server_port" type="text" class="formfld unknown" size="66" value="<?=htmlspecialchars($pconfig['auth_server_port']);?>" />
-								<br/><?=gettext("Leave blank for the default 1812 port."); ?>
+								<br /><?=gettext("Leave blank for the default 1812 port."); ?>
 							</td>
 						</tr>
 						<tr>
 							<td valign="top" class="vncell"><?=gettext("802.1X Authentication Server Shared Secret"); ?></td>
 							<td class="vtable">
 								<input name="auth_server_shared_secret" id="auth_server_shared_secret" type="text" class="formfld unknown" size="66" value="<?=htmlspecialchars($pconfig['auth_server_shared_secret']);?>" />
-								<br/>
+								<br />
 							</td>
 						</tr>
 						<tr>
 					<td valign="top" class="vncell"><?=gettext("Secondary 802.1X Authentication Server IP Address"); ?></td>
 							<td class="vtable">
 								<input name="auth_server_addr2" id="auth_server_addr2" type="text" class="formfld unknown" size="66" value="<?=htmlspecialchars($pconfig['auth_server_addr2']);?>" />
-								<br/><?=gettext("Enter the IP address of the 802.1X Authentication Server.  This is commonly a Radius server (FreeRadius, Internet Authentication Services, etc.)"); ?>
+								<br /><?=gettext("Enter the IP address of the 802.1X Authentication Server.  This is commonly a Radius server (FreeRadius, Internet Authentication Services, etc.)"); ?>
 							</td>
 						</tr>
 						<tr>
 							<td valign="top" class="vncell"><?=gettext("Secondary 802.1X Authentication Server Port"); ?></td>
 							<td class="vtable">
 								<input name="auth_server_port2" id="auth_server_port2" type="text" class="formfld unknown" size="66" value="<?=htmlspecialchars($pconfig['auth_server_port2']);?>" />
-								<br/><?=gettext("Leave blank for the default 1812 port."); ?>
+								<br /><?=gettext("Leave blank for the default 1812 port."); ?>
 							</td>
 						</tr>
 						<tr>
 							<td valign="top" class="vncell"><?=gettext("Secondary 802.1X Authentication Server Shared Secret"); ?></td>
 							<td class="vtable">
 								<input name="auth_server_shared_secret2" id="auth_server_shared_secret2" type="text" class="formfld unknown" size="66" value="<?=htmlspecialchars($pconfig['auth_server_shared_secret2']);?>" />
-								<br/>
+								<br />
 							</td>
 						</tr>
 						<tr>
 							<td valign="top" class="vncell">802.1X <?=gettext("Authentication Roaming Preauth"); ?></td>
 							<td class="vtable">
 								<input name="rsn_preauth" id="rsn_preauth" type="checkbox" class="formfld unknown" size="66" value="yes" <?php if ($pconfig['rsn_preauth']) echo "checked=\"checked\""; ?> />
-								<br/>
+								<br />
 							</td>
 						</tr>
 						<tr>
@@ -3258,7 +3258,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 							<td class="vtable">
 								<a name="rfc1918"></a>
 								<input name="blockpriv" type="checkbox" id="blockpriv" value="yes" <?php if ($pconfig['blockpriv']) echo "checked=\"checked\""; ?> />
-								<strong><?=gettext("Block private networks"); ?></strong><br/>
+								<strong><?=gettext("Block private networks"); ?></strong><br />
 								<?=gettext("When set, this option blocks traffic from IP addresses that are reserved " .
 								"for private  networks as per RFC 1918 (10/8, 172.16/12, 192.168/16) as"); ?>
 								<?=gettext("well as loopback addresses (127/8)."); ?>&nbsp;&nbsp; <?=gettext("You should generally " .
@@ -3270,12 +3270,12 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 							<td valign="middle" class="vncell">&nbsp;</td>
 							<td class="vtable">
 								<input name="blockbogons" type="checkbox" id="blockbogons" value="yes" <?php if ($pconfig['blockbogons']) echo "checked=\"checked\""; ?> />
-								<strong><?=gettext("Block bogon networks"); ?></strong><br/>
+								<strong><?=gettext("Block bogon networks"); ?></strong><br />
 								<?=gettext("When set, this option blocks traffic from IP addresses that are reserved " .
 								"(but not RFC 1918) or not yet assigned by IANA."); ?>&nbsp;&nbsp;
 								<?=gettext("Bogons are prefixes that should never appear in the Internet routing table, " .
 								"and obviously should not appear as the source address in any packets you receive."); ?>
-								<br/><br/>
+								<br /><br />
 								<?=gettext("Note: The update frequency can be changed under System->Advanced Firewall/NAT settings.")?>
 							</td>
 						</tr>
@@ -3288,7 +3288,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 								&nbsp;
 							</td>
 							<td width="78%">
-								<br/>
+								<br />
 								<input id="save" name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" />
 								<input id="cancel" type="button" class="formbtn" value="<?=gettext("Cancel"); ?>" onclick="history.back()" />
 								<input name="if" type="hidden" id="if" value="<?=htmlspecialchars($if);?>" />
diff --git a/usr/local/www/interfaces_assign.php b/usr/local/www/interfaces_assign.php
old mode 100755
new mode 100644
index f7ee2f5031..3fd531a7d6
--- a/usr/local/www/interfaces_assign.php
+++ b/usr/local/www/interfaces_assign.php
@@ -387,7 +387,7 @@ if(file_exists("/var/run/interface_mismatch_reboot_needed"))
 <form action="interfaces_assign.php" method="post" name="iform" id="iform">
 
 <?php if (file_exists("/tmp/reload_interfaces")): ?><p>
-	<?php print_info_box_np(gettext("The interface configuration has been changed.<br>You must apply the changes in order for them to take effect."));?><br/></p>
+	<?php print_info_box_np(gettext("The interface configuration has been changed.<br />You must apply the changes in order for them to take effect."));?><br /></p>
 <?php elseif($savemsg): ?>
 	<?php print_info_box($savemsg); ?>
 <?php endif; ?>
@@ -496,9 +496,9 @@ if(file_exists("/var/run/interface_mismatch_reboot_needed"))
   <?php endif; ?>
 </table>
 </div>
-<br/>
+<br />
 <div id='savediv' <?php if (empty($_GET['act'])) echo "style='display:none;'"; ?>>
-	<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" /><br/><br/>
+	<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" /><br /><br />
 </div>
 <ul>
 	<li><span class="vexpl"><?=gettext("Interfaces that are configured as members of a lagg(4) interface will not be shown."); ?></span></li>
diff --git a/usr/local/www/interfaces_ppps_edit.php b/usr/local/www/interfaces_ppps_edit.php
index 48df6919ae..e7ea12bf5a 100644
--- a/usr/local/www/interfaces_ppps_edit.php
+++ b/usr/local/www/interfaces_ppps_edit.php
@@ -427,7 +427,7 @@ $types = array("select" => gettext("Select"), "ppp" => "PPP", "pppoe" => "PPPoE"
 					<option></option>
 				</select>
 
-				<br/><span class="vexpl"><?= gettext("Select at least two interfaces for Multilink (MLPPP) connections."); ?></span>
+				<br /><span class="vexpl"><?= gettext("Select at least two interfaces for Multilink (MLPPP) connections."); ?></span>
 			</td>
 		</tr>
 		<tr style="display:none" name="portlists" id="portlists">
@@ -475,7 +475,7 @@ $types = array("select" => gettext("Select"), "ppp" => "PPP", "pppoe" => "PPPoE"
 			<td width="22%" valign="top" class="vncell"><?= gettext("Description"); ?></td>
 			<td width="78%" class="vtable">
 				<input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>" />
-				<br/> <span class="vexpl"><?= gettext("You may enter a description here for your reference. Description will appear in the \"Interfaces Assign\" select lists."); ?></span>
+				<br /> <span class="vexpl"><?= gettext("You may enter a description here for your reference. Description will appear in the \"Interfaces Assign\" select lists."); ?></span>
 			</td>
 		</tr>	
 		<tr style="display:none" name="select" id="select"><td style="display:none"></td></tr>
@@ -509,7 +509,7 @@ $types = array("select" => gettext("Select"), "ppp" => "PPP", "pppoe" => "PPPoE"
 						</td>
 					</tr>
 				</table>
-				<br/><span class="vexpl"><?= gettext("Select to fill in data for your service provider."); ?></span>
+				<br /><span class="vexpl"><?= gettext("Select to fill in data for your service provider."); ?></span>
 			</td>
 		</tr>
 		<tr>
@@ -529,7 +529,7 @@ $types = array("select" => gettext("Select"), "ppp" => "PPP", "pppoe" => "PPPoE"
 			<td width="22%" valign="top" class="vncell"><?= gettext("Phone Number"); ?></td>
 			<td width="78%" class="vtable">
 				<input name="phone" type="text" class="formfld unknown" id="phone" size="40" value="<?=htmlspecialchars($pconfig['phone']);?>" />
-				<br/><span class="vexpl"><?= gettext("Note: Typically *99# for GSM networks and #777 for CDMA networks"); ?></span>
+				<br /><span class="vexpl"><?= gettext("Note: Typically *99# for GSM networks and #777 for CDMA networks"); ?></span>
 			</td>
 		</tr>
 		<tr style="display:none" name="apn_" id="apn_">
@@ -546,7 +546,7 @@ $types = array("select" => gettext("Select"), "ppp" => "PPP", "pppoe" => "PPPoE"
 						<td width="22%" valign="top" class="vncell"><?= gettext("APN number (optional)"); ?></td>
 						<td width="78%" class="vtable">
 							<input name="apnum" type="text" class="formfld unknown" id="apnum" size="2" value="<?=htmlspecialchars($pconfig['apnum']);?>" />
-							<br/><span class="vexpl"><?= gettext("Note: Defaults to 1 if you set APN above. Ignored if you set no APN above."); ?></span>
+							<br /><span class="vexpl"><?= gettext("Note: Defaults to 1 if you set APN above. Ignored if you set no APN above."); ?></span>
 						</td>
 					</tr>
 					<tr style="display:none" id="advanced_<?=$k;?>" name="advanced_<?=$k;$k++;?>">
@@ -560,14 +560,14 @@ $types = array("select" => gettext("Select"), "ppp" => "PPP", "pppoe" => "PPPoE"
 						<td width="22%" valign="top" class="vncell"><?= gettext("SIM PIN wait"); ?></td>
 						<td width="78%" class="vtable">
 							<input name="pin-wait" type="text" class="formfld unknown" id="pin-wait" size="2" value="<?=htmlspecialchars($pconfig['pin-wait']);?>" />
-							<br/><span class="vexpl"><?= gettext("Note: Time to wait for SIM to discover network after PIN is sent to SIM (seconds)."); ?></span>
+							<br /><span class="vexpl"><?= gettext("Note: Time to wait for SIM to discover network after PIN is sent to SIM (seconds)."); ?></span>
 						</td>
 					</tr>
 					<tr style="display:none" id="advanced_<?=$k;?>" name="advanced_<?=$k;$k++;?>">
 						<td width="22%" valign="top" class="vncell"><?= gettext("Init String"); ?></td>
 						<td width="78%" class="vtable">
 							<input type="text" size="40" class="formfld unknown" id="initstr" name="initstr" value="<?=htmlspecialchars($pconfig['initstr']);?>" />
-							<br/><span class="vexpl"><?= gettext("Note: Enter the modem initialization string here. Do NOT include the \"AT\"" . 
+							<br /><span class="vexpl"><?= gettext("Note: Enter the modem initialization string here. Do NOT include the \"AT\"" . 
 							" string at the beginning of the command. Many modern USB 3G modems don't need an initialization string."); ?></span>
 						</td>
 					</tr>
@@ -575,14 +575,14 @@ $types = array("select" => gettext("Select"), "ppp" => "PPP", "pppoe" => "PPPoE"
 						<td width="22%" valign="top" class="vncell"><?= gettext("Connection Timeout"); ?></td>
 						<td width="78%" class="vtable">
 							<input name="connect-timeout" type="text" class="formfld unknown" id="connect-timeout" size="2" value="<?=htmlspecialchars($pconfig['connect-timeout']);?>" />
-							<br/><span class="vexpl"><?= gettext("Note: Enter timeout in seconds for connection to be established (sec.) Default is 45 sec."); ?></span>
+							<br /><span class="vexpl"><?= gettext("Note: Enter timeout in seconds for connection to be established (sec.) Default is 45 sec."); ?></span>
 						</td>
 					</tr>
 					<tr style="display:none" id="advanced_<?=$k;?>" name="advanced_<?=$k;$k++;?>">
 						<td valign="top" class="vncell"><?= gettext("Uptime Logging"); ?></td>
 						<td class="vtable">
 							<input type="checkbox" value="on" id="uptime" name="uptime" <?php if (isset($pconfig['uptime'])) echo "checked=\"checked\""; ?> /> <?= gettext("Enable persistent logging of connection uptime."); ?> 
-							<br/> <span class="vexpl"><?= gettext("This option causes cumulative uptime to be recorded and displayed on the Status Interfaces page."); ?></span>
+							<br /> <span class="vexpl"><?= gettext("This option causes cumulative uptime to be recorded and displayed on the Status Interfaces page."); ?></span>
 						</td>
 					</tr>
 				</table>
@@ -595,7 +595,7 @@ $types = array("select" => gettext("Select"), "ppp" => "PPP", "pppoe" => "PPPoE"
 						<td width="22%" valign="top" class="vncell"><?= gettext("Service name"); ?></td>
 						<td width="78%" class="vtable"><input name="provider" type="text" class="formfld unknown" id="provider" size="20" value="<?=htmlspecialchars($pconfig['provider']);?>" />&nbsp;&nbsp;
 						<input type="checkbox" value="on" id="null_service" name="null_service" <?php if (isset($pconfig['null_service'])) echo "checked=\"checked\""; ?> /> <?= gettext("Configure a NULL Service name"); ?> 
-							<br/> <span class="vexpl"><?= gettext("Hint: this field can usually be left empty. Service name will not be configured if this field is empty. Check the \"Configure NULL\" box to configure a blank Service name."); ?></span>
+							<br /> <span class="vexpl"><?= gettext("Hint: this field can usually be left empty. Service name will not be configured if this field is empty. Check the \"Configure NULL\" box to configure a blank Service name."); ?></span>
 						</td>
 					</tr>
 					<tr style="display:none" id="advanced_<?=$k;?>" name="advanced_<?=$k;$k++;?>">
@@ -684,7 +684,7 @@ $types = array("select" => gettext("Select"), "ppp" => "PPP", "pppoe" => "PPPoE"
 		<td valign="top" class="vncell"><?= gettext("Dial On Demand"); ?></td>
 			<td class="vtable">
 				<input type="checkbox" value="on" id="ondemand" name="ondemand" <?php if (isset($pconfig['ondemand'])) echo "checked=\"checked\""; ?> /> <?= gettext("Enable Dial-on-Demand mode"); ?> 
-				<br/> <span class="vexpl"><?= gettext("This option causes the interface to operate in dial-on-demand mode. Do NOT enable if you want your link to be always up. " .  
+				<br /> <span class="vexpl"><?= gettext("This option causes the interface to operate in dial-on-demand mode. Do NOT enable if you want your link to be always up. " .  
 				"The interface is configured, but the actual connection of the link is delayed until qualifying outgoing traffic is detected."); ?> </span>
 			</td>
 		</tr>
@@ -692,15 +692,15 @@ $types = array("select" => gettext("Select"), "ppp" => "PPP", "pppoe" => "PPPoE"
 			<td valign="top" class="vncell"><?= gettext("Idle Timeout"); ?></td>
 			<td class="vtable">
 				<input name="idletimeout" type="text" class="formfld unknown" id="idletimeout" size="12" value="<?=htmlspecialchars($pconfig['idletimeout']);?>" /> <?= gettext("(seconds) Default is 0, which disables the timeout feature."); ?>
-				<br/> <span class="vexpl"><?= gettext("If no incoming or outgoing packets are transmitted for the entered number of seconds the connection is brought down.");?>
-				<br/><?=gettext("When the idle timeout occurs, if the dial-on-demand option is enabled, mpd goes back into dial-on-demand mode. Otherwise, the interface is brought down and all associated routes removed."); ?></span>
+				<br /> <span class="vexpl"><?= gettext("If no incoming or outgoing packets are transmitted for the entered number of seconds the connection is brought down.");?>
+				<br /><?=gettext("When the idle timeout occurs, if the dial-on-demand option is enabled, mpd goes back into dial-on-demand mode. Otherwise, the interface is brought down and all associated routes removed."); ?></span>
 			</td>
 		</tr>
 		<tr style="display:none" id="advanced_<?=$k;?>" name="advanced_<?=$k;$k++;?>">
 			<td width="22%" valign="top" class="vncell"><?= gettext("Compression"); ?></td>
 			<td width="78%" class="vtable">
 				<input type="checkbox" value="on" id="vjcomp" name="vjcomp" <?php if (isset($pconfig['vjcomp'])) echo "checked=\"checked\""; ?> />&nbsp;<?= gettext("Disable vjcomp(compression) (auto-negotiated by default)."); ?>
-				<br/> <span class="vexpl"><?=gettext("This option enables Van Jacobson TCP header compression, which saves several bytes per TCP data packet. " .
+				<br /> <span class="vexpl"><?=gettext("This option enables Van Jacobson TCP header compression, which saves several bytes per TCP data packet. " .
 				"You almost always want this option. This compression ineffective for TCP connections with enabled modern extensions like time " .
 				"stamping or SACK, which modify TCP options between sequential packets.");?></span>
 			</td>
@@ -709,7 +709,7 @@ $types = array("select" => gettext("Select"), "ppp" => "PPP", "pppoe" => "PPPoE"
 			<td width="22%" valign="top" class="vncell"><?= gettext("TCPmssFix"); ?></td>
 			<td width="78%" class="vtable">
 				<input type="checkbox" value="on" id="tcpmssfix" name="tcpmssfix" <?php if (isset($pconfig['tcpmssfix'])) echo "checked=\"checked\""; ?> />&nbsp;<?= gettext("Disable tcpmssfix (enabled by default)."); ?>
-				<br/> <span class="vexpl"><?=gettext("This option causes mpd to adjust incoming and outgoing TCP SYN segments so that the requested maximum segment size is not greater than the amount ". 
+				<br /> <span class="vexpl"><?=gettext("This option causes mpd to adjust incoming and outgoing TCP SYN segments so that the requested maximum segment size is not greater than the amount ". 
 				"allowed by the interface MTU. This is necessary in many setups to avoid problems caused by routers that drop ICMP Datagram Too Big messages. Without these messages, ".
 				"the originating machine sends data, it passes the rogue router then hits a machine that has an MTU that is not big enough for the data. Because the IP Don't Fragment option is set, ".
 				"this machine sends an ICMP Datagram Too Big message back to the originator and drops the packet. The rogue router drops the ICMP message and the originator never ".
@@ -720,7 +720,7 @@ $types = array("select" => gettext("Select"), "ppp" => "PPP", "pppoe" => "PPPoE"
 			<td width="22%" valign="top" class="vncell"><?=gettext("ShortSeq");?></td>
 			<td width="78%" class="vtable">
 				<input type="checkbox" value="on" id="shortseq" name="shortseq" <?php if (isset($pconfig['shortseq'])) echo "checked=\"checked\""; ?> />&nbsp;<?= gettext("Disable shortseq (auto-negotiated by default)."); ?>
-				<br/> <span class="vexpl"><?= gettext("This option is only meaningful if multi-link PPP is negotiated. It proscribes shorter multi-link fragment headers, saving two bytes on every frame. " .
+				<br /> <span class="vexpl"><?= gettext("This option is only meaningful if multi-link PPP is negotiated. It proscribes shorter multi-link fragment headers, saving two bytes on every frame. " .
 				"It is not necessary to disable this for connections that are not multi-link."); ?></span>
 			</td>
 		</tr>
@@ -728,14 +728,14 @@ $types = array("select" => gettext("Select"), "ppp" => "PPP", "pppoe" => "PPPoE"
 			<td width="22%" valign="top" class="vncell"><?=gettext("ACFComp"); ?></td>
 			<td width="78%" class="vtable">
 				<input type="checkbox" value="on" id="acfcomp" name="acfcomp" <?php if (isset($pconfig['acfcomp'])) echo "checked=\"checked\""; ?> />&nbsp;<?= gettext("Disable acfcomp (compression) (auto-negotiated by default)."); ?>
-				<br/> <span class="vexpl"><?= gettext("Address and control field compression. This option only applies to asynchronous link types. It saves two bytes per frame."); ?></span>
+				<br /> <span class="vexpl"><?= gettext("Address and control field compression. This option only applies to asynchronous link types. It saves two bytes per frame."); ?></span>
 			</td>
 		</tr>
 		<tr style="display:none" id="advanced_<?=$k;?>" name="advanced_<?=$k;$k++;?>">
 			<td width="22%" valign="top" class="vncell"><?=gettext("ProtoComp"); ?></td>
 			<td width="78%" class="vtable">
 				<input type="checkbox" value="on" id="protocomp" name="protocomp" <?php if (isset($pconfig['protocomp'])) echo "checked=\"checked\""; ?> />&nbsp;<?= gettext("Disable protocomp (compression) (auto-negotiated by default)."); ?>
-				<br/> <span class="vexpl"><?= gettext("Protocol field compression. This option saves one byte per frame for most frames."); ?></span>
+				<br /> <span class="vexpl"><?= gettext("Protocol field compression. This option saves one byte per frame for most frames."); ?></span>
 			</td>
 		</tr>
 		<tr id="advanced_" name="advanced_">
@@ -754,29 +754,29 @@ $types = array("select" => gettext("Select"), "ppp" => "PPP", "pppoe" => "PPPoE"
 					<tr>
 						<td width="22%" id="bwlabel<?=$i;?>" valign="top"class="vncell"> <?=gettext("Bandwidth");?></td>
 						<td width="78%" class="vtable">
-						<br/><input name="bandwidth[]" id="bandwidth<?=$i;?>" type="text" class="formfld unknown" size="40" value="<?=htmlspecialchars($pconfig['bandwidth'][$i]);?>" />
-						<br/> <span class="vexpl"><?=gettext("Set ONLY for MLPPP connections and ONLY when links have different bandwidths.");?></span>
+						<br /><input name="bandwidth[]" id="bandwidth<?=$i;?>" type="text" class="formfld unknown" size="40" value="<?=htmlspecialchars($pconfig['bandwidth'][$i]);?>" />
+						<br /> <span class="vexpl"><?=gettext("Set ONLY for MLPPP connections and ONLY when links have different bandwidths.");?></span>
 					  </td>
 					</tr>
 					<tr>
 					  <td width="22%" id="mtulabel<?=$i;?>" valign="top" class="vncell"> <?=gettext("MTU"); ?></td>
 					  <td width="78%" class="vtable">
 						<input name="mtu[]" id="mtu<?=$i;?>" type="text" class="formfld unknown" size="6" value="<?=htmlspecialchars($pconfig['mtu'][$i]);?>" />
-						<br/> <span class="vexpl"><?=gettext("MTU will default to 1492.");?></span>
+						<br /> <span class="vexpl"><?=gettext("MTU will default to 1492.");?></span>
 					  </td>
 					</tr>
 					<tr>
 					  <td width="22%" id="mrulabel<?=$i;?>" valign="top" class="vncell"> <?=gettext("MRU"); ?></td>
 					  <td width="78%" class="vtable">
 						<input name="mru[]" id="mru<?=$i;?>" type="text" class="formfld unknown" size="6" value="<?=htmlspecialchars($pconfig['mru'][$i]);?>" />
-						<br/> <span class="vexpl">MRU <?=gettext("will be auto-negotiated by default.");?></span>
+						<br /> <span class="vexpl">MRU <?=gettext("will be auto-negotiated by default.");?></span>
 					  </td>
 					</tr>
 					<tr>
 					  <td width="22%" id="mrrulabel<?=$i;?>" valign="top" class="vncell"> <?=gettext("MRRU"); ?></td>
 					  <td width="78%" class="vtable">
 						<input name="mrru[]" id="mrru<?=$i;?>" type="text" class="formfld unknown" size="6" value="<?=htmlspecialchars($pconfig['mrru'][$i]);?>" />
-						<br/> <span class="vexpl"><?=gettext("Set ONLY for MLPPP connections.");?> MRRU <?=gettext("will be auto-negotiated by default.");?></span>
+						<br /> <span class="vexpl"><?=gettext("Set ONLY for MLPPP connections.");?> MRRU <?=gettext("will be auto-negotiated by default.");?></span>
 					  </td>
 					</tr>
 				</table>
diff --git a/usr/local/www/interfaces_qinq.php b/usr/local/www/interfaces_qinq.php
old mode 100755
new mode 100644
index 8119907489..559103d441
--- a/usr/local/www/interfaces_qinq.php
+++ b/usr/local/www/interfaces_qinq.php
@@ -152,7 +152,7 @@ include("head.inc");
 				</tr>
 				<tr>
 				<td colspan="4" class="list"><p class="vexpl"><span class="red"><strong>
-				  <?=gettext("Note:");?><br/>
+				  <?=gettext("Note:");?><br />
 				  </strong></span>
 				  <?php printf(gettext("Not all drivers/NICs support 802.1Q QinQ tagging properly. On cards that do not explicitly support it, QinQ tagging will still work, but the reduced MTU may cause problems. See the %s handbook for information on supported cards."), $g['product_name']);?></p>
 				  </td>
diff --git a/usr/local/www/interfaces_vlan.php b/usr/local/www/interfaces_vlan.php
old mode 100755
new mode 100644
index 7639c0fd01..e8acce920f
--- a/usr/local/www/interfaces_vlan.php
+++ b/usr/local/www/interfaces_vlan.php
@@ -137,7 +137,7 @@ include("head.inc");
 				</tr>
 				<tr>
 				<td colspan="3" class="list"><p class="vexpl"><span class="red"><strong>
-				  <?=gettext("Note:");?><br/>
+				  <?=gettext("Note:");?><br />
 				  </strong></span>
 				  <?php printf(gettext("Not all drivers/NICs support 802.1Q VLAN tagging properly. On cards that do not explicitly support it, VLAN tagging will still work, but the reduced MTU may cause problems. See the %s handbook for information on supported cards."),$g['product_name']);?> </p>
 				  </td>
diff --git a/usr/local/www/interfaces_vlan_edit.php b/usr/local/www/interfaces_vlan_edit.php
old mode 100755
new mode 100644
index a93b687425..76b6967059
--- a/usr/local/www/interfaces_vlan_edit.php
+++ b/usr/local/www/interfaces_vlan_edit.php
@@ -176,21 +176,21 @@ include("head.inc");
 						}
 		      ?>
                     </select>
-			<br/>
+			<br />
 			<span class="vexpl"><?=gettext("Only VLAN capable interfaces will be shown.");?></span></td>
                 </tr>
 				<tr>
                   <td valign="top" class="vncellreq"><?=gettext("VLAN tag ");?></td>
                   <td class="vtable">
                     <input name="tag" type="text" class="formfld unknown" id="tag" size="6" value="<?=htmlspecialchars($pconfig['tag']);?>" />
-                    <br/>
+                    <br />
                     <span class="vexpl"><?=gettext("802.1Q VLAN tag (between 1 and 4094) ");?></span></td>
 			    </tr>
 				<tr>
                   <td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td>
                   <td width="78%" class="vtable">
                     <input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>" />
-                    <br/> <span class="vexpl"><?=gettext("You may enter a description here ".
+                    <br /> <span class="vexpl"><?=gettext("You may enter a description here ".
                     "for your reference (not parsed).");?></span></td>
                 </tr>
                 <tr>
diff --git a/usr/local/www/interfaces_wireless.php b/usr/local/www/interfaces_wireless.php
index 03aba27934..be5a8d1dc3 100644
--- a/usr/local/www/interfaces_wireless.php
+++ b/usr/local/www/interfaces_wireless.php
@@ -133,7 +133,7 @@ include("head.inc");
 			</tr>
 				<tr>
 				<td colspan="3" class="list"><p class="vexpl"><span class="red"><strong>
-				  <?=gettext("Note");?>:<br/>
+				  <?=gettext("Note");?>:<br />
 				  </strong></span>
 				  <?=gettext("Here you can configure clones of wireless interfaces, which can be assigned as separate independent interfaces. Only available on wireless chipsets that support this, with limitations on the number that can be created in each mode.");?></p>
 				  </td>
diff --git a/usr/local/www/interfaces_wireless_edit.php b/usr/local/www/interfaces_wireless_edit.php
index 67aefaa7e8..e89967f4b2 100644
--- a/usr/local/www/interfaces_wireless_edit.php
+++ b/usr/local/www/interfaces_wireless_edit.php
@@ -188,7 +188,7 @@ include("head.inc");
                   <td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td>
                   <td width="78%" class="vtable">
                     <input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>" />
-                    <br/> <span class="vexpl"><?=gettext("You may enter a description here ".
+                    <br /> <span class="vexpl"><?=gettext("You may enter a description here ".
                     "for your reference (not parsed).");?></span></td>
                 </tr>
                 <tr>
diff --git a/usr/local/www/javascript/scriptaculous/unittest.js b/usr/local/www/javascript/scriptaculous/unittest.js
index 33a0c7157f..1237e0fab4 100644
--- a/usr/local/www/javascript/scriptaculous/unittest.js
+++ b/usr/local/www/javascript/scriptaculous/unittest.js
@@ -121,7 +121,7 @@ Test.Unit.Logger.prototype = {
     this.loglines = $('loglines');
   },
   _toHTML: function(txt) {
-    return txt.escapeHTML().replace(/\n/g,"<br/>");
+    return txt.escapeHTML().replace(/\n/g,"<br />");
   },
   addLinksToResults: function(){ 
     $$("tr.failed .nameCell").each( function(td){ // todo: limit to children of this.log
diff --git a/usr/local/www/license.php b/usr/local/www/license.php
old mode 100755
new mode 100644
index e2ffb98fb9..84aec4000c
--- a/usr/local/www/license.php
+++ b/usr/local/www/license.php
@@ -44,100 +44,100 @@ include("head.inc");
 <?php include("fbegin.inc"); ?>
 <p class="pgtitle"><?=gettext("License");?></p>
 
-            <p><strong><?=$g['product_name'];?> <?=gettext("is Copyright");?> &copy; <?=$g['product_copyright_years'];?> <?=gettext("by");?> <?=$g['product_copyright'];?><br>
+            <p><strong><?=$g['product_name'];?> <?=gettext("is Copyright");?> &copy; <?=$g['product_copyright_years'];?> <?=gettext("by");?> <?=$g['product_copyright'];?><br />
               <?=gettext("All rights reserved");?>.</strong></p>
 
             <p><strong><?=gettext("m0n0wall is Copyright ");?>&copy; <?=gettext("2002-2014 by Manuel Kasper");?>
-              (<a href="mailto:mk@neon1.net">mk@neon1.net</a>).<br>
+              (<a href="mailto:mk@neon1.net">mk@neon1.net</a>).<br />
               <?=gettext("All rights reserved");?>.</strong></p>
-            <p> <?=gettext("Redistribution and use in source and binary forms, with or without");?><br>
+            <p> <?=gettext("Redistribution and use in source and binary forms, with or without");?><br />
               <?=gettext("modification, are permitted provided that the following conditions ".
-              "are met");?>:<br>
-              <br>
+              "are met");?>:<br />
+              <br />
               <?=gettext("1. Redistributions of source code must retain the above copyright ".
-              "notice,");?><br>
-              <?=gettext("this list of conditions and the following disclaimer");?>.<br>
-              <br>
-              <?=gettext("2. Redistributions in binary form must reproduce the above copyright");?><br>
+              "notice,");?><br />
+              <?=gettext("this list of conditions and the following disclaimer");?>.<br />
+              <br />
+              <?=gettext("2. Redistributions in binary form must reproduce the above copyright");?><br />
               <?=gettext("notice, this list of conditions and the following disclaimer in ".
-              "the");?><br>
-              <?=gettext("documentation and/or other materials provided with the distribution.");?><br>
-              <br>
+              "the");?><br />
+              <?=gettext("documentation and/or other materials provided with the distribution.");?><br />
+              <br />
               <strong><?=gettext("THIS SOFTWARE IS PROVIDED ");?>&quot;<?=gettext("AS IS'' AND ANY EXPRESS ".
-              "OR IMPLIED WARRANTIES,");?><br>
-              <?=gettext("INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY");?><br>
+              "OR IMPLIED WARRANTIES,");?><br />
+              <?=gettext("INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY");?><br />
               <?=gettext("AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT ".
-              "SHALL THE");?><br>
+              "SHALL THE");?><br />
               <?=gettext("AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, ".
-              "EXEMPLARY,");?><br>
+              "EXEMPLARY,");?><br />
               <?=gettext("OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT ".
-              "OF");?><br>
+              "OF");?><br />
               <?=gettext("SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR ".
-              "BUSINESS");?><br>
+              "BUSINESS");?><br />
               <?=gettext("INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER ".
-              "IN");?><br>
-              <?=gettext("CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)");?><br>
+              "IN");?><br />
+              <?=gettext("CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)");?><br />
               <?=gettext("ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED ".
-              "OF THE");?><br>
+              "OF THE");?><br />
               <?=gettext("POSSIBILITY OF SUCH DAMAGE");?></strong>.</p>
             <hr size="1">
             <p><?= "{$g['product_name']} " . gettext("is based upon/includes various free software packages, ".
-              "listed below.");?><br>
+              "listed below.");?><br />
               <?php printf(gettext("The authors of %s would like to thank the authors of these " .
               "software packages for their efforts"),$g['product_name']);?>.</p>
-            <p>FreeBSD (<a href="http://www.freebsd.org" target="_blank">http://www.freebsd.org</a>)<br>
-              <?=gettext("Copyright");?> &copy;<?=gettext("1992-2014 The FreeBSD Project. All rights reserved");?>.<br>
-              <br>
-              <?=gettext("This product includes PHP, freely available from");?> <a href="http://www.php.net/" target="_blank">http://www.php.net</a>.<br>
-              <?=gettext("Copyright"); ?> &copy; <?=gettext("1999-2014 The PHP Group. All rights reserved.");?>.<br>
-              <br>
-              <?=gettext("LightTPD"); ?> (<a href="http://www.lighttpd.net" target="_blank">http://www.lighttpd.net)</a><br>
+            <p>FreeBSD (<a href="http://www.freebsd.org" target="_blank">http://www.freebsd.org</a>)<br />
+              <?=gettext("Copyright");?> &copy;<?=gettext("1992-2014 The FreeBSD Project. All rights reserved");?>.<br />
+              <br />
+              <?=gettext("This product includes PHP, freely available from");?> <a href="http://www.php.net/" target="_blank">http://www.php.net</a>.<br />
+              <?=gettext("Copyright"); ?> &copy; <?=gettext("1999-2014 The PHP Group. All rights reserved.");?>.<br />
+              <br />
+              <?=gettext("LightTPD"); ?> (<a href="http://www.lighttpd.net" target="_blank">http://www.lighttpd.net)</a><br />
               <?=gettext("Copyright"); ?> &copy;<?=gettext("2004, Jan Knescke, incremental");?><jan@kneschke.de>
-              <?=gettext("All rights reserved.");?><br>
-              <br>
-              <?=gettext("ISC DHCP server ");?>(<a href="http://www.isc.org/products/DHCP/" target="_blank">http://www.isc.org/products/DHCP</a>)<br>
-              <?=gettext("Copyright"); ?> &copy; <?=gettext("2004-2012 Internet Software Consortium, Inc.");?><br>
-              <?=gettext("Copyright"); ?> &copy; <?=gettext("1995-2003 Internet Software Consortium");?><br>
-              <br>
-              <?=gettext("PF"); ?> (<a href="http://www.openbsd.org/faq/pf" target="_blank">http://www.openbsd.org</a>)<br>
-			  <br>
-              <?=gettext("MPD - Multi-link PPP daemon for FreeBSD");?> (<a href="http://www.dellroad.org/mpd" target="_blank">http://www.dellroad.org/mpd</a>)<br>
-              <?=gettext("Copyright"); ?> &copy; 2003-2004, Archie L. Cobbs, Michael Bretterklieber, Alexander Motin<br>
-			  <?=gettext("All rights reserved.");?><br>
-              <br>
-              <?=gettext("Circular log support for FreeBSD syslogd ");?>(<a href="http://software.wheelhouse.org/syslogd/" target="_blank">http://software.wheelhouse.org/syslogd/</a>)<br>
-              <?=gettext("Copyright"); ?> &copy; 2001 Jeff Wheelhouse (jdw@wwwi.com)<br>
-              <br>
-              <?=gettext("Dnsmasq - a DNS forwarder for NAT firewalls");?> (<a href="http://www.thekelleys.org.uk" target="_blank">http://www.thekelleys.org.uk</a>)<br>
-              <?=gettext("Copyright"); ?> &copy; 2000-2012 Simon Kelley.<br>
-              <br>
-              <?=gettext("IPsec-Tools"); ?> (<a href="http://ipsec-tools.sourceforge.net/" target="_blank">http://ipsec-tools.sourceforge.net/</a>)<br>
-              <?=gettext("Copyright"); ?> &copy; <?=gettext("1995-2002 WIDE Project. All rights reserved.");?><br>
-              <br>
-              <?=gettext("msntp"); ?> (<a href="http://www.hpcf.cam.ac.uk/export" target="_blank">http://www.hpcf.cam.ac.uk/export</a>)<br>
+              <?=gettext("All rights reserved.");?><br />
+              <br />
+              <?=gettext("ISC DHCP server ");?>(<a href="http://www.isc.org/products/DHCP/" target="_blank">http://www.isc.org/products/DHCP</a>)<br />
+              <?=gettext("Copyright"); ?> &copy; <?=gettext("2004-2012 Internet Software Consortium, Inc.");?><br />
+              <?=gettext("Copyright"); ?> &copy; <?=gettext("1995-2003 Internet Software Consortium");?><br />
+              <br />
+              <?=gettext("PF"); ?> (<a href="http://www.openbsd.org/faq/pf" target="_blank">http://www.openbsd.org</a>)<br />
+			  <br />
+              <?=gettext("MPD - Multi-link PPP daemon for FreeBSD");?> (<a href="http://www.dellroad.org/mpd" target="_blank">http://www.dellroad.org/mpd</a>)<br />
+              <?=gettext("Copyright"); ?> &copy; 2003-2004, Archie L. Cobbs, Michael Bretterklieber, Alexander Motin<br />
+			  <?=gettext("All rights reserved.");?><br />
+              <br />
+              <?=gettext("Circular log support for FreeBSD syslogd ");?>(<a href="http://software.wheelhouse.org/syslogd/" target="_blank">http://software.wheelhouse.org/syslogd/</a>)<br />
+              <?=gettext("Copyright"); ?> &copy; 2001 Jeff Wheelhouse (jdw@wwwi.com)<br />
+              <br />
+              <?=gettext("Dnsmasq - a DNS forwarder for NAT firewalls");?> (<a href="http://www.thekelleys.org.uk" target="_blank">http://www.thekelleys.org.uk</a>)<br />
+              <?=gettext("Copyright"); ?> &copy; 2000-2012 Simon Kelley.<br />
+              <br />
+              <?=gettext("IPsec-Tools"); ?> (<a href="http://ipsec-tools.sourceforge.net/" target="_blank">http://ipsec-tools.sourceforge.net/</a>)<br />
+              <?=gettext("Copyright"); ?> &copy; <?=gettext("1995-2002 WIDE Project. All rights reserved.");?><br />
+              <br />
+              <?=gettext("msntp"); ?> (<a href="http://www.hpcf.cam.ac.uk/export" target="_blank">http://www.hpcf.cam.ac.uk/export</a>)<br />
               <?=gettext("Copyright"); ?> &copy;<?=gettext(" 1996, 1997, 2000 N.M. Maclaren, University of Cambridge. ".
-              "All rights reserved.");?><br>
-              <br>
-              <?=gettext("UCD-SNMP"); ?> (<a href="http://www.ece.ucdavis.edu/ucd-snmp" target="_blank">http://www.ece.ucdavis.edu/ucd-snmp</a>)<br>
-              <?=gettext("Copyright"); ?> &copy; <?=gettext("1989, 1991, 1992 by Carnegie Mellon University.");?><br>
+              "All rights reserved.");?><br />
+              <br />
+              <?=gettext("UCD-SNMP"); ?> (<a href="http://www.ece.ucdavis.edu/ucd-snmp" target="_blank">http://www.ece.ucdavis.edu/ucd-snmp</a>)<br />
+              <?=gettext("Copyright"); ?> &copy; <?=gettext("1989, 1991, 1992 by Carnegie Mellon University.");?><br />
               <?=gettext("Copyright"); ?> &copy; <?=gettext("1996, 1998-2000 The Regents of the University of ".
-              "California. All rights reserved");?>.<br>
+              "California. All rights reserved");?>.<br />
               <?=gettext("Copyright"); ?> &copy; <?=gettext("2001-2002, Network Associates Technology, Inc. ".
-              "All rights reserved.");?><br>
+              "All rights reserved.");?><br />
               <?=gettext("Portions of this code are copyright");?> &copy; <?=gettext("2001-2002, Cambridge ".
-              "Broadband Ltd. All rights reserved.");?><br>
-              <br>
-              <?=gettext("choparp"); ?> (<a href="http://choparp.sourceforge.net/" target="_blank">http://choparp.sourceforge.net</a>)<br>
-              <?=gettext("Copyright"); ?> &copy; 1997 Takamichi Tateoka (tree@mma.club.uec.ac.jp)<br>
-			 <?=gettext("Copyright"); ?> &copy; 2002 Thomas Quinot (thomas@cuivre.fr.eu.org)<br>
-              <br>
-              <?=gettext("php-radius"); ?> (<a href="http://www.mavetju.org/programming/php.php" target="_blank">http://www.mavetju.org/programming/php.php</a>)<br>
-              <?=gettext("Copyright 2000, 2001, 2002 by Edwin Groothuis. All rights reserved.");?><br>
-			  <?=gettext("This product includes software developed by Edwin Groothuis.");?><br>
-			  <br>
-			  <?=gettext("wol"); ?> (<a href="http://ahh.sourceforge.net/wol" target="_blank">http://ahh.sourceforge.net/wol</a>)<br>
+              "Broadband Ltd. All rights reserved.");?><br />
+              <br />
+              <?=gettext("choparp"); ?> (<a href="http://choparp.sourceforge.net/" target="_blank">http://choparp.sourceforge.net</a>)<br />
+              <?=gettext("Copyright"); ?> &copy; 1997 Takamichi Tateoka (tree@mma.club.uec.ac.jp)<br />
+			 <?=gettext("Copyright"); ?> &copy; 2002 Thomas Quinot (thomas@cuivre.fr.eu.org)<br />
+              <br />
+              <?=gettext("php-radius"); ?> (<a href="http://www.mavetju.org/programming/php.php" target="_blank">http://www.mavetju.org/programming/php.php</a>)<br />
+              <?=gettext("Copyright 2000, 2001, 2002 by Edwin Groothuis. All rights reserved.");?><br />
+			  <?=gettext("This product includes software developed by Edwin Groothuis.");?><br />
+			  <br />
+			  <?=gettext("wol"); ?> (<a href="http://ahh.sourceforge.net/wol" target="_blank">http://ahh.sourceforge.net/wol</a>)<br />
 			  <?=gettext("Copyright"); ?> &copy; 2000,2001,2002,2003,2004 Thomas Krennwallner &lt;krennwallner@aon.at&gt;
-			  <br>
+			  <br />
 			  <?=gettext("OpenVPN"); ?> (<a href="http://openvpn.net/" target="_blank">http://openvpn.net/</a>)
 			  <?=gettext("Copyright (C) 2002-2005 OpenVPN Solutions LLC ");?>
 			  <?php include("fend.inc"); ?>
diff --git a/usr/local/www/load_balancer_monitor.php b/usr/local/www/load_balancer_monitor.php
old mode 100755
new mode 100644
index b9ae1e2047..a4596e2e40
--- a/usr/local/www/load_balancer_monitor.php
+++ b/usr/local/www/load_balancer_monitor.php
@@ -97,7 +97,7 @@ include("head.inc");
 <?php if ($input_errors) print_input_errors($input_errors); ?>
 <?php if ($savemsg) print_info_box($savemsg); ?>
 <?php if (is_subsystem_dirty('loadbalancer')): ?><p>
-<?php print_info_box_np(gettext("The load balancer configuration has been changed") . ".<br>" . gettext("You must apply the changes in order for them to take effect."));?><br>
+<?php print_info_box_np(gettext("The load balancer configuration has been changed") . ".<br />" . gettext("You must apply the changes in order for them to take effect."));?><br />
 <?php endif; ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
   <tr><td class="tabnavtbl">
diff --git a/usr/local/www/load_balancer_monitor_edit.php b/usr/local/www/load_balancer_monitor_edit.php
old mode 100755
new mode 100644
index 7df311e953..b20d485004
--- a/usr/local/www/load_balancer_monitor_edit.php
+++ b/usr/local/www/load_balancer_monitor_edit.php
@@ -275,7 +275,7 @@ function updateType(t){
 					<tr align="left">
 						<td valign="top"  align="right" class="vtable"><?=gettext("Host"); ?></td>
 						<td class="vtable" colspan="2">
-							<input name="http_options_host" type="text" <?if(isset($pconfig['options']['host'])) echo "value=\"" . htmlspecialchars($pconfig['options']['host']) . "\"";?>size="64"><br/><?=gettext("Hostname for Host: header if needed."); ?>
+							<input name="http_options_host" type="text" <?if(isset($pconfig['options']['host'])) echo "value=\"" . htmlspecialchars($pconfig['options']['host']) . "\"";?>size="64"><br /><?=gettext("Hostname for Host: header if needed."); ?>
 						</td>
 					</td>
 					<tr align="left">
@@ -308,7 +308,7 @@ function updateType(t){
 					<tr align="left">
 						<td valign="top"  align="right" class="vtable"><?=gettext("Host"); ?></td>
 						<td class="vtable" colspan="2">
-							<input name="https_options_host" type="text" <?if(isset($pconfig['options']['host'])) echo "value=\"" . htmlspecialchars($pconfig['options']['host']) . "\"";?>size="64"><br/><?=gettext("Hostname for Host: header if needed."); ?>
+							<input name="https_options_host" type="text" <?if(isset($pconfig['options']['host'])) echo "value=\"" . htmlspecialchars($pconfig['options']['host']) . "\"";?>size="64"><br /><?=gettext("Hostname for Host: header if needed."); ?>
 						</td>
 					</td>
 					<tr align="left">
@@ -359,7 +359,7 @@ function updateType(t){
 		</tr>
 	</table>
 	</form>
-<br>
+<br />
 <?php include("fend.inc"); ?>
 </body>
 </html>
diff --git a/usr/local/www/load_balancer_pool.php b/usr/local/www/load_balancer_pool.php
old mode 100755
new mode 100644
index 9c5f179ecc..ee38962161
--- a/usr/local/www/load_balancer_pool.php
+++ b/usr/local/www/load_balancer_pool.php
@@ -106,7 +106,7 @@ include("head.inc");
 <?php if ($input_errors) print_input_errors($input_errors); ?>
 <?php if ($savemsg) print_info_box($savemsg); ?>
 <?php if (is_subsystem_dirty('loadbalancer')): ?><p>
-<?php print_info_box_np(sprintf(gettext("The load balancer configuration has been changed%sYou must apply the changes in order for them to take effect."), "<br>"));?><br>
+<?php print_info_box_np(sprintf(gettext("The load balancer configuration has been changed%sYou must apply the changes in order for them to take effect."), "<br />"));?><br />
 <?php endif; ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
   <tr><td class="tabnavtbl">
@@ -144,7 +144,7 @@ include("head.inc");
     </td>
   </tr>
   <tr><td>
-	<br/><span class="red"><strong><?=gettext("Hint:");?></strong></span><br/>
+	<br /><span class="red"><strong><?=gettext("Hint:");?></strong></span><br />
 	<?= sprintf(gettext("The Load Balancer in %s 2.0 is for server load balancing, not Multi-WAN. For load balancing or failover for multiple WANs, use "), $g['product_name']);?>
 	<a href="/system_gateway_groups.php"><?= gettext("Gateway Groups"); ?></a>
   </td></tr>
diff --git a/usr/local/www/load_balancer_pool_edit.php b/usr/local/www/load_balancer_pool_edit.php
old mode 100755
new mode 100644
index 29f7f198b9..b83ab653d6
--- a/usr/local/www/load_balancer_pool_edit.php
+++ b/usr/local/www/load_balancer_pool_edit.php
@@ -216,7 +216,7 @@ function clearcombo(){
 		<tr align="left">
 			<td width="22%" valign="top" id="monitorport_text" class="vncellreq"><?=gettext("Port"); ?></td>
 			<td width="78%" class="vtable" colspan="2">
-				<input class="formfldalias" id="port" name="port" type="text" <?if(isset($pconfig['port'])) echo "value=\"{$pconfig['port']}\"";?> size="16" maxlength="16"><br>
+				<input class="formfldalias" id="port" name="port" type="text" <?if(isset($pconfig['port'])) echo "value=\"{$pconfig['port']}\"";?> size="16" maxlength="16"><br />
 				<div id="monitorport_desc">
 					<?=gettext("This is the port your servers are listening on."); ?><br />
 					<?=gettext("You may also specify a port alias listed in Firewall -&gt; Aliases here."); ?>
@@ -232,7 +232,7 @@ function clearcombo(){
 		<tr align="left">
 			<td width="22%" valign="top" id="retry_text" class="vncell"><?=gettext("Retry"); ?></td>
 			<td width="78%" class="vtable" colspan="2">
-				<input name="retry" type="text" <?if(isset($pconfig['retry'])) echo "value=\"{$pconfig['retry']}\"";?> size="16" maxlength="16"><br>
+				<input name="retry" type="text" <?if(isset($pconfig['retry'])) echo "value=\"{$pconfig['retry']}\"";?> size="16" maxlength="16"><br />
 				<div id="retry_desc"><?=gettext("Optionally specify how many times to retry checking a server before declaring it down."); ?></div>
 			</td>
 		</tr>
@@ -267,7 +267,7 @@ function clearcombo(){
 			<td width="22%" valign="top" class="vncellreq"><?=gettext("Server IP Address"); ?></td>
 			<td width="78%" class="vtable" colspan="2">
 				<input name="ipaddr" type="text" size="16" style="float: left;"> 
-				<input class="formbtn" type="button" name="button1" value="<?=gettext("Add to pool"); ?>" onclick="AddServerToPool(document.iform); enforceFailover(); checkPoolControls();"><br>
+				<input class="formbtn" type="button" name="button1" value="<?=gettext("Add to pool"); ?>" onclick="AddServerToPool(document.iform); enforceFailover(); checkPoolControls();"><br />
 			</td>
 		</tr>
 		<tr>
@@ -301,7 +301,7 @@ function clearcombo(){
 						</td>
 
 						<td valign="middle">
-							<input class="formbtn" type="button" id="moveToEnabled" name="moveToEnabled" value=">" onclick="moveOptions(document.iform.serversDisabledSelect, document.iform.serversSelect); checkPoolControls();" /><br/>
+							<input class="formbtn" type="button" id="moveToEnabled" name="moveToEnabled" value=">" onclick="moveOptions(document.iform.serversDisabledSelect, document.iform.serversSelect); checkPoolControls();" /><br />
 							<input class="formbtn" type="button" id="moveToDisabled" name="moveToDisabled" value="<" onclick="moveOptions(document.iform.serversSelect, document.iform.serversDisabledSelect); checkPoolControls();" />
 						</td>
 
@@ -330,7 +330,7 @@ echo "</select>";
 		<tr align="left">
 			<td width="22%" valign="top">&nbsp;</td>
 			<td width="78%">
-				<br/>
+				<br />
 				<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" onClick="AllServers('serversSelect', true); AllServers('serversDisabledSelect', true);"> 
 				<input type="button" class="formbtn" value="<?=gettext("Cancel"); ?>" onclick="history.back()">
 				<?php if (isset($id) && $a_pool[$id] && $_GET['act'] != 'dup'): ?>
@@ -340,7 +340,7 @@ echo "</select>";
 		</tr>
 	</table>
 	</form>
-<br>
+<br />
 <?php include("fend.inc"); ?>
 </body>
 </html>
diff --git a/usr/local/www/load_balancer_relay_action.php b/usr/local/www/load_balancer_relay_action.php
old mode 100755
new mode 100644
index 6e0a112c9d..93be17a9aa
--- a/usr/local/www/load_balancer_relay_action.php
+++ b/usr/local/www/load_balancer_relay_action.php
@@ -113,7 +113,7 @@ include("head.inc");
 <?php if ($input_errors) print_input_errors($input_errors); ?>
 <?php if ($savemsg) print_info_box($savemsg); ?>
 <?php if (is_subsystem_dirty('loadbalancer')): ?><p>
-<?php print_info_box_np(gettext("The load balancer configuration has been changed.<br>You must apply the changes in order for them to take effect."));?><br>
+<?php print_info_box_np(gettext("The load balancer configuration has been changed.<br />You must apply the changes in order for them to take effect."));?><br />
 <?php endif; ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
   <tr><td class="tabnavtbl">
diff --git a/usr/local/www/load_balancer_relay_action_edit.php b/usr/local/www/load_balancer_relay_action_edit.php
old mode 100755
new mode 100644
index 51f5245a0b..1c9d82aada
--- a/usr/local/www/load_balancer_relay_action_edit.php
+++ b/usr/local/www/load_balancer_relay_action_edit.php
@@ -498,7 +498,7 @@ jQuery(document).ready(function() {
 	}
 ?>
 				</select>
-<br/>
+<br />
 <table><tr>
 <td><div id="input_action_value"><?=gettext("Value"); ?>&nbsp;<input id="option_action_value" name="option_action_value" type="text" <?if(isset($pconfig['options']['value'])) echo "value=\"{$pconfig['options']['value']}\"";?>size="20"></div></td>
 <td><div id="action_action_value"></div></td>
@@ -559,7 +559,7 @@ jQuery(document).ready(function() {
 		</tr>
 	</table>
 	</form>
-<br>
+<br />
 <?php include("fend.inc"); ?>
 </body>
 </html>
diff --git a/usr/local/www/load_balancer_relay_protocol.php b/usr/local/www/load_balancer_relay_protocol.php
old mode 100755
new mode 100644
index be812ce667..5caabc8d04
--- a/usr/local/www/load_balancer_relay_protocol.php
+++ b/usr/local/www/load_balancer_relay_protocol.php
@@ -109,7 +109,7 @@ include("head.inc");
 <?php if ($input_errors) print_input_errors($input_errors); ?>
 <?php if ($savemsg) print_info_box($savemsg); ?>
 <?php if (is_subsystem_dirty('loadbalancer')): ?><p>
-<?php print_info_box_np(gettext("The load balancer configuration has been changed") . ".<br>" . gettext("You must apply the changes in order for them to take effect."));?><br>
+<?php print_info_box_np(gettext("The load balancer configuration has been changed") . ".<br />" . gettext("You must apply the changes in order for them to take effect."));?><br />
 <?php endif; ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
   <tr><td class="tabnavtbl">
diff --git a/usr/local/www/load_balancer_relay_protocol_edit.php b/usr/local/www/load_balancer_relay_protocol_edit.php
old mode 100755
new mode 100644
index c2593a6ae0..d2ac7b15a7
--- a/usr/local/www/load_balancer_relay_protocol_edit.php
+++ b/usr/local/www/load_balancer_relay_protocol_edit.php
@@ -233,7 +233,7 @@ jQuery(document).ready(function(){
 						<td>
 							<center>
 							<b><?=gettext("Available Actions"); ?></b>
-							<br/>
+							<br />
 							<select id="available_action" name="available_action[]" multiple="true" size="5">
 <?php
 if (is_array($config['load_balancer']['lbaction'])) {
@@ -243,11 +243,11 @@ if (is_array($config['load_balancer']['lbaction'])) {
 }
 echo "</select>";
 ?>
-							<br/>
+							<br />
 						</td>
 						<td valign="middle">
 							<center>
-								<input class="formbtn" type="button" name="copyToEnabled" value="<?=gettext("Add"); ?>" onclick="copyOption($('available_action'), $('lbaction'));" /><br/>
+								<input class="formbtn" type="button" name="copyToEnabled" value="<?=gettext("Add"); ?>" onclick="copyOption($('available_action'), $('lbaction'));" /><br />
 								<input class="formbtn" type="button" name="removeFromEnabled" value="<?=gettext("Remove"); ?>" onclick="deleteOption($('lbaction'));" />
 							</center>
 						</td>
@@ -255,7 +255,7 @@ echo "</select>";
 						<td>
 							<center>
 							<b><?=gettext("Enabled Actions"); ?></b>
-							<br/>
+							<br />
 							<select id="lbaction" name="lbaction[]" multiple="true" size="5">
 <?php
 if (is_array($pconfig['lbaction'])) {
@@ -265,7 +265,7 @@ if (is_array($pconfig['lbaction'])) {
 }
 echo "</select>";
 ?>
-							<br/>
+							<br />
 						</td>
 					</tr>
 					</tbody>
@@ -283,7 +283,7 @@ echo "</select>";
 		</tr>
 	</table>
 	</form>
-<br>
+<br />
 <?php include("fend.inc"); ?>
 </body>
 </html>
diff --git a/usr/local/www/load_balancer_setting.php b/usr/local/www/load_balancer_setting.php
old mode 100755
new mode 100644
index 7085e5a736..18b7d10e67
--- a/usr/local/www/load_balancer_setting.php
+++ b/usr/local/www/load_balancer_setting.php
@@ -107,7 +107,7 @@ include("head.inc");
 <?php if ($input_errors) print_input_errors($input_errors); ?>
 <?php if ($savemsg) print_info_box($savemsg); ?>
 <?php if (is_subsystem_dirty('loadbalancer')): ?><p>
-<?php print_info_box_np(gettext("The load balancer configuration has been changed") . ".<br>" . gettext("You must apply the changes in order for them to take effect."));?><br>
+<?php print_info_box_np(gettext("The load balancer configuration has been changed") . ".<br />" . gettext("You must apply the changes in order for them to take effect."));?><br />
 <?php endif; ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
    <tr>
diff --git a/usr/local/www/load_balancer_virtual_server.php b/usr/local/www/load_balancer_virtual_server.php
old mode 100755
new mode 100644
index 023bbd4dae..5a7ab234ba
--- a/usr/local/www/load_balancer_virtual_server.php
+++ b/usr/local/www/load_balancer_virtual_server.php
@@ -106,7 +106,7 @@ include("head.inc");
 <?php if ($input_errors) print_input_errors($input_errors); ?>
 <?php if ($savemsg) print_info_box($savemsg); ?>
 <?php if (is_subsystem_dirty('loadbalancer')): ?><p>
-<?php print_info_box_np(gettext("The virtual server configuration has been changed") . ".<br>" . gettext("You must apply the changes in order for them to take effect."));?><br>
+<?php print_info_box_np(gettext("The virtual server configuration has been changed") . ".<br />" . gettext("You must apply the changes in order for them to take effect."));?><br />
 <?php endif; ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
   <tr><td class="tabnavtbl">
diff --git a/usr/local/www/load_balancer_virtual_server_edit.php b/usr/local/www/load_balancer_virtual_server_edit.php
old mode 100755
new mode 100644
index a3263702e9..a29b841c25
--- a/usr/local/www/load_balancer_virtual_server_edit.php
+++ b/usr/local/www/load_balancer_virtual_server_edit.php
@@ -174,8 +174,8 @@ include("head.inc");
 		  			<td width="22%" valign="top" class="vncellreq"><?=gettext("IP Address"); ?></td>
                   <td width="78%" class="vtable" colspan="2">
                     <input class="formfldalias" id="ipaddr" name="ipaddr" type="text" <?if(isset($pconfig['ipaddr'])) echo "value=\"" . htmlspecialchars($pconfig['ipaddr']) . "\"";?> size="39" maxlength="39">
-					<br><?=gettext("This is normally the WAN IP address that you would like the server to listen on.  All connections to this IP and port will be forwarded to the pool cluster."); ?>
-					<br><?=gettext("You may also specify a host alias listed in Firewall -&gt; Aliases here."); ?>
+					<br /><?=gettext("This is normally the WAN IP address that you would like the server to listen on.  All connections to this IP and port will be forwarded to the pool cluster."); ?>
+					<br /><?=gettext("You may also specify a host alias listed in Firewall -&gt; Aliases here."); ?>
 					<script type="text/javascript">
 					//<![CDATA[
 						var host_aliases = <?= json_encode(get_alias_list(array("host", "network", "url", "urltable"))) ?>;
@@ -188,9 +188,9 @@ include("head.inc");
 		  			<td width="22%" valign="top" class="vncell"><?=gettext("Port"); ?></td>
                   <td width="78%" class="vtable" colspan="2">
                     <input class="formfldalias" name="port" id="port" type="text" <?if(isset($pconfig['port'])) echo "value=\"" . htmlspecialchars($pconfig['port']) . "\"";?> size="16" maxlength="16">
-					<br><?=gettext("This is the port that the clients will connect to.  All connections to this port will be forwarded to the pool cluster."); ?>
-					<br><?=gettext("If left blank, listening ports from the pool will be used."); ?>
-					<br><?=gettext("You may also specify a port alias listed in Firewall -&gt; Aliases here."); ?>
+					<br /><?=gettext("This is the port that the clients will connect to.  All connections to this port will be forwarded to the pool cluster."); ?>
+					<br /><?=gettext("If left blank, listening ports from the pool will be used."); ?>
+					<br /><?=gettext("You may also specify a port alias listed in Firewall -&gt; Aliases here."); ?>
 					<script type="text/javascript">
 					//<![CDATA[
 						var port_aliases = <?= json_encode(get_alias_list(array("port", "url_ports", "urltable_ports"))) ?>;
@@ -235,8 +235,8 @@ include("head.inc");
             				}
             			?>
             			</select>
-				<br><?=gettext("The server pool to which clients will be redirected if *ALL* servers in the Virtual Server Pool are offline."); ?>
-				<br><?=gettext("This option is NOT compatible with the DNS relay protocol."); ?>
+				<br /><?=gettext("The server pool to which clients will be redirected if *ALL* servers in the Virtual Server Pool are offline."); ?>
+				<br /><?=gettext("This option is NOT compatible with the DNS relay protocol."); ?>
 				  <?php endif; ?>
                   </td>
 				</tr>
@@ -248,7 +248,7 @@ include("head.inc");
                     <input id="redirect_mode" type="radio" name="mode" value="redirect"<?=htmlspecialchars($pconfig['mode']) == 'redirect' ? ' checked="checked"': ''?>> Redirect
                     <input id="relay_mode" type="radio" name="mode" value="relay"<?=htmlspecialchars($pconfig['mode']) == 'relay' ? ' checked="checked"': ''?>> Relay
 
-                  <br>
+                  <br />
                   </td>
 				</tr>
 -->
@@ -266,7 +266,7 @@ include("head.inc");
 				}
 			?>
 			</select>
-			<br>
+			<br />
 			</td>
 		</tr>
                 <tr align="left">
@@ -280,7 +280,7 @@ include("head.inc");
 			</tr>
 		</table>
 	</form>
-	<br/>
+	<br />
 	<span class="red"><strong><?=gettext("Note:"); ?></strong></span> <?=gettext("Don't forget to add a firewall rule for the virtual server/pool after you're finished setting it up."); ?>
 <?php include("fend.inc"); ?>
 </body>
diff --git a/usr/local/www/pkg_edit.php b/usr/local/www/pkg_edit.php
old mode 100755
new mode 100644
index 99e64f83fe..4c5e8f79cd
--- a/usr/local/www/pkg_edit.php
+++ b/usr/local/www/pkg_edit.php
@@ -430,7 +430,7 @@ if ($pkg['tabs'] <> "") {
 	if ($pkg['advanced_options'] == "enabled") {
 		$adv_filed_count = 0;
 		$advanced = "<td>&nbsp;</td>";
-		$advanced .= "<tr><td colspan=\"2\" class=\"listtopic\">". gettext("Advanced features") . "<br/></td></tr>\n";
+		$advanced .= "<tr><td colspan=\"2\" class=\"listtopic\">". gettext("Advanced features") . "<br /></td></tr>\n";
 		}		
 	foreach ($pkg['fields']['field'] as $pkga) {
 		if ($pkga['type'] == "sorting") 
@@ -438,7 +438,7 @@ if ($pkg['tabs'] <> "") {
 
 		if ($pkga['type'] == "listtopic") {
 			$input = "<tr id='td_{$pkga['fieldname']}'><td>&nbsp;</td></tr>";
-			$input .= "<tr id='tr_{$pkga['fieldname']}'><td colspan=\"2\" class=\"listtopic\">{$pkga['name']}<br/></td></tr>\n";
+			$input .= "<tr id='tr_{$pkga['fieldname']}'><td colspan=\"2\" class=\"listtopic\">{$pkga['name']}<br /></td></tr>\n";
 			if(isset($pkga['advancedfield']) && isset($adv_filed_count)) {
 				$advanced .= $input;
 				$adv_filed_count++;
@@ -520,7 +520,7 @@ if ($pkg['tabs'] <> "") {
 			case "input":
 				$size = ($pkga['size'] ? " size='{$pkga['size']}' " : "");
 				$input = "<input {$size} id='{$pkga['fieldname']}' name='{$pkga['fieldname']}' class='formfld unknown' value=\"" . htmlspecialchars($value) ."\" />\n";
-				$input .= "<br/>" . fixup_string($pkga['description']) . "\n";
+				$input .= "<br />" . fixup_string($pkga['description']) . "\n";
 				if(isset($pkga['advancedfield']) && isset($adv_filed_count)) {
 					$js_array[] = $pkga['fieldname'];
 					$advanced .= display_advanced_field($pkga['fieldname']).$input ."</div>\n";
@@ -532,7 +532,7 @@ if ($pkg['tabs'] <> "") {
 			case "password":
 				$size = ($pkga['size'] ? " size='{$pkga['size']}' " : "");
 				$input = "<input " . $size . " id='" . $pkga['fieldname'] . "' type='password' name='" . $pkga['fieldname'] . "' class='formfld pwd' value=\"" . htmlspecialchars($value) . "\" />\n";
-				$input .= "<br/>" . fixup_string($pkga['description']) . "\n";
+				$input .= "<br />" . fixup_string($pkga['description']) . "\n";
 				if(isset($pkga['advancedfield']) && isset($adv_filed_count)) {
 					$js_array[] = $pkga['fieldname'];
 					$advanced .= display_advanced_field($pkga['fieldname']).$input ."</div>\n";
@@ -626,7 +626,7 @@ if ($pkg['tabs'] <> "") {
 					$input .= "\t<option value=\"{$vpn['descr']}\">{$vpn['descr']}</option>\n";
 					}
 				$input .= "</select>\n";
-				$input .= "<br/>" . fixup_string($pkga['description']) . "\n";
+				$input .= "<br />" . fixup_string($pkga['description']) . "\n";
 
 				if(isset($pkga['advancedfield']) && isset($adv_filed_count)) {
 					$js_array[] = $pkga['fieldname'];
@@ -643,7 +643,7 @@ if ($pkg['tabs'] <> "") {
 				if (isset($pkga['enablefields']) || isset($pkga['checkenablefields']))
 					$onclick = ' onclick="javascript:enablechange();"';
 				$input = "<input id='{$pkga['fieldname']}' type='checkbox' name='{$pkga['fieldname']}' {$checkboxchecked} {$onclick} {$onchange} />\n";
-				$input .= "<br/>" . fixup_string($pkga['description']) . "\n";
+				$input .= "<br />" . fixup_string($pkga['description']) . "\n";
 
 				if(isset($pkga['advancedfield']) && isset($adv_filed_count)) {
 					$js_array[] = $pkga['fieldname'];
@@ -663,7 +663,7 @@ if ($pkg['tabs'] <> "") {
 					$value = base64_decode($value);
 				$wrap =($pkga['wrap'] == "off" ? 'wrap="off" style="white-space:nowrap;"' : '');		  
 				$input = "<textarea {$rows} {$cols} name='{$pkga['fieldname']}'{$wrap}>{$value}</textarea>\n";
-				$input .= "<br/>" . fixup_string($pkga['description']) . "\n";
+				$input .= "<br />" . fixup_string($pkga['description']) . "\n";
 				if(isset($pkga['advancedfield']) && isset($adv_filed_count)) {
 					$js_array[] = $pkga['fieldname'];
 					$advanced .= display_advanced_field($pkga['fieldname']).$input;
@@ -793,7 +793,7 @@ if ($pkg['tabs'] <> "") {
 				if(isset($pkga['placeonbottom']))
 					$pkg_buttons .= $input;
 				else
-					echo $input ."\n<br/>" . fixup_string($pkga['description']) . "\n";;
+					echo $input ."\n<br />" . fixup_string($pkga['description']) . "\n";;
 				break;
 
 			case "rowhelper":
@@ -868,9 +868,9 @@ if ($pkg['tabs'] <> "") {
 				<tbody></tbody>
 				</table>
 	
-				<!-- <br/><a onclick="javascript:addRowTo('maintable'); return false;" href="#"><img border="0" src="./themes/<?#= $g['theme']; ?>/images/icons/icon_plus.gif" alt="add" /></a>-->
-				<br/><a class="add" href="#"><img border="0" src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" alt="add" /></a>
-				<br/><?php if($pkga['description'] != "") echo $pkga['description']; ?>
+				<!-- <br /><a onclick="javascript:addRowTo('maintable'); return false;" href="#"><img border="0" src="./themes/<?#= $g['theme']; ?>/images/icons/icon_plus.gif" alt="add" /></a>-->
+				<br /><a class="add" href="#"><img border="0" src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" alt="add" /></a>
+				<br /><?php if($pkga['description'] != "") echo $pkga['description']; ?>
 				<script type="text/javascript">
 				//<![CDATA[
 				field_counter_js = <?= $fieldcounter ?>;
@@ -896,7 +896,7 @@ if ($pkg['tabs'] <> "") {
      	else{
 			$input= "</td></tr>";
 			if($pkga['usecolspan2'])
-				$input.= "</tr><br/>";
+				$input.= "</tr><br />";
 	     	}
    	 	if(isset($pkga['advancedfield']) && isset($adv_filed_count))
 			$advanced .= "{$input}\n";
diff --git a/usr/local/www/pkg_mgr.php b/usr/local/www/pkg_mgr.php
old mode 100755
new mode 100644
index dea82b8cea..d9b0c78ce4
--- a/usr/local/www/pkg_mgr.php
+++ b/usr/local/www/pkg_mgr.php
@@ -231,16 +231,16 @@ include("head.inc");
 							print ">\n";
 						}
 
-						print "{$index['status']} <br>\n";
+						print "{$index['status']} <br />\n";
 
 						if ($g['disablepackagehistory'])
 							echo"<a>{$index['version']}</a>";
 						else
 							echo "<a target='_blank' href='{$changeloglink}'>{$index['version']}</a>";
 ?>
-						<br/>
+						<br />
 						<?=gettext("platform") .": ". $index['required_version'] ?>
-						<br/>
+						<br />
 						<?=$index['maximum_version'] ?>
 						</td>
 						<td class="listbg" style="overflow:hidden; text-align:justify;" <?=domTT_title(gettext("Click package info for more details about ".ucfirst($index['name'])." package."))?>>
@@ -248,7 +248,7 @@ include("head.inc");
 <?php
 						if (! $g['disablepackageinfo']):
 ?>
-							<br/><br/>
+							<br /><br />
 							<a target='_blank' href='<?=$pkginfolink?>' style='align:center;color:#ffffff; filter:Glow(color=#ff0000, strength=12);'><?=$pkginfo?></a>
 <?php
 						endif;
diff --git a/usr/local/www/pkg_mgr_install.php b/usr/local/www/pkg_mgr_install.php
old mode 100755
new mode 100644
index 79bb9f2b23..dcd5cd13db
--- a/usr/local/www/pkg_mgr_install.php
+++ b/usr/local/www/pkg_mgr_install.php
@@ -127,8 +127,8 @@ if ($_POST) {
 					<td class="tabcont" align="center">
 						<table style="height:15;colspacing:0" width="420" border="0" cellpadding="0" cellspacing="0" summary="images">
 							<tr>
-								<td class="tabcont" align="center">Package:<b><?=$pkgname;?></b> will be <?=$pkgtxt;?>.<br/>
-								Please confirm the action on this package.<br/>
+								<td class="tabcont" align="center">Package:<b><?=$pkgname;?></b> will be <?=$pkgtxt;?>.<br />
+								Please confirm the action on this package.<br />
 								</td>
 								<td class="tabcont" align="center">
 									<input type="hidden" name="id" value="<?=$pkgname;?>" />
@@ -157,7 +157,7 @@ if ($_POST) {
 								</td>
 							</tr>
 						</table>
-						<br/>
+						<br />
 						<!-- status box -->
 						<textarea cols="80" rows="1" name="status" id="status" wrap="hard"><?=gettext("Beginning package installation.");?></textarea>
 						<!-- command output box -->
diff --git a/usr/local/www/pkg_mgr_installed.php b/usr/local/www/pkg_mgr_installed.php
old mode 100755
new mode 100644
index 1308213d83..a9d3f357e1
--- a/usr/local/www/pkg_mgr_installed.php
+++ b/usr/local/www/pkg_mgr_installed.php
@@ -141,18 +141,18 @@ include("head.inc");
 										if(strcmp($pkg['version'], $latest_package) > 0) {
 											$tdclass = "listbggrey";
 											if ($g['disablepackagehistory'])
-												$pkgver  = "<a>".gettext("Available") .": ". $latest_package . "<br/>";
+												$pkgver  = "<a>".gettext("Available") .": ". $latest_package . "<br />";
 											else
-												$pkgver  = "<a target='_blank' href='$changeloglink'>".gettext("Available") .": ". $latest_package . "<br/>";
+												$pkgver  = "<a target='_blank' href='$changeloglink'>".gettext("Available") .": ". $latest_package . "<br />";
 											$pkgver .= gettext("Installed") .": ". $pkg['version']. "</a>";
 										}
 										// we're running an older version of the package
 										if(strcmp($pkg['version'], $latest_package) < 0) {
 											$tdclass = "listbg";
 											if ($g['disablepackagehistory'])
-												$pkgver  = "<a><font color='#ffffff'>" . gettext("Available") .": ". $latest_package . "</font><br/>";
+												$pkgver  = "<a><font color='#ffffff'>" . gettext("Available") .": ". $latest_package . "</font><br />";
 											else
-												$pkgver  = "<a target='_blank' href='$changeloglink'><font color='#ffffff'>" . gettext("Available") .": ". $latest_package . "<br/>";
+												$pkgver  = "<a target='_blank' href='$changeloglink'><font color='#ffffff'>" . gettext("Available") .": ". $latest_package . "<br />";
 											$pkgver .= gettext("Installed") .": ". $pkg['version']."</font></a>";
 										}
 										// we're running the current version
@@ -201,7 +201,7 @@ include("head.inc");
 							<td class="listbg" style="overflow:hidden; text-align:justify;" <?=domTT_title(gettext("Click package info for more details about ".ucfirst($pkg['name'])." package."))?>>
 									<?=$currentvers[$pkg['name']]['descr'];?>
 							<?php if (! $g['disablepackageinfo']): ?>
-							<br/><br/>
+							<br /><br />
 							<a target='_blank' href='<?=$pkginfolink?>' style='align:center;color:#ffffff; filter:Glow(color=#ff0000, strength=12);'><?=$pkginfo?></a>
 							<?php endif; ?>
 							</td>
@@ -209,7 +209,7 @@ include("head.inc");
 								<a href="pkg_mgr_install.php?mode=delete&amp;pkg=<?= $pkg['name']; ?>">
 									<img <?=domTT_title(gettext("Remove ".ucfirst($pkg['name'])." package."))?> src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="delete" />
 								</a>
-								<br/>
+								<br />
 								<a href="pkg_mgr_install.php?mode=reinstallpkg&amp;pkg=<?= $pkg['name']; ?>">
 									<img <?=domTT_title(gettext("Reinstall ".ucfirst($pkg['name'])." package."));?> src="./themes/<?= $g['theme']; ?>/images/icons/icon_reinstall_pkg.gif" width="17" height="17" border="0" alt="reinstall" />
 								</a>
diff --git a/usr/local/www/pkg_mgr_settings.php b/usr/local/www/pkg_mgr_settings.php
index 7e6c3e7b5e..ef655b56ab 100644
--- a/usr/local/www/pkg_mgr_settings.php
+++ b/usr/local/www/pkg_mgr_settings.php
@@ -103,7 +103,7 @@ function enable_altpkgrepourl(enable_over) {
 	<tr>
 		<td valign="top" class="vncell"><?=gettext("Package Repository URL");?></td>
 		<td class="vtable">
-			<input name="alturlenable" type="checkbox" id="alturlenable" value="yes" onclick="enable_altpkgrepourl()" <?php if(isset($curcfg['enable'])) echo "checked=\"checked\""; ?> /> <?=gettext("Use a non-official server for packages");?> <br/>
+			<input name="alturlenable" type="checkbox" id="alturlenable" value="yes" onclick="enable_altpkgrepourl()" <?php if(isset($curcfg['enable'])) echo "checked=\"checked\""; ?> /> <?=gettext("Use a non-official server for packages");?> <br />
 			<table summary="alternative URL">
 			<tr><td><?=gettext("Base URL:");?></td><td><input name="pkgrepourl" type="text" class="formfld url" id="pkgrepourl" size="64" value="<?php if($curcfg['xmlrpcbaseurl']) echo $curcfg['xmlrpcbaseurl']; else echo $g['']; ?>" /></td></tr>
 			</table>
diff --git a/usr/local/www/restart_httpd.php b/usr/local/www/restart_httpd.php
old mode 100755
new mode 100644
index b037ac5806..b8600668fc
--- a/usr/local/www/restart_httpd.php
+++ b/usr/local/www/restart_httpd.php
@@ -49,16 +49,16 @@ include("head.inc");
 
 <?=gettext("Mounting file systems read/write");?>...
 <?php flush(); sleep(1); conf_mount_rw(); ?>
-<?=gettext("Done");?>.<br>
+<?=gettext("Done");?>.<br />
 <?=gettext("Forcing all PHP file permissions to 0755");?>...
 <?php flush(); sleep(1); system('/bin/chmod -R 0755 /usr/local/www/*.php'); ?>
-<?=gettext("Done");?>.<br>
+<?=gettext("Done");?>.<br />
 <?=gettext("Mounting file systems read only");?>...
 <?php flush(); sleep(1); conf_mount_ro(); ?>
-<?=gettext("Done");?>.<br>
+<?=gettext("Done");?>.<br />
 <?=gettext("Restarting mini_httpd");?>...
 <?php flush(); sleep(1); system_webgui_start(); ?>
-<?=gettext("Done");?>.<br>
+<?=gettext("Done");?>.<br />
 
 <?php
 include("fend.inc");
diff --git a/usr/local/www/services_captiveportal.php b/usr/local/www/services_captiveportal.php
old mode 100755
new mode 100644
index ade0b8f77c..b0d8abd31f
--- a/usr/local/www/services_captiveportal.php
+++ b/usr/local/www/services_captiveportal.php
@@ -525,7 +525,7 @@ function enable_change(enable_change) {
 			  <?=htmlspecialchars($ifacename);?>
 			  </option>
 		  <?php endforeach; ?>
-		</select> <br>
+		</select> <br />
 		<span class="vexpl"><?=gettext("Select the interface(s) to enable for captive portal."); ?></span></td>
 	</tr>
 	<tr>
@@ -544,48 +544,48 @@ function enable_change(enable_change) {
 	  <td valign="top" class="vncell"><?=gettext("Idle timeout"); ?></td>
 	  <td class="vtable">
 		<input name="idletimeout" type="text" class="formfld unknown" id="idletimeout" size="6" value="<?=htmlspecialchars($pconfig['idletimeout']);?>">
-<?=gettext("minutes"); ?><br>
+<?=gettext("minutes"); ?><br />
 <?=gettext("Clients will be disconnected after this amount of inactivity. They may log in again immediately, though. Leave this field blank for no idle timeout."); ?></td>
 	</tr>
 	<tr>
 	  <td width="22%" valign="top" class="vncell"><?=gettext("Hard timeout"); ?></td>
 	  <td width="78%" class="vtable">
 		<input name="timeout" type="text" class="formfld unknown" id="timeout" size="6" value="<?=htmlspecialchars($pconfig['timeout']);?>">
-		<?=gettext("minutes"); ?><br>
+		<?=gettext("minutes"); ?><br />
 	  <?=gettext("Clients will be disconnected after this amount of time, regardless of activity. They may log in again immediately, though. Leave this field blank for no hard timeout (not recommended unless an idle timeout is set)."); ?></td>
 	</tr>
 	<tr>
 	  <td width="22%" valign="top" class="vncell"><?=gettext("Pass-through credits allowed per MAC address"); ?></td>
 	  <td width="78%" class="vtable">
 		<input name="freelogins_count" type="text" class="formfld unknown" id="freelogins_count" size="6" value="<?=htmlspecialchars($pconfig['freelogins_count']);?>">
-		<?=gettext("per client MAC address (0 or blank = none)"); ?><br>
+		<?=gettext("per client MAC address (0 or blank = none)"); ?><br />
 		<?=gettext("This setting allows passing through the captive portal without authentication a limited number of times per MAC address. Once used up, the client can only log in with valid credentials until the waiting period specified below has expired. Recommended to set a hard timeout and/or idle timeout when using this for it to be effective."); ?></td>
 	</tr>
 	<tr>
 	  <td width="22%" valign="top" class="vncell"><?=gettext("Waiting period to restore pass-through credits"); ?></td>
 	  <td width="78%" class="vtable">
 		<input name="freelogins_resettimeout" type="text" class="formfld unknown" id="freelogins_resettimeout" size="6" value="<?=htmlspecialchars($pconfig['freelogins_resettimeout']);?>">
-		<?=gettext("hours"); ?><br>
+		<?=gettext("hours"); ?><br />
 		<?=gettext("Clients will have their available pass-through credits restored to the original count after this amount of time since using the first one. This must be above 0 hours if pass-through credits are enabled."); ?></td>
 	</tr>
 	<tr>
 	  <td width="22%" valign="top" class="vncell"><?=gettext("Reset waiting period on attempted access"); ?></td>
 	  <td width="78%" class="vtable">
 		<input name="freelogins_updatetimeouts" type="checkbox" class="formfld" id="freelogins_updatetimeouts" value="yes" <?php if($pconfig['freelogins_updatetimeouts']) echo "checked"; ?>>
-		<strong><?=gettext("Enable waiting period reset on attempted access"); ?></strong><br>
+		<strong><?=gettext("Enable waiting period reset on attempted access"); ?></strong><br />
 		<?=gettext("If enabled, the waiting period is reset to the original duration if access is attempted when all pass-through credits have already been exhausted."); ?></td>
 	</tr>
 	<tr>
 	  <td width="22%" valign="top" class="vncell"><?=gettext("Logout popup window"); ?></td>
 	  <td width="78%" class="vtable">
 		<input name="logoutwin_enable" type="checkbox" class="formfld" id="logoutwin_enable" value="yes" <?php if($pconfig['logoutwin_enable']) echo "checked"; ?>>
-		<strong><?=gettext("Enable logout popup window"); ?></strong><br>
+		<strong><?=gettext("Enable logout popup window"); ?></strong><br />
 	  <?=gettext("If enabled, a popup window will appear when clients are allowed through the captive portal. This allows clients to explicitly disconnect themselves before the idle or hard timeout occurs."); ?></td>
 	</tr>
 	<tr>
       <td valign="top" class="vncell"><?=gettext("Pre-authentication redirect URL"); ?> </td>
       <td class="vtable">
-        <input name="preauthurl" type="text" class="formfld url" id="preauthurl" size="60" value="<?=htmlspecialchars($pconfig['preauthurl']);?>"><br>
+        <input name="preauthurl" type="text" class="formfld url" id="preauthurl" size="60" value="<?=htmlspecialchars($pconfig['preauthurl']);?>"><br />
 		<?php printf(gettext("Use this field to set \$PORTAL_REDIRURL\$ variable which can be accessed using your custom captive portal index.php page or error pages."));?>
 	  </td>
 	</tr>
@@ -593,14 +593,14 @@ function enable_change(enable_change) {
 	  <td valign="top" class="vncell"><?=gettext("After authentication Redirection URL"); ?></td>
 	  <td class="vtable">
 		<input name="redirurl" type="text" class="formfld url" id="redirurl" size="60" value="<?=htmlspecialchars($pconfig['redirurl']);?>">
-		<br>
+		<br />
 <?=gettext("If you provide a URL here, clients will be redirected to that URL instead of the one they initially tried " .
 "to access after they've authenticated."); ?></td>
 	</tr>
 	<tr>
 		<td valign="top" class="vncell"><?=gettext("Blocked MAC address redirect URL"); ?> </td>
 		<td class="vtable">
-			<input name="blockedmacsurl" type="text" class="formfld url" id="blockedmacsurl" size="60" value="<?=htmlspecialchars($pconfig['blockedmacsurl']);?>"><br>
+			<input name="blockedmacsurl" type="text" class="formfld url" id="blockedmacsurl" size="60" value="<?=htmlspecialchars($pconfig['blockedmacsurl']);?>"><br />
 			<?php printf(gettext("If you provide a URL here, MAC addresses set to be blocked will be redirect to that URL when attempt to access anything."));?>
 		</td>
 	</tr>
@@ -608,14 +608,14 @@ function enable_change(enable_change) {
       <td valign="top" class="vncell"><?=gettext("Concurrent user logins"); ?></td>
       <td class="vtable">
 	<input name="noconcurrentlogins" type="checkbox" class="formfld" id="noconcurrentlogins" value="yes" <?php if ($pconfig['noconcurrentlogins']) echo "checked"; ?>>
-	<strong><?=gettext("Disable concurrent logins"); ?></strong><br>
+	<strong><?=gettext("Disable concurrent logins"); ?></strong><br />
 	<?=gettext("If this option is set, only the most recent login per username will be active. Subsequent logins will cause machines previously logged in with the same username to be disconnected."); ?></td>
 	</tr>
 	<tr>
       <td valign="top" class="vncell"><?=gettext("MAC filtering"); ?> </td>
       <td class="vtable">
         <input name="nomacfilter" type="checkbox" class="formfld" id="nomacfilter" value="yes" <?php if ($pconfig['nomacfilter']) echo "checked"; ?>>
-        <strong><?=gettext("Disable MAC filtering"); ?></strong><br>
+        <strong><?=gettext("Disable MAC filtering"); ?></strong><br />
     <?=gettext("If this option is set, no attempts will be made to ensure that the MAC address of clients stays the same while they're logged in." .
     "This is required when the MAC address of the client cannot be determined (usually because there are routers between"); ?> <?php echo $g['product_name'] ?> <?=gettext("and the clients)."); ?>
     <?=gettext("If this is enabled, RADIUS MAC authentication cannot be used."); ?></td>
@@ -624,13 +624,13 @@ function enable_change(enable_change) {
       <td valign="top" class="vncell"><?=gettext("Pass-through MAC Auto Entry"); ?></td>
       <td class="vtable">
         <input name="passthrumacadd" type="checkbox" class="formfld" id="passthrumacadd" value="yes" <?php if ($pconfig['passthrumacadd']) echo "checked"; ?>>
-        <strong><?=gettext("Enable Pass-through MAC automatic additions"); ?></strong><br>
+        <strong><?=gettext("Enable Pass-through MAC automatic additions"); ?></strong><br />
     <?=gettext("If this option is set, a MAC passthrough entry is automatically added after the user has successfully authenticated. Users of that MAC address will never have to authenticate again."); ?>
     <?=gettext("To remove the passthrough MAC entry you either have to log in and remove it manually from the"); ?> <a href="services_captiveportal_mac.php"><?=gettext("MAC tab"); ?></a> <?=gettext("or send a POST from another system to remove it."); ?>
     <?=gettext("If this is enabled, RADIUS MAC authentication cannot be used. Also, the logout window will not be shown."); ?>
-	<br/><br/>
+	<br /><br />
         <input name="passthrumacaddusername" type="checkbox" class="formfld" id="passthrumacaddusername" value="yes" <?php if ($pconfig['passthrumacaddusername']) echo "checked"; ?>>
-        <strong><?=gettext("Enable Pass-through MAC automatic addition with username"); ?></strong><br>
+        <strong><?=gettext("Enable Pass-through MAC automatic addition with username"); ?></strong><br />
     <?=gettext("If this option is set, with the automatically MAC passthrough entry created the username, used during authentication, will be saved."); ?>
     <?=gettext("To remove the passthrough MAC entry you either have to log in and remove it manually from the"); ?> <a href="services_captiveportal_mac.php"><?=gettext("MAC tab"); ?></a> <?=gettext("or send a POST from another system to remove it."); ?>
 	</td>
@@ -639,7 +639,7 @@ function enable_change(enable_change) {
       <td valign="top" class="vncell"><?=gettext("Per-user bandwidth restriction"); ?></td>
       <td class="vtable">
         <input name="peruserbw" type="checkbox" class="formfld" id="peruserbw" value="yes" <?php if ($pconfig['peruserbw']) echo "checked"; ?>>
-        <strong><?=gettext("Enable per-user bandwidth restriction"); ?></strong><br><br>
+        <strong><?=gettext("Enable per-user bandwidth restriction"); ?></strong><br /><br />
         <table cellpadding="0" cellspacing="0">
         <tr>
         <td><?=gettext("Default download"); ?></td>
@@ -649,7 +649,7 @@ function enable_change(enable_change) {
         <td><?=gettext("Default upload"); ?></td>
         <td><input type="text" class="formfld unknown" name="bwdefaultup" id="bwdefaultup" size="10" value="<?=htmlspecialchars($pconfig['bwdefaultup']);?>"> <?=gettext("Kbit/s"); ?></td>
         </tr></table>
-        <br>
+        <br />
         <?=gettext("If this option is set, the captive portal will restrict each user who logs in to the specified default bandwidth. RADIUS can override the default settings. Leave empty or set to 0 for no limit."); ?> </td>
 	</tr>
 	<tr>
@@ -716,17 +716,17 @@ function enable_change(enable_change) {
 			</tr>
 			<tr>
 				<td class="vncell" valign="top"><?=gettext("IP address"); ?></td>
-				<td class="vtable"><input name="radiusip" type="text" class="formfld unknown" id="radiusip" size="20" value="<?=htmlspecialchars($pconfig['radiusip']);?>"><br>
+				<td class="vtable"><input name="radiusip" type="text" class="formfld unknown" id="radiusip" size="20" value="<?=htmlspecialchars($pconfig['radiusip']);?>"><br />
 				<?=gettext("Enter the IP address of the RADIUS server which users of the captive portal have to authenticate against."); ?></td>
 			</tr>
 			<tr>
 				<td class="vncell" valign="top"><?=gettext("Port"); ?></td>
-				<td class="vtable"><input name="radiusport" type="text" class="formfld unknown" id="radiusport" size="5" value="<?=htmlspecialchars($pconfig['radiusport']);?>"><br>
+				<td class="vtable"><input name="radiusport" type="text" class="formfld unknown" id="radiusport" size="5" value="<?=htmlspecialchars($pconfig['radiusport']);?>"><br />
 				 <?=gettext("Leave this field blank to use the default port (1812)."); ?></td>
 			</tr>
 			<tr>
 				<td class="vncell" valign="top"><?=gettext("Shared secret"); ?>&nbsp;&nbsp;</td>
-				<td class="vtable"><input name="radiuskey" type="text" class="formfld unknown" id="radiuskey" size="16" value="<?=htmlspecialchars($pconfig['radiuskey']);?>"><br>
+				<td class="vtable"><input name="radiuskey" type="text" class="formfld unknown" id="radiuskey" size="16" value="<?=htmlspecialchars($pconfig['radiuskey']);?>"><br />
 				<?=gettext("Leave this field blank to not use a RADIUS shared secret (not recommended)."); ?></td>
 			</tr>
 			<tr>
@@ -737,7 +737,7 @@ function enable_change(enable_change) {
 			</tr>
 			<tr>
 				<td class="vncell" valign="top"><?=gettext("IP address"); ?></td>
-				<td class="vtable"><input name="radiusip2" type="text" class="formfld unknown" id="radiusip2" size="20" value="<?=htmlspecialchars($pconfig['radiusip2']);?>"><br>
+				<td class="vtable"><input name="radiusip2" type="text" class="formfld unknown" id="radiusip2" size="20" value="<?=htmlspecialchars($pconfig['radiusip2']);?>"><br />
 				<?=gettext("If you have a second RADIUS server, you can activate it by entering its IP address here."); ?></td>
 			</tr>
 			<tr>
@@ -759,7 +759,7 @@ function enable_change(enable_change) {
 			</tr>
 			<tr>
 				<td class="vncell" valign="top"><?=gettext("IP address"); ?></td>
-				<td class="vtable"><input name="radiusip3" type="text" class="formfld unknown" id="radiusip3" size="20" value="<?=htmlspecialchars($pconfig['radiusip3']);?>"><br>
+				<td class="vtable"><input name="radiusip3" type="text" class="formfld unknown" id="radiusip3" size="20" value="<?=htmlspecialchars($pconfig['radiusip3']);?>"><br />
 				<?=gettext("If you have a third RADIUS server, you can activate it by entering its IP address here."); ?></td>
 			</tr>
 			<tr>
@@ -778,7 +778,7 @@ function enable_change(enable_change) {
 			</tr>
 			<tr>
 				<td class="vncell" valign="top"><?=gettext("IP address"); ?></td>
-				<td class="vtable"><input name="radiusip4" type="text" class="formfld unknown" id="radiusip4" size="20" value="<?=htmlspecialchars($pconfig['radiusip4']);?>"><br>
+				<td class="vtable"><input name="radiusip4" type="text" class="formfld unknown" id="radiusip4" size="20" value="<?=htmlspecialchars($pconfig['radiusip4']);?>"><br />
 				<?=gettext("If you have a fourth RADIUS server, you can activate it by entering its IP address here."); ?></td>
 			</tr>
 			<tr>
@@ -798,12 +798,12 @@ function enable_change(enable_change) {
 			<tr>
 				<td class="vncell">&nbsp;</td>
 				<td class="vtable"><input name="radacct_enable" type="checkbox" id="radacct_enable" value="yes" onClick="enable_change(false)" <?php if($pconfig['radacct_enable']) echo "checked"; ?>>
-				<strong><?=gettext("send RADIUS accounting packets"); ?></strong><br>
+				<strong><?=gettext("send RADIUS accounting packets"); ?></strong><br />
 				<?=gettext("If this is enabled, RADIUS accounting packets will be sent to the primary RADIUS server."); ?></td>
 			</tr>
 			<tr>
 			  <td class="vncell" valign="top"><?=gettext("Accounting port"); ?></td>
-			  <td class="vtable"><input name="radiusacctport" type="text" class="formfld unknown" id="radiusacctport" size="5" value="<?=htmlspecialchars($pconfig['radiusacctport']);?>"><br>
+			  <td class="vtable"><input name="radiusacctport" type="text" class="formfld unknown" id="radiusacctport" size="5" value="<?=htmlspecialchars($pconfig['radiusacctport']);?>"><br />
 			  <?=gettext("Leave blank to use the default port (1813)."); ?></td>
 			  </tr>
 			<tr>
@@ -812,8 +812,8 @@ function enable_change(enable_change) {
 			<tr>
 			  <td class="vncell" valign="top"><?=gettext("Accounting updates"); ?></td>
 			  <td class="vtable">
-			  <input name="reauthenticateacct" type="radio" value="" <?php if(!$pconfig['reauthenticateacct']) echo "checked"; ?>> <?=gettext("no accounting updates"); ?><br>
-			  <input name="reauthenticateacct" type="radio" value="stopstart" <?php if($pconfig['reauthenticateacct'] == "stopstart") echo "checked"; ?>> <?=gettext("stop/start accounting"); ?><br>
+			  <input name="reauthenticateacct" type="radio" value="" <?php if(!$pconfig['reauthenticateacct']) echo "checked"; ?>> <?=gettext("no accounting updates"); ?><br />
+			  <input name="reauthenticateacct" type="radio" value="stopstart" <?php if($pconfig['reauthenticateacct'] == "stopstart") echo "checked"; ?>> <?=gettext("stop/start accounting"); ?><br />
 			  <input name="reauthenticateacct" type="radio" value="interimupdate" <?php if($pconfig['reauthenticateacct'] == "interimupdate") echo "checked"; ?>> <?=gettext("interim update"); ?>
 			  </td>
 			</tr>
@@ -826,14 +826,14 @@ function enable_change(enable_change) {
 			<tr>
 				<td class="vncell"><?=gettext("Reauthentication"); ?></td>
 				<td class="vtable"><input name="reauthenticate" type="checkbox" id="reauthenticate" value="yes" onClick="enable_change(false)" <?php if($pconfig['reauthenticate']) echo "checked"; ?>>
-				<strong><?=gettext("Reauthenticate connected users every minute"); ?></strong><br>
+				<strong><?=gettext("Reauthenticate connected users every minute"); ?></strong><br />
 				<?=gettext("If reauthentication is enabled, Access-Requests will be sent to the RADIUS server for each user that is " .
 				"logged in every minute. If an Access-Reject is received for a user, that user is disconnected from the captive portal immediately."); ?></td>
 			</tr>
 			<tr>
 				<td class=""><?=gettext("RADIUS MAC authentication"); ?></td>
 				<td class="">
-				<input name="radmac_enable" type="checkbox" id="radmac_enable" value="yes" onClick="enable_change(false)" <?php if ($pconfig['radmac_enable']) echo "checked"; ?>><strong><?=gettext("Enable RADIUS MAC authentication"); ?></strong><br>
+				<input name="radmac_enable" type="checkbox" id="radmac_enable" value="yes" onClick="enable_change(false)" <?php if ($pconfig['radmac_enable']) echo "checked"; ?>><strong><?=gettext("Enable RADIUS MAC authentication"); ?></strong><br />
 				<?=gettext("If this option is enabled, the captive portal will try to authenticate users by sending their MAC address as the username and the password " .
 				"entered below to the RADIUS server."); ?></td>
 			</tr>
@@ -871,14 +871,14 @@ function enable_change(enable_change) {
 						}
 					}
 				?>
-				</select><br/>
+				</select><br />
 				<?=gettext("Choose the IP to use for calling station attribute."); ?>
 				</td>
 			</tr>
 
 			<tr>
 				<td class="vncell" valign="top"><?=gettext("Session-Timeout"); ?></td>
-				<td class="vtable"><input name="radiussession_timeout" type="checkbox" id="radiussession_timeout" value="yes" <?php if ($pconfig['radiussession_timeout']) echo "checked"; ?>><strong><?=gettext("Use RADIUS Session-Timeout attributes"); ?></strong><br>
+				<td class="vtable"><input name="radiussession_timeout" type="checkbox" id="radiussession_timeout" value="yes" <?php if ($pconfig['radiussession_timeout']) echo "checked"; ?>><strong><?=gettext("Use RADIUS Session-Timeout attributes"); ?></strong><br />
 				<?=gettext("When this is enabled, clients will be disconnected after the amount of time retrieved from the RADIUS Session-Timeout attribute."); ?></td>
 			</tr>
 
@@ -894,7 +894,7 @@ function enable_change(enable_change) {
 					else
 						echo "<option value=\"$radiusvendor\">$radiusvendor</option>\n";
 				}
-				?></select><br>
+				?></select><br />
 				<?php printf(gettext("If RADIUS type is set to Cisco, in Access-Requests the value of Calling-Station-Id will be set to the client's IP address and " .
 				"the Called-Station-Id to the client's MAC address. Default behavior is Calling-Station-Id = client's MAC address and Called-Station-Id = %s's WAN IP address."),
 					$g['product_name']);?></td>
@@ -902,13 +902,13 @@ function enable_change(enable_change) {
 
 			<tr>
 				<td class="vncell" valign="top"><?=gettext("Accounting Style"); ?></td>
-				<td class="vtable"><input name="reverseacct" type="checkbox" id="reverseacct" value="yes" <?php if ($pconfig['reverseacct']) echo "checked"; ?>><strong><?=gettext("Invert Acct-Input-Octets and Acct-Output-Octets"); ?></strong><br>
+				<td class="vtable"><input name="reverseacct" type="checkbox" id="reverseacct" value="yes" <?php if ($pconfig['reverseacct']) echo "checked"; ?>><strong><?=gettext("Invert Acct-Input-Octets and Acct-Output-Octets"); ?></strong><br />
 				<?=gettext("When this is enabled, data counts for RADIUS accounting packets will be taken from the client perspective, not the NAS. Acct-Input-Octets will represent download, and Acct-Output-Octets will represent upload."); ?></td>
 			</tr>
 
 			<tr>
 				<td class="vncell" valign="top"><?=gettext("NAS Identifier"); ?></td>
-				<td class="vtable"><input name="radiusnasid" type="text" maxlength="253" class="formfld unknown" id="radiusnasid" value="<?=htmlspecialchars($pconfig['radiusnasid']);?>"/><br/>
+				<td class="vtable"><input name="radiusnasid" type="text" maxlength="253" class="formfld unknown" id="radiusnasid" value="<?=htmlspecialchars($pconfig['radiusnasid']);?>"/><br />
 					<?=gettext("Specify a NAS identifier to override the default value") . " (" . php_uname("n") . ")"; ?></td>
 			</tr>
 			<tr>
@@ -926,13 +926,13 @@ function enable_change(enable_change) {
 							}
 						}
 						?>
-					</select></br>
+					</select><br />
 					<?=gettext("This option changes the MAC address format used in the whole RADIUS system. Change this if you also"); ?>
-					<?=gettext("need to change the username format for RADIUS MAC authentication."); ?><br>
-					<?=gettext("default:"); ?> 00:11:22:33:44:55<br>
-					<?=gettext("singledash:"); ?> 001122-334455<br>
-					<?=gettext("ietf:"); ?> 00-11-22-33-44-55<br>
-					<?=gettext("cisco:"); ?> 0011.2233.4455<br>
+					<?=gettext("need to change the username format for RADIUS MAC authentication."); ?><br />
+					<?=gettext("default:"); ?> 00:11:22:33:44:55<br />
+					<?=gettext("singledash:"); ?> 001122-334455<br />
+					<?=gettext("ietf:"); ?> 00-11-22-33-44-55<br />
+					<?=gettext("cisco:"); ?> 0011.2233.4455<br />
 					<?=gettext("unformatted:"); ?> 001122334455
 				</td>
 			</tr>
@@ -942,13 +942,13 @@ function enable_change(enable_change) {
 		<td valign="top" class="vncell"><?=gettext("HTTPS login"); ?></td>
 		<td class="vtable">
 			<input name="httpslogin_enable" type="checkbox" class="formfld" id="httpslogin_enable" value="yes" onClick="enable_change(false)" <?php if($pconfig['httpslogin_enable']) echo "checked"; ?>>
-			<strong><?=gettext("Enable HTTPS login"); ?></strong><br>
+			<strong><?=gettext("Enable HTTPS login"); ?></strong><br />
 			<?=gettext("If enabled, the username and password will be transmitted over an HTTPS connection to protect against eavesdroppers. A server name and certificate must also be specified below."); ?></td>
 	</tr>
 	<tr>
 		<td valign="top" class="vncell"><?=gettext("HTTPS server name"); ?> </td>
 		<td class="vtable">
-			<input name="httpsname" type="text" class="formfld unknown" id="httpsname" size="30" value="<?=htmlspecialchars($pconfig['httpsname']);?>"><br>
+			<input name="httpsname" type="text" class="formfld unknown" id="httpsname" size="30" value="<?=htmlspecialchars($pconfig['httpsname']);?>"><br />
 			<?php printf(gettext("This name will be used in the form action for the HTTPS POST and should match the Common Name (CN) in your certificate (otherwise, the client browser will most likely display a security warning). Make sure captive portal clients can resolve this name in DNS and verify on the client that the IP resolves to the correct interface IP on %s."), $g['product_name']);?> </td>
 	</tr>
 	<tr id="ssl_opts">
@@ -966,14 +966,14 @@ function enable_change(enable_change) {
 			<?php endforeach; ?>
 			</select>
 			<?php else: ?>
-				<b><?=gettext("No Certificates defined."); ?></b> <br/>Create one under <a href="system_certmanager.php">System &gt; Cert Manager</a>.
+				<b><?=gettext("No Certificates defined."); ?></b> <br />Create one under <a href="system_certmanager.php">System &gt; Cert Manager</a>.
 			<?php endif; ?>
 		</td>
 	</tr>
 	<tr>
 		<td width="22%" valign="top" class="vncell"><?=gettext("Portal page contents"); ?></td>
 		<td width="78%" class="vtable">
-		<?=$mandfldhtml;?><input type="file" name="htmlfile" class="formfld file" id="htmlfile"><br>
+		<?=$mandfldhtml;?><input type="file" name="htmlfile" class="formfld file" id="htmlfile"><br />
 		<?php
 			list($host) = explode(":", $_SERVER['HTTP_HOST']);
 			$zoneid = $pconfig['zoneid'] ? $pconfig['zoneid'] : 8000;
@@ -993,8 +993,8 @@ function enable_change(enable_change) {
 		<a href="?zone=<?=$cpzone?>&amp;act=delhtmlhtml" onclick="return confirm('Do you really want to restore default page?')" target="_blank">
 			<?=gettext("Restore default portal page"); ?>
 		</a>
-		  <br>
-		  <br>
+		  <br />
+		  <br />
 		<?php endif; ?>
 			<?php
 				printf(
@@ -1009,22 +1009,22 @@ function enable_change(enable_change) {
 					"&quot;auth_pass&quot;",
 					"&quot;auth_voucher&quot;");
 			?>
-			<?=gettext("Example code for the form:"); ?><br>
-		  <br>
-		  <tt>&lt;form method=&quot;post&quot; action=&quot;$PORTAL_ACTION$&quot;&gt;<br>
-		  &nbsp;&nbsp;&nbsp;&lt;input name=&quot;auth_user&quot; type=&quot;text&quot;&gt;<br>
-		  &nbsp;&nbsp;&nbsp;&lt;input name=&quot;auth_pass&quot; type=&quot;password&quot;&gt;<br>
-		  &nbsp;&nbsp;&nbsp;&lt;input name=&quot;auth_voucher&quot; type=&quot;text&quot;&gt;<br>
-		  &nbsp;&nbsp;&nbsp;&lt;input name=&quot;redirurl&quot; type=&quot;hidden&quot; value=&quot;$PORTAL_REDIRURL$&quot;&gt;<br>
-&nbsp;&nbsp;&nbsp;&lt;input name=&quot;accept&quot; type=&quot;submit&quot; value=&quot;Continue&quot;&gt;<br>
+			<?=gettext("Example code for the form:"); ?><br />
+		  <br />
+		  <tt>&lt;form method=&quot;post&quot; action=&quot;$PORTAL_ACTION$&quot;&gt;<br />
+		  &nbsp;&nbsp;&nbsp;&lt;input name=&quot;auth_user&quot; type=&quot;text&quot;&gt;<br />
+		  &nbsp;&nbsp;&nbsp;&lt;input name=&quot;auth_pass&quot; type=&quot;password&quot;&gt;<br />
+		  &nbsp;&nbsp;&nbsp;&lt;input name=&quot;auth_voucher&quot; type=&quot;text&quot;&gt;<br />
+		  &nbsp;&nbsp;&nbsp;&lt;input name=&quot;redirurl&quot; type=&quot;hidden&quot; value=&quot;$PORTAL_REDIRURL$&quot;&gt;<br />
+&nbsp;&nbsp;&nbsp;&lt;input name=&quot;accept&quot; type=&quot;submit&quot; value=&quot;Continue&quot;&gt;<br />
 		  &lt;/form&gt;</tt></td>
 	</tr>
 	<tr>
-	  <td width="22%" valign="top" class="vncell"><?=gettext("Authentication"); ?><br>
-		<?=gettext("error page"); ?><br>
+	  <td width="22%" valign="top" class="vncell"><?=gettext("Authentication"); ?><br />
+		<?=gettext("error page"); ?><br />
 		<?=gettext("contents"); ?></td>
 	  <td class="vtable">
-		<input name="errfile" type="file" class="formfld file" id="errfile"><br>
+		<input name="errfile" type="file" class="formfld file" id="errfile"><br />
 		<?php if ($pconfig['page']['errtext']): ?>
 		<a href="?zone=<?=$cpzone?>&amp;act=viewerrhtml" target="_blank"><?=gettext("View current page"); ?></a>
 		<br />
@@ -1033,18 +1033,18 @@ function enable_change(enable_change) {
 		<a href="?zone=<?=$cpzone?>&amp;act=delerrhtml" onclick="return confirm('Do you really want to restore default page?')" target="_blank">
 			<?=gettext("Restore default error page"); ?>
 		</a>
-		  <br>
-		  <br>
+		  <br />
+		  <br />
 		<?php endif; ?>
 <?=gettext("The contents of the HTML/PHP file that you upload here are displayed when an authentication error occurs. " .
 "You may include"); ?> &quot;$PORTAL_MESSAGE$&quot;, <?=gettext("which will be replaced by the error or reply messages from the RADIUS server, if any."); ?></td>
 	</tr>
 	<tr>
-	  <td width="22%" valign="top" class="vncell"><?=gettext("Logout"); ?><br>
-		<?=gettext("page"); ?><br>
+	  <td width="22%" valign="top" class="vncell"><?=gettext("Logout"); ?><br />
+		<?=gettext("page"); ?><br />
 		<?=gettext("contents"); ?></td>
 	  <td class="vtable">
-		<input name="logoutfile" type="file" class="formfld file" id="logoutfile"><br>
+		<input name="logoutfile" type="file" class="formfld file" id="logoutfile"><br />
 		<?php if ($pconfig['page']['logouttext']): ?>
 		<a href="?zone=<?=$cpzone?>&amp;act=viewlogouthtml" target="_blank"><?=gettext("View current page"); ?></a>
 		<br />
@@ -1053,8 +1053,8 @@ function enable_change(enable_change) {
 		<a href="?zone=<?=$cpzone?>&amp;act=dellogouthtml" onclick="return confirm('Do you really want to restore default page?')" target="_blank">
 			<?=gettext("Restore default logout page"); ?>
 		</a>
-		  <br>
-		  <br>
+		  <br />
+		  <br />
 		<?php endif; ?>
 <?=gettext("The contents of the HTML/PHP file that you upload here are displayed on authentication success when the logout popup is enabled."); ?></td>
 	</tr>
@@ -1068,7 +1068,7 @@ function enable_change(enable_change) {
 	</tr>
 	<tr>
 	  <td width="22%" valign="top">&nbsp;</td>
-	  <td width="78%"><span class="vexpl"><span class="red"><strong><?=gettext("Note:"); ?><br>
+	  <td width="78%"><span class="vexpl"><span class="red"><strong><?=gettext("Note:"); ?><br />
 		</strong></span><?=gettext("Changing any settings on this page will disconnect all clients! Don't forget to enable the DHCP server on your captive portal interface! Make sure that the default/maximum DHCP lease time is higher than the timeout entered on this page. Also, the DNS forwarder needs to be enabled for DNS lookups by unauthenticated clients to work."); ?> </span></td>
 	</tr>
   </table>
diff --git a/usr/local/www/services_captiveportal_filemanager.php b/usr/local/www/services_captiveportal_filemanager.php
old mode 100755
new mode 100644
index 34d87a6fe6..80572df9f6
--- a/usr/local/www/services_captiveportal_filemanager.php
+++ b/usr/local/www/services_captiveportal_filemanager.php
@@ -209,20 +209,20 @@ include("head.inc");
   <?php endif; ?>
 	</table>
 	<span class="vexpl"><span class="red"><strong>
-	<?=gettext("Note:"); ?><br>
+	<?=gettext("Note:"); ?><br />
 	</strong></span>
 	<?=gettext("Any files that you upload here with the filename prefix of captiveportal- will " .
 	"be made available in the root directory of the captive portal HTTP(S) server. " .
 	"You may reference them directly from your portal page HTML code using relative paths. " .
 	"Example: you've uploaded an image with the name 'captiveportal-test.jpg' using the " .
-	"file manager. Then you can include it in your portal page like this:"); ?><br><br>
+	"file manager. Then you can include it in your portal page like this:"); ?><br /><br />
 	<tt>&lt;img src=&quot;captiveportal-test.jpg&quot; width=... height=...&gt;</tt>
-	<br><br>
+	<br /><br />
 	<?=gettext("In addition, you can also upload .php files for execution.  You can pass the filename " .
 	"to your custom page from the initial page by using text similar to:"); ?>
-	<br><br>
+	<br /><br />
 	<tt>&lt;a href="/captiveportal-aup.php?zone=$PORTAL_ZONE$&redirurl=$PORTAL_REDIRURL$"&gt;<?=gettext("Acceptable usage policy"); ?>&lt/a&gt;</tt>
-	<br><br>
+	<br /><br />
 	<?php printf(gettext("The total size limit for all files is %s."), format_bytes($g['captiveportal_element_sizelimit']));?></span>
 </td>
 </tr>
diff --git a/usr/local/www/services_captiveportal_hostname.php b/usr/local/www/services_captiveportal_hostname.php
old mode 100755
new mode 100644
index 2d1fba1883..73336ed76d
--- a/usr/local/www/services_captiveportal_hostname.php
+++ b/usr/local/www/services_captiveportal_hostname.php
@@ -166,7 +166,7 @@ include("head.inc");
 	</tr>
 	<tr>
 	<td colspan="2" class="list"><p class="vexpl"><span class="red"><strong>
-	  <?=gettext("Note:"); ?><br>
+	  <?=gettext("Note:"); ?><br />
 	  </strong></span>
 	  <?=gettext("Adding allowed Hostnames will allow a DNS hostname access to/from access through the captive portal without being taken to the portal page. This can be used for a web server serving images for the portal page or a DNS server on another network, for example. By specifying <em>from</em> addresses, it may be used to always allow pass-through access from a client behind the captive portal."); ?></p>
 	  <table border="0" cellspacing="0" cellpadding="0">
diff --git a/usr/local/www/services_captiveportal_hostname_edit.php b/usr/local/www/services_captiveportal_hostname_edit.php
old mode 100755
new mode 100644
index 707473cfe9..11d329a663
--- a/usr/local/www/services_captiveportal_hostname_edit.php
+++ b/usr/local/www/services_captiveportal_hostname_edit.php
@@ -170,7 +170,7 @@ include("head.inc");
 				</option>
 		<?php endforeach; ?>
 			</select>
-			<br> 
+			<br /> 
 			<span class="vexpl"><?=gettext("Use"); ?> <em><?=gettext("From"); ?></em> <?=gettext("to always allow an Hostname through the captive portal (without authentication)"); ?>. 
 				<?=gettext("Use"); ?> <em><?=gettext("To"); ?></em> <?=gettext("to allow access from all clients (even non-authenticated ones) behind the portal to this Hostname"); ?>.</span></td>
 		</tr>
@@ -178,26 +178,26 @@ include("head.inc");
 			<td width="22%" valign="top" class="vncellreq"><?=gettext("Hostname"); ?></td>
 			<td width="78%" class="vtable"> 
 				<?=$mandfldhtml;?><input name="hostname" type="text" class="formfld unknown" id="hostname" size="17" value="<?=htmlspecialchars($pconfig['hostname']);?>">
-			<br> 
+			<br /> 
 			<span class="vexpl"><?=gettext("Hostname");?>.</span></td>
 		</tr>
 		<tr>
 			<td width="22%" valign="top" class="vncell"><?=gettext("Description"); ?></td>
 			<td width="78%" class="vtable"> 
 			<input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>">
-			<br> <span class="vexpl"><?=gettext("You may enter a description here for your reference (not parsed)"); ?>.</span></td>
+			<br /> <span class="vexpl"><?=gettext("You may enter a description here for your reference (not parsed)"); ?>.</span></td>
 			</tr>
 		<tr>
 			<td width="22%" valign="top" class="vncell"><?=gettext("Bandwidth up"); ?></td>
 			<td width="78%" class="vtable">
 			<input name="bw_up" type="text" class="formfld unknown" id="bw_up" size="10" value="<?=htmlspecialchars($pconfig['bw_up']);?>">
-			<br> <span class="vexpl"><?=gettext("Enter a upload limit to be enforced on this Hostname in Kbit/s"); ?></span></td>
+			<br /> <span class="vexpl"><?=gettext("Enter a upload limit to be enforced on this Hostname in Kbit/s"); ?></span></td>
 		</tr>
 		<tr>
 			<td width="22%" valign="top" class="vncell"><?=gettext("Bandwidth down"); ?></td>
 			<td width="78%" class="vtable">
 			<input name="bw_down" type="text" class="formfld unknown" id="bw_down" size="10" value="<?=htmlspecialchars($pconfig['bw_down']);?>">
-			<br> <span class="vexpl"><?=gettext("Enter a download limit to be enforced on this Hostname in Kbit/s"); ?></span></td>
+			<br /> <span class="vexpl"><?=gettext("Enter a download limit to be enforced on this Hostname in Kbit/s"); ?></span></td>
 		</tr>
 		<tr>
 			<td width="22%" valign="top">&nbsp;</td>
diff --git a/usr/local/www/services_captiveportal_ip.php b/usr/local/www/services_captiveportal_ip.php
old mode 100755
new mode 100644
index ab5f965df2..d628b852b1
--- a/usr/local/www/services_captiveportal_ip.php
+++ b/usr/local/www/services_captiveportal_ip.php
@@ -165,7 +165,7 @@ include("head.inc");
 	</tr>
 	<tr>
 	<td colspan="2" class="list"><p class="vexpl"><span class="red"><strong>
-	  <?=gettext("Note:"); ?><br>
+	  <?=gettext("Note:"); ?><br />
 	  </strong></span>
 	  <?=gettext("Adding allowed IP addresses will allow IP access to/from these addresses through the captive portal without being taken to the portal page. This can be used for a web server serving images for the portal page or a DNS server on another network, for example. By specifying <em>from</em> addresses, it may be used to always allow pass-through access from a client behind the captive portal."); ?></p>
 	  <table border="0" cellspacing="0" cellpadding="0">
diff --git a/usr/local/www/services_captiveportal_ip_edit.php b/usr/local/www/services_captiveportal_ip_edit.php
old mode 100755
new mode 100644
index 0ecef07998..7cea8d4e55
--- a/usr/local/www/services_captiveportal_ip_edit.php
+++ b/usr/local/www/services_captiveportal_ip_edit.php
@@ -194,7 +194,7 @@ include("head.inc");
 					<option value="<?=$i;?>" <?php if ($i == $pconfig['sn']) echo "selected"; ?>><?=$i;?></option>
 				<?php endfor; ?>
 				</select>
-				<br> 
+				<br /> 
 				<span class="vexpl"><?=gettext("IP address and subnet mask. Use /32 for a single IP");?>.</span>
 			</td>
 		</tr>
@@ -202,21 +202,21 @@ include("head.inc");
 			<td width="22%" valign="top" class="vncell"><?=gettext("Description"); ?></td>
 			<td width="78%" class="vtable"> 
 				<input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>">
-				<br> <span class="vexpl"><?=gettext("You may enter a description here for your reference (not parsed)"); ?>.</span>
+				<br /> <span class="vexpl"><?=gettext("You may enter a description here for your reference (not parsed)"); ?>.</span>
 			</td>
 		</tr>
 		<tr>
 			<td width="22%" valign="top" class="vncell"><?=gettext("Bandwidth up"); ?></td>
 			<td width="78%" class="vtable">
 			<input name="bw_up" type="text" class="formfld unknown" id="bw_up" size="10" value="<?=htmlspecialchars($pconfig['bw_up']);?>">
-			<br> <span class="vexpl"><?=gettext("Enter a upload limit to be enforced on this IP address in Kbit/s"); ?></span>
+			<br /> <span class="vexpl"><?=gettext("Enter a upload limit to be enforced on this IP address in Kbit/s"); ?></span>
 		</td>
 		</tr>
 		<tr>
 		 <td width="22%" valign="top" class="vncell"><?=gettext("Bandwidth down"); ?></td>
 		 <td width="78%" class="vtable">
 			<input name="bw_down" type="text" class="formfld unknown" id="bw_down" size="10" value="<?=htmlspecialchars($pconfig['bw_down']);?>">
-			<br> <span class="vexpl"><?=gettext("Enter a download limit to be enforced on this IP address in Kbit/s"); ?></span>
+			<br /> <span class="vexpl"><?=gettext("Enter a download limit to be enforced on this IP address in Kbit/s"); ?></span>
 		</td>
 		</tr>
 		<tr>
diff --git a/usr/local/www/services_captiveportal_mac.php b/usr/local/www/services_captiveportal_mac.php
old mode 100755
new mode 100644
index 2d66ab5357..2e15a9a2c5
--- a/usr/local/www/services_captiveportal_mac.php
+++ b/usr/local/www/services_captiveportal_mac.php
@@ -146,7 +146,7 @@ include("head.inc");
 <input type="hidden" name="zone" id="zone" value="<?=htmlspecialchars($cpzone);?>"/>
 <?php if ($savemsg) print_info_box($savemsg); ?>
 <?php if (is_subsystem_dirty('passthrumac')): ?><p>
-<?php print_info_box_np(gettext("The captive portal MAC address configuration has been changed.<br>You must apply the changes in order for them to take effect."));?><br>
+<?php print_info_box_np(gettext("The captive portal MAC address configuration has been changed.<br />You must apply the changes in order for them to take effect."));?><br />
 <?php endif; ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
 	<tr><td class="tabnavtbl">
@@ -211,7 +211,7 @@ include("head.inc");
 				<tr>
 					<td colspan="3" class="list">
 						<span class="vexpl">
-							<span class="red"><strong><?=gettext("Note:"); ?><br></strong></span>
+							<span class="red"><strong><?=gettext("Note:"); ?><br /></strong></span>
 							<?=gettext("Adding MAC addresses as 'pass' MACs allows them access through the captive portal automatically without being taken to the portal page."); ?>
 						</span>
 					</td>
diff --git a/usr/local/www/services_captiveportal_mac_edit.php b/usr/local/www/services_captiveportal_mac_edit.php
old mode 100755
new mode 100644
index 7302c23e90..fa258c1708
--- a/usr/local/www/services_captiveportal_mac_edit.php
+++ b/usr/local/www/services_captiveportal_mac_edit.php
@@ -196,7 +196,7 @@ include("head.inc");
 					endforeach;
 ?>
 				</select>
-				<br>
+				<br />
 				<span class="vexpl"><?=gettext("Choose what to do with packets coming from this MAC address"); ?>.</span>
 			</td>
 		</tr>
@@ -210,14 +210,14 @@ include("head.inc");
 				$mac = str_replace("\n","",$mac);
 ?>
 				<a OnClick="document.forms[0].mac.value='<?=$mac?>';" href="#"><?=gettext("Copy my MAC address");?></a>
-				<br>
+				<br />
 				<span class="vexpl"><?=gettext("MAC address (6 hex octets separated by colons)"); ?></span></td>
 		</tr>
 		<tr>
 			<td width="22%" valign="top" class="vncell"><?=gettext("Description"); ?></td>
 			<td width="78%" class="vtable">
 				<input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>">
-				<br>
+				<br />
 				<span class="vexpl"><?=gettext("You may enter a description here for your reference (not parsed)"); ?>.</span>
 			</td>
 		</tr>
@@ -225,7 +225,7 @@ include("head.inc");
 			<td width="22%" valign="top" class="vncell"><?=gettext("Bandwidth up"); ?></td>
 			<td width="78%" class="vtable">
 				<input name="bw_up" type="text" class="formfld unknown" id="bw_up" size="10" value="<?=htmlspecialchars($pconfig['bw_up']);?>">
-				<br>
+				<br />
 				<span class="vexpl"><?=gettext("Enter a upload limit to be enforced on this MAC address in Kbit/s"); ?></span>
 			</td>
 		</tr>
@@ -233,7 +233,7 @@ include("head.inc");
 			<td width="22%" valign="top" class="vncell"><?=gettext("Bandwidth down"); ?></td>
 			<td width="78%" class="vtable">
 				<input name="bw_down" type="text" class="formfld unknown" id="bw_down" size="10" value="<?=htmlspecialchars($pconfig['bw_down']);?>">
-				<br>
+				<br />
 				<span class="vexpl"><?=gettext("Enter a download limit to be enforced on this MAC address in Kbit/s"); ?></span>
 			</td>
 		</tr>
diff --git a/usr/local/www/services_captiveportal_vouchers.php b/usr/local/www/services_captiveportal_vouchers.php
index aaa29b78f2..4d88804476 100644
--- a/usr/local/www/services_captiveportal_vouchers.php
+++ b/usr/local/www/services_captiveportal_vouchers.php
@@ -460,7 +460,7 @@ function enable_change(enable_change) {
 						<?=gettext("Voucher Rolls"); ?>
 						<?php 
 							if($pconfig['vouchersyncdbip']) 
-								echo "<br/>(Synchronized from {$pconfig['vouchersyncdbip']})";
+								echo "<br />(Synchronized from {$pconfig['vouchersyncdbip']})";
 						?>
 					</td>
 					<td class="vtable">
@@ -521,14 +521,14 @@ function enable_change(enable_change) {
 						</td>
 						<td class="vtable">
 							<textarea name="publickey" cols="65" rows="4" id="publickey" class="formpre"><?=htmlspecialchars($pconfig['publickey']);?></textarea>
-							<br>
+							<br />
 								<?=gettext("Paste an RSA public key (64 Bit or smaller) in PEM format here. This key is used to decrypt vouchers."); ?> <a href='#' onClick='generatenewkey();'><?=gettext('Generate');?></a> <?=gettext('new key');?>.</td>
 						</tr>
 						<tr>
 							<td valign="top" class="vncell"><?=gettext("Voucher private key"); ?></td>
 							<td class="vtable">
 								<textarea name="privatekey" cols="65" rows="5" id="privatekey" class="formpre"><?=htmlspecialchars($pconfig['privatekey']);?></textarea>
-								<br>
+								<br />
 								<?=gettext("Paste an RSA private key (64 Bit or smaller) in PEM format here. This key is only used to generate encrypted vouchers and doesn't need to be available if the vouchers have been generated offline."); ?> <a href='#' onClick='generatenewkey();'> <?=gettext('Generate');?></a> <?=gettext('new key');?>.</td>
 							</td>
 						</tr>
@@ -536,7 +536,7 @@ function enable_change(enable_change) {
 							<td width="22%" valign="top" class="vncellreq"><?=gettext("Character set"); ?></td>
 							<td width="78%" class="vtable">
 								<input name="charset" type="text" class="formfld" id="charset" size="80" value="<?=htmlspecialchars($pconfig['charset']);?>">
-								<br>
+								<br />
 								<?=gettext("Tickets are generated with the specified character set. It should contain printable characters (numbers, lower case and upper case letters) that are hard to confuse with others. Avoid e.g. 0/O and l/1."); ?>
 							</td>
 						</tr>
@@ -544,7 +544,7 @@ function enable_change(enable_change) {
 							<td width="22%" valign="top" class="vncellreq"># <?=gettext("of Roll Bits"); ?></td>
 							<td width="78%" class="vtable">
 								<input name="rollbits" type="text" class="formfld" id="rollbits" size="2" value="<?=htmlspecialchars($pconfig['rollbits']);?>">
-								<br>
+								<br />
 								<?=gettext("Reserves a range in each voucher to store the Roll # it belongs to. Allowed range: 1..31. Sum of Roll+Ticket+Checksum bits must be one Bit less than the RSA key size."); ?>
 							</td>
 						</tr>
@@ -552,7 +552,7 @@ function enable_change(enable_change) {
 							<td width="22%" valign="top" class="vncellreq"># <?=gettext("of Ticket Bits"); ?></td>
 							<td width="78%" class="vtable">
 								<input name="ticketbits" type="text" class="formfld" id="ticketbits" size="2" value="<?=htmlspecialchars($pconfig['ticketbits']);?>">
-								<br>
+								<br />
 								<?=gettext("Reserves a range in each voucher to store the Ticket# it belongs to. Allowed range: 1..16. Using 16 bits allows a roll to have up to 65535 vouchers. A bit array, stored in RAM and in the config, is used to mark if a voucher has been used. A bit array for 65535 vouchers requires 8 KB of storage."); ?>
 							</td>
 						</tr>
@@ -560,7 +560,7 @@ function enable_change(enable_change) {
 							<td width="22%" valign="top" class="vncellreq"># <?=gettext("of Checksum Bits"); ?></td>
 							<td width="78%" class="vtable">
 								<input name="checksumbits" type="text" class="formfld" id="checksumbits" size="2" value="<?=htmlspecialchars($pconfig['checksumbits']);?>">
-								<br>
+								<br />
 								<?=gettext("Reserves a range in each voucher to store a simple checksum over Roll # and Ticket#. Allowed range is 0..31."); ?>
 							</td>
 						</tr>
@@ -568,7 +568,7 @@ function enable_change(enable_change) {
 							<td width="22%" valign="top" class="vncellreq"><?=gettext("Magic Number"); ?></td>
 							<td width="78%" class="vtable">
 								<input name="magic" type="text" class="formfld" id="magic" size="20" value="<?=htmlspecialchars($pconfig['magic']);?>">
-								<br>
+								<br />
 								<?=gettext("Magic number stored in every voucher. Verified during voucher check. Size depends on how many bits are left by Roll+Ticket+Checksum bits. If all bits are used, no magic number will be used and checked."); ?>
 							</td>
 						</tr>
@@ -576,14 +576,14 @@ function enable_change(enable_change) {
 							<td width="22%" valign="top" class="vncellreq"><?=gettext("Invalid Voucher Message"); ?></td>
 							<td width="78%" class="vtable">
 								<input name="msgnoaccess" type="text" class="formfld" id="msgnoaccess" size="80" value="<?=htmlspecialchars($pconfig['msgnoaccess']);?>">
-								<br><?=gettext("Error message displayed for invalid vouchers on captive portal error page"); ?> ($PORTAL_MESSAGE$).
+								<br /><?=gettext("Error message displayed for invalid vouchers on captive portal error page"); ?> ($PORTAL_MESSAGE$).
 							</td>
 						</tr>
 						<tr> 
 							<td width="22%" valign="top" class="vncellreq"><?=gettext("Expired Voucher Message"); ?></td>
 							<td width="78%" class="vtable">
 								<input name="msgexpired" type="text" class="formfld" id="msgexpired" size="80" value="<?=htmlspecialchars($pconfig['msgexpired']);?>">
-								<br><?=gettext("Error message displayed for expired vouchers on captive portal error page"); ?> ($PORTAL_MESSAGE$).
+								<br /><?=gettext("Error message displayed for expired vouchers on captive portal error page"); ?> ($PORTAL_MESSAGE$).
 							</td>
 						</tr>
 						<tr>
@@ -599,29 +599,29 @@ function enable_change(enable_change) {
 							<td width="22%" valign="top" class="vncellreq"><?=gettext("Synchronize Voucher Database IP"); ?></td>
 							<td width="78%" class="vtable">
 								<input name="vouchersyncdbip" type="text" class="formfld" id="vouchersyncdbip" size="17" value="<?=htmlspecialchars($pconfig['vouchersyncdbip']);?>">
-								<br/><?=gettext("IP address of master nodes webConfigurator to synchronize voucher database and used vouchers from."); ?>
-								<br/><?=gettext("NOTE: this should be setup on the slave nodes and not the primary node!"); ?>
+								<br /><?=gettext("IP address of master nodes webConfigurator to synchronize voucher database and used vouchers from."); ?>
+								<br /><?=gettext("NOTE: this should be setup on the slave nodes and not the primary node!"); ?>
 							</td>
 						</tr>
 						<tr> 
 							<td width="22%" valign="top" class="vncellreq"><?=gettext("Voucher sync port"); ?></td>
 							<td width="78%" class="vtable">
 								<input name="vouchersyncport" type="text" class="formfld" id="vouchersyncport" size="7" value="<?=htmlspecialchars($pconfig['vouchersyncport']);?>">
-								<br><?=gettext("This is the port of the master voucher nodes webConfigurator.  Example: 443"); ?>
+								<br /><?=gettext("This is the port of the master voucher nodes webConfigurator.  Example: 443"); ?>
 							</td>
 						</tr>
 						<tr> 
 							<td width="22%" valign="top" class="vncellreq"><?=gettext("Voucher sync username"); ?></td>
 							<td width="78%" class="vtable">
 								<input name="vouchersyncusername" type="text" class="formfld" id="vouchersyncusername" size="25" value="<?=htmlspecialchars($pconfig['vouchersyncusername']);?>" autocomplete="off">
-								<br><?=gettext("This is the username of the master voucher nodes webConfigurator."); ?>
+								<br /><?=gettext("This is the username of the master voucher nodes webConfigurator."); ?>
 							</td>
 						</tr>
 						<tr> 
 							<td width="22%" valign="top" class="vncellreq"><?=gettext("Voucher sync password"); ?></td>
 							<td width="78%" class="vtable">
 								<input name="vouchersyncpass" type="password" class="formfld" id="vouchersyncpass" size="25" value="<?=htmlspecialchars($pconfig['vouchersyncpass']);?>"  autocomplete="off">
-								<br><?=gettext("This is the password of the master voucher nodes webConfigurator."); ?>
+								<br /><?=gettext("This is the password of the master voucher nodes webConfigurator."); ?>
 							</td>
 						</tr>
 						<tr>
@@ -635,9 +635,9 @@ function enable_change(enable_change) {
 						</tr>
 						<tr>
 							<td colspan="2" class="list"><p class="vexpl">
-								<span class="red"><strong> <?=gettext("Note:"); ?><br>   </strong></span>
+								<span class="red"><strong> <?=gettext("Note:"); ?><br />   </strong></span>
 							<?=gettext("Changing any Voucher parameter (apart from managing the list of Rolls) on this page will render existing vouchers useless if they were generated with different settings."); ?>
-							<br/>
+							<br />
 							<?=gettext("Specifying the Voucher Database Synchronization options will not record any other value from the other options. They will be retrieved/synced from the master."); ?>
 						</p>
 					</td>
diff --git a/usr/local/www/services_captiveportal_vouchers_edit.php b/usr/local/www/services_captiveportal_vouchers_edit.php
index 79e6001afe..ca1095b689 100644
--- a/usr/local/www/services_captiveportal_vouchers_edit.php
+++ b/usr/local/www/services_captiveportal_vouchers_edit.php
@@ -172,7 +172,7 @@ include("head.inc");
 	  <td width="22%" valign="top" class="vncellreq"><?=gettext("Roll"); ?>#</td>
 	  <td width="78%" class="vtable"> 
 		<?=$mandfldhtml;?><input name="number" type="text" class="formfld" id="number" size="10" value="<?=htmlspecialchars($pconfig['number']);?>"> 
-        <br>
+        <br />
         <span class="vexpl"><?=gettext("Enter the Roll"); ?># (0..<?=htmlspecialchars($maxnumber);?>) <?=gettext("found on top of the generated/printed vouchers"); ?>.</span>
 		</td>
 	</tr>
@@ -180,7 +180,7 @@ include("head.inc");
 	  <td width="22%" valign="top" class="vncellreq"><?=gettext("Minutes per Ticket"); ?></td>
 	  <td width="78%" class="vtable"> 
 		<?=$mandfldhtml;?><input name="minutes" type="text" class="formfld" id="minutes" size="10" value="<?=htmlspecialchars($pconfig['minutes']);?>"> 
-        <br>
+        <br />
         <span class="vexpl"><?=gettext("Defines the time in minutes that a user is allowed access. The clock starts ticking the first time a voucher is used for authentication"); ?>.</span>
 	   </td>
 	</tr>
@@ -188,7 +188,7 @@ include("head.inc");
 	  <td width="22%" valign="top" class="vncellreq"><?=gettext("Count"); ?></td>
 	  <td width="78%" class="vtable"> 
 		<?=$mandfldhtml;?><input name="count" type="text" class="formfld" id="count" size="10" value="<?=htmlspecialchars($pconfig['count']);?>"> 
-        <br>
+        <br />
         <span class="vexpl"><?=gettext("Enter the number of vouchers"); ?> (1..<?=htmlspecialchars($maxcount);?>) <?=gettext("found on top of the generated/printed vouchers. WARNING: Changing this number for an existing Roll will mark all vouchers as unused again"); ?>.</span>
 		</td>
 	</tr>
@@ -196,7 +196,7 @@ include("head.inc");
 	  <td width="22%" valign="top" class="vncell"><?=gettext("Comment"); ?></td>
 	  <td width="78%" class="vtable"> 
 		<?=$mandfldhtml;?><input name="descr" type="text" class="formfld" id="descr" size="60" value="<?=htmlspecialchars($pconfig['descr']);?>"> 
-        <br>
+        <br />
         <span class="vexpl"><?=gettext("Can be used to further identify this roll. Ignored by the system"); ?>.</span>
 		</td>
 	</tr>
diff --git a/usr/local/www/services_captiveportal_zones.php b/usr/local/www/services_captiveportal_zones.php
index 454b36e985..d6adb64479 100644
--- a/usr/local/www/services_captiveportal_zones.php
+++ b/usr/local/www/services_captiveportal_zones.php
@@ -49,7 +49,7 @@ include("head.inc");
 <form action="services_captiveportal_zones.php" method="post">
 <?php if ($savemsg) print_info_box($savemsg); ?>
 <?php if (is_subsystem_dirty('captiveportal')): ?><p>
-<?php print_info_box_np(gettext("The CaptivePortal entry list has been changed") . ".<br>" . gettext("You must apply the changes in order for them to take effect."));?>
+<?php print_info_box_np(gettext("The CaptivePortal entry list has been changed") . ".<br />" . gettext("You must apply the changes in order for them to take effect."));?>
 <?php endif; ?>
 
 <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
diff --git a/usr/local/www/services_captiveportal_zones_edit.php b/usr/local/www/services_captiveportal_zones_edit.php
index e6042809aa..d7b9b94b91 100644
--- a/usr/local/www/services_captiveportal_zones_edit.php
+++ b/usr/local/www/services_captiveportal_zones_edit.php
@@ -97,7 +97,7 @@ include("head.inc");
 				<td width="22%" valign="top" class="vncellreq"><?=gettext("Zone name"); ?></td>
 				<td width="78%" class="vtable">
 					<input name="zone" type="text" class="formfld unknown" id="zone" size="64">
-					<br>
+					<br />
 					<span class="vexpl"><?=gettext("Zone name. Can only contain letters, digits, and underscores (_)."); ?></span>
 				</td>
 			</tr>
@@ -105,7 +105,7 @@ include("head.inc");
 				<td width="22%" valign="top" class="vncell"><?=gettext("Description"); ?></td>
 				<td width="78%" class="vtable">
 					<input name="descr" type="text" class="formfld unknown" id="descr" size="40" >
-					<br>
+					<br />
 					<span class="vexpl"><?=gettext("You may enter a description here for your reference (not parsed)"); ?>.</span>
 				</td>
 			</tr>
diff --git a/usr/local/www/services_dhcp.php b/usr/local/www/services_dhcp.php
old mode 100755
new mode 100644
index da5e849cfc..156458edc4
--- a/usr/local/www/services_dhcp.php
+++ b/usr/local/www/services_dhcp.php
@@ -704,7 +704,7 @@ include("head.inc");
 	}
 ?>
 <?php if (is_subsystem_dirty('staticmaps')): ?><p>
-<?php print_info_box_np(gettext("The static mapping configuration has been changed") . ".<br>" . gettext("You must apply the changes in order for them to take effect."));?><br>
+<?php print_info_box_np(gettext("The static mapping configuration has been changed") . ".<br />" . gettext("You must apply the changes in order for them to take effect."));?><br />
 <?php endif; ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr><td>
@@ -757,7 +757,7 @@ include("head.inc");
 			<td width="22%" valign="top" class="vtable">&nbsp;</td>
 			<td width="78%" class="vtable">
 				<input name="denyunknown" id="denyunknown" type="checkbox" value="yes" <?php if ($pconfig['denyunknown']) echo "checked"; ?>>
-				<strong><?=gettext("Deny unknown clients");?></strong><br>
+				<strong><?=gettext("Deny unknown clients");?></strong><br />
 				<?=gettext("If this is checked, only the clients defined below will get DHCP leases from this server. ");?></td>
 			</tr>
 			<?php if (is_numeric($pool) || ($act == "newpool")): ?>
@@ -795,13 +795,13 @@ include("head.inc");
 				echo long2ip32($range_to);
 			?>
 			<?php if (is_numeric($pool) || ($act == "newpool")): ?>
-				<br/>In-use DHCP Pool Ranges:
+				<br />In-use DHCP Pool Ranges:
 				<?php if (is_array($config['dhcpd'][$if]['range'])): ?>
-					<br/><?php echo $config['dhcpd'][$if]['range']['from']; ?>-<?php echo $config['dhcpd'][$if]['range']['to']; ?>
+					<br /><?php echo $config['dhcpd'][$if]['range']['from']; ?>-<?php echo $config['dhcpd'][$if]['range']['to']; ?>
 				<?php endif; ?>
 				<?php foreach ($a_pools as $p): ?>
 					<?php if (is_array($p['range'])): ?>
-					<br/><?php echo $p['range']['from']; ?>-<?php echo $p['range']['to']; ?>
+					<br /><?php echo $p['range']['from']; ?>-<?php echo $p['range']['to']; ?>
 					<?php endif; ?>
 				<?php endforeach; ?>
 			<?php endif; ?>
@@ -894,36 +894,36 @@ include("head.inc");
 			<tr>
 			<td width="22%" valign="top" class="vncell"><?=gettext("WINS servers");?></td>
 			<td width="78%" class="vtable">
-				<input name="wins1" type="text" class="formfld unknown" id="wins1" size="20" value="<?=htmlspecialchars($pconfig['wins1']);?>"><br>
+				<input name="wins1" type="text" class="formfld unknown" id="wins1" size="20" value="<?=htmlspecialchars($pconfig['wins1']);?>"><br />
 				<input name="wins2" type="text" class="formfld unknown" id="wins2" size="20" value="<?=htmlspecialchars($pconfig['wins2']);?>">
 			</td>
 			</tr>
 			<tr>
 			<td width="22%" valign="top" class="vncell"><?=gettext("DNS servers");?></td>
 			<td width="78%" class="vtable">
-				<input name="dns1" type="text" class="formfld unknown" id="dns1" size="20" value="<?=htmlspecialchars($pconfig['dns1']);?>"><br>
-				<input name="dns2" type="text" class="formfld unknown" id="dns2" size="20" value="<?=htmlspecialchars($pconfig['dns2']);?>"><br>
+				<input name="dns1" type="text" class="formfld unknown" id="dns1" size="20" value="<?=htmlspecialchars($pconfig['dns1']);?>"><br />
+				<input name="dns2" type="text" class="formfld unknown" id="dns2" size="20" value="<?=htmlspecialchars($pconfig['dns2']);?>"><br />
 				<?=gettext("NOTE: leave blank to use the system default DNS servers - this interface's IP if DNS forwarder is enabled, otherwise the servers configured on the General page.");?>
 			</td>
 			</tr>
 			<tr>
 			<td width="22%" valign="top" class="vncell"><?=gettext("Gateway");?></td>
 			<td width="78%" class="vtable">
-				<input name="gateway" type="text" class="formfld host" id="gateway" size="20" value="<?=htmlspecialchars($pconfig['gateway']);?>"><br>
+				<input name="gateway" type="text" class="formfld host" id="gateway" size="20" value="<?=htmlspecialchars($pconfig['gateway']);?>"><br />
 				<?=gettext("The default is to use the IP on this interface of the firewall as the gateway. Specify an alternate gateway here if this is not the correct gateway for your network. Type \"none\" for no gateway assignment.");?>
 			</td>
 			</tr>
 			<tr>
 			<td width="22%" valign="top" class="vncell"><?=gettext("Domain name");?></td>
 			<td width="78%" class="vtable">
-				<input name="domain" type="text" class="formfld unknown" id="domain" size="20" value="<?=htmlspecialchars($pconfig['domain']);?>"><br>
+				<input name="domain" type="text" class="formfld unknown" id="domain" size="20" value="<?=htmlspecialchars($pconfig['domain']);?>"><br />
 				<?=gettext("The default is to use the domain name of this system as the default domain name provided by DHCP. You may specify an alternate domain name here.");?>
 			</td>
 			</tr>
 			<tr>
 			<td width="22%" valign="top" class="vncell"><?=gettext("Domain search list");?></td>
 			<td width="78%" class="vtable">
-				<input name="domainsearchlist" type="text" class="formfld unknown" id="domainsearchlist" size="20" value="<?=htmlspecialchars($pconfig['domainsearchlist']);?>"><br>
+				<input name="domainsearchlist" type="text" class="formfld unknown" id="domainsearchlist" size="20" value="<?=htmlspecialchars($pconfig['domainsearchlist']);?>"><br />
 				<?=gettext("The DHCP server can optionally provide a domain search list. Use the semicolon character as separator ");?>
 			</td>
 			</tr>
@@ -931,9 +931,9 @@ include("head.inc");
 			<td width="22%" valign="top" class="vncell"><?=gettext("Default lease time");?></td>
 			<td width="78%" class="vtable">
 				<input name="deftime" type="text" class="formfld unknown" id="deftime" size="10" value="<?=htmlspecialchars($pconfig['deftime']);?>">
-				<?=gettext("seconds");?><br>
+				<?=gettext("seconds");?><br />
 				<?=gettext("This is used for clients that do not ask for a specific " .
-				"expiration time."); ?><br>
+				"expiration time."); ?><br />
 				<?=gettext("The default is 7200 seconds.");?>
 			</td>
 			</tr>
@@ -941,9 +941,9 @@ include("head.inc");
 			<td width="22%" valign="top" class="vncell"><?=gettext("Maximum lease time");?></td>
 			<td width="78%" class="vtable">
 				<input name="maxtime" type="text" class="formfld unknown" id="maxtime" size="10" value="<?=htmlspecialchars($pconfig['maxtime']);?>">
-				<?=gettext("seconds");?><br>
+				<?=gettext("seconds");?><br />
 				<?=gettext("This is the maximum lease time for clients that ask".
-				" for a specific expiration time."); ?><br>
+				" for a specific expiration time."); ?><br />
 				<?=gettext("The default is 86400 seconds.");?>
 			</td>
 			</tr>
@@ -951,7 +951,7 @@ include("head.inc");
 			<tr>
 			<td width="22%" valign="top" class="vncell"><?=gettext("Failover peer IP:");?></td>
 			<td width="78%" class="vtable">
-				<input name="failover_peerip" type="text" class="formfld host" id="failover_peerip" size="20" value="<?=htmlspecialchars($pconfig['failover_peerip']);?>"><br>
+				<input name="failover_peerip" type="text" class="formfld host" id="failover_peerip" size="20" value="<?=htmlspecialchars($pconfig['failover_peerip']);?>"><br />
 				<?=gettext("Leave blank to disable.  Enter the interface IP address of the other machine.  Machines must be using CARP. Interface's advskew determines whether the DHCPd process is Primary or Secondary. Ensure one machine's advskew<20 (and the other is >20).");?>
 			</td>
 			</tr>
@@ -1016,7 +1016,7 @@ include("head.inc");
 					<input name="ddnsdomain" type="text" class="formfld unknown" id="ddnsdomain" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomain']);?>"><br />
 					<?=gettext("Note: Leave blank to disable dynamic DNS registration.");?><br />
 					<?=gettext("Enter the dynamic DNS domain which will be used to register client names in the DNS server.");?>
-					<input name="ddnsdomainprimary" type="text" class="formfld unknown" id="ddnsdomainprimary" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomainprimary']);?>"><br>
+					<input name="ddnsdomainprimary" type="text" class="formfld unknown" id="ddnsdomainprimary" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomainprimary']);?>"><br />
 					<?=gettext("Enter the primary domain name server IP address for the dynamic domain name.");?><br />
 					<input name="ddnsdomainkeyname" type="text" class="formfld unknown" id="ddnsdomainkeyname" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomainkeyname']);?>"><br />
 					<?=gettext("Enter the dynamic DNS domain key name which will be used to register client names in the DNS server.");?>
@@ -1046,7 +1046,7 @@ include("head.inc");
 					<input type="button" onClick="show_ntp_config()" value="<?=gettext("Advanced");?>"></input> - <?=gettext("Show NTP configuration");?></a>
 				</div>
 				<div id="showntp" style="display:none">
-					<input name="ntp1" type="text" class="formfld unknown" id="ntp1" size="20" value="<?=htmlspecialchars($pconfig['ntp1']);?>"><br>
+					<input name="ntp1" type="text" class="formfld unknown" id="ntp1" size="20" value="<?=htmlspecialchars($pconfig['ntp1']);?>"><br />
 					<input name="ntp2" type="text" class="formfld unknown" id="ntp2" size="20" value="<?=htmlspecialchars($pconfig['ntp2']);?>">
 				</div>
 			</td>
@@ -1058,7 +1058,7 @@ include("head.inc");
 				<input type="button" onClick="show_tftp_config()" value="<?=gettext("Advanced");?>"></input> - <?=gettext("Show TFTP configuration");?></a>
 			</div>
 			<div id="showtftp" style="display:none">
-				<input name="tftp" type="text" class="formfld unknown" id="tftp" size="50" value="<?=htmlspecialchars($pconfig['tftp']);?>"><br>
+				<input name="tftp" type="text" class="formfld unknown" id="tftp" size="50" value="<?=htmlspecialchars($pconfig['tftp']);?>"><br />
 				<?=gettext("Leave blank to disable.  Enter a full hostname or IP for the TFTP server.");?>
 			</div>
 			</td>
@@ -1070,7 +1070,7 @@ include("head.inc");
 					<input type="button" onClick="show_ldap_config()" value="<?=gettext("Advanced");?>"></input> - <?=gettext("Show LDAP configuration");?></a>
 				</div>
 				<div id="showldap" style="display:none">
-					<input name="ldap" type="text" class="formfld unknown" id="ldap" size="80" value="<?=htmlspecialchars($pconfig['ldap']);?>"><br>
+					<input name="ldap" type="text" class="formfld unknown" id="ldap" size="80" value="<?=htmlspecialchars($pconfig['ldap']);?>"><br />
 					<?=gettext("Leave blank to disable.  Enter a full URI for the LDAP server in the form ldap://ldap.example.com/dc=example,dc=com");?>
 				</div>
 			</td>
@@ -1086,18 +1086,18 @@ include("head.inc");
 					<b><?=gettext("Enables network booting.");?></b>
 					<p>
 					<?=gettext("Enter the IP of the"); ?> <b><?=gettext("next-server"); ?></b>
-					<input name="nextserver" type="text" class="formfld unknown" id="nextserver" size="20" value="<?=htmlspecialchars($pconfig['nextserver']);?>"><br>
+					<input name="nextserver" type="text" class="formfld unknown" id="nextserver" size="20" value="<?=htmlspecialchars($pconfig['nextserver']);?>"><br />
 					<?=gettext("and the default bios filename");?>
-						<input name="filename" type="text" class="formfld unknown" id="filename" size="20" value="<?=htmlspecialchars($pconfig['filename']);?>"><br>
+						<input name="filename" type="text" class="formfld unknown" id="filename" size="20" value="<?=htmlspecialchars($pconfig['filename']);?>"><br />
 					<?=gettext("and the UEFI 32bit filename  ");?>
-						<input name="filename32" type="text" class="formfld unknown" id="filename32" size="20" value="<?=htmlspecialchars($pconfig['filename32']);?>"><br>
+						<input name="filename32" type="text" class="formfld unknown" id="filename32" size="20" value="<?=htmlspecialchars($pconfig['filename32']);?>"><br />
 					<?=gettext("and the UEFI 64bit filename  ");?>
-						<input name="filename64" type="text" class="formfld unknown" id="filename64" size="20" value="<?=htmlspecialchars($pconfig['filename64']);?>"><br>
+						<input name="filename64" type="text" class="formfld unknown" id="filename64" size="20" value="<?=htmlspecialchars($pconfig['filename64']);?>"><br />
 					<?=gettext("Note: You need both a filename and a boot server configured for this to work!");?>
 					<?=gettext("You will need all three filenames and a boot server configured for UEFI to work!");?>
 					<p>
 					<?=gettext("Enter the"); ?> <b><?=gettext("root-path"); ?></b>-<?=gettext("string");?>
-					<input name="rootpath" type="text" class="formfld unknown" id="rootpath" size="90" value="<?=htmlspecialchars($pconfig['rootpath']);?>"><br>
+					<input name="rootpath" type="text" class="formfld unknown" id="rootpath" size="90" value="<?=htmlspecialchars($pconfig['rootpath']);?>"><br />
 					<?=gettext("Note: string-format: iscsi:(servername):(protocol):(port):(LUN):targetname");?>
 				</div>
 			</td>
@@ -1191,14 +1191,14 @@ include("head.inc");
 			</tr>
 			<tr>
 			<td width="22%" valign="top">&nbsp;</td>
-			<td width="78%"> <p><span class="vexpl"><span class="red"><strong><?=gettext("Note:");?><br>
+			<td width="78%"> <p><span class="vexpl"><span class="red"><strong><?=gettext("Note:");?><br />
 				</strong></span><?=gettext("The DNS servers entered in"); ?> <a href="system.php"><?=gettext("System: " .
 				"General setup"); ?></a> <?=gettext("(or the"); ?> <a href="services_dnsmasq.php"><?=gettext("DNS " .
 				"forwarder"); ?></a>, <?=gettext("if enabled)"); ?> </span><span class="vexpl"><?=gettext("will " .
-				"be assigned to clients by the DHCP server."); ?><br>
-				<br>
+				"be assigned to clients by the DHCP server."); ?><br />
+				<br />
 				<?=gettext("The DHCP lease table can be viewed on the"); ?> <a href="status_dhcp_leases.php"><?=gettext("Status: " .
-				"DHCP leases"); ?></a> <?=gettext("page."); ?><br>
+				"DHCP leases"); ?></a> <?=gettext("page."); ?><br />
 				</span></p>
 			</td>
 			</tr>
diff --git a/usr/local/www/services_dhcp_edit.php b/usr/local/www/services_dhcp_edit.php
old mode 100755
new mode 100644
index 5f9767c4dd..9c4c1503fe
--- a/usr/local/www/services_dhcp_edit.php
+++ b/usr/local/www/services_dhcp_edit.php
@@ -365,7 +365,7 @@ include("head.inc");
 			$mac = str_replace("\n","",$mac);
 		    ?>
 		    <a OnClick="document.forms[0].mac.value='<?=$mac?>';" href="#"><?=gettext("Copy my MAC address");?></a>
-                    <br>
+                    <br />
                     <span class="vexpl"><?=gettext("Enter a MAC address in the following format: ".
                     "xx:xx:xx:xx:xx:xx");?></span></td>
                 </tr>
@@ -378,9 +378,9 @@ include("head.inc");
                   <td width="22%" valign="top" class="vncell"><?=gettext("IP address");?></td>
                   <td width="78%" class="vtable">
                     <input name="ipaddr" type="text" class="formfld unknown" id="ipaddr" size="20" value="<?=htmlspecialchars($pconfig['ipaddr']);?>">
-                    <br>
+                    <br />
 			<?=gettext("If an IPv4 address is entered, the address must be outside of the pool.");?>
-			<br/>
+			<br />
 			<?=gettext("If no IPv4 address is given, one will be dynamically allocated from the pool.");?>
 			</td>
                 </tr>
@@ -388,69 +388,69 @@ include("head.inc");
                   <td width="22%" valign="top" class="vncell"><?=gettext("Hostname");?></td>
                   <td width="78%" class="vtable">
                     <input name="hostname" type="text" class="formfld unknown" id="hostname" size="20" value="<?=htmlspecialchars($pconfig['hostname']);?>">
-                    <br> <span class="vexpl"><?=gettext("Name of the host, without domain part.");?></span></td>
+                    <br /> <span class="vexpl"><?=gettext("Name of the host, without domain part.");?></span></td>
                 </tr>
                 <?php if($netboot_enabled) { ?>
 		<tr>
 		  <td width="22%" valign="top" class="vncell">Netboot Filename</td>
 		  <td width="78%" class="vtable">
 		    <input name="filename" type="text" class="formfld unknown" id="filename" size="20" value="<?=htmlspecialchars($pconfig['filename']);?>">
-		    <br> <span class="vexpl">Name of the file that should be loaded when this host boots off of the network, overrides setting on main page.</span></td>
+		    <br /> <span class="vexpl">Name of the file that should be loaded when this host boots off of the network, overrides setting on main page.</span></td>
 		</tr>
 		<tr>
 		  <td width="22%" valign="top" class="vncell">Root Path</td>
 		  <td width="78%" class="vtable">
 			<input name="rootpath" type="text" class="formfld unknown" id="rootpath" size="90" value="<?=htmlspecialchars($pconfig['rootpath']);?>">
-		    <br> <span class="vexpl"><?=gettext("Enter the"); ?> <b><?=gettext("root-path"); ?></b>-<?=gettext("string");?>, overrides setting on main page.</span></td>
+		    <br /> <span class="vexpl"><?=gettext("Enter the"); ?> <b><?=gettext("root-path"); ?></b>-<?=gettext("string");?>, overrides setting on main page.</span></td>
 		</tr>
 		<?php } ?>
                 <tr>
                   <td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td>
                   <td width="78%" class="vtable">
                     <input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>">
-                    <br> <span class="vexpl"><?=gettext("You may enter a description here ".
+                    <br /> <span class="vexpl"><?=gettext("You may enter a description here ".
                     "for your reference (not parsed).");?></span></td>
                 </tr>
                 <tr>
                   <td width="22%" valign="top" class="vncell"><?=gettext("ARP Table Static Entry");?></td>
                   <td width="78%" class="vtable">
                     <input name="arp_table_static_entry" id="arp_table_static_entry" type="checkbox" value="yes" <?php if ($pconfig['arp_table_static_entry']) echo "checked"; ?>>
-                    <br> <span class="vexpl"><?=gettext("Create an ARP Table Static Entry for this MAC & IP Address pair. ".
+                    <br /> <span class="vexpl"><?=gettext("Create an ARP Table Static Entry for this MAC & IP Address pair. ".
                     "");?></span></td>
                 </tr>
 		<tr>
 		<td width="22%" valign="top" class="vncell"><?=gettext("WINS servers");?></td>
 		<td width="78%" class="vtable">
-			<input name="wins1" type="text" class="formfld unknown" id="wins1" size="20" value="<?=htmlspecialchars($pconfig['wins1']);?>"><br>
+			<input name="wins1" type="text" class="formfld unknown" id="wins1" size="20" value="<?=htmlspecialchars($pconfig['wins1']);?>"><br />
 			<input name="wins2" type="text" class="formfld unknown" id="wins2" size="20" value="<?=htmlspecialchars($pconfig['wins2']);?>">
 		</td>
 		</tr>
 		<tr>
 		<td width="22%" valign="top" class="vncell"><?=gettext("DNS servers");?></td>
 		<td width="78%" class="vtable">
-			<input name="dns1" type="text" class="formfld unknown" id="dns1" size="20" value="<?=htmlspecialchars($pconfig['dns1']);?>"><br>
-			<input name="dns2" type="text" class="formfld unknown" id="dns2" size="20" value="<?=htmlspecialchars($pconfig['dns2']);?>"><br>
+			<input name="dns1" type="text" class="formfld unknown" id="dns1" size="20" value="<?=htmlspecialchars($pconfig['dns1']);?>"><br />
+			<input name="dns2" type="text" class="formfld unknown" id="dns2" size="20" value="<?=htmlspecialchars($pconfig['dns2']);?>"><br />
 			<?=gettext("NOTE: leave blank to use the system default DNS servers - this interface's IP if DNS forwarder is enabled, otherwise the servers configured on the General page.");?>
 		</td>
 		</tr>
 		<tr>
 		<td width="22%" valign="top" class="vncell"><?=gettext("Gateway");?></td>
 		<td width="78%" class="vtable">
-			<input name="gateway" type="text" class="formfld host" id="gateway" size="20" value="<?=htmlspecialchars($pconfig['gateway']);?>"><br>
+			<input name="gateway" type="text" class="formfld host" id="gateway" size="20" value="<?=htmlspecialchars($pconfig['gateway']);?>"><br />
 			 <?=gettext("The default is to use the IP on this interface of the firewall as the gateway. Specify an alternate gateway here if this is not the correct gateway for your network.");?>
 		</td>
 		</tr>
 		<tr>
 		<td width="22%" valign="top" class="vncell"><?=gettext("Domain name");?></td>
 		<td width="78%" class="vtable">
-			<input name="domain" type="text" class="formfld unknown" id="domain" size="20" value="<?=htmlspecialchars($pconfig['domain']);?>"><br>
+			<input name="domain" type="text" class="formfld unknown" id="domain" size="20" value="<?=htmlspecialchars($pconfig['domain']);?>"><br />
 			 <?=gettext("The default is to use the domain name of this system as the default domain name provided by DHCP. You may specify an alternate domain name here.");?>
 		</td>
 		</tr>
 		<tr>
 		<td width="22%" valign="top" class="vncell"><?=gettext("Domain search list");?></td>
 		<td width="78%" class="vtable">
-			<input name="domainsearchlist" type="text" class="formfld unknown" id="domainsearchlist" size="20" value="<?=htmlspecialchars($pconfig['domainsearchlist']);?>"><br>
+			<input name="domainsearchlist" type="text" class="formfld unknown" id="domainsearchlist" size="20" value="<?=htmlspecialchars($pconfig['domainsearchlist']);?>"><br />
 			<?=gettext("The DHCP server can optionally provide a domain search list. Use the semicolon character as separator ");?>
 		</td>
 		</tr>
@@ -458,9 +458,9 @@ include("head.inc");
 		<td width="22%" valign="top" class="vncell"><?=gettext("Default lease time");?></td>
 		<td width="78%" class="vtable">
 			<input name="deftime" type="text" class="formfld unknown" id="deftime" size="10" value="<?=htmlspecialchars($pconfig['deftime']);?>">
-			<?=gettext("seconds");?><br>
+			<?=gettext("seconds");?><br />
 			<?=gettext("This is used for clients that do not ask for a specific " .
-			"expiration time."); ?><br>
+			"expiration time."); ?><br />
 			<?=gettext("The default is 7200 seconds.");?>
 		</td>
 		</tr>
@@ -468,9 +468,9 @@ include("head.inc");
 		<td width="22%" valign="top" class="vncell"><?=gettext("Maximum lease time");?></td>
 		<td width="78%" class="vtable">
 			<input name="maxtime" type="text" class="formfld unknown" id="maxtime" size="10" value="<?=htmlspecialchars($pconfig['maxtime']);?>">
-			<?=gettext("seconds");?><br>
+			<?=gettext("seconds");?><br />
 			<?=gettext("This is the maximum lease time for clients that ask".
-			" for a specific expiration time."); ?><br>
+			" for a specific expiration time."); ?><br />
 			<?=gettext("The default is 86400 seconds.");?>
 		</td>
 		</tr>
@@ -487,7 +487,7 @@ include("head.inc");
 				<input name="ddnsdomain" type="text" class="formfld unknown" id="ddnsdomain" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomain']);?>"><br />
 				<?=gettext("Note: Leave blank to disable dynamic DNS registration.");?><br />
 				<?=gettext("Enter the dynamic DNS domain which will be used to register client names in the DNS server.");?>
-				<input name="ddnsdomainprimary" type="text" class="formfld unknown" id="ddnsdomainprimary" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomainprimary']);?>"><br>
+				<input name="ddnsdomainprimary" type="text" class="formfld unknown" id="ddnsdomainprimary" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomainprimary']);?>"><br />
 				<?=gettext("Enter the primary domain name server IP address for the dynamic domain name.");?><br />
 				<input name="ddnsdomainkeyname" type="text" class="formfld unknown" id="ddnsdomainkeyname" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomainkeyname']);?>"><br />
 				<?=gettext("Enter the dynamic DNS domain key name which will be used to register client names in the DNS server.");?>
@@ -503,7 +503,7 @@ include("head.inc");
 				<input type="button" onClick="show_ntp_config()" value="<?=gettext("Advanced");?>"></input> - <?=gettext("Show NTP configuration");?></a>
 			</div>
 			<div id="showntp" style="display:none">
-				<input name="ntp1" type="text" class="formfld unknown" id="ntp1" size="20" value="<?=htmlspecialchars($pconfig['ntp1']);?>"><br>
+				<input name="ntp1" type="text" class="formfld unknown" id="ntp1" size="20" value="<?=htmlspecialchars($pconfig['ntp1']);?>"><br />
 				<input name="ntp2" type="text" class="formfld unknown" id="ntp2" size="20" value="<?=htmlspecialchars($pconfig['ntp2']);?>">
 			</div>
 		</td>
@@ -515,7 +515,7 @@ include("head.inc");
 			<input type="button" onClick="show_tftp_config()" value="<?=gettext("Advanced");?>"></input> - <?=gettext("Show TFTP configuration");?></a>
 		</div>
 		<div id="showtftp" style="display:none">
-			<input name="tftp" type="text" class="formfld unknown" id="tftp" size="50" value="<?=htmlspecialchars($pconfig['tftp']);?>"><br>
+			<input name="tftp" type="text" class="formfld unknown" id="tftp" size="50" value="<?=htmlspecialchars($pconfig['tftp']);?>"><br />
 			<?=gettext("Leave blank to disable.  Enter a full hostname or IP for the TFTP server.");?>
 		</div>
 		</td>
diff --git a/usr/local/www/services_dhcpv6.php b/usr/local/www/services_dhcpv6.php
index e9e9b8d750..60395aaed5 100644
--- a/usr/local/www/services_dhcpv6.php
+++ b/usr/local/www/services_dhcpv6.php
@@ -466,7 +466,7 @@ include("head.inc");
 	}
 ?>
 <?php if (is_subsystem_dirty('staticmaps')): ?><p>
-<?php print_info_box_np(gettext("The static mapping configuration has been changed") . ".<br>" . gettext("You must apply the changes in order for them to take effect."));?><br>
+<?php print_info_box_np(gettext("The static mapping configuration has been changed") . ".<br />" . gettext("You must apply the changes in order for them to take effect."));?><br />
 <?php endif; ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr><td>
@@ -597,7 +597,7 @@ display_top_tabs($tab_array);
 			<td width="78%" class="vtable">
 				<input name="prefixrange_from" type="text" class="formfld unknown" id="prefixrange_from" size="28" value="<?=htmlspecialchars($pconfig['prefixrange_from']);?>">
 				&nbsp;<?=gettext("to"); ?>&nbsp; <input name="prefixrange_to" type="text" class="formfld unknown" id="prefixrange_to" size="28" value="<?=htmlspecialchars($pconfig['prefixrange_to']);?>">
-				&nbsp;<br/><?=gettext("Prefix Delegation Size"); ?>:&nbsp; <select name="prefixrange_length" class="formselect" id="prefixrange_length">
+				&nbsp;<br /><?=gettext("Prefix Delegation Size"); ?>:&nbsp; <select name="prefixrange_length" class="formselect" id="prefixrange_length">
 					<option value="48" <?php if($pconfig['prefixrange_length'] == 48) echo "selected"; ?>>48</option>
 					<option value="52" <?php if($pconfig['prefixrange_length'] == 52) echo "selected"; ?>>52</option>
 					<option value="56" <?php if($pconfig['prefixrange_length'] == 56) echo "selected"; ?>>56</option>
@@ -605,7 +605,7 @@ display_top_tabs($tab_array);
 					<option value="62" <?php if($pconfig['prefixrange_length'] == 62) echo "selected"; ?>>62</option>
 					<option value="63" <?php if($pconfig['prefixrange_length'] == 63) echo "selected"; ?>>63</option>
 					<option value="64" <?php if($pconfig['prefixrange_length'] == 64) echo "selected"; ?>>64</option>
-				</select> <br/>
+				</select> <br />
 				<?php echo gettext("You can define a Prefix range here for DHCP Prefix Delegation. This allows for 
 					assigning networks to subrouters. The start and end of the range must end on boundaries of the prefix delegation size."); ?>
 			</td>
@@ -613,22 +613,22 @@ display_top_tabs($tab_array);
 			<tr>
 			<td width="22%" valign="top" class="vncell"><?=gettext("DNS servers");?></td>
 			<td width="78%" class="vtable">
-				<input name="dns1" type="text" class="formfld unknown" id="dns1" size="28" value="<?=htmlspecialchars($pconfig['dns1']);?>"><br>
-				<input name="dns2" type="text" class="formfld unknown" id="dns2" size="28" value="<?=htmlspecialchars($pconfig['dns2']);?>"><br>
+				<input name="dns1" type="text" class="formfld unknown" id="dns1" size="28" value="<?=htmlspecialchars($pconfig['dns1']);?>"><br />
+				<input name="dns2" type="text" class="formfld unknown" id="dns2" size="28" value="<?=htmlspecialchars($pconfig['dns2']);?>"><br />
 				<?=gettext("NOTE: leave blank to use the system default DNS servers - this interface's IP if DNS forwarder is enabled, otherwise the servers configured on the General page.");?>
 			</td>
 			</tr>
 			<tr>
 			<td width="22%" valign="top" class="vncell"><?=gettext("Domain name");?></td>
 			<td width="78%" class="vtable">
-				<input name="domain" type="text" class="formfld unknown" id="domain" size="28" value="<?=htmlspecialchars($pconfig['domain']);?>"><br>
+				<input name="domain" type="text" class="formfld unknown" id="domain" size="28" value="<?=htmlspecialchars($pconfig['domain']);?>"><br />
 				 <?=gettext("The default is to use the domain name of this system as the default domain name provided by DHCP. You may specify an alternate domain name here.");?>
 			 </td>
 			</tr>
 			<tr>
 			<td width="22%" valign="top" class="vncell"><?=gettext("Domain search list");?></td>
 			<td width="78%" class="vtable">
-				<input name="domainsearchlist" type="text" class="formfld unknown" id="domainsearchlist" size="28" value="<?=htmlspecialchars($pconfig['domainsearchlist']);?>"><br>
+				<input name="domainsearchlist" type="text" class="formfld unknown" id="domainsearchlist" size="28" value="<?=htmlspecialchars($pconfig['domainsearchlist']);?>"><br />
 				<?=gettext("The DHCP server can optionally provide a domain search list. Use the semicolon character as separator");?>
 			</td>
 			</tr>
@@ -636,9 +636,9 @@ display_top_tabs($tab_array);
 			<td width="22%" valign="top" class="vncell"><?=gettext("Default lease time");?></td>
 			<td width="78%" class="vtable">
 				<input name="deftime" type="text" class="formfld unknown" id="deftime" size="10" value="<?=htmlspecialchars($pconfig['deftime']);?>">
-				<?=gettext("seconds");?><br>
+				<?=gettext("seconds");?><br />
 				<?=gettext("This is used for clients that do not ask for a specific " .
-				"expiration time."); ?><br>
+				"expiration time."); ?><br />
 				<?=gettext("The default is 7200 seconds.");?>
 			</td>
 			</tr>
@@ -646,9 +646,9 @@ display_top_tabs($tab_array);
 			<td width="22%" valign="top" class="vncell"><?=gettext("Maximum lease time");?></td>
 			<td width="78%" class="vtable">
 				<input name="maxtime" type="text" class="formfld unknown" id="maxtime" size="10" value="<?=htmlspecialchars($pconfig['maxtime']);?>">
-				<?=gettext("seconds");?><br>
+				<?=gettext("seconds");?><br />
 				<?=gettext("This is the maximum lease time for clients that ask".
-				" for a specific expiration time."); ?><br>
+				" for a specific expiration time."); ?><br />
 				<?=gettext("The default is 86400 seconds.");?>
 			</td>
 			</tr>
@@ -690,7 +690,7 @@ display_top_tabs($tab_array);
 					<input name="ddnsdomain" type="text" class="formfld unknown" id="ddnsdomain" size="28" value="<?=htmlspecialchars($pconfig['ddnsdomain']);?>"><br />
 					<?=gettext("Note: Leave blank to disable dynamic DNS registration.");?><br />
 					<?=gettext("Enter the dynamic DNS domain which will be used to register client names in the DNS server.");?>
-					<input name="ddnsdomainprimary" type="text" class="formfld unknown" id="ddnsdomainprimary" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomainprimary']);?>"><br>
+					<input name="ddnsdomainprimary" type="text" class="formfld unknown" id="ddnsdomainprimary" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomainprimary']);?>"><br />
 					<?=gettext("Enter the primary domain name server IP address for the dynamic domain name.");?><br />
 					<input name="ddnsdomainkeyname" type="text" class="formfld unknown" id="ddnsdomainkeyname" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomainkeyname']);?>"><br />
 					<?=gettext("Enter the dynamic DNS domain key name which will be used to register client names in the DNS server.");?>
@@ -706,7 +706,7 @@ display_top_tabs($tab_array);
 					<input type="button" onClick="show_ntp_config()" value="<?=gettext("Advanced");?>"></input> - <?=gettext("Show NTP configuration");?></a>
 				</div>
 				<div id="showntp" style="display:none">
-					<input name="ntp1" type="text" class="formfld unknown" id="ntp1" size="28" value="<?=htmlspecialchars($pconfig['ntp1']);?>"><br>
+					<input name="ntp1" type="text" class="formfld unknown" id="ntp1" size="28" value="<?=htmlspecialchars($pconfig['ntp1']);?>"><br />
 					<input name="ntp2" type="text" class="formfld unknown" id="ntp2" size="28" value="<?=htmlspecialchars($pconfig['ntp2']);?>">
 				</div>
 			</td>
@@ -719,7 +719,7 @@ display_top_tabs($tab_array);
 				<input type="button" onClick="show_tftp_config()" value="<?=gettext("Advanced");?>"></input> - <?=gettext("Show TFTP configuration");?></a>
 			</div>
 			<div id="showtftp" style="display:none">
-				<input name="tftp" type="text" class="formfld unknown" id="tftp" size="50" value="<?=htmlspecialchars($pconfig['tftp']);?>"><br>
+				<input name="tftp" type="text" class="formfld unknown" id="tftp" size="50" value="<?=htmlspecialchars($pconfig['tftp']);?>"><br />
 				<?=gettext("Leave blank to disable.  Enter a full hostname or IP for the TFTP server.");?>
 			</div>
 			</td>
@@ -732,7 +732,7 @@ display_top_tabs($tab_array);
 					<input type="button" onClick="show_ldap_config()" value="<?=gettext("Advanced");?>"></input> - <?=gettext("Show LDAP configuration");?></a>
 				</div>
 				<div id="showldap" style="display:none">
-					<input name="ldap" type="text" class="formfld unknown" id="ldap" size="80" value="<?=htmlspecialchars($pconfig['ldap']);?>"><br>
+					<input name="ldap" type="text" class="formfld unknown" id="ldap" size="80" value="<?=htmlspecialchars($pconfig['ldap']);?>"><br />
 					<?=gettext("Leave blank to disable.  Enter a full URI for the LDAP server in the form ldap://ldap.example.com/dc=example,dc=com");?>
 				</div>
 			</td>
@@ -820,14 +820,14 @@ display_top_tabs($tab_array);
 			</tr>
 			<tr>
 			<td width="22%" valign="top">&nbsp;</td>
-			<td width="78%"> <p><span class="vexpl"><span class="red"><strong><?=gettext("Note:");?><br>
+			<td width="78%"> <p><span class="vexpl"><span class="red"><strong><?=gettext("Note:");?><br />
 				</strong></span><?=gettext("The DNS servers entered in"); ?> <a href="system.php"><?=gettext("System: " .
 				"General setup"); ?></a> <?=gettext("(or the"); ?> <a href="services_dnsmasq.php"><?=gettext("DNS " .
 				"forwarder"); ?></a>, <?=gettext("if enabled)"); ?> </span><span class="vexpl"><?=gettext("will " .
-				"be assigned to clients by the DHCP server."); ?><br>
-				<br>
+				"be assigned to clients by the DHCP server."); ?><br />
+				<br />
 				<?=gettext("The DHCP lease table can be viewed on the"); ?> <a href="status_dhcpv6_leases.php"><?=gettext("Status: " .
-				"DHCPv6 leases"); ?></a> <?=gettext("page."); ?><br>
+				"DHCPv6 leases"); ?></a> <?=gettext("page."); ?><br />
 				</span></p>
 			</td>
 			</tr>
diff --git a/usr/local/www/services_dhcpv6_edit.php b/usr/local/www/services_dhcpv6_edit.php
index 40f71caeef..e049af5024 100644
--- a/usr/local/www/services_dhcpv6_edit.php
+++ b/usr/local/www/services_dhcpv6_edit.php
@@ -195,7 +195,7 @@ include("head.inc");
                   <td width="22%" valign="top" class="vncellreq"><?=gettext("DUID Identifier");?></td>
                   <td width="78%" class="vtable"> 
                     <input name="duid" type="text" class="formfld unknown" id="duid" size="40" value="<?=htmlspecialchars($pconfig['duid']);?>">
-                    <br>
+                    <br />
                     <span class="vexpl"><?=gettext("Enter a DUID Identifier in the following format: ");?><br />
 "DUID-LLT - ETH -- TIME --- ---- address ----" <br />
 "xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx"</span></td>
@@ -204,9 +204,9 @@ include("head.inc");
                   <td width="22%" valign="top" class="vncell"><?=gettext("IPv6 address");?></td>
                   <td width="78%" class="vtable"> 
                     <input name="ipaddrv6" type="text" class="formfld unknown" id="ipaddrv6" size="28" value="<?=htmlspecialchars($pconfig['ipaddrv6']);?>">
-                    <br>
+                    <br />
 			<?=gettext("If an IPv6 address is entered, the address must be outside of the pool.");?>
-			<br/>
+			<br />
 			<?=gettext("If no IPv6 address is given, one will be dynamically allocated from the pool.");?>
 			</td>
                 </tr>
@@ -214,27 +214,27 @@ include("head.inc");
                   <td width="22%" valign="top" class="vncell"><?=gettext("Hostname");?></td>
                   <td width="78%" class="vtable"> 
                     <input name="hostname" type="text" class="formfld unknown" id="hostname" size="28" value="<?=htmlspecialchars($pconfig['hostname']);?>">
-                    <br> <span class="vexpl"><?=gettext("Name of the host, without domain part.");?></span></td>
+                    <br /> <span class="vexpl"><?=gettext("Name of the host, without domain part.");?></span></td>
                 </tr>				
                 <?php if($netboot_enabled) { ?>
 		<tr>
 		  <td width="22%" valign="top" class="vncell">Netboot filename</td>
 		  <td width="78%" class="vtable">
 		    <input name="filename" type="text" class="formfld unknown" id="filename" size="28" value="<?=htmlspecialchars($pconfig['filename']);?>">
-		    <br> <span class="vexpl">Name of the file that should be loaded when this host boots off of the network, overrides setting on main page.</span></td>
+		    <br /> <span class="vexpl">Name of the file that should be loaded when this host boots off of the network, overrides setting on main page.</span></td>
 		</tr>
 		<tr>
 		  <td width="22%" valign="top" class="vncell">Root Path</td>
 		  <td width="78%" class="vtable">
 			<input name="rootpath" type="text" class="formfld unknown" id="rootpath" size="90" value="<?=htmlspecialchars($pconfig['rootpath']);?>">
-		    <br> <span class="vexpl"><?=gettext("Enter the"); ?> <b><?=gettext("root-path"); ?></b>-<?=gettext("string");?>, overrides setting on main page.</span></td>
+		    <br /> <span class="vexpl"><?=gettext("Enter the"); ?> <b><?=gettext("root-path"); ?></b>-<?=gettext("string");?>, overrides setting on main page.</span></td>
 		</tr>
 		<?php } ?>
                 <tr> 
                   <td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td>
                   <td width="78%" class="vtable"> 
                     <input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>"> 
-                    <br> <span class="vexpl"><?=gettext("You may enter a description here ".
+                    <br /> <span class="vexpl"><?=gettext("You may enter a description here ".
                     "for your reference (not parsed).");?></span></td>
                 </tr>
                 <tr> 
diff --git a/usr/local/www/services_dnsmasq.php b/usr/local/www/services_dnsmasq.php
old mode 100755
new mode 100644
index 59f55f2a3e..d3529ec562
--- a/usr/local/www/services_dnsmasq.php
+++ b/usr/local/www/services_dnsmasq.php
@@ -172,7 +172,7 @@ function show_advanced_dns() {
 <?php if ($input_errors) print_input_errors($input_errors); ?>
 <?php if ($savemsg) print_info_box($savemsg); ?>
 <?php if (is_subsystem_dirty('hosts')): ?><p>
-<?php print_info_box_np(gettext("The DNS forwarder configuration has been changed") . ".<br>" . gettext("You must apply the changes in order for them to take effect."));?><br>
+<?php print_info_box_np(gettext("The DNS forwarder configuration has been changed") . ".<br />" . gettext("You must apply the changes in order for them to take effect."));?><br />
 <?php endif; ?>
 <table width="100%" border="0" cellpadding="6" cellspacing="0">
 	<tr>
@@ -182,14 +182,14 @@ function show_advanced_dns() {
 		<td width="22%" valign="top" class="vncellreq"><?=gettext("Enable");?></td>
 		<td width="78%" class="vtable"><p>
 			<input name="enable" type="checkbox" id="enable" value="yes" <?php if ($pconfig['enable'] == "yes") echo "checked";?> onClick="enable_change(false)">
-			<strong><?=gettext("Enable DNS forwarder");?><br>
+			<strong><?=gettext("Enable DNS forwarder");?><br />
 			</strong></p></td>
 		</tr>
 	<tr>
 		<td width="22%" valign="top" class="vncellreq"><?=gettext("DHCP Registration");?></td>
 		<td width="78%" class="vtable"><p>
 			<input name="regdhcp" type="checkbox" id="regdhcp" value="yes" <?php if ($pconfig['regdhcp'] == "yes") echo "checked";?>>
-			<strong><?=gettext("Register DHCP leases in DNS forwarder");?><br>
+			<strong><?=gettext("Register DHCP leases in DNS forwarder");?><br />
 			</strong><?php printf(gettext("If this option is set, then machines that specify".
 			" their hostname when requesting a DHCP lease will be registered".
 			" in the DNS forwarder, so that their name can be resolved.".
@@ -201,7 +201,7 @@ function show_advanced_dns() {
 		<td width="22%" valign="top" class="vncellreq"><?=gettext("Static DHCP");?></td>
 		<td width="78%" class="vtable"><p>
 			<input name="regdhcpstatic" type="checkbox" id="regdhcpstatic" value="yes" <?php if ($pconfig['regdhcpstatic'] == "yes") echo "checked";?>>
-			<strong><?=gettext("Register DHCP static mappings in DNS forwarder");?><br>
+			<strong><?=gettext("Register DHCP static mappings in DNS forwarder");?><br />
 			</strong><?php printf(gettext("If this option is set, then DHCP static mappings will ".
 					"be registered in the DNS forwarder, so that their name can be ".
 					"resolved. You should also set the domain in %s".
@@ -212,7 +212,7 @@ function show_advanced_dns() {
 		<td width="22%" valign="top" class="vncellreq"><?=gettext("Prefer DHCP");?></td>
 		<td width="78%" class="vtable"><p>
 			<input name="dhcpfirst" type="checkbox" id="dhcpfirst" value="yes" <?php if ($pconfig['dhcpfirst'] == "yes") echo "checked";?>>
-			<strong><?=gettext("Resolve DHCP mappings first");?><br>
+			<strong><?=gettext("Resolve DHCP mappings first");?><br />
 			</strong><?php printf(gettext("If this option is set, then DHCP mappings will ".
 					"be resolved before the manual list of names below. This only ".
 					"affects the name given for a reverse lookup (PTR)."));?></p>
@@ -222,7 +222,7 @@ function show_advanced_dns() {
 		<td rowspan="3" width="22%" valign="top" class="vncellreq"><?=gettext("DNS Query Forwarding");?></td>
 		<td width="78%" class="vtable"><p>
 			<input name="strict_order" type="checkbox" id="strict_order" value="yes" <?php if ($pconfig['strict_order'] == "yes") echo "checked";?>>
-			<strong><?=gettext("Query DNS servers sequentially");?><br>
+			<strong><?=gettext("Query DNS servers sequentially");?><br />
 			</strong><?php printf(gettext("If this option is set, %s DNS Forwarder (dnsmasq) will ".
 					"query the DNS servers sequentially in the order specified (<i>System - General Setup - DNS Servers</i>), ".
 					"rather than all at once in parallel. ".
@@ -232,7 +232,7 @@ function show_advanced_dns() {
 	<tr>
 		<td width="78%" class="vtable"><p>
 			<input name="domain_needed" type="checkbox" id="domain_needed" value="yes" <?php if ($pconfig['domain_needed'] == "yes") echo "checked";?>>
-			<strong><?=gettext("Require domain");?><br>
+			<strong><?=gettext("Require domain");?><br />
 			</strong><?php printf(gettext("If this option is set, %s DNS Forwarder (dnsmasq) will ".
 					"not forward A or AAAA queries for plain names, without dots or domain parts, to upstream name servers.  ".
 					"If the name is not known from /etc/hosts or DHCP then a \"not found\" answer is returned. ".
@@ -242,7 +242,7 @@ function show_advanced_dns() {
 	<tr>
 		<td width="78%" class="vtable"><p>
 			<input name="no_private_reverse" type="checkbox" id="no_private_reverse" value="yes" <?php if ($pconfig['no_private_reverse'] == "yes") echo "checked";?>>
-			<strong><?=gettext("Do not forward private reverse lookups");?><br>
+			<strong><?=gettext("Do not forward private reverse lookups");?><br />
 			</strong><?php printf(gettext("If this option is set, %s DNS Forwarder (dnsmasq) will ".
 					"not forward reverse DNS lookups (PTR) for private addresses (RFC 1918) to upstream name servers.  ".
 					"Any entries in the Domain Overrides section forwarding private \"n.n.n.in-addr.arpa\" names to a specific server are still forwarded. ".
@@ -300,9 +300,9 @@ function show_advanced_dns() {
 				<input type="button" onClick="show_advanced_dns()" value="<?=gettext("Advanced"); ?>"></input> - <?=gettext("Show advanced option");?></a>
 			</div>
 			<div id="showadv" <?php if (empty($pconfig['custom_options'])) echo "style='display:none'"; ?>>
-				<strong><?=gettext("Advanced");?><br></strong>
-				<textarea rows="6" cols="78" name="custom_options" id="custom_options"><?=htmlspecialchars($pconfig['custom_options']);?></textarea><br/>
-				<?=gettext("Enter any additional options you would like to add to the dnsmasq configuration here, separated by a space or newline"); ?><br/>
+				<strong><?=gettext("Advanced");?><br /></strong>
+				<textarea rows="6" cols="78" name="custom_options" id="custom_options"><?=htmlspecialchars($pconfig['custom_options']);?></textarea><br />
+				<?=gettext("Enter any additional options you would like to add to the dnsmasq configuration here, separated by a space or newline"); ?><br />
 			</div>
 			</p>
 		</td>
@@ -314,7 +314,7 @@ function show_advanced_dns() {
 	</tr>
 </table>
 
-<p><span class="vexpl"><span class="red"><strong><?=gettext("Note:");?><br>
+<p><span class="vexpl"><span class="red"><strong><?=gettext("Note:");?><br />
 </strong></span><?php printf(gettext("If the DNS forwarder is enabled, the DHCP".
 " service (if enabled) will automatically serve the LAN IP".
 " address as a DNS server to DHCP clients so they will use".
@@ -325,16 +325,16 @@ function show_advanced_dns() {
 " is checked. If you don't use that option (or if you use".
 " a static IP address on WAN), you must manually specify at".
 " least one DNS server on the %sSystem:".
-"General setup%s page."),'<a href="system.php">','</a>','<a href="system.php">','</a>');?><br>
+"General setup%s page."),'<a href="system.php">','</a>','<a href="system.php">','</a>');?><br />
 </span></p>
 
-&nbsp;<br>
+&nbsp;<br />
 <table width="100%" border="0" cellpadding="0" cellspacing="0" class="tabcont">
 <tr>
 	<td colspan="5" valign="top" class="listtopic"><?=gettext("Host Overrides");?></td>
 </tr>
 <tr>
-	<td><br/>
+	<td><br />
 	<?=gettext("Entries in this section override individual results from the forwarders.");?>
 	<?=gettext("Use these for changing DNS results or for adding custom DNS records.");?>
 	</td>
@@ -417,7 +417,7 @@ function show_advanced_dns() {
 	</tr>
 	</tfoot>
 </table>
-<br/>
+<br />
 <table width="100%" border="0" cellpadding="0" cellspacing="0" class="tabcont">
 <tr>
 	<td colspan="5" valign="top" class="listtopic"><?=gettext("Domain Overrides");?></td>
diff --git a/usr/local/www/services_dnsmasq_domainoverride_edit.php b/usr/local/www/services_dnsmasq_domainoverride_edit.php
old mode 100755
new mode 100644
index 1e595da210..e74d396564
--- a/usr/local/www/services_dnsmasq_domainoverride_edit.php
+++ b/usr/local/www/services_dnsmasq_domainoverride_edit.php
@@ -131,28 +131,28 @@ include("head.inc");
                   <td width="22%" valign="top" class="vncellreq"><?=gettext("Domain");?></td>
                   <td width="78%" class="vtable">
                     <?=$mandfldhtml;?><input name="domain" type="text" class="formfld unknown" id="domain" size="40" value="<?=htmlspecialchars($pconfig['domain']);?>">
-                    <br> <span class="vexpl"><?=gettext("Domain to override (NOTE: this does not have to be a valid TLD!)"); ?><br>
+                    <br /> <span class="vexpl"><?=gettext("Domain to override (NOTE: this does not have to be a valid TLD!)"); ?><br />
                     <?=gettext("e.g."); ?> <em><?=gettext("test"); ?></em> <?=gettext("or"); ?> <em>mycompany.localdomain</em> <?=gettext("or"); ?> <em>1.168.192.in-addr.arpa</em> </span></td>
                 </tr>
                                <tr>
                   <td width="22%" valign="top" class="vncellreq"><?=gettext("IP address");?></td>
                   <td width="78%" class="vtable">
                     <?=$mandfldhtml;?><input name="ip" type="text" class="formfld unknown" id="ip" size="40" value="<?=htmlspecialchars($pconfig['ip']);?>">
-                    <br> <span class="vexpl"><?=gettext("IP address of the authoritative DNS server for this domain"); ?><br>
-                    <?=gettext("e.g."); ?> <em>192.168.100.100</em><br/><?=gettext("Or enter # for an exclusion to pass through this host/subdomain to standard nameservers instead of a previous override."); ?><br/><?=gettext("Or enter ! for lookups for this host/subdomain to NOT be forwarded anywhere."); ?></span></td>
+                    <br /> <span class="vexpl"><?=gettext("IP address of the authoritative DNS server for this domain"); ?><br />
+                    <?=gettext("e.g."); ?> <em>192.168.100.100</em><br /><?=gettext("Or enter # for an exclusion to pass through this host/subdomain to standard nameservers instead of a previous override."); ?><br /><?=gettext("Or enter ! for lookups for this host/subdomain to NOT be forwarded anywhere."); ?></span></td>
                 </tr>
                                <tr>
                   <td width="22%" valign="top" class="vncell"><?=gettext("Source IP");?></td>
                   <td width="78%" class="vtable">
                     <?=$mandfldhtml;?><input name="dnssrcip" type="text" class="formfld unknown" id="dnssrcip" size="40" value="<?=htmlspecialchars($pconfig['dnssrcip']);?>">
-                    <br> <span class="vexpl"><?=gettext("Source IP address for queries to the DNS server for the override domain."); ?><br>
+                    <br /> <span class="vexpl"><?=gettext("Source IP address for queries to the DNS server for the override domain."); ?><br />
                     <?=gettext("Leave blank unless your DNS server is accessed through a VPN tunnel."); ?></span></td>
                 </tr>
                                <tr>
                   <td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td>
                   <td width="78%" class="vtable">
                     <input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>">
-                    <br> <span class="vexpl"><?=gettext("You may enter a description here".
+                    <br /> <span class="vexpl"><?=gettext("You may enter a description here".
                     " for your reference (not parsed).");?></span></td>
                 </tr>
                 <tr>
diff --git a/usr/local/www/services_dnsmasq_edit.php b/usr/local/www/services_dnsmasq_edit.php
old mode 100755
new mode 100644
index 4efeafd5d0..5916b1c5ad
--- a/usr/local/www/services_dnsmasq_edit.php
+++ b/usr/local/www/services_dnsmasq_edit.php
@@ -198,29 +198,29 @@ include("head.inc");
                   <td width="22%" valign="top" class="vncell"><?=gettext("Host");?></td>
                   <td width="78%" class="vtable"> 
                     <input name="host" type="text" class="formfld" id="host" size="40" value="<?=htmlspecialchars($pconfig['host']);?>">
-                    <br> <span class="vexpl"><?=gettext("Name of the host, without".
-                   " domain part"); ?><br>
+                    <br /> <span class="vexpl"><?=gettext("Name of the host, without".
+                   " domain part"); ?><br />
                    <?=gettext("e.g."); ?> <em><?=gettext("myhost"); ?></em></span></td>
                 </tr>
 				<tr>
                   <td width="22%" valign="top" class="vncellreq"><?=gettext("Domain");?></td>
                   <td width="78%" class="vtable"> 
                     <input name="domain" type="text" class="formfld" id="domain" size="40" value="<?=htmlspecialchars($pconfig['domain']);?>">
-                    <br> <span class="vexpl"><?=gettext("Domain of the host"); ?><br>
+                    <br /> <span class="vexpl"><?=gettext("Domain of the host"); ?><br />
                    <?=gettext("e.g."); ?> <em><?=gettext("example.com"); ?></em></span></td>
                 </tr>
 				<tr>
                   <td width="22%" valign="top" class="vncellreq"><?=gettext("IP address");?></td>
                   <td width="78%" class="vtable"> 
                     <input name="ip" type="text" class="formfld" id="ip" size="40" value="<?=htmlspecialchars($pconfig['ip']);?>">
-                    <br> <span class="vexpl"><?=gettext("IP address of the host"); ?><br>
+                    <br /> <span class="vexpl"><?=gettext("IP address of the host"); ?><br />
                    <?=gettext("e.g."); ?> <em>192.168.100.100</em> <?=gettext("or"); ?> <em>fd00:abcd::1</em></span></td>
                 </tr>
 				<tr>
                   <td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td>
                   <td width="78%" class="vtable"> 
                     <input name="descr" type="text" class="formfld" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>">
-                    <br> <span class="vexpl"><?=gettext("You may enter a description here".
+                    <br /> <span class="vexpl"><?=gettext("You may enter a description here".
                    " for your reference (not parsed).");?></span></td>
                 </tr>
 				<tr>
diff --git a/usr/local/www/services_dyndns.php b/usr/local/www/services_dyndns.php
old mode 100755
new mode 100644
index 0852071923..c2f4860a4d
--- a/usr/local/www/services_dyndns.php
+++ b/usr/local/www/services_dyndns.php
@@ -185,9 +185,9 @@ include("head.inc");
 		</tr>
 		<tr>
 		  <td colspan="5" class="list"><p class="vexpl"><span class="red"><strong>
-			<?=gettext("Note:");?><br>
+			<?=gettext("Note:");?><br />
 			</strong></span>
-			<?=gettext("IP addresses appearing in green are up to date with Dynamic DNS provider.");?><br>
+			<?=gettext("IP addresses appearing in green are up to date with Dynamic DNS provider.");?><br />
 			<?=gettext("You can force an update for an IP address on the edit page for that service.");?>
 		  </td>
 		  <td class="list">&nbsp;</td>
diff --git a/usr/local/www/services_dyndns_edit.php b/usr/local/www/services_dyndns_edit.php
index 0284988143..83ce62c3a4 100644
--- a/usr/local/www/services_dyndns_edit.php
+++ b/usr/local/www/services_dyndns_edit.php
@@ -292,7 +292,7 @@ function _onTypeChange(type){
 					unset($grouplist);
 				?>
 					</select>
-					<br/><?= gettext("Note: This is almost always the same as the Interface to Monitor.");?>
+					<br /><?= gettext("Note: This is almost always the same as the Interface to Monitor.");?>
 					</td>
 					</td>
 				</tr>
@@ -300,11 +300,11 @@ function _onTypeChange(type){
                   <td width="22%" valign="top" class="vncellreq"><?=gettext("Hostname");?></td>
                   <td width="78%" class="vtable">
                     <input name="host" type="text" class="formfld unknown" id="host" size="30" value="<?=htmlspecialchars($pconfig['host']);?>">
-                    <br>
+                    <br />
 				    <span class="vexpl">
-				    <span class="red"><strong><?=gettext("Note:");?><br></strong>
+				    <span class="red"><strong><?=gettext("Note:");?><br /></strong>
 				    </span>
-					<?=gettext("Enter the complete host/domain name.  example:  myhost.dyndns.org");?><br/>
+					<?=gettext("Enter the complete host/domain name.  example:  myhost.dyndns.org");?><br />
 					<?=gettext("For he.net tunnelbroker, enter your tunnel ID");?>
 				    </span>
 		          </td>
@@ -313,9 +313,9 @@ function _onTypeChange(type){
                   <td width="22%" valign="top" class="vncell"><?=gettext("MX"); ?></td>
                   <td width="78%" class="vtable">
                     <input name="mx" type="text" class="formfld unknown" id="mx" size="30" value="<?=htmlspecialchars($pconfig['mx']);?>">
-                    <br>
+                    <br />
 					<?=gettext("Note: With DynDNS service you can only use a hostname, not an IP address.");?>
-					<br>
+					<br />
                     <?=gettext("Set this option only if you need a special MX record. Not".
                    " all services support this.");?></td>
 				</tr>
@@ -335,7 +335,7 @@ function _onTypeChange(type){
                   <td width="22%" valign="top" class="vncell"><?=gettext("CURL options"); ?></td>
                   <td width="78%" class="vtable">
                     <input name="curl_ipresolve_v4" type="checkbox" id="curl_ipresolve_v4" value="yes" <?php if ($pconfig['curl_ipresolve_v4']) echo "checked"; ?>>
-                    <?=gettext("Force IPv4 resolving"); ?><br/>
+                    <?=gettext("Force IPv4 resolving"); ?><br />
 					<input name="curl_ssl_verifypeer" type="checkbox" id="curl_ssl_verifypeer" value="yes" <?php if ($pconfig['curl_ssl_verifypeer']) echo "checked"; ?>>
                     <?=gettext("Verify SSL peer"); ?>
 				  </td>
@@ -344,18 +344,18 @@ function _onTypeChange(type){
                   <td width="22%" valign="top" class="vncellreq"><?=gettext("Username");?></td>
                   <td width="78%" class="vtable">
                     <input name="username" type="text" class="formfld user" id="username" size="20" value="<?=htmlspecialchars($pconfig['username']);?>">
-                    <br/><?= gettext("Username is required for all types except Namecheap, FreeDNS and Custom Entries.");?>
-		    <br/><?= gettext("Route 53: Enter your Access Key ID.");?>
-		    <br/><?= gettext("For Custom Entries, Username and Password represent HTTP Authentication username and passwords.");?>
+                    <br /><?= gettext("Username is required for all types except Namecheap, FreeDNS and Custom Entries.");?>
+		    <br /><?= gettext("Route 53: Enter your Access Key ID.");?>
+		    <br /><?= gettext("For Custom Entries, Username and Password represent HTTP Authentication username and passwords.");?>
                   </td>
                 </tr>
                 <tr>
                   <td width="22%" valign="top" class="vncellreq"><?=gettext("Password");?></td>
                   <td width="78%" class="vtable">
                     <input name="password" type="password" class="formfld pwd" id="password" size="20" value="<?=htmlspecialchars($pconfig['password']);?>">
-                    <br/>
+                    <br />
                     <?=gettext("FreeDNS (freedns.afraid.org): Enter your \"Authentication Token\" provided by FreeDNS.");?>
-		    <br/><?= gettext("Route 53: Enter your Secret Access Key.");?>
+		    <br /><?= gettext("Route 53: Enter your Secret Access Key.");?>
                   </td>
                 </tr>
 
@@ -363,15 +363,15 @@ function _onTypeChange(type){
                   <td width="22%" valign="top" class="vncellreq"><?=gettext("Zone ID");?></td>
                   <td width="78%" class="vtable">
                     <input name="zoneid" type="text" class="formfld user" id="zoneid" size="20" value="<?=htmlspecialchars($pconfig['zoneid']);?>">
-                    <br/><?= gettext("Enter Zone ID that you received when you created your domain in Route 53.");?>
+                    <br /><?= gettext("Enter Zone ID that you received when you created your domain in Route 53.");?>
                   </td>
                 </tr>
                 <tr id="_urltr">
                   <td width="22%" valign="top" class="vncell"><?=gettext("Update URL");?></td>
                   <td width="78%" class="vtable">
                     <input name="updateurl" type="text" class="formfld unknown" id="updateurl" size="60" value="<?=htmlspecialchars($pconfig['updateurl']);?>">
-                    <br/><?= gettext("This is the only field required by for Custom Dynamic DNS, and is only used by Custom Entries.");?>
-			<br/>
+                    <br /><?= gettext("This is the only field required by for Custom Dynamic DNS, and is only used by Custom Entries.");?>
+			<br />
 			<?= gettext("If you need the new IP to be included in the request, put %IP% in its place.");?>
                   </td>
                 </tr>
@@ -379,14 +379,14 @@ function _onTypeChange(type){
                   <td width="22%" valign="top" class="vncell"><?=gettext("Result Match");?></td>
                   <td width="78%" class="vtable">
                     <textarea name="resultmatch" class="formpre" id="resultmatch" cols="65" rows="7"><?=htmlspecialchars($pconfig['resultmatch']);?></textarea>
-                    <br/><?= gettext("This field is only used by Custom Dynamic DNS Entries.");?>
-			<br/>
+                    <br /><?= gettext("This field is only used by Custom Dynamic DNS Entries.");?>
+			<br />
 			<?= gettext("This field should be identical to what your DDNS Provider will return if the update succeeds, leave it blank to disable checking of returned results.");?>
-			<br/>
+			<br />
 			<?= gettext("If you need the new IP to be included in the request, put %IP% in its place.");?>
-			<br/>
+			<br />
 			<?= gettext("If you need to include multiple possible values, separate them with a |.  If your provider includes a |, escape it with \\|");?>
-			<br/>
+			<br />
 			<?= gettext("Tabs (\\t), newlines (\\n) and carriage returns (\\r) at the beginning or end of the returned results are removed before comparison.");?>
                   </td>
                 </tr>
@@ -396,7 +396,7 @@ function _onTypeChange(type){
                   <td width="22%" valign="top" class="vncellreq"><?=gettext("TTL");?></td>
                   <td width="78%" class="vtable">
                     <input name="ttl" type="text" class="formfld user" id="ttl" size="20" value="<?=htmlspecialchars($pconfig['ttl']);?>">
-                    <br/><?= gettext("Choose TTL for your dns record.");?>
+                    <br /><?= gettext("Choose TTL for your dns record.");?>
                   </td>
                 </tr>
                 <tr>
@@ -421,7 +421,7 @@ function _onTypeChange(type){
                 </tr>
                 <tr>
                   <td width="22%" valign="top">&nbsp;</td>
-                  <td width="78%"><span class="vexpl"><span class="red"><strong><?=gettext("Note:");?><br>
+                  <td width="78%"><span class="vexpl"><span class="red"><strong><?=gettext("Note:");?><br />
                     </strong></span><?php printf(gettext("You must configure a DNS server in %sSystem:
                     General setup%s or allow the DNS server list to be overridden
                     by DHCP/PPP on WAN for dynamic DNS updates to work."),'<a href="system.php">','</a>');?></span></td>
diff --git a/usr/local/www/services_ntpd.php b/usr/local/www/services_ntpd.php
index 5c75bc72d9..36ac57a07d 100644
--- a/usr/local/www/services_ntpd.php
+++ b/usr/local/www/services_ntpd.php
@@ -265,11 +265,11 @@ include("head.inc");
 		echo ">{$ifacename}</option>\n";
 	} ?>
 					</select>
-					<br/>
-					<br/><?php echo gettext("Interfaces without an IP address will not be shown."); ?>
-					<br/>
-					<br/><?php echo gettext("Selecting no interfaces will listen on all interfaces with a wildcard."); ?>
-					<br/><?php echo gettext("Selecting all interfaces will explicitly listen on only the interfaces/IPs specified."); ?>
+					<br />
+					<br /><?php echo gettext("Interfaces without an IP address will not be shown."); ?>
+					<br />
+					<br /><?php echo gettext("Selecting no interfaces will listen on all interfaces with a wildcard."); ?>
+					<br /><?php echo gettext("Selecting all interfaces will explicitly listen on only the interfaces/IPs specified."); ?>
 				</td>
 			</tr>
 			<tr>
@@ -292,24 +292,24 @@ include("head.inc");
 						echo '>&nbsp;prefer&emsp;';
 						echo "\n<input name=\"servselect{$i}\" class=\"formcheckbox\" id=\"servselect{$i}\" OnClick=\"CheckOffOther('servselect{$i}', 'servprefer{$i}')\" type=\"checkbox\"";
 						if (substr_count($config['ntpd']['noselect'], $timeservers[$i])) echo ' checked';
-						echo ">&nbsp;noselect\n<br/>\n</div>\n";
+						echo ">&nbsp;noselect\n<br />\n</div>\n";
 					}
 					?>
 					<div id="addserver">
 					<img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" title="<?php echo gettext("Add another Time server");?>" OnClick="NewTimeServer(<?php echo $j;?>)">
 					</div>
-					<br/>
+					<br />
 					<?php echo gettext('For best results three to five servers should be configured here.'); ?>
-					<br/>
+					<br />
 					<?php echo gettext('The <i>prefer</i> option indicates that NTP should favor the use of this server more than all others.'); ?>
-					<br/>
+					<br />
 					<?php echo gettext('The <i>noselect</i> option indicates that NTP should not use this server for time, but stats for this server will be collected and displayed.'); ?>
 				</td>
 			</tr>
 			<tr>
 				<td width="22%" valign="top" class="vncellreq">Orphan mode</td>
 				<td width="78%" class="vtable">
-					<input name="ntporphan" type="text" class="formfld unknown" id="ntporphan" min="1" max="16" size="20" value="<?=htmlspecialchars($pconfig['orphan']);?>"><?php echo gettext("(0-15)");?><br>
+					<input name="ntporphan" type="text" class="formfld unknown" id="ntporphan" min="1" max="16" size="20" value="<?=htmlspecialchars($pconfig['orphan']);?>"><?php echo gettext("(0-15)");?><br />
 					<?php echo gettext("Orphan mode allows the system clock to be used when no other clocks are available. The number here specifies the stratum reported during orphan mode and should normally be set to a number high enough to insure that any other servers available to clients are preferred over this server. (default: 12)."); ?>
 				</td>
 			</tr>
@@ -324,10 +324,10 @@ include("head.inc");
 				<td width="22%" valign="top" class="vncellreq">Syslog logging</td>
 				<td width="78%" class="vtable">
 					<?php echo gettext("These options enable additional messages from NTP to be written to the System Log");?> (<a href="diag_logs_ntpd.php"><?php echo gettext("Status > System Logs > NTP"); ?></a>).
-					<br/><br/>
+					<br /><br />
 					<input name="logpeer" type="checkbox" class="formcheckbox" id="logpeer"<?php if($pconfig['logpeer']) echo ' checked'; ?>>
 					<?php echo gettext("Enable logging of peer messages (default: disabled)."); ?>
-					<br/>
+					<br />
 					<input name="logsys" type="checkbox" class="formcheckbox" id="logsys"<?php if($pconfig['logsys']) echo ' checked'; ?>>
 					<?php echo gettext("Enable logging of system messages (default: disabled)."); ?>
 				</td>
@@ -340,13 +340,13 @@ include("head.inc");
 					</div>
 					<div id="showstatistics" style="display:none">
 					<strong><?php echo gettext("Warning: ")?></strong><?php echo gettext("these options will create persistant daily log files in /var/log/ntp."); ?>
-					<br/><br/>
+					<br /><br />
 					<input name="clockstats" type="checkbox" class="formcheckbox" id="clockstats"<?php if($pconfig['clockstats']) echo ' checked'; ?>>
 					<?php echo gettext("Enable logging of reference clock statistics (default: disabled)."); ?>
-					<br/>
+					<br />
 					<input name="loopstats" type="checkbox" class="formcheckbox" id="loopstats"<?php if($pconfig['loopstats']) echo ' checked'; ?>>
 					<?php echo gettext("Enable logging of clock discipline statistics (default: disabled)."); ?>
-					<br/>
+					<br />
 					<input name="peerstats" type="checkbox" class="formcheckbox" id="peerstats"<?php if($pconfig['peerstats']) echo ' checked'; ?>>
 					<?php echo gettext("Enable logging of NTP peer statistics (default: disabled)."); ?>
 					</div>
@@ -360,22 +360,22 @@ include("head.inc");
 					</div>
 					<div id="showrestrict" style="display:none">
 					<?php echo gettext("these options control access to NTP from the WAN."); ?>
-					<br/><br/>
+					<br /><br />
 					<input name="kod" type="checkbox" class="formcheckbox" id="kod"<?php if(!$pconfig['kod']) echo ' checked'; ?>>
 					<?php echo gettext("Enable Kiss-o'-death packets (default: enabled)."); ?>
-					<br/>
+					<br />
 					<input name="nomodify" type="checkbox" class="formcheckbox" id="nomodify"<?php if(!$pconfig['nomodify']) echo ' checked'; ?>>
 					<?php echo gettext("Deny state modifications (i.e. run time configuration) by ntpq and ntpdc (default: enabled)."); ?>
-					<br/>
+					<br />
 					<input name="noquery" type="checkbox" class="formcheckbox" id="noquery"<?php if($pconfig['noquery']) echo ' checked'; ?>>
 					<?php echo gettext("Disable ntpq and ntpdc queries (default: disabled)."); ?>
-					<br/>
+					<br />
 					<input name="noserve" type="checkbox" class="formcheckbox" id="noserve"<?php if($pconfig['noserve']) echo ' checked'; ?>>
 					<?php echo gettext("Disable all except ntpq and ntpdc queries (default: disabled)."); ?>
-					<br/>
+					<br />
 					<input name="nopeer" type="checkbox" class="formcheckbox" id="nopeer"<?php if(!$pconfig['nopeer']) echo ' checked'; ?>>
 					<?php echo gettext("Deny packets that attempt a peer association (default: enabled)."); ?>
-					<br/>
+					<br />
 					<input name="notrap" type="checkbox" class="formcheckbox" id="notrap"<?php if(!$pconfig['notrap']) echo ' checked'; ?>>
 					<?php echo gettext("Deny mode 6 control message trap service (default: enabled)."); ?>
 					</div>
@@ -390,9 +390,9 @@ include("head.inc");
 					<div id="showleapsec" style="display:none">
 					<?php echo gettext("A leap second file allows NTP to advertize an upcoming leap second addition or subtraction.");?>
 					<?php echo gettext("Normally this is only useful if this server is a stratum 1 time server.");?>
-					<br/><br/>
+					<br /><br />
 					<?php echo gettext("Enter Leap second configuration as text:");?><br />
-					<textarea name="leaptxt" class="formpre" id="leaptxt" cols="65" rows="7"><?php $text = base64_decode(chunk_split($pconfig['leapsec'])); echo $text;?></textarea><br/>
+					<textarea name="leaptxt" class="formpre" id="leaptxt" cols="65" rows="7"><?php $text = base64_decode(chunk_split($pconfig['leapsec'])); echo $text;?></textarea><br />
 					<strong><?php echo gettext("Or");?></strong>, <?php echo gettext("select a file to upload:");?>
 					<input type="file" name="leapfile" class="formfld file" id="leapfile">
 					</div>
diff --git a/usr/local/www/services_ntpd_gps.php b/usr/local/www/services_ntpd_gps.php
index e993f3733d..e1955048e2 100644
--- a/usr/local/www/services_ntpd_gps.php
+++ b/usr/local/www/services_ntpd_gps.php
@@ -383,8 +383,8 @@ SureGPS = 		#Sure Electronics SKG16B
 			<td width="22%" valign="top" class="vncellreq">
 			</td>
 			<td width="78%" class="vtable">A GPS connected via a serial port may be used as a reference clock for NTP. If the GPS also supports PPS and is properly configured, and connected, that GPS may also be used as a Pulse Per Second clock reference. NOTE: a USB GPS may work, but is not recommended due to USB bus timing issues.
-			<br/>
-			<br/><?php echo gettext("For the best results, NTP should have at least three sources of time. So it is best to configure at least 2 servers under"); ?> <a href="services_ntpd.php"><?php echo gettext("Services > NTP"); ?></a> <?php echo gettext("to minimize clock drift if the GPS data is not valid over time. Otherwise ntpd may only use values from the unsynchronized local clock when providing time to clients."); ?>
+			<br />
+			<br /><?php echo gettext("For the best results, NTP should have at least three sources of time. So it is best to configure at least 2 servers under"); ?> <a href="services_ntpd.php"><?php echo gettext("Services > NTP"); ?></a> <?php echo gettext("to minimize clock drift if the GPS data is not valid over time. Otherwise ntpd may only use values from the unsynchronized local clock when providing time to clients."); ?>
 			</td>
 		</tr>
 		<tr>
@@ -400,8 +400,8 @@ SureGPS = 		#Sure Electronics SKG16B
 					<option value="U-Blox" title="$PUBX... U-Blox 5, 6 and probably 7"<?php if($pconfig['type'] == 'U-Blox') echo ' selected';?>>U-Blox</option>
 					<option value="SureGPS" title="$PMTK... Sure Electronics SKG16B"<?php if($pconfig['type'] == 'SureGPS') echo ' selected';?>>SureGPS</option>
 				</select> <?php echo gettext("This option allows you to select a predefined configuration.");?>
-				<br/>
-				<br/>
+				<br />
+				<br />
 				<strong><?php echo gettext(" Note: ");?></strong><?php echo gettext("Default is the configuration of pfSense 2.1 and earlier"); ?>
 				<?php echo gettext(" (not recommended). Select Generic if your GPS is not listed.)"); ?>
 				<strong><?php echo gettext(" Note: ");?></strong><?php echo gettext("The perdefined configurations assume your GPS has already been set to NMEA mode."); ?>
@@ -423,7 +423,7 @@ SureGPS = 		#Sure Electronics SKG16B
 					<?php endforeach; ?>
 				</select>&nbsp;
 				<?php echo gettext("All serial ports are listed, be sure to pick the port with the GPS attached."); ?>
-				<br/><br/>
+				<br /><br />
 				<select id="gpsspeed" name="gpsspeed" class="formselect">
 					<option value="0"<?php if(!$pconfig['speed']) echo ' selected'; ?>>4800</option>
 					<option value="16"<?php if($pconfig['speed'] === '16') echo ' selected';?>>9600</option>
@@ -432,8 +432,8 @@ SureGPS = 		#Sure Electronics SKG16B
 					<option value="64"<?php if($pconfig['speed'] === '64') echo ' selected';?>>57600</option>
 					<option value="80"<?php if($pconfig['speed'] === '80') echo ' selected';?>>115200</option>
 				</select>&nbsp;<?php echo gettext("Serial port baud rate."); ?>
-				<br/>
-				<br/>
+				<br />
+				<br />
 				<?php echo gettext("Note: A higher baud rate is generally only helpful if the GPS is sending too many sentences. It is recommended to configure the GPS to send only one sentence at a baud rate of 4800 or 9600."); ?>
 			</td>
 		</tr>
@@ -448,26 +448,26 @@ SureGPS = 		#Sure Electronics SKG16B
 					<option value="2"<?php if($pconfig['nmea'] & 2) echo ' selected';?>>GGA</option>
 					<option value="4"<?php if($pconfig['nmea'] & 4) echo ' selected';?>>GLL</option>
 					<option value="8"<?php if($pconfig['nmea'] & 8) echo ' selected';?>>ZDA or ZDG</option>
-				</select></br>
+				</select><br />
 				<?php echo gettext("By default NTP will listen for all supported NMEA sentences. Here one or more sentences to listen for may be specified."); ?>
 			</td>
 		</tr>
 		<tr>
 			<td width="22%" valign="top" class="vncellreq">Fudge time 1</td>
 			<td width="78%" class="vtable">
-				<input name="gpsfudge1" type="text" class="formfld unknown" id="gpsfudge1" min="-1" max="1" size="20" value="<?=htmlspecialchars($pconfig['fudge1']);?>">(<?php echo gettext("seconds");?>)<br>
+				<input name="gpsfudge1" type="text" class="formfld unknown" id="gpsfudge1" min="-1" max="1" size="20" value="<?=htmlspecialchars($pconfig['fudge1']);?>">(<?php echo gettext("seconds");?>)<br />
 				<?php echo gettext("Fudge time 1 is used to specify the GPS PPS signal offset");?> (<?php echo gettext("default");?>: 0.0).</td>
 		</tr>
 		<tr>
 			<td width="22%" valign="top" class="vncellreq">Fudge time 2</td>
 			<td width="78%" class="vtable">
-				<input name="gpsfudge2" type="text" class="formfld unknown" id="gpsfudge2" min="-1" max="1" size="20" value="<?=htmlspecialchars($pconfig['fudge2']);?>">(<?php echo gettext("seconds");?>)<br>
+				<input name="gpsfudge2" type="text" class="formfld unknown" id="gpsfudge2" min="-1" max="1" size="20" value="<?=htmlspecialchars($pconfig['fudge2']);?>">(<?php echo gettext("seconds");?>)<br />
 				<?php echo gettext("Fudge time 2 is used to specify the GPS time offset");?> (<?php echo gettext("default");?>: 0.0).</td>
 		</tr>
 		<tr>
 			<td width="22%" valign="top" class="vncellreq">Stratum</td>
 			<td width="78%" class="vtable">
-				<input name="gpsstratum" type="text" class="formfld unknown" id="gpsstratum" max="16" size="20" value="<?=htmlspecialchars($pconfig['stratum']);?>"><?php echo gettext("(0-16)");?><br>
+				<input name="gpsstratum" type="text" class="formfld unknown" id="gpsstratum" max="16" size="20" value="<?=htmlspecialchars($pconfig['stratum']);?>"><?php echo gettext("(0-16)");?><br />
 				<?php echo gettext("This may be used to change the GPS Clock stratum");?> (<?php echo gettext("default");?>: 0). <?php echo gettext("This may be useful if, for some reason, you want ntpd to prefer a different clock"); ?></td>
 		</tr>
 		<tr>
@@ -476,7 +476,7 @@ SureGPS = 		#Sure Electronics SKG16B
 				<table>
 					<tr>
 						<td>
-				<?php echo gettext("Normally there should be no need to change these options from the defaults."); ?></br>
+				<?php echo gettext("Normally there should be no need to change these options from the defaults."); ?><br />
 						</td>
 					</tr>
 				</table>
@@ -534,7 +534,7 @@ SureGPS = 		#Sure Electronics SKG16B
 							<input name="gpssubsec" type="checkbox" class="formcheckbox" id="gpssubsec"<?php if($pconfig['subsec']) echo ' checked'; ?>>
 						</td>
 						<td>
-							<span class="vexpl"><?php echo gettext("Log the sub-second fraction of the received time stamp (default: Not logged).<br/>Note: enabling this will rapidly fill the log, but is useful for tuning Fudge time 2."); ?></span>
+							<span class="vexpl"><?php echo gettext("Log the sub-second fraction of the received time stamp (default: Not logged).<br />Note: enabling this will rapidly fill the log, but is useful for tuning Fudge time 2."); ?></span>
 						</td>
 					</tr>
 				</table>
@@ -543,7 +543,7 @@ SureGPS = 		#Sure Electronics SKG16B
 		<tr>
 			<td width="22%" valign="top" class="vncellreq">Clock ID</td>
 			<td width="78%" class="vtable">
-				<input name="gpsrefid" type="text" class="formfld unknown" id="gpsrefid" maxlength= "4" size="20" value="<?=htmlspecialchars($pconfig['refid']);?>"><?php echo gettext("(1 to 4 charactors)");?><br>
+				<input name="gpsrefid" type="text" class="formfld unknown" id="gpsrefid" maxlength= "4" size="20" value="<?=htmlspecialchars($pconfig['refid']);?>"><?php echo gettext("(1 to 4 charactors)");?><br />
 				<?php echo gettext("This may be used to change the GPS Clock ID");?> (<?php echo gettext("default");?>: GPS).</td>
 		</tr>
 		<tr>
diff --git a/usr/local/www/services_ntpd_pps.php b/usr/local/www/services_ntpd_pps.php
index 1eb3141900..6d50a40e3e 100644
--- a/usr/local/www/services_ntpd_pps.php
+++ b/usr/local/www/services_ntpd_pps.php
@@ -133,8 +133,8 @@ include("head.inc");
 			<td width="78%" class="vtable"><?php echo gettext("Devices with a Pulse Per Second output such as radios that receive a time signal from DCF77 (DE), JJY (JP), MSF (GB) or WWVB (US) may be used as a PPS reference for NTP.");?> 
 			<?php echo gettext("A serial GPS may also be used, but the serial GPS driver would usually be the better option.");?> 
 			<?php echo gettext("A PPS signal only provides a reference to the change of a second, so at least one other source to number the seconds is required.");?>
-			<br/>
-			<br/><strong><?php echo gettext("Note");?>:</strong> <?php echo gettext("At least 3 additional time sources should be configured under"); ?> <a href="services_ntpd.php"><?php echo gettext("Services > NTP"); ?></a> <?php echo gettext("to reliably supply the time of each PPS pulse."); ?>
+			<br />
+			<br /><strong><?php echo gettext("Note");?>:</strong> <?php echo gettext("At least 3 additional time sources should be configured under"); ?> <a href="services_ntpd.php"><?php echo gettext("Services > NTP"); ?></a> <?php echo gettext("to reliably supply the time of each PPS pulse."); ?>
 			</td>
 		</tr>
 <?php $serialports = glob("/dev/cua?[0-9]{,.[0-9]}", GLOB_BRACE); ?>
@@ -157,13 +157,13 @@ include("head.inc");
 		<tr>
 			<td width="22%" valign="top" class="vncellreq">Fudge time</td>
 			<td width="78%" class="vtable">
-				<input name="ppsfudge1" type="text" class="formfld unknown" id="ppsfudge1" min="-1" max="1" size="20" value="<?=htmlspecialchars($pconfig['fudge1']);?>">(<?php echo gettext("seconds");?>)<br>
+				<input name="ppsfudge1" type="text" class="formfld unknown" id="ppsfudge1" min="-1" max="1" size="20" value="<?=htmlspecialchars($pconfig['fudge1']);?>">(<?php echo gettext("seconds");?>)<br />
 				<?php echo gettext("Fudge time is used to specify the PPS signal offset from the actual second such as the transmission delay between the transmitter and the receiver.");?> (<?php echo gettext("default");?>: 0.0).</td>
 		</tr>
 		<tr>
 			<td width="22%" valign="top" class="vncellreq">Stratum</td>
 			<td width="78%" class="vtable">
-				<input name="ppsstratum" type="text" class="formfld unknown" id="ppsstratum" max="16" size="20" value="<?=htmlspecialchars($pconfig['stratum']);?>"><?php echo gettext("(0-16)");?><br>
+				<input name="ppsstratum" type="text" class="formfld unknown" id="ppsstratum" max="16" size="20" value="<?=htmlspecialchars($pconfig['stratum']);?>"><?php echo gettext("(0-16)");?><br />
 				<?php echo gettext("This may be used to change the PPS Clock stratum");?> (<?php echo gettext("default");?>: 0). <?php echo gettext("This may be useful if, for some reason, you want ntpd to prefer a different clock and just monitor this source."); ?></td>
 		</tr>
 		<tr>
@@ -172,7 +172,7 @@ include("head.inc");
 				<table>
 					<tr>
 						<td>
-				<?php echo gettext("Normally there should be no need to change these options from the defaults."); ?></br>
+				<?php echo gettext("Normally there should be no need to change these options from the defaults."); ?><br />
 						</td>
 					</tr>
 				</table>
@@ -207,7 +207,7 @@ include("head.inc");
 		<tr>
 			<td width="22%" valign="top" class="vncellreq">Clock ID</td>
 			<td width="78%" class="vtable">
-				<input name="ppsrefid" type="text" class="formfld unknown" id="ppsrefid" maxlength= "4" size="20" value="<?php htmlspecialchars($pconfig['refid']);?>"><?php echo gettext("(1 to 4 charactors)");?><br>
+				<input name="ppsrefid" type="text" class="formfld unknown" id="ppsrefid" maxlength= "4" size="20" value="<?php htmlspecialchars($pconfig['refid']);?>"><?php echo gettext("(1 to 4 charactors)");?><br />
 				<?php echo gettext("This may be used to change the PPS Clock ID");?> (<?php echo gettext("default");?>: PPS).</td>
 		</tr>
 		<tr>
diff --git a/usr/local/www/services_router_advertisements.php b/usr/local/www/services_router_advertisements.php
index 4b58331450..ca258d7c66 100644
--- a/usr/local/www/services_router_advertisements.php
+++ b/usr/local/www/services_router_advertisements.php
@@ -366,8 +366,8 @@ display_top_tabs($tab_array);
 			<tr>
 			<td width="22%" valign="top" class="vncell"><?=gettext("DNS servers");?></td>
 			<td width="78%" class="vtable">
-				<input name="radns1" type="text" class="formfld unknown" id="radns1" size="28" value="<?=htmlspecialchars($pconfig['radns1']);?>"><br>
-				<input name="radns2" type="text" class="formfld unknown" id="radns2" size="28" value="<?=htmlspecialchars($pconfig['radns2']);?>"><br>
+				<input name="radns1" type="text" class="formfld unknown" id="radns1" size="28" value="<?=htmlspecialchars($pconfig['radns1']);?>"><br />
+				<input name="radns2" type="text" class="formfld unknown" id="radns2" size="28" value="<?=htmlspecialchars($pconfig['radns2']);?>"><br />
 				<?=gettext("NOTE: leave blank to use the system default DNS servers - this interface's IP if DNS forwarder is enabled, otherwise the servers configured on the General page.");?>
 			</td>
 			</tr>
@@ -375,7 +375,7 @@ display_top_tabs($tab_array);
 			<tr>
 			<td width="22%" valign="top" class="vncell"><?=gettext("Domain search list");?></td>
 			<td width="78%" class="vtable">
-				<input name="radomainsearchlist" type="text" class="formfld unknown" id="radomainsearchlist" size="28" value="<?=htmlspecialchars($pconfig['radomainsearchlist']);?>"><br>
+				<input name="radomainsearchlist" type="text" class="formfld unknown" id="radomainsearchlist" size="28" value="<?=htmlspecialchars($pconfig['radomainsearchlist']);?>"><br />
 				<?=gettext("The RA server can optionally provide a domain search list. Use the semicolon character as separator");?>
 			</td>
 			</tr>
diff --git a/usr/local/www/services_snmp.php b/usr/local/www/services_snmp.php
old mode 100755
new mode 100644
index 32e3baa02a..8cec9cc11b
--- a/usr/local/www/services_snmp.php
+++ b/usr/local/www/services_snmp.php
@@ -290,7 +290,7 @@ function enable_change(whichone) {
                   <td width="22%" valign="top" class="vncellreq"><?=gettext("Polling Port ");?></td>
                   <td width="78%" class="vtable">
                     <input name="pollport" type="text" class="formfld unknown" id="pollport" size="40" value="<?=htmlspecialchars($pconfig['pollport']) ? htmlspecialchars($pconfig['pollport']) : htmlspecialchars(161);?>">
-                    <br><?=gettext("Enter the port to accept polling events on (default 161)");?></br>
+                    <br /><?=gettext("Enter the port to accept polling events on (default 161)");?><br />
 		  </td>
                 </tr>
 
@@ -312,7 +312,7 @@ function enable_change(whichone) {
                   <td width="22%" valign="top" class="vncellreq"><?=gettext("Read Community String");?></td>
                   <td width="78%" class="vtable"> 
                     <input name="rocommunity" type="text" class="formfld unknown" id="rocommunity" size="40" value="<?=htmlspecialchars($pconfig['rocommunity']);?>"> 
-		    <br><?=gettext("The community string is like a password, restricting access to querying SNMP to hosts knowing the community string. Use a strong value here to protect from unauthorized information disclosure.");?></br>
+		    <br /><?=gettext("The community string is like a password, restricting access to querying SNMP to hosts knowing the community string. Use a strong value here to protect from unauthorized information disclosure.");?><br />
 		  </td>
                 </tr>
 
@@ -330,7 +330,7 @@ function enable_change(whichone) {
 		  <td width="22%" valign="top" class="vncellreq">Write community string</td>
           <td width="78%" class="vtable">
                     <input name="rwcommunity" type="text" class="formfld unknown" id="rwcommunity" size="40" value="<?=htmlspecialchars($pconfig['rwcommunity']);?>">
-		    <br>Please use something other then &quot;private&quot; here</br>
+		    <br />Please use something other then &quot;private&quot; here<br />
 		  </td>
                 </tr>
 		    	*/ 
@@ -351,7 +351,7 @@ function enable_change(whichone) {
                   <td width="22%" valign="top" class="vncellreq"><?=gettext("Trap server");?></td>
                   <td width="78%" class="vtable">
                     <input name="trapserver" type="text" class="formfld unknown" id="trapserver" size="40" value="<?=htmlspecialchars($pconfig['trapserver']);?>">
-                    <br><?=gettext("Enter trap server name");?></br>
+                    <br /><?=gettext("Enter trap server name");?><br />
 		  </td>
                 </tr>
 
@@ -359,7 +359,7 @@ function enable_change(whichone) {
                   <td width="22%" valign="top" class="vncellreq"><?=gettext("Trap server port ");?></td>
                   <td width="78%" class="vtable">
                     <input name="trapserverport" type="text" class="formfld unknown" id="trapserverport" size="40" value="<?=htmlspecialchars($pconfig['trapserverport']) ? htmlspecialchars($pconfig['trapserverport']) : htmlspecialchars(162);?>">
-                    <br><?=gettext("Enter the port to send the traps to (default 162)");?></br>
+                    <br /><?=gettext("Enter the port to send the traps to (default 162)");?><br />
 		  </td>
                 </tr>
 
@@ -367,7 +367,7 @@ function enable_change(whichone) {
                   <td width="22%" valign="top" class="vncellreq"><?=gettext("Enter the SNMP trap string");?></td>
                   <td width="78%" class="vtable">
                     <input name="trapstring" type="text" class="formfld unknown" id="trapstring" size="40" value="<?=htmlspecialchars($pconfig['trapstring']);?>">
-                    <br><?=gettext("Trap string");?></br>
+                    <br /><?=gettext("Trap string");?><br />
 		  </td>
                 </tr>
 
diff --git a/usr/local/www/services_unbound.php b/usr/local/www/services_unbound.php
index 4b646f16f4..a5c37b309c 100644
--- a/usr/local/www/services_unbound.php
+++ b/usr/local/www/services_unbound.php
@@ -132,7 +132,7 @@ function show_advanced_dns() {
 <?php if ($input_errors) print_input_errors($input_errors); ?>
 <?php if ($savemsg) print_info_box($savemsg); ?>
 <?php if (is_subsystem_dirty('hosts')): ?><p>
-<?php print_info_box_np(gettext("The configuration for the DNS Resolver, has been changed") . ".<br>" . gettext("You must apply the changes in order for them to take effect."));?><br>
+<?php print_info_box_np(gettext("The configuration for the DNS Resolver, has been changed") . ".<br />" . gettext("You must apply the changes in order for them to take effect."));?><br />
 <?php endif; ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0" summary="services unbound">
 	<tbody>
@@ -159,7 +159,7 @@ function show_advanced_dns() {
 								<td width="22%" valign="top" class="vncellreq"><?=gettext("Enable");?></td>
 								<td width="78%" class="vtable"><p>
 									<input name="enable" type="checkbox" id="enable" value="yes" <?php if ($pconfig['enable'] == "yes") echo "checked";?> onClick="enable_change(false)">
-									<strong><?=gettext("Enable DNS Resolver");?><br>
+									<strong><?=gettext("Enable DNS Resolver");?><br />
 									</strong></p></td>
 								</td>
 							</tr>
@@ -215,7 +215,7 @@ function show_advanced_dns() {
 								<td width="22%" valign="top" class="vncellreq"><?=gettext("DNSSEC");?></td>
 								<td width="78%" class="vtable"><p>
 									<input name="dnssec" type="checkbox" id="dnssec" value="yes" <?php if ($pconfig['dnssec'] === true) echo "checked";?>/>
-									<strong><?=gettext("Enable DNSSEC Support");?><br>
+									<strong><?=gettext("Enable DNSSEC Support");?><br />
 									</strong></p>
 								</td>
 							</tr>
@@ -223,14 +223,14 @@ function show_advanced_dns() {
 								<td width="22%" valign="top" class="vncellreq"><?=gettext("DNS Query Forwarding");?></td>
 								<td width="78%" class="vtable"><p>
 									<input name="forwarding" type="checkbox" id="forwarding" value="yes" <?php if ($pconfig['forwarding'] == "yes") echo "checked";?>>
-									<strong><?=gettext("Enable Forwarding Mode");?></strong><br></p>
+									<strong><?=gettext("Enable Forwarding Mode");?></strong><br /></p>
 								</td>
 							</tr>
 							<tr>
 								<td width="22%" valign="top" class="vncellreq"><?=gettext("DHCP Registration");?></td>
 								<td width="78%" class="vtable"><p>
 									<input name="regdhcp" type="checkbox" id="regdhcp" value="yes" <?php if ($pconfig['regdhcp'] === true) echo "checked";?>>
-									<strong><?=gettext("Register DHCP leases in the DNS Resolver");?><br>
+									<strong><?=gettext("Register DHCP leases in the DNS Resolver");?><br />
 									</strong><?php printf(gettext("If this option is set, then machines that specify".
 									" their hostname when requesting a DHCP lease will be registered".
 									" in the DNS Resolver, so that their name can be resolved.".
@@ -242,7 +242,7 @@ function show_advanced_dns() {
 								<td width="22%" valign="top" class="vncellreq"><?=gettext("Static DHCP");?></td>
 								<td width="78%" class="vtable"><p>
 									<input name="regdhcpstatic" type="checkbox" id="regdhcpstatic" value="yes" <?php if ($pconfig['regdhcpstatic'] === true) echo "checked";?>>
-									<strong><?=gettext("Register DHCP static mappings in the DNS Resolver");?><br>
+									<strong><?=gettext("Register DHCP static mappings in the DNS Resolver");?><br />
 									</strong><?php printf(gettext("If this option is set, then DHCP static mappings will ".
 											"be registered in the DNS Resolver, so that their name can be ".
 											"resolved. You should also set the domain in %s".
@@ -253,7 +253,7 @@ function show_advanced_dns() {
 								<td width="22%" valign="top" class="vncellreq"><?=gettext("Prefer DHCP");?></td>
 								<td width="78%" class="vtable"><p>
 									<input name="dhcpfirst" type="checkbox" id="dhcpfirst" value="yes" <?php if ($pconfig['dhcpfirst'] === true) echo "checked";?>>
-									<strong><?=gettext("Resolve DHCP mappings first");?><br>
+									<strong><?=gettext("Resolve DHCP mappings first");?><br />
 									</strong><?php printf(gettext("If this option is set, then DHCP mappings will ".
 											"be resolved before the manual list of names below. This only ".
 											"affects the name given for a reverse lookup (PTR)."));?></p>
@@ -274,9 +274,9 @@ function show_advanced_dns() {
 										<input type="button" onClick="show_advanced_dns()" value="<?=gettext("Advanced"); ?>"></input> - <?=gettext("Show advanced option");?></a>
 									</div>
 									<div id="showadv" <?php if (empty($pconfig['custom_options'])) echo "style='display:none'"; ?>>
-										<strong><?=gettext("Advanced");?><br></strong>
-										<textarea rows="6" cols="78" name="custom_options" id="custom_options"><?=htmlspecialchars($pconfig['custom_options']);?></textarea><br/>
-										<?=gettext("Enter any additional options you would like to add to the DNS Resolver configuration here, separated by a space or newline"); ?><br/>
+										<strong><?=gettext("Advanced");?><br /></strong>
+										<textarea rows="6" cols="78" name="custom_options" id="custom_options"><?=htmlspecialchars($pconfig['custom_options']);?></textarea><br />
+										<?=gettext("Enter any additional options you would like to add to the DNS Resolver configuration here, separated by a space or newline"); ?><br />
 									</div>
 									</p>
 								</td>
@@ -295,7 +295,7 @@ function show_advanced_dns() {
 </table>
 
 
-<p><span class="vexpl"><span class="red"><strong><?=gettext("Note:");?><br>
+<p><span class="vexpl"><span class="red"><strong><?=gettext("Note:");?><br />
 </strong></span><?php printf(gettext("If the DNS Resolver is enabled, the DHCP".
 " service (if enabled) will automatically serve the LAN IP".
 " address as a DNS server to DHCP clients so they will use".
@@ -303,16 +303,16 @@ function show_advanced_dns() {
 " entered in %sSystem: General setup%s".
 " or those obtained via DHCP or PPP on WAN if the &quot;Allow".
 " DNS server list to be overridden by DHCP/PPP on WAN&quot;".
-" is checked."),'<a href="system.php">','</a>');?><br>
+" is checked."),'<a href="system.php">','</a>');?><br />
 </span></p>
 
-&nbsp;<br>
+&nbsp;<br />
 <table width="100%" border="0" cellpadding="0" cellspacing="0" class="tabcont">
 <tr>
 	<td colspan="5" valign="top" class="listtopic"><?=gettext("Host Overrides");?></td>
 </tr>
 <tr>
-	<td><br/>
+	<td><br />
 	<?=gettext("Entries in this section override individual results from the forwarders.");?>
 	<?=gettext("Use these for changing DNS results or for adding custom DNS records.");?>
 	</td>
@@ -374,7 +374,7 @@ function show_advanced_dns() {
 	</tr>
 	</tfoot>
 </table>
-<br/>
+<br />
 <table width="100%" border="0" cellpadding="0" cellspacing="0" class="tabcont">
 <tr>
 	<td colspan="5" valign="top" class="listtopic"><?=gettext("Domain Overrides");?></td>
diff --git a/usr/local/www/services_unbound_acls.php b/usr/local/www/services_unbound_acls.php
index 08393bab45..e6577ac93d 100644
--- a/usr/local/www/services_unbound_acls.php
+++ b/usr/local/www/services_unbound_acls.php
@@ -54,7 +54,7 @@ if ($act == "del") {
 	unset($a_acls[$id]);
 	write_config();
 	services_unbound_configure();
-	$savemsg = gettext("Access List successfully deleted")."<br/>";
+	$savemsg = gettext("Access List successfully deleted")."<br />";
 }
 
 if ($act == "new") {
@@ -217,13 +217,13 @@ if (is_subsystem_dirty("unbound"))
 									</option>
 									<?php endforeach; ?>
 								</select>
-								<br/>
+								<br />
 								<span class="vexpl">
-									<?=gettext("Choose what to do with DNS requests that match the criteria specified below.");?> <br/>
-									<?=gettext("<b>Deny:</b> This action stops queries from hosts within the netblock defined below.");?> <br/>
-									<?=gettext("<b>Refuse:</b> This action also stops queries from hosts within the netblock defined below, but sends a DNS rcode REFUSED error message back to the client.");?> <br/>
-									<?=gettext("<b>Allow:</b> This action allows queries from hosts within the netblock defined below.");?> <br/>
-									<?=gettext("<b>Allow Snoop:</b> This action allows recursive and nonrecursive access from hosts within the netblock defined below. Used for cache snooping and ideally should only be configured for your administrative host.");?> <br/>
+									<?=gettext("Choose what to do with DNS requests that match the criteria specified below.");?> <br />
+									<?=gettext("<b>Deny:</b> This action stops queries from hosts within the netblock defined below.");?> <br />
+									<?=gettext("<b>Refuse:</b> This action also stops queries from hosts within the netblock defined below, but sends a DNS rcode REFUSED error message back to the client.");?> <br />
+									<?=gettext("<b>Allow:</b> This action allows queries from hosts within the netblock defined below.");?> <br />
+									<?=gettext("<b>Allow Snoop:</b> This action allows recursive and nonrecursive access from hosts within the netblock defined below. Used for cache snooping and ideally should only be configured for your administrative host.");?> <br />
 								</span>
 							</td>
 						</tr>
@@ -302,7 +302,7 @@ if (is_subsystem_dirty("unbound"))
 						<tr>
 							<td width="22%" valign="top">&nbsp;</td>
 							<td width="78%">
-								&nbsp;<br>&nbsp;
+								&nbsp;<br />&nbsp;
 								<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>">  <input type="button" class="formbtn" value="<?=gettext("Cancel"); ?>" onclick="history.back()">
 							</td>
 						</tr>
diff --git a/usr/local/www/services_unbound_advanced.php b/usr/local/www/services_unbound_advanced.php
index be348c4cd6..1314d28406 100644
--- a/usr/local/www/services_unbound_advanced.php
+++ b/usr/local/www/services_unbound_advanced.php
@@ -114,7 +114,7 @@ function enable_change(enable_over) {
 <?php if ($input_errors) print_input_errors($input_errors); ?>
 <?php if ($savemsg) print_info_box($savemsg); ?>
 <?php if (is_subsystem_dirty('hosts')): ?><p>
-<?php print_info_box_np(gettext("The configuration of the DNS Resolver, has been changed") . ".<br>" . gettext("You must apply the changes in order for them to take effect."));?><br>
+<?php print_info_box_np(gettext("The configuration of the DNS Resolver, has been changed") . ".<br />" . gettext("You must apply the changes in order for them to take effect."));?><br />
 <?php endif; ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0" summary="services unbound advanced">
 	<tbody>
@@ -140,42 +140,42 @@ function enable_change(enable_over) {
 							<tr>
 								<td width="22%" valign="top" class="vncell"><?=gettext("Hide Identity");?></td>
 								<td width="78%" class="vtable">
-									<p><input name="hideidentity" type="checkbox" id="hideidentity" value="yes" <?php if ($pconfig['hideidentity'] === true) echo "checked";?> onClick="enable_change(false)"><br/>
+									<p><input name="hideidentity" type="checkbox" id="hideidentity" value="yes" <?php if ($pconfig['hideidentity'] === true) echo "checked";?> onClick="enable_change(false)"><br />
 									<?=gettext("If enabled, id.server and hostname.bind queries are refused.");?></p>
 								</td>
 							</tr>
 							<tr>
 								<td width="22%" valign="top" class="vncell"><?=gettext("Hide Version");?></td>
 								<td width="78%" class="vtable">
-									<p><input name="enable" type="checkbox" id="hideversion" value="yes" <?php if ($pconfig['hideversion'] == "yes") echo "checked";?> onClick="enable_change(false)"><br/>
+									<p><input name="enable" type="checkbox" id="hideversion" value="yes" <?php if ($pconfig['hideversion'] == "yes") echo "checked";?> onClick="enable_change(false)"><br />
 									<?=gettext("If enabled, version.server and version.bind queries are refused.");?></p>
 								</td>
 							</tr>
 							<tr>
 								<td width="22%" valign="top" class="vncell"><?=gettext("Prefetch Support");?></td>
 								<td width="78%" class="vtable">
-									<p><input name="enable" type="checkbox" id="prefetch" value="yes" <?php if ($pconfig['prefetch'] == "yes") echo "checked";?> onClick="enable_change(false)"><br/>
+									<p><input name="enable" type="checkbox" id="prefetch" value="yes" <?php if ($pconfig['prefetch'] == "yes") echo "checked";?> onClick="enable_change(false)"><br />
 									<?=gettext("Message cache elements are prefetched before they expire to help keep the cache up to date. When enabled, this option can cause an increase of around 10% more DNS traffic and load on the server, but frequently requested items will not expire from the cache.");?></p>
 								</td>
 							</tr>
 							<tr>
 								<td width="22%" valign="top" class="vncell"><?=gettext("Prefetch DNS Key Support");?></td>
 								<td width="78%" class="vtable">
-									<p><input name="enable" type="checkbox" id="prefetchkey" value="yes" <?php if ($pconfig['prefetchkey'] == "yes") echo "checked";?> onClick="enable_change(false)"><br/>
+									<p><input name="enable" type="checkbox" id="prefetchkey" value="yes" <?php if ($pconfig['prefetchkey'] == "yes") echo "checked";?> onClick="enable_change(false)"><br />
 									<?=sprintf(gettext("DNSKEY's are fetched earlier in the validation process when a %sDelegation signer%s is encountered. This helps lower the latency of requests but does utilize a little more CPU."), "<a href='http://en.wikipedia.org/wiki/List_of_DNS_record_types'>", "</a>");?></p>
 								</td>
 							</tr>
 							<tr>
 								<td width="22%" valign="top" class="vncell"><?=gettext("Harden Glue");?></td>
 								<td width="78%" class="vtable">
-									<p><input name="enable" type="checkbox" id="hardenglue" value="yes" <?php if ($pconfig['hardenglue'] == "yes") echo "checked";?> onClick="enable_change(false)"><br/>
+									<p><input name="enable" type="checkbox" id="hardenglue" value="yes" <?php if ($pconfig['hardenglue'] == "yes") echo "checked";?> onClick="enable_change(false)"><br />
 									<?=gettext("Only trust glue if it is within the servers authority.");?></p>
 								</td>
 							</tr>
 							<tr>
 								<td width="22%" valign="top" class="vncell"><?=gettext("Harden DNSSEC data");?></td>
 								<td width="78%" class="vtable">
-									<p><input name="enable" type="checkbox" id="dnssecstripped" value="yes" <?php if ($pconfig['dnssecstripped'] == "yes") echo "checked";?> onClick="enable_change(false)"><br/>
+									<p><input name="enable" type="checkbox" id="dnssecstripped" value="yes" <?php if ($pconfig['dnssecstripped'] == "yes") echo "checked";?> onClick="enable_change(false)"><br />
 									<?=gettext("DNSSEC data is required for trust-anchored zones. If such data is absent, the zone becomes bogus. If this is disabled and no DNSSEC data is received, then the zone is made insecure.");?></p>
 								</td>
 							</tr>
@@ -191,7 +191,7 @@ function enable_change(enable_over) {
 											<option value="100">100MB</option>
 											<option value="250">250MB</option>
 											<option value="512">512MB</option>
-										</select><br/>
+										</select><br />
 										<?=gettext("Size of the message cache. The message cache stores DNS rcodes and validation statuses. The RRSet cache will automatically be set to twice this amount. The RRSet cache contains the actual RR data. The default is 4 megabytes.");?>
 									</p>
 								</td>
@@ -207,7 +207,7 @@ function enable_change(enable_over) {
 											<option value="30">30</option>
 											<option value="40">40</option>
 											<option value="50">50</option>
-										</select><br/>
+										</select><br />
 										<?=gettext("The number of outgoing TCP buffers to allocate per thread. The default value is 10. If 0 is selected then no TCP queries, to authoritative servers, are done.");?>
 									</p>
 								</td>
@@ -223,7 +223,7 @@ function enable_change(enable_over) {
 											<option value="30">30</option>
 											<option value="40">40</option>
 											<option value="50">50</option>
-										</select><br/>
+										</select><br />
 										<?=gettext("The number of incoming TCP buffers to allocate per thread. The default value is 10. If 0 is selected then no TCP queries, from clients, are accepted.");?>
 									</p>
 								</td>
@@ -236,7 +236,7 @@ function enable_change(enable_over) {
 											<option value="512">512</option>
 											<option value="1480">1480</option>
 											<option value="4096">4096</option>
-										</select><br/>
+										</select><br />
 										<?=gettext("Number of bytes size to advertise as the EDNS reassembly buffer size. This is the value that is used in UDP datagrams sent to peers. RFC recommendation is 4096 (which is the default). If you have fragmentation reassemble problems, usually seen as timeouts, then a value of 1480 should help. The 512 value bypasses most MTU path problems, but it can generate an excessive amount of TCP fallback.");?>
 									</p>
 								</td>
@@ -249,7 +249,7 @@ function enable_change(enable_over) {
 											<option value="512">512</option>
 											<option value="1024">1024</option>
 											<option value="2048">2048</option>
-										</select><br/>
+										</select><br />
 										<?=gettext("The number of queries that every thread will service simultaneously. If more queries arrive that need to be serviced, and no queries can be jostled, then these queries are dropped.");?>
 									</p>
 								</td>
@@ -263,7 +263,7 @@ function enable_change(enable_over) {
 											<option value="200">200</option>
 											<option value="500">500</option>
 											<option value="1000">1000</option>
-										</select><br/>
+										</select><br />
 										<?=gettext("This timeout is used for when the server is very busy. This protects against denial of service by slow queries or high query rates. The default value is 200 milliseconds.");?>
 									</p>
 								</td>
@@ -272,7 +272,7 @@ function enable_change(enable_over) {
 								<td width="22%" valign="top" class="vncell"><?=gettext("Maximum TTL for RRsets and messages");?></td>
 								<td width="78%" class="vtable">
 									<p>
-										<input type="text" id="cache_max_ttl" name="cache_max_ttl" size=5><br/>
+										<input type="text" id="cache_max_ttl" name="cache_max_ttl" size=5><br />
 										<?=gettext("Configure a maximum Time to live for RRsets and messages in the cache. The default is 86400 seconds (1 day). When the internal TTL expires the cache item is expired. This can be configured to force the resolver to query for data more often and not trust (very large) TTL values.");?>
 									</p>
 								</td>
@@ -281,7 +281,7 @@ function enable_change(enable_over) {
 								<td width="22%" valign="top" class="vncell"><?=gettext("Minimum TTL for RRsets and messages");?></td>
 								<td width="78%" class="vtable">
 									<p>
-										<input type="text" id="cache_min_ttl" name="cache_min_ttl" size=5><br/>
+										<input type="text" id="cache_min_ttl" name="cache_min_ttl" size=5><br />
 										<?=gettext("Configure a minimum Time to live for RRsets and messages in the cache. The default is 0 seconds. If the minimum value kicks in, the data is cached for longer than the domain owner intended, and thus less queries are made to look up the data. The 0 value ensures the data in the cache is as the domain owner intended. High values can lead to trouble as the data in the cache might not match up with the actual data anymore.");?>
 									</p>
 								</td>
@@ -296,7 +296,7 @@ function enable_change(enable_over) {
 											<option value="300">5 minutes</option>
 											<option value="600">10 minutes</option>
 											<option value="900">15 minutes</option>
-										</select><br/>
+										</select><br />
 										<?=gettext("Time to live for entries in the host cache. The host cache contains roundtrip timing and EDNS support information. The default is 15 minutes.");?>
 									</p>
 								</td>
@@ -311,7 +311,7 @@ function enable_change(enable_over) {
 											<option value="300">5 minutes</option>
 											<option value="600">10 minutes</option>
 											<option value="900">15 minutes</option>
-										</select><br/>
+										</select><br />
 										<?=gettext("Time to live for when a delegation is considered to be lame. The default is 15 minutes.");?>
 									</p>
 								</td>
@@ -326,7 +326,7 @@ function enable_change(enable_over) {
 											<option value="10000">10 000</option>
 											<option value="20000">20 000</option>
 											<option value="50000">50 000</option>
-										</select><br/>
+										</select><br />
 										<?=gettext("Number of hosts for which information is cached. The default is 10,000.");?>
 									</p>
 								</td>
@@ -342,7 +342,7 @@ function enable_change(enable_over) {
 											<option value="20000000">20 million</option>
 											<option value="40000000">40 million</option>
 											<option value="50000000">50 million</option>
-										</select><br/>
+										</select><br />
 										<?=gettext("If enabled, a total number of unwanted replies is kept track of in every thread. When it reaches the threshold, a defensive action is taken and a warning is printed to the log file. This defensive action is to clear the RRSet and message caches, hopefully flushing away any poison. The default is disabled, but if enabled a value of 10 million is suggested.");?>
 									</p>
 								</td>
@@ -358,7 +358,7 @@ function enable_change(enable_over) {
 											<option value="3">Level 3</option>
 											<option value="4">Level 4</option>
 											<option value="5">Level 5</option>
-										</select><br/>
+										</select><br />
 										<?=gettext("Select the log verbosity.");?>
 									</p>
 								</td>
diff --git a/usr/local/www/services_wol.php b/usr/local/www/services_wol.php
old mode 100755
new mode 100644
index 6494a07acd..b01be640c7
--- a/usr/local/www/services_wol.php
+++ b/usr/local/www/services_wol.php
@@ -60,9 +60,9 @@ if($_GET['wakeall'] <> "") {
 		$bcip = gen_subnet_max($ipaddr, get_interface_subnet($if));
 		/* Execute wol command and check return code. */
 		if (!mwexec("/usr/local/bin/wol -i {$bcip} {$mac}"))
-			$savemsg .= sprintf(gettext('Sent magic packet to %1$s (%2$s)%3$s'),$mac, $description, ".<br>");
+			$savemsg .= sprintf(gettext('Sent magic packet to %1$s (%2$s)%3$s'),$mac, $description, ".<br />");
 		else
-			$savemsg .= sprintf(gettext('Please check the %1$ssystem log%2$s, the wol command for %3$s (%4$s) did not complete successfully%5$s'),'<a href="/diag_logs.php">','</a>',$description,$mac,".<br>");
+			$savemsg .= sprintf(gettext('Please check the %1$ssystem log%2$s, the wol command for %3$s (%4$s) did not complete successfully%5$s'),'<a href="/diag_logs.php">','</a>',$description,$mac,".<br />");
 	}
 }
 
@@ -98,7 +98,7 @@ if ($_POST || $_GET['mac']) {
 			if(!mwexec("/usr/local/bin/wol -i {$bcip} " . escapeshellarg($mac)))
 				$savemsg .= sprintf(gettext("Sent magic packet to %s."),$mac);
 			else
-				$savemsg .= sprintf(gettext('Please check the %1$ssystem log%2$s, the wol command for %3$s did not complete successfully%4$s'),'<a href="/diag_logs.php">', '</a>', $mac, ".<br>");
+				$savemsg .= sprintf(gettext('Please check the %1$ssystem log%2$s, the wol command for %3$s did not complete successfully%4$s'),'<a href="/diag_logs.php">', '</a>', $mac, ".<br />");
 		}
 	}
 }
@@ -137,14 +137,14 @@ include("head.inc");
                       <?=htmlspecialchars($ifacename);?>
                       </option>
                       <?php endforeach; ?>
-                    </select> <br>
+                    </select> <br />
                     <span class="vexpl"><?=gettext("Choose which interface the host to be woken up is connected to.");?></span></td>
                 </tr>
                 <tr>
 				  <td width="22%" valign="top" class="vncellreq"><?=gettext("MAC address");?></td>
 				  <td width="78%" class="vtable">
                       <input name="mac" type="text" class="formfld unknown" id="mac" size="20" value="<?=htmlspecialchars($mac);?>">
-                      <br>
+                      <br />
                       <?=gettext("Enter a MAC address ");?><span class="vexpl"> <?=gettext("in the following format: xx:xx:xx:xx:xx:xx");?></span></td></tr>
 				<tr>
 				  <td width="22%" valign="top">&nbsp;</td>
@@ -153,7 +153,7 @@ include("head.inc");
 				</td>
 				</tr>
 			</table>
-			&nbsp;<br>
+			&nbsp;<br />
 			<?=gettext("Wake all clients at once: ");?><a href="services_wol.php?wakeall=true"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_wol_all.gif" width="17" height="17" border="0"></a><p/>
 			<?=gettext("Or Click the MAC address to wake up an individual device:");?>
 			<table width="100%" border="0" cellpadding="0" cellspacing="0" class="tabcont">
@@ -207,7 +207,7 @@ include("head.inc");
 			<span class="vexpl">
 					<span class="red">
 						<strong>
-							<?=gettext("Note:");?><br>
+							<?=gettext("Note:");?><br />
             			</strong>
 					</span><?=gettext("This service can be used to wake up (power on) computers by sending special"); ?> &quot;<?=gettext("Magic Packets"); ?>&quot;. <?=gettext("The NIC in the computer that is to be woken up must support Wake on LAN and has to be configured properly (WOL cable, BIOS settings). ");?>
 			</span>
diff --git a/usr/local/www/services_wol_edit.php b/usr/local/www/services_wol_edit.php
old mode 100755
new mode 100644
index a4cf4ed134..28f6e961ae
--- a/usr/local/www/services_wol_edit.php
+++ b/usr/local/www/services_wol_edit.php
@@ -134,14 +134,14 @@ include("head.inc");
                       <?=htmlspecialchars($ifacename);?>
                       </option>
                       <?php endforeach; ?>
-                    </select> <br>
+                    </select> <br />
                     <span class="vexpl"><?=gettext("Choose which interface this host is connected to.");?></span></td>
                 </tr>
 				<tr>
                   <td width="22%" valign="top" class="vncellreq"><?=gettext("MAC address");?></td>
                   <td width="78%" class="vtable"> 
                     <input name="mac" type="text" class="formfld" id="mac" size="20" value="<?=htmlspecialchars($pconfig['mac']);?>">
-                    <br> 
+                    <br /> 
                     <span class="vexpl"><?=gettext("Enter a MAC address  in the following format: ".
                     "xx:xx:xx:xx:xx:xx");?><em></em></span></td>
                 </tr>
@@ -149,7 +149,7 @@ include("head.inc");
                   <td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td>
                   <td width="78%" class="vtable"> 
                     <input name="descr" type="text" class="formfld" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>">
-                    <br> <span class="vexpl"><?=gettext("You may enter a description here".
+                    <br /> <span class="vexpl"><?=gettext("You may enter a description here".
                    " for your reference (not parsed).");?></span></td>
                 </tr>
                 <tr>
diff --git a/usr/local/www/status_captiveportal.php b/usr/local/www/status_captiveportal.php
old mode 100755
new mode 100644
index 0acbe8961a..86fa2d83af
--- a/usr/local/www/status_captiveportal.php
+++ b/usr/local/www/status_captiveportal.php
@@ -120,7 +120,7 @@ $mac_man = load_mac_manufacturer_table();
 <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
   <tr>
 	<td width="20%" class="vncell" valign="top"> 
-               <br/><?=gettext("Captive Portal Zone"); ?><br/<br/>
+               <br /><?=gettext("Captive Portal Zone"); ?><br/<br />
 	</td>
 	<td "class="vncell" width="30%" align="center"> 
 	<form action="status_captiveportal.php" method="post" enctype="multipart/form-data" name="form1" id="form1">
@@ -134,12 +134,12 @@ $mac_man = load_mac_manufacturer_table();
 		       }
                ?>
                </select>
-		<br/>
+		<br />
 	</form>
 	</td>
 	<td colspan="3" width="50%"></td>
   </tr>
-  <tr><td colspan="5"><br/></tr>
+  <tr><td colspan="5"><br /></tr>
 <?php if (!empty($cpzone)): ?>
   <tr>
 	<td colspan="5" valign="top" class="listtopic"><?=gettext("Captiveportal status");?></td>
@@ -165,7 +165,7 @@ $mac_man = load_mac_manufacturer_table();
 		if (!empty($mac)) {
 			$mac_hi = strtoupper($mac[0] . $mac[1] . $mac[3] . $mac[4] . $mac[6] . $mac[7]);
 			print htmlentities($mac);
-			if(isset($mac_man[$mac_hi])){ print "<br/><font size=\"-2\"><i>{$mac_man[$mac_hi]}</i></font>"; }
+			if(isset($mac_man[$mac_hi])){ print "<br /><font size=\"-2\"><i>{$mac_man[$mac_hi]}</i></font>"; }
 		}
 		?>&nbsp;
 	</td>
diff --git a/usr/local/www/status_captiveportal_expire.php b/usr/local/www/status_captiveportal_expire.php
index 48d3f05d4c..d4de544c45 100644
--- a/usr/local/www/status_captiveportal_expire.php
+++ b/usr/local/www/status_captiveportal_expire.php
@@ -82,7 +82,7 @@ include("fbegin.inc");
     <td valign="top" class="vncellreq"><?=gettext("Voucher(s)"); ?></td>
     <td class="vtable">
     <textarea name="vouchers" cols="65" rows="3" type="text" id="vouchers" class="formpre"><?=htmlspecialchars($_POST['vouchers']);?></textarea>
-    <br>
+    <br />
 <?=gettext("Enter multiple vouchers separated by space or newline. All valid vouchers will be marked as expired"); ?>.</td>
   </tr>
   <tr>
diff --git a/usr/local/www/status_captiveportal_test.php b/usr/local/www/status_captiveportal_test.php
index a0cafbda16..47d64c9bf4 100644
--- a/usr/local/www/status_captiveportal_test.php
+++ b/usr/local/www/status_captiveportal_test.php
@@ -84,7 +84,7 @@ include("fbegin.inc");
     <td valign="top" class="vncellreq"><?=gettext("Voucher(s)"); ?></td>
     <td class="vtable">
     <textarea name="vouchers" cols="65" rows="3" type="text" id="vouchers" class="formpre"><?=htmlspecialchars($_POST['vouchers']);?></textarea>
-    <br>
+    <br />
 <?=gettext("Enter multiple vouchers separated by space or newline. The remaining time, if valid, will be shown for each voucher"); ?>.</td>      
   </tr>      
   <tr>
diff --git a/usr/local/www/status_dhcp_leases.php b/usr/local/www/status_dhcp_leases.php
old mode 100755
new mode 100644
index b7624d865f..edd445ee49
--- a/usr/local/www/status_dhcp_leases.php
+++ b/usr/local/www/status_dhcp_leases.php
@@ -377,13 +377,13 @@ foreach ($leases as $data) {
 		$mac_hi = strtoupper($mac[0] . $mac[1] . $mac[3] . $mac[4] . $mac[6] . $mac[7]);
                 if ($data['online'] != "online") {
 			if(isset($mac_man[$mac_hi])){ // Manufacturer for this MAC is defined
-	                        echo "<td class=\"listr\">{$fspans}<a href=\"services_wol.php?if={$data['if']}&mac=$mac\" title=\"" . gettext("$mac - send Wake on LAN packet to this MAC address") ."\">{$mac}</a><br/><font size=\"-2\"><i>{$mac_man[$mac_hi]}</i></font>{$fspane}&nbsp;</td>\n";
+	                        echo "<td class=\"listr\">{$fspans}<a href=\"services_wol.php?if={$data['if']}&mac=$mac\" title=\"" . gettext("$mac - send Wake on LAN packet to this MAC address") ."\">{$mac}</a><br /><font size=\"-2\"><i>{$mac_man[$mac_hi]}</i></font>{$fspane}&nbsp;</td>\n";
 			}else{	
                         	echo "<td class=\"listr\">{$fspans}<a href=\"services_wol.php?if={$data['if']}&mac={$data['mac']}\" title=\"" . gettext("send Wake on LAN packet to this MAC address") ."\">{$data['mac']}</a>{$fspane}&nbsp;</td>\n";
 			}
                 }else{
 			if(isset($mac_man[$mac_hi])){ // Manufacturer for this MAC is defined
-				echo "<td class=\"listr\">{$fspans}{$mac}<br/><font size=\"-2\"><i>{$mac_man[$mac_hi]}</i></font>{$fspane}&nbsp;</td>\n";
+				echo "<td class=\"listr\">{$fspans}{$mac}<br /><font size=\"-2\"><i>{$mac_man[$mac_hi]}</i></font>{$fspane}&nbsp;</td>\n";
 	                }else{
                 		echo "<td class=\"listr\">{$fspans}{$data['mac']}{$fspane}&nbsp;</td>\n";
 			}
diff --git a/usr/local/www/status_dhcpv6_leases.php b/usr/local/www/status_dhcpv6_leases.php
index 089d31ad44..3fa58a631d 100644
--- a/usr/local/www/status_dhcpv6_leases.php
+++ b/usr/local/www/status_dhcpv6_leases.php
@@ -454,14 +454,14 @@ foreach ($leases as $data) {
 		echo "<td class=\"listr\">{$fspans}{$data['duid']}{$fspane}&nbsp;</td>\n";
 		echo "<td class=\"listr\">{$fspans}";
 		if (!empty($data['hostname'])) {
-			echo htmlentities($data['hostname']) . "<br/>";
+			echo htmlentities($data['hostname']) . "<br />";
 		}
 
 		$mac=trim($ndpdata[$data['ip']]['mac']);
 		if (!empty($mac)) {
 			$mac_hi = strtoupper($mac[0] . $mac[1] . $mac[3] . $mac[4] . $mac[6] . $mac[7]);
 			print htmlentities($mac);
-			if(isset($mac_man[$mac_hi])){ print "<br/><font size=\"-2\"><i>{$mac_man[$mac_hi]}</i></font>"; }
+			if(isset($mac_man[$mac_hi])){ print "<br /><font size=\"-2\"><i>{$mac_man[$mac_hi]}</i></font>"; }
 		}
 
 		echo "{$fspane}&nbsp;</td>\n";
@@ -533,7 +533,7 @@ foreach ($prefixes as $data) {
 		}
 		echo "<tr>\n";
 		if ($mappings[$data['iaid'] . $data['duid']]) {
-			$dip = "<br/>Routed To: {$mappings[$data['iaid'] . $data['duid']]}";
+			$dip = "<br />Routed To: {$mappings[$data['iaid'] . $data['duid']]}";
 		}
 		echo "<td class=\"listlr\">{$fspans}{$data['prefix']}{$dip}{$fspane}&nbsp;</td>\n";
 		echo "<td class=\"listr\">{$fspans}{$data['iaid']}{$fspane}&nbsp;</td>\n";
diff --git a/usr/local/www/status_filter_reload.php b/usr/local/www/status_filter_reload.php
index 8a64c86bd2..48d8563e01 100644
--- a/usr/local/www/status_filter_reload.php
+++ b/usr/local/www/status_filter_reload.php
@@ -68,7 +68,7 @@ include("head.inc");
 <body link="#0000CC" vlink="#0000CC" alink="#0000CC">
 
 <?php include("fbegin.inc"); ?>
-<br/>
+<br />
 <form action="status_filter_reload.php" method="post" name="filter">
 <input type="submit" value="Reload Filter" name="reloadfilter" id="reloadfilter">
 <?php if ($config['hasync'] && $config['hasync']["synchronizetoip"] != ""): ?>
@@ -76,7 +76,7 @@ include("head.inc");
 <input type="submit" value="Force Config Sync" name="syncfilter" id="syncfilter">
 <?php endif; ?>
 </form>
-<br/><br/><br/>
+<br /><br /><br />
 <div id="status" name="status" style="padding:5px; border:1px dashed #990000; background-color: #ffffff; color: #000000;">
 	<?php echo $status; ?>
 </div>
diff --git a/usr/local/www/status_gateways.php b/usr/local/www/status_gateways.php
old mode 100755
new mode 100644
index ffe1458aa7..40ef01aced
--- a/usr/local/www/status_gateways.php
+++ b/usr/local/www/status_gateways.php
@@ -141,7 +141,7 @@ include("head.inc");
 				echo "<tr><td><table width='100%'><tr><td bgcolor=\"$bgcolor\">&nbsp;$online&nbsp;</td></tr><tr><td>";
 				$lastchange = $gateways_status[$gname]['lastcheck'];
 				if(!empty($lastchange)) {
-					echo gettext("Last check:") . '<br/>' . $lastchange;
+					echo gettext("Last check:") . '<br />' . $lastchange;
 				}
 				echo "</td></tr></table></td></tr>";
                         ?>
diff --git a/usr/local/www/status_graph_cpu.php b/usr/local/www/status_graph_cpu.php
index cefe472d4d..4e218146a7 100644
--- a/usr/local/www/status_graph_cpu.php
+++ b/usr/local/www/status_graph_cpu.php
@@ -50,5 +50,5 @@ $pgtitle = gettext("Status: CPU Graph");
 <embed src="graph_cpu.php" type="image/svg+xml"
 		width="550" height="275" pluginspage="http://www.adobe.com/svg/viewer/install/auto" />
 </div>
-<br><span class="red"><strong><?=gettext("Note"); ?>:</strong></span> <?=gettext("if you can't see the graph, you may have to install the"); ?> <a href="http://www.adobe.com/svg/viewer/install/" target="_blank"><?=gettext("Adobe SVG viewer"); ?></a>.
+<br /><span class="red"><strong><?=gettext("Note"); ?>:</strong></span> <?=gettext("if you can't see the graph, you may have to install the"); ?> <a href="http://www.adobe.com/svg/viewer/install/" target="_blank"><?=gettext("Adobe SVG viewer"); ?></a>.
 <?php include("fend.inc"); ?>
diff --git a/usr/local/www/status_interfaces.php b/usr/local/www/status_interfaces.php
old mode 100755
new mode 100644
index cd71c1bd2a..58ed077657
--- a/usr/local/www/status_interfaces.php
+++ b/usr/local/www/status_interfaces.php
@@ -325,7 +325,7 @@ include("head.inc");
 		<?php
 			$dns_servers = get_dns_servers();
 			foreach($dns_servers as $dns) {
-				echo "{$dns}<br/>";
+				echo "{$dns}<br />";
 			}
 		?>
 		</td>
@@ -349,7 +349,7 @@ include("head.inc");
 		<td width="22%" class="vncellt"><?=gettext("LAGG Ports");?></td>
 		<td width="78%" class="listr">
 			<?php 	foreach ($ifinfo['laggport'] as $laggport) { ?>
-					<?php echo htmlspecialchars($laggport); ?><br/>
+					<?php echo htmlspecialchars($laggport); ?><br />
 			<?php	} ?>
 		</td>
 	</tr>
@@ -461,7 +461,7 @@ include("head.inc");
 		<td width="78%" class="listr">
 			<?php
 				echo $interrupt_total . " " . gettext("total");
-				echo "<br/>";
+				echo "<br />";
 				echo $interrupt_sec . " " . gettext("rate");
 			?>
 		</td>
@@ -471,7 +471,7 @@ include("head.inc");
 <?php $i++; endforeach; ?>
 </table>
 
-<br/>
+<br />
 
 <?php printf(gettext("Using dial-on-demand will bring the connection up again if any packet ".
 "triggers it. To substantiate this point: disconnecting manually ".
diff --git a/usr/local/www/status_lb_pool.php b/usr/local/www/status_lb_pool.php
old mode 100755
new mode 100644
index ce00625078..148a280652
--- a/usr/local/www/status_lb_pool.php
+++ b/usr/local/www/status_lb_pool.php
@@ -110,7 +110,7 @@ if ($_POST) {
 <?php include("fbegin.inc"); ?>
 <form action="status_lb_pool.php" method="post">
 <?php if (is_subsystem_dirty('loadbalancer')): ?><p>
-<?php print_info_box_np(sprintf(gettext("The load balancer configuration has been changed%sYou must apply the changes in order for them to take effect."), "<br>"));?><br>
+<?php print_info_box_np(sprintf(gettext("The load balancer configuration has been changed%sYou must apply the changes in order for them to take effect."), "<br />"));?><br />
 <?php endif; ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
 	<tr><td class="tabnavtbl">
diff --git a/usr/local/www/status_lb_vs.php b/usr/local/www/status_lb_vs.php
old mode 100755
new mode 100644
index c38928705e..2fdd1ca0c0
--- a/usr/local/www/status_lb_vs.php
+++ b/usr/local/www/status_lb_vs.php
@@ -125,9 +125,9 @@ include("head.inc");
 			if (!empty($rdr_a[$vsent['name']]['total']))
 				echo "Total Sessions: {$rdr_a[$vsent['name']]['total']}\n";
 			if (!empty($rdr_a[$vsent['name']]['last']))
-				echo "<br/>Last: {$rdr_a[$vsent['name']]['last']}\n";
+				echo "<br />Last: {$rdr_a[$vsent['name']]['last']}\n";
 			if (!empty($rdr_a[$vsent['name']]['average']))
-				echo "<br/>Average: {$rdr_a[$vsent['name']]['average']}\n";
+				echo "<br />Average: {$rdr_a[$vsent['name']]['average']}\n";
 			?>
                   </td>
                   <td class="listbg" >
diff --git a/usr/local/www/status_openvpn.php b/usr/local/www/status_openvpn.php
index 495682179d..5e9c2db418 100644
--- a/usr/local/www/status_openvpn.php
+++ b/usr/local/www/status_openvpn.php
@@ -210,7 +210,7 @@ include("head.inc"); ?>
 <?php if (is_array($server['routes']) && count($server['routes'])): ?>
 <div id="shroutebut-<?= $i ?>">
 <input type="button" onClick="show_routes('tabroute-<?= $i ?>','shroutebut-<?= $i ?>')" value="<?php echo gettext("Show Routing Table"); ?>"></input> - <?= gettext("Display OpenVPN's internal routing table for this server.") ?></a>
-<br/><br/>
+<br /><br />
 </div>
 <table style="display: none; padding-top:0px; padding-bottom:0px; padding-left:0px; padding-right:0px" width="100%" border="0" cellpadding="0" cellspacing="0" id="tabroute-<?= $i ?>">
 	<tr>
@@ -255,10 +255,10 @@ include("head.inc"); ?>
 	</tr>
 </table>
 <?php endif; ?>
-<br/>
+<br />
 <?php $i++; ?>
 <?php endforeach; ?>
-<br/>
+<br />
 
 <?php if (!empty($sk_servers)) { ?>
 <table style="padding-top:0px; padding-bottom:0px; padding-left:0px; padding-right:0px" width="100%" border="0" cellpadding="0" cellspacing="0">
@@ -322,7 +322,7 @@ include("head.inc"); ?>
 
 <?php
 } ?>
-<br>
+<br />
 <?php if (!empty($clients)) { ?>
 <table style="padding-top:0px; padding-bottom:0px; padding-left:0px; padding-right:0px" width="100%" border="0" cellpadding="0" cellspacing="0">
 	<tr>
@@ -387,7 +387,7 @@ include("head.inc"); ?>
 }
 
 if ($DisplayNote) {
-	echo "<br/><b>" . gettext("NOTE") . ":</b> " . gettext("If you have custom options that override the management features of OpenVPN on a client or server, they will cause that OpenVPN instance to not work correctly with this status page.");
+	echo "<br /><b>" . gettext("NOTE") . ":</b> " . gettext("If you have custom options that override the management features of OpenVPN on a client or server, they will cause that OpenVPN instance to not work correctly with this status page.");
 }
 
 if ((empty($clients)) && (empty($servers)) && (empty($sk_servers))) {
diff --git a/usr/local/www/status_queues.php b/usr/local/www/status_queues.php
old mode 100755
new mode 100644
index 2db3bd583b..7c0cd322ed
--- a/usr/local/www/status_queues.php
+++ b/usr/local/www/status_queues.php
@@ -182,8 +182,8 @@ if(!is_array($config['shaper']['queue']) || count($config['shaper']['queue']) <
 <?php endif; ?>
 </table>
 <p>
-	<strong><span class="red"><?=gettext("Note"); ?>:</span></strong><br/>
-	<?=gettext("Queue graphs take 5 seconds to sample data"); ?>.<br/>
+	<strong><span class="red"><?=gettext("Note"); ?>:</span></strong><br />
+	<?=gettext("Queue graphs take 5 seconds to sample data"); ?>.<br />
 	<?=gettext("You can configure the Traffic Shaper"); ?> <a href="/firewall_shaper_wizards.php"><?=gettext("here"); ?></a>.
 </p>
 <script type="text/javascript">
diff --git a/usr/local/www/status_rrd_graph.php b/usr/local/www/status_rrd_graph.php
old mode 100755
new mode 100644
index 4c7c95008b..c6e58c26f1
--- a/usr/local/www/status_rrd_graph.php
+++ b/usr/local/www/status_rrd_graph.php
@@ -392,7 +392,7 @@ function get_dates($curperiod, $graph) {
 				break;
 		}
 	}
-	// echo "start $start ". date('l jS \of F Y h:i:s A', $start) .", end $end ". date('l jS \of F Y h:i:s A', $end) ."<br>";
+	// echo "start $start ". date('l jS \of F Y h:i:s A', $start) .", end $end ". date('l jS \of F Y h:i:s A', $end) ."<br />";
 	$dates = array();
 	$dates['start'] = $start;
 	$dates['end'] = $end;
diff --git a/usr/local/www/status_rrd_graph_settings.php b/usr/local/www/status_rrd_graph_settings.php
old mode 100755
new mode 100644
index f0fcccc1bc..4c3e35a7bd
--- a/usr/local/www/status_rrd_graph_settings.php
+++ b/usr/local/www/status_rrd_graph_settings.php
@@ -243,7 +243,7 @@ include("head.inc");
 			</tr>
 			<tr>
 				<td width="22%" height="53" valign="top">&nbsp;</td>
-				<td width="78%"><strong><span class="red"><?=gettext("Note:");?></span></strong><br/>
+				<td width="78%"><strong><span class="red"><?=gettext("Note:");?></span></strong><br />
 					<?=gettext("Graphs will not be allowed to be recreated within a 1 minute interval, please " .
 					"take this into account after changing the style.");?>
 				</td>
diff --git a/usr/local/www/status_wireless.php b/usr/local/www/status_wireless.php
old mode 100755
new mode 100644
index f18c9b52fb..c0d4a4bd2d
--- a/usr/local/www/status_wireless.php
+++ b/usr/local/www/status_wireless.php
@@ -90,7 +90,7 @@ display_top_tabs($tab_array);
 <tr><td>
 <div id="mainarea" class="tabcont">
 <input type="hidden" name="if" id="if" value="<?php echo htmlspecialchars($if); ?>">
-<b><input type="submit" name="rescanwifi" id="rescanwifi" value="Rescan"></b><br/><br/>
+<b><input type="submit" name="rescanwifi" id="rescanwifi" value="Rescan"></b><br /><br />
 <b><?php echo gettext("Nearby access points or ad-hoc peers"); ?></b>
 <table class="tabcont sortable" colspan="3" cellpadding="3" width="100%">
 	<thead>
@@ -138,7 +138,7 @@ display_top_tabs($tab_array);
 ?>
 	</tbody>
 </table>
-<b><?php echo gettext("Associated or ad-hoc peers"); ?></b><br/>
+<b><?php echo gettext("Associated or ad-hoc peers"); ?></b><br />
 <table class="tabcont sortable" colspan="3" cellpadding="3" width="100%">
 	<thead>
 		<tr bgcolor='#990000'>
@@ -184,8 +184,8 @@ display_top_tabs($tab_array);
 ?>
 	</tbody>
 </table>
-</div><br>
-	<b>Flags:</b> A = authorized, E = Extended Rate (802.11g), P = Power save mode<br>
+</div><br />
+	<b>Flags:</b> A = authorized, E = Extended Rate (802.11g), P = Power save mode<br />
 	<b>Capabilities:</b> E = ESS (infrastructure mode), I = IBSS (ad-hoc mode), P = privacy (WEP/TKIP/AES),
 		S = Short preamble, s = Short slot time
 </td></tr>
diff --git a/usr/local/www/system.php b/usr/local/www/system.php
old mode 100755
new mode 100644
index 28811b7a22..be5446e6e0
--- a/usr/local/www/system.php
+++ b/usr/local/www/system.php
@@ -301,10 +301,10 @@ include("head.inc");
 			<tr>
 				<td width="22%" valign="top" class="vncellreq"><?=gettext("Hostname"); ?></td>
 				<td width="78%" class="vtable"> <input name="hostname" type="text" class="formfld unknown" id="hostname" size="40" value="<?=htmlspecialchars($pconfig['hostname']);?>" />
-					<br/>
+					<br />
 					<span class="vexpl">
 						<?=gettext("Name of the firewall host, without domain part"); ?>
-						<br/>
+						<br />
 						<?=gettext("e.g."); ?> <em>firewall</em>
 					</span>
 				</td>
@@ -312,10 +312,10 @@ include("head.inc");
 			<tr>
 				<td width="22%" valign="top" class="vncellreq"><?=gettext("Domain"); ?></td>
 				<td width="78%" class="vtable"> <input name="domain" type="text" class="formfld unknown" id="domain" size="40" value="<?=htmlspecialchars($pconfig['domain']);?>" />
-					<br/>
+					<br />
 					<span class="vexpl">
 						<?=gettext("Do not use 'local' as a domain name. It will cause local hosts running mDNS (avahi, bonjour, etc.) to be unable to resolve local hosts not running mDNS."); ?>
-						<br/>
+						<br />
 						<?=gettext("e.g."); ?> <em><?=gettext("mycorp.com, home, office, private, etc."); ?></em>
 					</span>
 				</td>
@@ -323,7 +323,7 @@ include("head.inc");
 			<tr>
 				<td width="22%" valign="top" class="vncell"><?=gettext("DNS servers"); ?></td>
 				<td width="78%" class="vtable">
-						<br/>
+						<br />
 						<table summary="dns servers and gateways">
 							<tr>
 								<td><b><?=gettext("DNS Server"); ?></b></td>
@@ -377,19 +377,19 @@ include("head.inc");
 						<span class="vexpl">
 							<?=gettext("Enter IP addresses to be used by the system for DNS resolution. " .
 							"These are also used for the DHCP service, DNS forwarder and for PPTP VPN clients."); ?>
-							<br/>
+							<br />
 							<?php if($multiwan): ?>
-							<br/>
+							<br />
 							<?=gettext("In addition, optionally select the gateway for each DNS server. " .
 							"When using multiple WAN connections there should be at least one unique DNS server per gateway."); ?>
-							<br/>
+							<br />
 							<?php endif; ?>
-							<br/>
+							<br />
 							<input name="dnsallowoverride" type="checkbox" id="dnsallowoverride" value="yes" <?php if ($pconfig['dnsallowoverride']) echo "checked=\"checked\""; ?> />
 							<strong>
 								<?=gettext("Allow DNS server list to be overridden by DHCP/PPP on WAN"); ?>
 							</strong>
-							<br/>
+							<br />
 							<?php printf(gettext("If this option is set, %s will " .
 							"use DNS servers assigned by a DHCP/PPP server on WAN " .
 							"for its own purposes (including the DNS forwarder). " .
@@ -418,7 +418,7 @@ include("head.inc");
 						</option>
 						<?php endforeach; ?>
 					</select>
-					<br/>
+					<br />
 					<span class="vexpl">
 						<?=gettext("Select the location closest to you"); ?>
 					</span>
@@ -429,7 +429,7 @@ include("head.inc");
 				<td width="22%" valign="top" class="vncell">Time update interval</td>
 				<td width="78%" class="vtable">
 					<input name="timeupdateinterval" type="text" class="formfld unknown" id="timeupdateinterval" size="4" value="<?=htmlspecialchars($pconfig['timeupdateinterval']);?>" />
-					<br/>
+					<br />
 					<span class="vexpl">
 						Minutes between network time sync. 300 recommended,
 						or 0 to disable
@@ -441,7 +441,7 @@ include("head.inc");
 				<td width="22%" valign="top" class="vncell"><?=gettext("NTP time server"); ?></td>
 				<td width="78%" class="vtable">
 					<input name="timeservers" type="text" class="formfld unknown" id="timeservers" size="40" value="<?=htmlspecialchars($pconfig['timeservers']);?>" />
-					<br/>
+					<br />
 					<span class="vexpl">
 						<?=gettext("Use a space to separate multiple hosts (only one " .
 						"required). Remember to set up at least one DNS server " .
diff --git a/usr/local/www/system_advanced_admin.php b/usr/local/www/system_advanced_admin.php
index d2074d7e45..4a4f7a784b 100644
--- a/usr/local/www/system_advanced_admin.php
+++ b/usr/local/www/system_advanced_admin.php
@@ -316,9 +316,9 @@ function prot_change() {
 								<strong><?=gettext("NOTE:"); ?>&nbsp;</strong>
 							</span>
 							<?=gettext("The options on this page are intended for use by advanced users only."); ?>
-							<br/>
+							<br />
 						</span>
-						<br/>
+						<br />
 						<table width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area">
 							<tr>
 								<td colspan="2" valign="top" class="listtopic"><?=gettext("webConfigurator"); ?></td>
@@ -340,7 +340,7 @@ function prot_change() {
 									<input name="webguiproto" id="https_proto" type="radio" value="https" <?=$https_chk;?> <?=$https_disabled;?> onclick="prot_change()" />
 									<?=gettext("HTTPS"); ?>
 									<?php if (!$certs_available): ?>
-									<br/>
+									<br />
 									<?=gettext("No Certificates have been defined. You must"); ?>
 									<a href="system_certmanager.php"><?=gettext("Create or Import"); ?></a>
 									<?=gettext("a Certificate before SSL can be enabled."); ?>
@@ -391,7 +391,7 @@ function prot_change() {
 								<td width="78%" class="vtable">
 									<input name="disablehttpredirect" type="checkbox" id="disablehttpredirect" value="yes" <?php if ($pconfig['disablehttpredirect']) echo "checked=\"checked\""; ?> />
 									<strong><?=gettext("Disable webConfigurator redirect rule"); ?></strong>
-									<br/>
+									<br />
 									<?php echo gettext("When this is unchecked, access to the webConfigurator " .
 									"is always permitted even on port 80, regardless of the listening port configured. " .
 									"Check this box to disable this automatically added redirect rule. ");
@@ -403,7 +403,7 @@ function prot_change() {
 								<td width="78%" class="vtable">
 									<input name="noautocomplete" type="checkbox" id="noautocomplete" value="yes" <?php if ($pconfig['noautocomplete']) echo "checked=\"checked\""; ?> />
 									<strong><?=gettext("Disable webConfigurator login autocomplete"); ?></strong>
-									<br/>
+									<br />
 									<?php echo gettext("When this is unchecked, login credentials for the webConfigurator " .
 									"may be saved by the browser. While convenient, some security standards require this to be disabled. " .
 									"Check this box to disable autocomplete on the login form so that browsers will not prompt to save credentials (NOTE: Some browsers do not respect this option). ");
@@ -415,7 +415,7 @@ function prot_change() {
 								<td width="78%" class="vtable">
 									<input name="quietlogin" type="checkbox" id="quietlogin" value="yes" <?php if ($pconfig['quietlogin']) echo "checked=\"checked\""; ?> />
 									<strong><?=gettext("Disable logging of webConfigurator successful logins"); ?></strong>
-									<br/>
+									<br />
 									<?php echo gettext("When this is checked, successful logins to the webConfigurator " .
 									"will not be logged.");
 									?>
@@ -432,7 +432,7 @@ function prot_change() {
 									?>
 									<input name="noantilockout" type="checkbox" id="noantilockout" value="yes" <?php if ($pconfig['noantilockout']) echo "checked=\"checked\""; ?> />
 									<strong><?=gettext("Disable webConfigurator anti-lockout rule"); ?></strong>
-									<br/>
+									<br />
 									<?php printf(gettext("When this is unchecked, access to the webConfigurator " .
 									"on the %s interface is always permitted, regardless of the user-defined firewall " .
 									"rule set. Check this box to disable this automatically added rule, so access " .
@@ -447,7 +447,7 @@ function prot_change() {
 								<td width="78%" class="vtable">
 									<input name="nodnsrebindcheck" type="checkbox" id="nodnsrebindcheck" value="yes" <?php if ($pconfig['nodnsrebindcheck']) echo "checked=\"checked\""; ?> />
 									<strong><?=gettext("Disable DNS Rebinding Checks"); ?></strong>
-									<br/>
+									<br />
 									<?php echo gettext("When this is unchecked, your system " .
 									"is protected against <a href=\"http://en.wikipedia.org/wiki/DNS_rebinding\">DNS Rebinding attacks</a>. " .
 									"This blocks private IP responses from your configured DNS servers. Check this box to disable this protection if it interferes with " .
@@ -458,9 +458,9 @@ function prot_change() {
 								<td width="22%" valign="top" class="vncell"><?=gettext("Alternate Hostnames"); ?></td>
 								<td width="78%" class="vtable">
 									<input name="althostnames" type="text" class="formfld unknown" id="althostnames" size="75" value="<?=htmlspecialchars($pconfig['althostnames']);?>"/>
-									<br/>
+									<br />
 									<strong><?=gettext("Alternate Hostnames for DNS Rebinding and HTTP_REFERER Checks"); ?></strong>
-									<br/>
+									<br />
 									<?php echo gettext("Here you can specify alternate hostnames by which the router may be queried, to " . 
 									"bypass the DNS Rebinding Attack checks. Separate hostnames with spaces."); ?>
 								</td>
@@ -470,7 +470,7 @@ function prot_change() {
 								<td width="78%" class="vtable">
 									<input name="nohttpreferercheck" type="checkbox" id="nohttpreferercheck" value="yes" <?php if ($pconfig['nohttpreferercheck']) echo "checked=\"checked\""; ?> />
 									<strong><?=gettext("Disable HTTP_REFERER enforcement check"); ?></strong>
-									<br/>
+									<br />
 									<?php echo gettext("When this is unchecked, access to the webConfigurator " .
 									"is protected against HTTP_REFERER redirection attempts. " .
 									"Check this box to disable this protection if you find that it interferes with " .
@@ -482,11 +482,11 @@ function prot_change() {
 								<td width="78%" class="vtable">
 									<input name="beast_protection" type="checkbox" id="beast_protection" value="yes" <?php if ($pconfig['beast_protection']) echo "checked=\"checked\""; ?> <?= $disable_beast_option ?>/>
 									<strong><?=gettext("Mitigate the BEAST SSL Attack"); ?></strong>
-									<br/>
+									<br />
 									<?php echo gettext("When this is checked, the webConfigurator can mitigate BEAST SSL attacks. ") ?>
-									<br/>
+									<br />
 									<?php 	if ($disable_beast_option) {
-											echo "<br/>" . sprintf(gettext("This option has been automatically disabled because a conflicting cryptographic accelerator card has been detected (%s)."), $hwcrypto) . "<br/><br/>";
+											echo "<br />" . sprintf(gettext("This option has been automatically disabled because a conflicting cryptographic accelerator card has been detected (%s)."), $hwcrypto) . "<br /><br />";
 										} ?>
 									<?php echo gettext("This option is off by default because Hifn accelerators do NOT work with this option, and the GUI will not function. " .
 									"It is possible that other accelerators have a similar problem that is not yet known/documented. " .
@@ -511,7 +511,7 @@ function prot_change() {
 								<td width="78%" class="vtable">
 									<input name="sshdkeyonly" type="checkbox" id="sshdkeyonly" value="yes" <?php if ($pconfig['sshdkeyonly']) echo "checked=\"checked\""; ?> />
 									<strong><?=gettext("Disable password login for Secure Shell (RSA/DSA key only)"); ?></strong>
-									<br/>
+									<br />
 									<?=gettext("When enabled, authorized keys need to be configured for each"); ?>
 									<a href="system_usermanager.php"><?=gettext("user"); ?></a>
 									<?=gettext("that has been granted secure shell access."); ?>
@@ -521,7 +521,7 @@ function prot_change() {
 								<td width="22%" valign="top" class="vncell"><?=gettext("SSH port"); ?></td>
 								<td width="78%" class="vtable">
 									<input name="sshport" type="text" id="sshport" value="<?php echo $pconfig['sshport']; ?>" />
-									<br/>
+									<br />
 									<span class="vexpl"><?=gettext("Note: Leave this blank for the default of 22."); ?></span>
 								</td>
 							</tr>
@@ -552,7 +552,7 @@ function prot_change() {
 										<option value="57600"  <?php if ($pconfig['serialspeed'] == "57600")  echo "selected=\"selected\"";?>>57600</option>
 										<option value="115200" <?php if ($pconfig['serialspeed'] == "115200") echo "selected=\"selected\"";?>>115200</option>
 									</select> bps
-									<br/><?=gettext("Allows selection of different speeds for the serial console port."); ?>
+									<br /><?=gettext("Allows selection of different speeds for the serial console port."); ?>
 								</td>
 							</tr>
 							<?php if (!$g['primaryconsole_force'] && ($g['platform'] == "pfSense" || $g['platform'] == "cdrom" || file_exists("/etc/nano_use_vga.txt"))): ?>
@@ -563,7 +563,7 @@ function prot_change() {
 										<option value="serial"   <?php if ($pconfig['primaryconsole'] == "serial")   echo "selected=\"selected\"";?>>Serial Console</option>
 										<option value="video"  <?php if ($pconfig['primaryconsole'] == "video")  echo "selected=\"selected\"";?>>VGA Console</option>
 									</select>
-									<br/><?=gettext("Select the preferred console if multiple consoles are present. The preferred console will show pfSense boot script output. All consoles display OS boot messages, console messages, and the console menu."); ?>
+									<br /><?=gettext("Select the preferred console if multiple consoles are present. The preferred console will show pfSense boot script output. All consoles display OS boot messages, console messages, and the console menu."); ?>
 								</td>
 							</tr>
 							<?php endif; ?>
@@ -578,7 +578,7 @@ function prot_change() {
 								<td width="78%" class="vtable">
 									<input name="disableconsolemenu" type="checkbox" id="disableconsolemenu" value="yes" <?php if ($pconfig['disableconsolemenu']) echo "checked=\"checked\""; ?>  />
 									<strong><?=gettext("Password protect the console menu"); ?></strong>
-									<br/>
+									<br />
 									<span class="vexpl"><?=gettext("Changes to this option will take effect after a reboot."); ?></span>
 								</td>
 							</tr>
diff --git a/usr/local/www/system_advanced_firewall.php b/usr/local/www/system_advanced_firewall.php
index bdd25bb6ca..e3a523dc5f 100644
--- a/usr/local/www/system_advanced_firewall.php
+++ b/usr/local/www/system_advanced_firewall.php
@@ -285,9 +285,9 @@ function update_description(itemnum) {
 								<strong><?=gettext("NOTE:");?>&nbsp;</strong>
 							</span>
 							<?=gettext("The options on this page are intended for use by advanced users only.");?>
-							<br/>
+							<br />
 						</span>
-						<br/>
+						<br />
 						<table width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area">
 							<tr>
 								<td colspan="2" valign="top" class="listtopic"><?=gettext("Firewall Advanced");?></td>
@@ -296,7 +296,7 @@ function update_description(itemnum) {
 								<td width="22%" valign="top" class="vncell"><?=gettext("IP Do-Not-Fragment compatibility");?></td>
 								<td width="78%" class="vtable">
 									<input name="scrubnodf" type="checkbox" id="scrubnodf" value="yes" <?php if (isset($config['system']['scrubnodf'])) echo "checked=\"checked\""; ?> />
-									<strong><?=gettext("Clear invalid DF bits instead of dropping the packets");?></strong><br/>
+									<strong><?=gettext("Clear invalid DF bits instead of dropping the packets");?></strong><br />
 									<?=gettext("This allows for communications with hosts that generate fragmented " .
 									"packets with the don't fragment (DF) bit set. Linux NFS is known to " .
 									"do this. This will cause the filter to not drop such packets but " .
@@ -307,7 +307,7 @@ function update_description(itemnum) {
 								<td width="22%" valign="top" class="vncell"><?=gettext("IP Random id generation");?></td>
 								<td width="78%" class="vtable">
 									<input name="scrubrnid" type="checkbox" id="scrubrnid" value="yes" <?php if (isset($config['system']['scrubrnid'])) echo "checked=\"checked\""; ?> />
-									<strong><?=gettext("Insert a stronger id into IP header of packets passing through the filter.");?></strong><br/>
+									<strong><?=gettext("Insert a stronger id into IP header of packets passing through the filter.");?></strong><br />
 									<?=gettext("Replaces the IP identification field of packets with random values to " .
 									"compensate for operating systems that use predictable values. " .
 									"This option only applies to packets that are not fragmented after the " .
@@ -323,14 +323,14 @@ function update_description(itemnum) {
 										<option value="aggressive"<?php if($config['system']['optimization']=="aggressive") echo " selected=\"selected\""; ?>><?=gettext("aggressive");?></option>
 										<option value="conservative"<?php if($config['system']['optimization']=="conservative") echo " selected=\"selected\""; ?>><?=gettext("conservative");?></option>
 									</select>
-									<br/>
+									<br />
 									<textarea readonly="readonly" cols="60" rows="2" id="info" name="info"style="padding:5px; border:1px dashed #990000; background-color: #ffffff; color: #000000; font-size: 8pt;"></textarea>
 									<script type="text/javascript">
 									//<![CDATA[
 										update_description(document.forms[0].optimization.selectedIndex);
 									//]]>
 									</script>
-									<br/>
+									<br />
 									<?=gettext("Select the type of state table optimization to use");?>
 								</td>
 							</tr>
@@ -339,10 +339,10 @@ function update_description(itemnum) {
 								<td width="78%" class="vtable">
 									<input name="disablefilter" type="checkbox" id="disablefilter" value="yes" <?php if (isset($config['system']['disablefilter'])) echo "checked=\"checked\""; ?> />
 									<strong><?=gettext("Disable all packet filtering.");?></strong>
-									<br/>
+									<br />
 									<span class="vexpl"><?php printf(gettext("Note:  This converts %s into a routing only platform!"), $g['product_name']);?><br />
 										<?=gettext("Note:  This will also turn off NAT!");?>
-										<br/><?=gettext("If you only want to disable NAT, and not firewall rules, visit the");?> <a href="firewall_nat_out.php"><?=gettext("Outbound NAT");?></a> <?=gettext("page");?>.
+										<br /><?=gettext("If you only want to disable NAT, and not firewall rules, visit the");?> <a href="firewall_nat_out.php"><?=gettext("Outbound NAT");?></a> <?=gettext("page");?>.
 									</span>
 								</td>
 							</tr>
@@ -351,21 +351,21 @@ function update_description(itemnum) {
 								<td width="78%" class="vtable">
 									<input name="disablescrub" type="checkbox" id="disablescrub" value="yes" <?php if (isset($config['system']['disablescrub'])) echo "checked=\"checked\""; ?> />
 									<strong><?=gettext("Disables the PF scrubbing option which can sometimes interfere with NFS and PPTP traffic.");?></strong>
-									<br/>
+									<br />
 								</td>
 							</tr>
 							<tr>
 								<td width="22%" valign="top" class="vncell"><?=gettext("Firewall Adaptive Timeouts");?></td>
 								<td width="78%" class="vtable">
 									<strong><?=gettext("Timeouts for states can be scaled adaptively as the number of state table entries grows.");?></strong>
-									<br/>
+									<br />
 									<input name="adaptivestart" type="text" id="adaptivestart" value="<?php echo $pconfig['adaptivestart']; ?>" />
-									<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 /><?=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/>
+									<br />
 									<input name="adaptiveend" type="text" id="adaptiveend" value="<?php echo $pconfig['adaptiveend']; ?>" />
-									<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).");?>
-									<br/>
+									<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).");?>
+									<br />
 									<span class="vexpl"><?=gettext("Note:  Leave this blank for the default(0).");?></span>
 								</td>
 							</tr>
@@ -373,9 +373,9 @@ function update_description(itemnum) {
 								<td width="22%" valign="top" class="vncell"><?=gettext("Firewall Maximum States");?></td>
 								<td width="78%" class="vtable">
 									<input name="maximumstates" type="text" id="maximumstates" value="<?php echo $pconfig['maximumstates']; ?>" />
-									<br/>
+									<br />
 									<strong><?=gettext("Maximum number of connections to hold in the firewall state table.");?></strong>
-									<br/>
+									<br />
 									<span class="vexpl"><?=gettext("Note:  Leave this blank for the default.  On your system the default size is:");?> <?= pfsense_default_state_size() ?></span>
 								</td>
 							</tr>
@@ -383,9 +383,9 @@ function update_description(itemnum) {
 								<td width="22%" valign="top" class="vncell"><?=gettext("Firewall Maximum Table Entries");?></td>
 								<td width="78%" class="vtable">
 									<input name="maximumtableentries" type="text" id="maximumtableentries" value="<?php echo $pconfig['maximumtableentries']; ?>" />
-									<br/>
+									<br />
 									<strong><?=gettext("Maximum number of table entries for systems such as aliases, sshlockout, snort, etc, combined.");?></strong>
-									<br/>
+									<br />
 									<span class="vexpl">
 										<?=gettext("Note:  Leave this blank for the default.");?>
 										<?php if (empty($pconfig['maximumtableentries'])): ?>
@@ -399,11 +399,11 @@ function update_description(itemnum) {
 								<td width="78%" class="vtable">
 									<input name="bypassstaticroutes" type="checkbox" id="bypassstaticroutes" value="yes" <?php if ($pconfig['bypassstaticroutes']) echo "checked=\"checked\""; ?> />
 									<strong><?=gettext("Bypass firewall rules for traffic on the same interface");?></strong>
-									<br/>
+									<br />
 									<?=gettext("This option only applies if you have defined one or more static routes. If it is enabled, traffic that enters and " .
 									"leaves through the same interface will not be checked by the firewall. This may be desirable in some situations where " .
 									"multiple subnets are connected to the same interface.");?>
-									<br/>
+									<br />
 								</td>
 							</tr>
 							<tr>
@@ -441,9 +441,9 @@ function update_description(itemnum) {
 								<td width="22%" valign="top" class="vncell"><?=gettext("Aliases Hostnames Resolve Interval");?></td>
 								<td width="78%" class="vtable">
 									<input name="aliasesresolveinterval" type="text" id="aliasesresolveinterval" value="<?php echo $pconfig['aliasesresolveinterval']; ?>" />
-									<br/>
+									<br />
 									<strong><?=gettext("Interval, in seconds, that will be used to resolve hostnames configured on aliases.");?></strong>
-									<br/>
+									<br />
 									<span class="vexpl"><?=gettext("Note:  Leave this blank for the default (300s).");?></span>
 								</td>
 							</tr>
@@ -471,7 +471,7 @@ function update_description(itemnum) {
 									<option value="weekly" <?php if ($pconfig['bogonsinterval'] == 'weekly') echo "selected=\"selected\""; ?>><?=gettext("Weekly"); ?></option>
 									<option value="daily" <?php if ($pconfig['bogonsinterval'] == 'daily') echo "selected=\"selected\""; ?>><?=gettext("Daily"); ?></option>
 									</select>
-									<br/>
+									<br />
 									<?=gettext("The frequency of updating the lists of IP addresses that are reserved (but not RFC 1918) or not yet assigned by IANA.");?>
 								</td>
 							</tr>
@@ -490,22 +490,22 @@ function update_description(itemnum) {
 									<option value="proxy" <?php if (!isset($config['system']['disablenatreflection']) && !isset($config['system']['enablenatreflectionpurenat'])) echo "selected=\"selected\""; ?>><?=gettext("Enable (NAT + Proxy)"); ?></option>
 									<option value="purenat" <?php if (!isset($config['system']['disablenatreflection']) && isset($config['system']['enablenatreflectionpurenat'])) echo "selected=\"selected\""; ?>><?=gettext("Enable (Pure NAT)"); ?></option>
 									</select>
-									<br/>
+									<br />
 									<strong><?=gettext("When enabled, this automatically creates additional NAT redirect rules for access to port forwards on your external IP addresses from within your internal networks.");?></strong>
-									<br/><br/>
+									<br /><br />
 									<?=gettext("The NAT + proxy mode uses a helper program to send packets to the target of the port forward.  It is useful in setups where the interface and/or gateway IP used for communication with the target cannot be accurately determined at the time the rules are loaded.  Reflection rules are not created for ranges larger than 500 ports and will not be used for more than 1000 ports total between all port forwards.  Only TCP and UDP protocols are supported.");?>
-									<br/><br/>
+									<br /><br />
 									<?=gettext("The pure NAT mode uses a set of NAT rules to direct packets to the target of the port forward.  It has better scalability, but it must be possible to accurately determine the interface and gateway IP used for communication with the target at the time the rules are loaded.  There are no inherent limits to the number of ports other than the limits of the protocols.  All protocols available for port forwards are supported.");?>
-									<br/><br/>
+									<br /><br />
 									<?=gettext("Individual rules may be configured to override this system setting on a per-rule basis.");?>
 								</td>
 							</tr>
 							<tr>
 								<td width="22%" valign="top" class="vncell"><?=gettext("Reflection Timeout");?></td>
 								<td width="78%" class="vtable">
-									<input name="reflectiontimeout" id="reflectiontimeout" value="<?php echo $config['system']['reflectiontimeout']; ?>" /><br/>
+									<input name="reflectiontimeout" id="reflectiontimeout" value="<?php echo $config['system']['reflectiontimeout']; ?>" /><br />
 									<strong><?=gettext("Enter value for Reflection timeout in seconds.");?></strong>
-									<br/><br/>
+									<br /><br />
 									<?=gettext("Note: Only applies to Reflection on port forwards in NAT + proxy mode.");?>
 								</td>
 							</tr>
@@ -514,9 +514,9 @@ function update_description(itemnum) {
 								<td width="78%" class="vtable">
 									<input name="enablebinatreflection" type="checkbox" id="enablebinatreflection" value="yes" <?php if (isset($config['system']['enablebinatreflection'])) echo "checked=\"checked\""; ?> />
 									<strong><?=gettext("Enables the automatic creation of additional NAT redirect rules for access to 1:1 mappings of your external IP addresses from within your internal networks.");?></strong>
-									<br/><br/>
+									<br /><br />
 									<?=gettext("Note: Reflection on 1:1 mappings is only for the inbound component of the 1:1 mappings.  This functions the same as the pure NAT mode for port forwards.  For more details, refer to the pure NAT mode description above.");?>
-									<br/><br/>
+									<br /><br />
 									<?=gettext("Individual rules may be configured to override this system setting on a per-rule basis.");?>
 								</td>
 							</tr>
@@ -525,9 +525,9 @@ function update_description(itemnum) {
 								<td width="78%" class="vtable">
 									<input name="enablenatreflectionhelper" type="checkbox" id="enablenatreflectionhelper" value="yes" <?php if (isset($config['system']['enablenatreflectionhelper'])) echo "checked=\"checked\""; ?> />
 									<strong><?=gettext("Automatically create outbound NAT rules which assist inbound NAT rules that direct traffic back out to the same subnet it originated from.");?></strong>
-									<br/>
+									<br />
 									<?=gettext("Required for full functionality of the pure NAT mode of NAT Reflection for port forwards or NAT Reflection for 1:1 NAT.");?>
-									<br/><br/>
+									<br /><br />
 									<?=gettext("Note: This only works for assigned interfaces.  Other interfaces require manually creating the outbound NAT rules that direct the reply packets back through the router.");?>
 								</td>
 							</tr>
diff --git a/usr/local/www/system_advanced_misc.php b/usr/local/www/system_advanced_misc.php
index 558c40d25d..c73479dba3 100644
--- a/usr/local/www/system_advanced_misc.php
+++ b/usr/local/www/system_advanced_misc.php
@@ -334,9 +334,9 @@ function tmpvar_checked(obj) {
 								<strong><?=gettext("NOTE:"); ?>&nbsp;</strong>
 							</span>
 							<?=gettext("The options on this page are intended for use by advanced users only."); ?>
-							<br/>
+							<br />
 						</span>
-						<br/>
+						<br />
 						<table width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area">
 							<tr>
 								<td colspan="2" valign="top" class="listtopic"><?=gettext("Proxy support"); ?></td>
@@ -380,7 +380,7 @@ function tmpvar_checked(obj) {
 								<td width="22%" valign="top" class="vncell"><?=gettext("Load Balancing"); ?></td>
 								<td width="78%" class="vtable">
 									<input name="lb_use_sticky" type="checkbox" id="lb_use_sticky" value="yes" <?php if ($pconfig['lb_use_sticky']) echo "checked=\"checked\""; ?> onclick="sticky_checked(this)" />
-									<strong><?=gettext("Use sticky connections"); ?></strong><br/>
+									<strong><?=gettext("Use sticky connections"); ?></strong><br />
 									<?=gettext("Successive connections will be redirected to the servers " .
 									"in a round-robin manner with connections from the same " .
 									"source being sent to the same web server. This 'sticky " .
@@ -401,7 +401,7 @@ function tmpvar_checked(obj) {
 								<td width="22%" valign="top" class="vncell"><?=gettext("Load Balancing"); ?></td>
 								<td width="78%" class="vtable">
 									<input name="gw_switch_default" type="checkbox" id="gw_switch_default" value="yes" <?php if ($pconfig['gw_switch_default']) echo "checked=\"checked\""; ?> />
-									<strong><?=gettext("Allow default gateway switching"); ?></strong><br/>
+									<strong><?=gettext("Allow default gateway switching"); ?></strong><br />
 									<?=gettext("If the link where the default gateway resides fails " .
 									"switch the default gateway to another available one."); ?>
 								</td>
@@ -416,8 +416,8 @@ function tmpvar_checked(obj) {
 								<td width="22%" valign="top" class="vncell"><?=gettext("PowerD"); ?></td>
 								<td width="78%" class="vtable">
 									<input name="powerd_enable" type="checkbox" id="powerd_enable" value="yes" <?php if ($pconfig['powerd_enable']) echo "checked=\"checked\""; ?> />
-									<strong><?=gettext("Use PowerD"); ?></strong><br/>
-									<br/>
+									<strong><?=gettext("Use PowerD"); ?></strong><br />
+									<br />
 									<?=gettext("On AC Power Mode"); ?>&nbsp;:&nbsp;
 									<select name="powerd_ac_mode" id="powerd_ac_mode">
 										<option value="hadp"<?php if($pconfig['powerd_ac_mode']=="hadp") echo " selected=\"selected\""; ?>><?=gettext("Hiadaptive");?></option>
@@ -433,7 +433,7 @@ function tmpvar_checked(obj) {
 										<option value="min"<?php if($pconfig['powerd_battery_mode']=="min") echo " selected=\"selected\""; ?>><?=gettext("Minimum");?></option>
 										<option value="max"<?php if($pconfig['powerd_battery_mode']=="max") echo " selected=\"selected\""; ?>><?=gettext("Maximum");?></option>
 									</select>
-									<br/><br/>
+									<br /><br />
 									<?=gettext("The powerd utility monitors the system state and sets various power control " .
 									"options accordingly.  It offers four modes (maximum, minimum, adaptive " .
 									"and hiadaptive) that can be individually selected while on AC power or batteries. " .
@@ -472,7 +472,7 @@ function tmpvar_checked(obj) {
 										"for IPsec when using a cipher supported by your chip, such as AES-128. OpenVPN " .
 										"should be set for AES-128-CBC and have cryptodev enabled for hardware " .
 										"acceleration."); ?>
-									<br/><br/>
+									<br /><br />
 									<?=gettext("If you do not have a crypto chip in your system, this option will have no " .
 									"effect. To unload the selected module, set this option to 'none' and then reboot."); ?>
 								</td>
@@ -496,7 +496,7 @@ function tmpvar_checked(obj) {
 								<?=gettext("If you have a supported CPU, selecting a themal sensor will load the appropriate " .
 										"driver to read its temperature. Setting this to 'None' will attempt to read the " .
 										"temperature from an ACPI-compliant motherboard sensor instead, if one is present."); ?>
-								<br/><br/>
+								<br /><br />
 								<?=gettext("If you do not have a supported thermal sensor chip in your system, this option will have no " .
 									"effect. To unload the selected module, set this option to 'none' and then reboot."); ?>
 								</td>
@@ -551,7 +551,7 @@ function tmpvar_checked(obj) {
 									</tr>
 								<?php endforeach; ?>
 									</table>
-									<br/><?=gettext("Launches IPSec in debug mode so that more verbose logs " .
+									<br /><?=gettext("Launches IPSec in debug mode so that more verbose logs " .
 									"will be generated to aid in troubleshooting."); ?>
 								</td>
 							</tr>
@@ -626,7 +626,7 @@ function tmpvar_checked(obj) {
 								<td width="22%" valign="top" class="vncell"><?=gettext("Use RAM Disks"); ?></td>
 								<td width="78%" class="vtable">
 									<input name="use_mfs_tmpvar" type="checkbox" id="use_mfs_tmpvar" value="yes" <?php if ($pconfig['use_mfs_tmpvar']) echo "checked=\"checked\""; ?> onclick="tmpvar_checked(this)" />
-									<strong><?=gettext("Use memory file system for /tmp and /var"); ?></strong><br/>
+									<strong><?=gettext("Use memory file system for /tmp and /var"); ?></strong><br />
 									<?=gettext("Set this if you wish to use /tmp and /var as RAM disks (memory file system disks) on a full install " .
 									"rather than use the hard disk. Setting this will cause the data in /tmp and /var to be lost at reboot, including log data. RRD and DHCP Leases will be retained."); ?>
 								</td>
@@ -660,10 +660,10 @@ function tmpvar_checked(obj) {
 										<option value='<?= $x ?>' <?php if ($config['system']['rrdbackup'] == $x) echo "selected='selected'"; ?>><?= $x ?> <?=gettext("hour"); ?><?php if ($x>1) echo "s"; ?></option>
 									<?php } ?>
 									</select>
-									<br/>
+									<br />
 									<?=gettext("This will periodically backup the RRD data so it can be restored automatically on the next boot. Keep in mind that the more frequent the backup, the more writes will happen to your media.");?>
-									<br/>
-									<br/>
+									<br />
+									<br />
 								</td>
 							</tr>
 							<tr>
@@ -676,10 +676,10 @@ function tmpvar_checked(obj) {
 										<option value='<?= $x ?>' <?php if ($config['system']['dhcpbackup'] == $x) echo "selected='selected'"; ?>><?= $x ?> <?=gettext("hour"); ?><?php if ($x>1) echo "s"; ?></option>
 									<?php } ?>
 									</select>
-									<br/>
+									<br />
 									<?=gettext("This will periodically backup the DHCP leases data so it can be restored automatically on the next boot. Keep in mind that the more frequent the backup, the more writes will happen to your media.");?>
-									<br/>
-									<br/>
+									<br />
+									<br />
 								</td>
 							</tr>
 							<tr>
@@ -705,7 +705,7 @@ function tmpvar_checked(obj) {
 										<option value="<?=$val;?>" <?php if($pconfig['harddiskstandby'] == $val) echo('selected="selected"');?>><?=$min;?> <?=gettext("minutes"); ?></option>
 										<?php endforeach; ?>
 									</select>
-									<br/>
+									<br />
 									<?=gettext("Puts the hard disk into standby mode when the selected amount of time after the last ".
 									"access has elapsed."); ?> <em><?=gettext("Do not set this for CF cards."); ?></em>
 								</td>
@@ -722,7 +722,7 @@ function tmpvar_checked(obj) {
 								<td width="22%" valign="top" class="vncell"><?=gettext("Packages signature"); ?></td>
 								<td width="78%" class="vtable">
 									<input name="pkg_nochecksig" type="checkbox" id="pkg_nochecksig" value="yes" <?php if ($pconfig['pkg_nochecksig']) echo "checked=\"checked\""; ?> />
-									<strong><?=gettext("Do NOT check packages signature"); ?></strong><br/>
+									<strong><?=gettext("Do NOT check packages signature"); ?></strong><br />
 									<?=gettext("Enable this option will make pfSense install any packages without check its signature."); ?>
 								</td>
 							</tr>
diff --git a/usr/local/www/system_advanced_network.php b/usr/local/www/system_advanced_network.php
index 28450ad699..24114904c6 100644
--- a/usr/local/www/system_advanced_network.php
+++ b/usr/local/www/system_advanced_network.php
@@ -206,9 +206,9 @@ function enable_change(enable_over) {
 								<strong><?=gettext("NOTE:"); ?>&nbsp;</strong>
 							</span>
 							<?=gettext("The options on this page are intended for use by advanced users only."); ?>
-							<br/>
+							<br />
 						</span>
-						<br/>
+						<br />
 						<table width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area">
 							<tr>
 								<td colspan="2" valign="top" class="listtopic"><?=gettext("IPv6 Options"); ?></td>
@@ -217,22 +217,22 @@ function enable_change(enable_over) {
 								<td width="22%" valign="top" class="vncell"><?=gettext("Allow IPv6"); ?></td>
 								<td width="78%" class="vtable">
 									<input name="ipv6allow" type="checkbox" id="ipv6allow" value="yes" <?php if ($pconfig['ipv6allow']) echo "checked=\"checked\""; ?> onclick="enable_change(false)" />
-									<strong><?=gettext("Allow IPv6"); ?></strong><br/>
-									<?=gettext("All IPv6 traffic will be blocked by the firewall unless this box is checked."); ?><br/>
-									<?=gettext("NOTE: This does not disable any IPv6 features on the firewall, it only blocks traffic."); ?><br/>
-									<br/>
+									<strong><?=gettext("Allow IPv6"); ?></strong><br />
+									<?=gettext("All IPv6 traffic will be blocked by the firewall unless this box is checked."); ?><br />
+									<?=gettext("NOTE: This does not disable any IPv6 features on the firewall, it only blocks traffic."); ?><br />
+									<br />
 								</td>
 							</tr>
 							<tr>
 								<td width="22%" valign="top" class="vncell"><?=gettext("IPv6 over IPv4 Tunneling"); ?></td>
 								<td width="78%" class="vtable">
 									<input name="ipv6nat_enable" type="checkbox" id="ipv6nat_enable" value="yes" <?php if ($pconfig['ipv6nat_enable']) echo "checked=\"checked\""; ?> onclick="enable_change(false)" />
-									<strong><?=gettext("Enable IPv4 NAT encapsulation of IPv6 packets"); ?></strong><br/>
+									<strong><?=gettext("Enable IPv4 NAT encapsulation of IPv6 packets"); ?></strong><br />
 									<?=gettext("This provides an RFC 2893 compatibility mechanism ".
 									"that can be used to tunneling IPv6 packets over IPv4 ".
 									"routing infrastructures. If enabled, don't forget to ".
-									"add a firewall rule to permit IPv6 packets."); ?><br/>
-									<br/>
+									"add a firewall rule to permit IPv6 packets."); ?><br />
+									<br />
 									<?=gettext("IP address"); ?>&nbsp;:&nbsp;
 									<input name="ipv6nat_ipaddr" type="text" class="formfld unknown" id="ipv6nat_ipaddr" size="20" value="<?=htmlspecialchars($pconfig['ipv6nat_ipaddr']);?>" />
 								</td>
@@ -241,7 +241,7 @@ function enable_change(enable_over) {
 								<td width="22%" valign="top" class="vncell"><?=gettext("Prefer IPv4 over IPv6"); ?></td>
 								<td width="78%" class="vtable">
 									<input name="prefer_ipv4" type="checkbox" id="prefer_ipv4" value="yes" <?php if ($pconfig['prefer_ipv4']) echo "checked=\"checked\""; ?> />
-									<strong><?=gettext("Prefer to use IPv4 even if IPv6 is available"); ?></strong><br/>
+									<strong><?=gettext("Prefer to use IPv4 even if IPv6 is available"); ?></strong><br />
 									<?=gettext("By default, if a hostname resolves IPv6 and IPv4 addresses ".
 									"IPv6 will be used, if you check this option, IPv4 will be " .
 									"used instead of IPv6."); ?><br />
@@ -267,7 +267,7 @@ function enable_change(enable_over) {
 									<input name="disablechecksumoffloading" type="checkbox" id="disablechecksumoffloading" value="yes" <?php if (isset($config['system']['disablechecksumoffloading'])) echo "checked=\"checked\""; ?> />
 									<strong><?=gettext("Disable hardware checksum offload"); ?></strong><br />
 									<?=gettext("Checking this option will disable hardware checksum offloading. Checksum offloading is broken in some hardware, particularly some Realtek cards. Rarely, drivers may have problems with checksum offloading and some specific NICs."); ?>
-									<br/>
+									<br />
 									<span class="red"><strong><?=gettext("Note:");?>&nbsp;</strong></span>
 									<?=gettext("This will take effect after you reboot the machine or re-configure each interface.");?>
 								</td>
@@ -278,7 +278,7 @@ function enable_change(enable_over) {
 									<input name="disablesegmentationoffloading" type="checkbox" id="disablesegmentationoffloading" value="yes" <?php if (isset($config['system']['disablesegmentationoffloading'])) echo "checked=\"checked\""; ?> />
 									<strong><?=gettext("Disable hardware TCP segmentation offload"); ?></strong><br />
 									<?=gettext("Checking this option will disable hardware TCP segmentation offloading (TSO, TSO4, TSO6). This offloading is broken in some hardware drivers, and may impact performance with some specific NICs."); ?>
-									<br/>
+									<br />
 									<span class="red"><strong><?=gettext("Note:");?>&nbsp;</strong></span>
 									<?=gettext("This will take effect after you reboot the machine or re-configure each interface.");?>
 								</td>
@@ -289,7 +289,7 @@ function enable_change(enable_over) {
 									<input name="disablelargereceiveoffloading" type="checkbox" id="disablelargereceiveoffloading" value="yes" <?php if (isset($config['system']['disablelargereceiveoffloading'])) echo "checked=\"checked\""; ?> />
 									<strong><?=gettext("Disable hardware large receive offload"); ?></strong><br />
 									<?=gettext("Checking this option will disable hardware large receive offloading (LRO). This offloading is broken in some hardware drivers, and may impact performance with some specific NICs."); ?>
-									<br/>
+									<br />
 									<span class="red"><strong><?=gettext("Note:");?>&nbsp;</strong></span>
 									<?=gettext("This will take effect after you reboot the machine or re-configure each interface.");?>
 								</td>
@@ -319,7 +319,7 @@ function enable_change(enable_over) {
 									<input name="flowtable" type="checkbox" id="polling_enable" value="yes" <?php if ($pconfig['flowtable']) echo "checked=\"checked\""; ?> />
 									<strong>Enable flowtable support</strong><br />
 									Enables infrastructure for caching flows as a means of accelerating L3 and L2 lookups
-									as well as providing stateful load balancing when used with RADIX_MPATH.<br/>
+									as well as providing stateful load balancing when used with RADIX_MPATH.<br />
 								</td>
 							</tr>
 <?php endif; ?>
diff --git a/usr/local/www/system_advanced_notifications.php b/usr/local/www/system_advanced_notifications.php
index fe2eb710d1..59950a2850 100644
--- a/usr/local/www/system_advanced_notifications.php
+++ b/usr/local/www/system_advanced_notifications.php
@@ -196,35 +196,35 @@ include("head.inc");
 						<tr>
 							<td width="22%" valign="top" class="vncell"><?=gettext("Disable Growl Notifications"); ?></td>
 							<td width="78%" class="vtable">
-								<input type='checkbox' name='disable_growl' value="yes" <?php if ($pconfig['disable_growl']) {?>checked="checked"<?php } ?> /><br/>
+								<input type='checkbox' name='disable_growl' value="yes" <?php if ($pconfig['disable_growl']) {?>checked="checked"<?php } ?> /><br />
 								<?=gettext("Check this option to disable growl notifications but preserve the settings below."); ?>
 							</td>
 						</tr>
 						<tr>
 							<td width="22%" valign="top" class="vncell"><?=gettext("Registration Name"); ?></td>
 							<td width="78%" class="vtable">
-								<input name='name' value='<?php echo $pconfig['name']; ?>' /><br/>
+								<input name='name' value='<?php echo $pconfig['name']; ?>' /><br />
 								<?=gettext("Enter the name to register with the Growl server (default: PHP-Growl)."); ?>
 							</td>
 						</tr>
   					<tr>
 							<td width="22%" valign="top" class="vncell"><?=gettext("Notification Name"); ?></td>
 							<td width="78%" class="vtable">
-								<input name='notification_name' value='<?php echo $pconfig['notification_name']; ?>' /><br/>
+								<input name='notification_name' value='<?php echo $pconfig['notification_name']; ?>' /><br />
 								<?=sprintf(gettext("Enter a name for the Growl notifications (default: %s growl alert)."), $g['product_name']); ?>
 							</td>
 						</tr>
 						<tr>
 							<td width="22%" valign="top" class="vncell"><?=gettext("IP Address"); ?></td>
 							<td width="78%" class="vtable">
-								<input name='ipaddress' value='<?php echo $pconfig['ipaddress']; ?>' /><br/>
+								<input name='ipaddress' value='<?php echo $pconfig['ipaddress']; ?>' /><br />
 								<?=gettext("This is the IP address that you would like to send growl notifications to."); ?>
 							</td>
 						</tr>
 						<tr>
 							<td width="22%" valign="top" class="vncell"><?=gettext("Password"); ?></td>
 							<td width="78%" class="vtable">
-								<input name='password' type='password' value='<?php echo $pconfig['password']; ?>' /><br/>
+								<input name='password' type='password' value='<?php echo $pconfig['password']; ?>' /><br />
 								<?=gettext("Enter the password of the remote growl notification device."); ?>
 							</td>
 						</tr>
@@ -247,56 +247,56 @@ include("head.inc");
 						<tr>
 							<td width="22%" valign="top" class="vncell"><?=gettext("Disable SMTP Notifications"); ?></td>
 							<td width="78%" class="vtable">
-								<input type='checkbox' name='disable_smtp' value="yes" <?php if ($pconfig['disable_smtp']) {?>checked="checked"<?php } ?> /><br/>
+								<input type='checkbox' name='disable_smtp' value="yes" <?php if ($pconfig['disable_smtp']) {?>checked="checked"<?php } ?> /><br />
 								<?=gettext("Check this option to disable SMTP notifications but preserve the settings below. Some other mechanisms, such as packages, may need these settings in place to function."); ?>
 							</td>
 						</tr>
 						<tr>
 							<td width="22%" valign="top" class="vncell"><?=gettext("E-Mail server"); ?></td>
 							<td width="78%" class="vtable">
-								<input name='smtpipaddress' value='<?php echo $pconfig['smtpipaddress']; ?>' /><br/>
+								<input name='smtpipaddress' value='<?php echo $pconfig['smtpipaddress']; ?>' /><br />
 								<?=gettext("This is the FQDN or IP address of the SMTP E-Mail server to which notifications will be sent."); ?>
 							</td>
 						</tr>
 						<tr>
 							<td width="22%" valign="top" class="vncell"><?=gettext("SMTP Port of E-Mail server"); ?></td>
 							<td width="78%" class="vtable">
-								<input name='smtpport' value='<?php echo $pconfig['smtpport']; ?>' /><br/>
+								<input name='smtpport' value='<?php echo $pconfig['smtpport']; ?>' /><br />
 								<?=gettext("This is the port of the SMTP E-Mail server, typically 25, 587 (submission) or 465 (smtps)"); ?>
 							</td>
 						</tr>
 						<tr>
 							<td width="22%" valign="top" class="vncell"><?=gettext("Secure SMTP Connection"); ?></td>
 							<td width="78%" class="vtable">
-								<input type='checkbox' id='smtpssl' name='smtpssl' <?php echo $pconfig['smtpssl']; ?> />Enable SMTP over SSL/TLS<br/>
-								<input type='checkbox' id='smtptls' name='smtptls' <?php echo $pconfig['smtptls']; ?> />Enable STARTTLS<br/>
+								<input type='checkbox' id='smtpssl' name='smtpssl' <?php echo $pconfig['smtpssl']; ?> />Enable SMTP over SSL/TLS<br />
+								<input type='checkbox' id='smtptls' name='smtptls' <?php echo $pconfig['smtptls']; ?> />Enable STARTTLS<br />
 							</td>
 						</tr>
 						<tr>
 							<td width="22%" valign="top" class="vncell"><?=gettext("From e-mail address"); ?></td>
 							<td width="78%" class="vtable">
-								<input name='smtpfromaddress' type='text' value='<?php echo $pconfig['smtpfromaddress']; ?>' /><br/>
+								<input name='smtpfromaddress' type='text' value='<?php echo $pconfig['smtpfromaddress']; ?>' /><br />
 								<?=gettext("This is the e-mail address that will appear in the from field."); ?>
 							</td>
 						</tr>
 						<tr>
 							<td width="22%" valign="top" class="vncell"><?=gettext("Notification E-Mail address"); ?></td>
 							<td width="78%" class="vtable">
-								<input name='smtpnotifyemailaddress' type='text' value='<?php echo $pconfig['smtpnotifyemailaddress']; ?>' /><br/>
+								<input name='smtpnotifyemailaddress' type='text' value='<?php echo $pconfig['smtpnotifyemailaddress']; ?>' /><br />
 								<?=gettext("Enter the e-mail address that you would like email notifications sent to."); ?>
 							</td>
 						</tr>
 						<tr>
 							<td width="22%" valign="top" class="vncell"><?=gettext("Notification E-Mail auth username (optional)"); ?></td>
 							<td width="78%" class="vtable">
-								<input name='smtpusername' type='text' value='<?php echo $pconfig['smtpusername']; ?>' /><br/>
+								<input name='smtpusername' type='text' value='<?php echo $pconfig['smtpusername']; ?>' /><br />
 								<?=gettext("Enter the e-mail address username for SMTP authentication."); ?>
 							</td>
 						</tr>
 						<tr>
 							<td width="22%" valign="top" class="vncell"><?=gettext("Notification E-Mail auth password"); ?></td>
 							<td width="78%" class="vtable">
-								<input name='smtppassword' type='password' value='<?php echo $pconfig['smtppassword']; ?>' /><br/>
+								<input name='smtppassword' type='password' value='<?php echo $pconfig['smtppassword']; ?>' /><br />
 								<?=gettext("Enter the e-mail address password for SMTP authentication."); ?>
 							</td>
 						</tr>
@@ -321,7 +321,7 @@ include("head.inc");
 							<td width="78%" class="vtable">
 								<input name="disablebeep" type="checkbox" id="disablebeep" value="yes" <?php if ($pconfig['disablebeep']) echo "checked=\"checked\""; ?>  />
 								<strong><?=gettext("Disable the startup/shutdown beep"); ?></strong>
-								<br/>
+								<br />
 								<span class="vexpl"><?=gettext("When this is checked, startup and shutdown sounds will no longer play."); ?></span>
 							</td>
 						</tr>
diff --git a/usr/local/www/system_advanced_sysctl.php b/usr/local/www/system_advanced_sysctl.php
index a7b1cee3c4..519ef81ab0 100644
--- a/usr/local/www/system_advanced_sysctl.php
+++ b/usr/local/www/system_advanced_sysctl.php
@@ -164,9 +164,9 @@ include("head.inc");
 							<strong><?=gettext("NOTE:"); ?>&nbsp;</strong>
 						</span>
 						<?=gettext("The options on this page are intended for use by advanced users only."); ?>
-						<br/>
+						<br />
 					</span>
-					<br/>
+					<br />
 					<table width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area">
 						<tr>
 							<td width="20%" class="listhdrr"><?=gettext("Tunable Name"); ?></td>
diff --git a/usr/local/www/system_authservers.php b/usr/local/www/system_authservers.php
index 6b5c502165..676e92820d 100644
--- a/usr/local/www/system_authservers.php
+++ b/usr/local/www/system_authservers.php
@@ -82,7 +82,7 @@ if ($act == "del") {
 	unset($a_server[$_GET['id']]);
 
 	$savemsg = gettext("Authentication Server")." {$serverdeleted} ".
-				gettext("deleted")."<br/>";
+				gettext("deleted")."<br />";
 	write_config($savemsg);
 }
 
@@ -542,10 +542,10 @@ function select_clicked() {
 									<option value="<?=$ca['refid'];?>" <?=$selected;?>><?=$ca['descr'];?></option>
                                                         <?php	endforeach; ?>
 								</select>
-								<br/><span><?=gettext("This option is used if 'SSL Encrypted' option is choosen.");?> <br/>
+								<br /><span><?=gettext("This option is used if 'SSL Encrypted' option is choosen.");?> <br />
 								<?=gettext("It must match with the CA in the AD otherwise problems will arise.");?></span>
                                                         <?php else: ?>
-                                                                <b>No Certificate Authorities defined.</b> <br/>Create one under <a href="system_camanager.php">System &gt; Cert Manager</a>.
+                                                                <b>No Certificate Authorities defined.</b> <br />Create one under <a href="system_camanager.php">System &gt; Cert Manager</a>.
                                                         <?php endif; ?>
                                                         </td>
 						</tr>
@@ -647,13 +647,13 @@ function select_clicked() {
 									<tr>
 										<td><?=gettext("User DN:");?> &nbsp;</td>
 										<td>
-											<input name="ldap_binddn" type="text" class="formfld unknown" id="ldap_binddn" size="40" value="<?=htmlspecialchars($pconfig['ldap_binddn']);?>"/><br/>
+											<input name="ldap_binddn" type="text" class="formfld unknown" id="ldap_binddn" size="40" value="<?=htmlspecialchars($pconfig['ldap_binddn']);?>"/><br />
 										</td>
 									</tr>
 									<tr>
 										<td><?=gettext("Password:");?> &nbsp;</td>
 										<td>
-											<input name="ldap_bindpw" type="password" class="formfld pwd" id="ldap_bindpw" size="20" value="<?=htmlspecialchars($pconfig['ldap_bindpw']);?>"/><br/>
+											<input name="ldap_bindpw" type="password" class="formfld pwd" id="ldap_bindpw" size="20" value="<?=htmlspecialchars($pconfig['ldap_bindpw']);?>"/><br />
 										</td>
 									</tr>
 								</table>
diff --git a/usr/local/www/system_camanager.php b/usr/local/www/system_camanager.php
index 63669e4655..9c9911a408 100644
--- a/usr/local/www/system_camanager.php
+++ b/usr/local/www/system_camanager.php
@@ -94,7 +94,7 @@ if ($act == "del") {
 	$name = $a_ca[$id]['descr'];
 	unset($a_ca[$id]);
 	write_config();
-	$savemsg = sprintf(gettext("Certificate Authority %s and its CRLs (if any) successfully deleted"), $name) . "<br/>";
+	$savemsg = sprintf(gettext("Certificate Authority %s and its CRLs (if any) successfully deleted"), $name) . "<br />";
 	pfSenseHeader("system_camanager.php");
 	exit;
 }
@@ -411,15 +411,15 @@ function method_change() {
 							<td width="22%" valign="top" class="vncellreq"><?=gettext("Certificate data");?></td>
 							<td width="78%" class="vtable">
 								<textarea name="cert" id="cert" cols="65" rows="7" class="formfld_cert"><?=htmlspecialchars($pconfig['cert']);?></textarea>
-								<br/>
+								<br />
 								<?=gettext("Paste a certificate in X.509 PEM format here.");?>
 							</td>
 						</tr>
 						<tr>
-							<td width="22%" valign="top" class="vncellreq"><?=gettext("Certificate Private Key");?><br/><?=gettext("(optional)");?></td>
+							<td width="22%" valign="top" class="vncellreq"><?=gettext("Certificate Private Key");?><br /><?=gettext("(optional)");?></td>
 							<td width="78%" class="vtable">
 								<textarea name="key" id="key" cols="65" rows="7" class="formfld_cert"><?=htmlspecialchars($pconfig['key']);?></textarea>
-								<br/>
+								<br />
 								<?=gettext("Paste the private key for the above certificate here. This is optional in most cases, but required if you need to generate a Certificate Revocation List (CRL).");?>
 							</td>
 						</tr>
@@ -429,7 +429,7 @@ function method_change() {
 							<td width="22%" valign="top" class="vncellreq"><?=gettext("Serial for next certificate");?></td>
 							<td width="78%" class="vtable">
 								<input name="serial" type="text" class="formfld unknown" id="serial" size="20" value="<?=htmlspecialchars($pconfig['serial']);?>"/>
-								<br/><?=gettext("Enter a decimal number to be used as the serial number for the next certificate to be created using this CA.");?>
+								<br /><?=gettext("Enter a decimal number to be used as the serial number for the next certificate to be created using this CA.");?>
 							</td>
 						</tr>
 					<?php endif; ?>
@@ -488,7 +488,7 @@ function method_change() {
 									<option value="<?=$digest_alg;?>"<?=$selected;?>><?=strtoupper($digest_alg);?></option>
 								<?php endforeach; ?>
 								</select>
-								<br/><?= gettext("NOTE: It is recommended to use an algorithm stronger than SHA1 when possible.") ?>
+								<br /><?= gettext("NOTE: It is recommended to use an algorithm stronger than SHA1 when possible.") ?>
 							</td>
 						</tr>
 						<tr>
diff --git a/usr/local/www/system_certmanager.php b/usr/local/www/system_certmanager.php
index c761a75e86..f825cde420 100644
--- a/usr/local/www/system_certmanager.php
+++ b/usr/local/www/system_certmanager.php
@@ -102,7 +102,7 @@ if ($act == "del") {
 	$name = $a_cert[$id]['descr'];
 	unset($a_cert[$id]);
 	write_config();
-	$savemsg = sprintf(gettext("Certificate %s successfully deleted"), $name) . "<br/>";
+	$savemsg = sprintf(gettext("Certificate %s successfully deleted"), $name) . "<br />";
 	pfSenseHeader("system_certmanager.php");
 	exit;
 }
@@ -634,7 +634,7 @@ function internalca_change() {
 							<td width="22%" valign="top" class="vncellreq"><?=gettext("Certificate data");?></td>
 							<td width="78%" class="vtable">
 								<textarea name="cert" id="cert" cols="65" rows="7" class="formfld_cert"><?=htmlspecialchars($pconfig['cert']);?></textarea>
-								<br/>
+								<br />
 								<?=gettext("Paste a certificate in X.509 PEM format here.");?>
 							</td>
 						</tr>
@@ -642,7 +642,7 @@ function internalca_change() {
 							<td width="22%" valign="top" class="vncellreq"><?=gettext("Private key data");?></td>
 							<td width="78%" class="vtable">
 								<textarea name="key" id="key" cols="65" rows="7" class="formfld_cert"><?=htmlspecialchars($pconfig['key']);?></textarea>
-								<br/>
+								<br />
 								<?=gettext("Paste a private key in X.509 PEM format here.");?>
 							</td>
 						</tr>
@@ -714,7 +714,7 @@ function internalca_change() {
 									<option value="<?=$digest_alg;?>"<?=$selected;?>><?=strtoupper($digest_alg);?></option>
 								<?php endforeach; ?>
 								</select>
-								<br/><?= gettext("NOTE: It is recommended to use an algorithm stronger than SHA1 when possible.") ?>
+								<br /><?= gettext("NOTE: It is recommended to use an algorithm stronger than SHA1 when possible.") ?>
 							</td>
 						</tr>
 						<tr>
@@ -730,7 +730,7 @@ function internalca_change() {
 									<option value="<?=$ct;?>"<?=$selected;?>><?=$ctdesc;?></option>
 								<?php endforeach; ?>
 								</select>
-								<br/>
+								<br />
 								<?=gettext("Type of certificate to generate. Used for placing restrictions on the usage of the generated certificate.");?>
 							</td>
 						</tr>
@@ -841,7 +841,7 @@ function internalca_change() {
 												loaded = <?php echo $counter; ?>;
 											//]]>
 											</script>
-											<br/>NOTE: Type must be one of DNS (FQDN or Hostname), IP (IP address), URI, or email.
+											<br />NOTE: Type must be one of DNS (FQDN or Hostname), IP (IP address), URI, or email.
 										</td>
 									</tr>
 								</table>
@@ -890,7 +890,7 @@ function internalca_change() {
 									<option value="<?=$csr_digest_alg;?>"<?=$selected;?>><?=strtoupper($csr_digest_alg);?></option>
 								<?php endforeach; ?>
 								</select>
-								<br/><?= gettext("NOTE: It is recommended to use an algorithm stronger than SHA1 when possible.") ?>
+								<br /><?= gettext("NOTE: It is recommended to use an algorithm stronger than SHA1 when possible.") ?>
 							</td>
 						</tr>
 						<tr>
@@ -1040,7 +1040,7 @@ function internalca_change() {
 							<td width="22%" valign="top" class="vncellreq"><?=gettext("Signing request data");?></td>
 							<td width="78%" class="vtable">
 								<textarea name="csr" id="csr" cols="65" rows="7" class="formfld_cert" readonly="readonly"><?=htmlspecialchars($pconfig['csr']);?></textarea>
-								<br/>
+								<br />
 								<?=gettext("Copy the certificate signing data from here and forward it to your certificate authority for signing.");?></td>
 							</td>
 						</tr>
@@ -1048,7 +1048,7 @@ function internalca_change() {
 							<td width="22%" valign="top" class="vncellreq"><?=gettext("Final certificate data");?></td>
 							<td width="78%" class="vtable">
 								<textarea name="cert" id="cert" cols="65" rows="7" class="formfld_cert"><?=htmlspecialchars($pconfig['cert']);?></textarea>
-								<br/>
+								<br />
 								<?=gettext("Paste the certificate received from your certificate authority here.");?></td>
 							</td>
 						</tr>
@@ -1061,7 +1061,7 @@ function internalca_change() {
 								<?php echo gettext("Warning: Using this option may create an " .
 								"invalid certificate.  Check this box to disable the request -> " .
 								"response subject verification. ");
-								?><br/>
+								?><br />
 								<?php endif; */ ?>
 								<input id="submit" name="save" type="submit" class="formbtn" value="<?=gettext("Update");?>" />
 								<?php if (isset($id) && $a_cert[$id]): ?>
@@ -1154,25 +1154,25 @@ function internalca_change() {
 						</td>
 						<td class="listr">
 							<?php if (is_cert_revoked($cert)): ?>
-							<b>Revoked</b><br/>
+							<b>Revoked</b><br />
 							<?php endif; ?>
 							<?php if (is_webgui_cert($cert['refid'])): ?>
-							webConfigurator<br/>
+							webConfigurator<br />
 							<?php endif; ?>
 							<?php if (is_user_cert($cert['refid'])): ?>
-							User Cert<br/>
+							User Cert<br />
 							<?php endif; ?>
 							<?php if (is_openvpn_server_cert($cert['refid'])): ?>
-							OpenVPN Server<br/>
+							OpenVPN Server<br />
 							<?php endif; ?>
 							<?php if (is_openvpn_client_cert($cert['refid'])): ?>
-							OpenVPN Client<br/>
+							OpenVPN Client<br />
 							<?php endif; ?>
 							<?php if (is_ipsec_cert($cert['refid'])): ?>
-							IPsec Tunnel<br/>
+							IPsec Tunnel<br />
 							<?php endif; ?>
 							<?php if (is_captiveportal_cert($cert['refid'])): ?>
-							Captive Portal<br/>
+							Captive Portal<br />
 							<?php endif; ?>
 						</td>
 						<td valign="middle" class="list nowrap">
diff --git a/usr/local/www/system_crlmanager.php b/usr/local/www/system_crlmanager.php
index 0e3f2300b1..b9624b9314 100644
--- a/usr/local/www/system_crlmanager.php
+++ b/usr/local/www/system_crlmanager.php
@@ -90,13 +90,13 @@ if (!$thiscrl && (($act != "") && ($act != "new"))) {
 if ($act == "del") {
 	$name = $thiscrl['descr'];
 	if (crl_in_use($id)) {
-		$savemsg = sprintf(gettext("Certificate Revocation List %s is in use and cannot be deleted"), $name) . "<br/>";
+		$savemsg = sprintf(gettext("Certificate Revocation List %s is in use and cannot be deleted"), $name) . "<br />";
 	} else {
 		foreach ($a_crl as $cid => $acrl)
 			if ($acrl['refid'] == $thiscrl['refid'])
 				unset($a_crl[$cid]);
 		write_config("Deleted CRL {$name}.");
-		$savemsg = sprintf(gettext("Certificate Revocation List %s successfully deleted"), $name) . "<br/>";
+		$savemsg = sprintf(gettext("Certificate Revocation List %s successfully deleted"), $name) . "<br />";
 	}
 }
 
@@ -174,11 +174,11 @@ if ($act == "delcert") {
 	}
 	$name = $thiscert['descr'];
 	if (cert_unrevoke($thiscert, $thiscrl)) {
-		$savemsg = sprintf(gettext("Deleted Certificate %s from CRL %s"), $name, $thiscrl['descr']) . "<br/>";
+		$savemsg = sprintf(gettext("Deleted Certificate %s from CRL %s"), $name, $thiscrl['descr']) . "<br />";
 		openvpn_refresh_crls();
 		write_config(sprintf(gettext("Deleted Certificate %s from CRL %s"), $name, $thiscrl['descr']));
 	} else {
-		$savemsg = sprintf(gettext("Failed to delete Certificate %s from CRL %s"), $name, $thiscrl['descr']) . "<br/>";
+		$savemsg = sprintf(gettext("Failed to delete Certificate %s from CRL %s"), $name, $thiscrl['descr']) . "<br />";
 	}
 	$act="edit";
 }
@@ -352,7 +352,7 @@ function method_change() {
 							<td width="22%" valign="top" class="vncellreq"><?=gettext("CRL data");?></td>
 							<td width="78%" class="vtable">
 								<textarea name="crltext" id="crltext" cols="65" rows="7" class="formfld_crl"><?=$pconfig['crltext'];?></textarea>
-								<br/>
+								<br />
 								<?=gettext("Paste a Certificate Revocation List in X.509 CRL format here.");?>
 							</td>
 						</tr>
@@ -369,7 +369,7 @@ function method_change() {
 							<td width="22%" valign="top" class="vncellreq"><?=gettext("Lifetime");?></td>
 							<td width="78%" class="vtable">
 								<input name="lifetime" type="text" class="formfld unknown" id="lifetime" size="5" value="<?=htmlspecialchars($pconfig['lifetime']);?>"/>
-								<?=gettext("days");?><br/>
+								<?=gettext("days");?><br />
 								<?=gettext("Default: 9999");?>
 							</td>
 						</tr>
@@ -377,7 +377,7 @@ function method_change() {
 							<td width="22%" valign="top" class="vncellreq"><?=gettext("Serial");?></td>
 							<td width="78%" class="vtable">
 								<input name="serial" type="text" class="formfld unknown" id="serial" size="5" value="<?=htmlspecialchars($pconfig['serial']);?>"/>
-								<br/>
+								<br />
 								<?=gettext("Default: 0");?>
 							</td>
 						</tr>
@@ -412,7 +412,7 @@ function method_change() {
 							<td width="22%" valign="top" class="vncellreq"><?=gettext("CRL data");?></td>
 							<td width="78%" class="vtable">
 								<textarea name="crltext" id="crltext" cols="65" rows="7" class="formfld_crl"><?=base64_decode($crl['text']);?></textarea>
-								<br/>
+								<br />
 								<?=gettext("Paste a Certificate Revocation List in X.509 CRL format here.");?></td>
 							</td>
 						</tr>
diff --git a/usr/local/www/system_firmware.php b/usr/local/www/system_firmware.php
old mode 100755
new mode 100644
index 1dbd77b4f2..65b556d071
--- a/usr/local/www/system_firmware.php
+++ b/usr/local/www/system_firmware.php
@@ -227,10 +227,10 @@ include("head.inc");
 <?php if ($fwinfo <> "") print_info_box($fwinfo); ?>
 <?php if ($sig_warning && !$input_errors): ?>
 <?php
-	$sig_warning = "<strong>" . $sig_warning . "</strong><br/>" . gettext("This means that the image you uploaded " .
+	$sig_warning = "<strong>" . $sig_warning . "</strong><br />" . gettext("This means that the image you uploaded " .
 		"is not an official/supported image and may lead to unexpected behavior or security " .
 		"compromises. Only install images that come from sources that you trust, and make sure ".
-		"that the image has not been tampered with.") . "<br/><br/>".
+		"that the image has not been tampered with.") . "<br /><br />".
 		gettext("Do you want to install this image anyway (on your own risk)?");
 print_info_box($sig_warning);
 if(stristr($_FILES['ulfile']['name'],"nanobsd"))
@@ -267,9 +267,9 @@ if(stristr($_FILES['ulfile']['name'],"nanobsd"))
 						<?php if (!is_subsystem_dirty('rebootreq')): ?>
 						<?php if (!is_subsystem_dirty('firmware')): ?>
 						<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Enable firmware upload");?>" />
-						<br/>
+						<br />
 							<?php printf(gettext('Click "Enable firmware upload" to begin.'),$g['firmware_update_text']);?>
-						<br/>
+						<br />
 						<?php else: ?>
 							<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Disable firmware upload");?>" />
 					</td>
@@ -295,13 +295,13 @@ if(stristr($_FILES['ulfile']['name'],"nanobsd"))
 											echo "<option value='{$kerntype}'>{$kerndescr}</option>";
 										}
 										echo "</select>";
-										echo "<br/>";
+										echo "<br />";
 									}
 								}
 							?>
 							<?php if ($g['hidebackupbeforeupgrade'] === false): ?>
 							<input type="checkbox" name='backupbeforeupgrade' id='backupbeforeupgrade' /> <?=gettext("Perform full backup prior to upgrade");?>
-							<br/>
+							<br />
 							<?php endif; ?>
 							<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Upgrade firmware");?>" />
 							<?=gettext('Click "Upgrade firmware" to start the upgrade process.');?>
@@ -317,7 +317,7 @@ if(stristr($_FILES['ulfile']['name'],"nanobsd"))
 					<span class="vexpl">
 						<span class="red">
 							<strong>
-								<?=gettext("Warning:");?><br/>
+								<?=gettext("Warning:");?><br />
 							</strong>
 						</span>
 						<?=gettext("DO NOT abort the firmware upgrade once it " .
diff --git a/usr/local/www/system_firmware_check.php b/usr/local/www/system_firmware_check.php
old mode 100755
new mode 100644
index 544a54d1d9..e2c3ebde01
--- a/usr/local/www/system_firmware_check.php
+++ b/usr/local/www/system_firmware_check.php
@@ -95,7 +95,7 @@ include("head.inc");
 						<textarea style="border:1;bordercolordark:#000000;bordercolorlight:#000000" cols="90" rows="9" name="output" id="output" wrap="hard"></textarea>
 						<div id="backupdiv" style="visibility:hidden">
 							<?php if ($g['hidebackupbeforeupgrade'] === false): ?>
-							<br/><input type="checkbox" name="backupbeforeupgrade" id="backupbeforeupgrade" /><?=gettext("Perform full backup prior to upgrade");?>
+							<br /><input type="checkbox" name="backupbeforeupgrade" id="backupbeforeupgrade" /><?=gettext("Perform full backup prior to upgrade");?>
 							<?php endif; ?>
 						</div>
 						<input id='invokeupgrade' style='visibility:hidden' type="submit" value="<?=gettext("Invoke Auto Upgrade"); ?>" />
diff --git a/usr/local/www/system_firmware_restorefullbackup.php b/usr/local/www/system_firmware_restorefullbackup.php
old mode 100755
new mode 100644
index d671fc21c7..2cc57a08b8
--- a/usr/local/www/system_firmware_restorefullbackup.php
+++ b/usr/local/www/system_firmware_restorefullbackup.php
@@ -113,7 +113,7 @@ include("head.inc");
 <?php if (is_subsystem_dirty('restore')): ?><p>
 <form action="reboot.php" method="post">
 <input name="Submit" type="hidden" value="Yes" />
-<?php print_info_box(gettext("The firewall configuration has been changed.") . "<br/>" . gettext("The firewall is now rebooting."));?><br/>
+<?php print_info_box(gettext("The firewall configuration has been changed.") . "<br />" . gettext("The firewall is now rebooting."));?><br />
 </form>
 <?php endif; ?>
 <form action="system_firmware_restorefullbackup.php" method="post">
@@ -178,9 +178,9 @@ include("head.inc");
 ?>
 				<tr>
 					<td width="78%" colspan="3">
-						&nbsp;<br/>
+						&nbsp;<br />
 						<input type="checkbox" name="overwriteconfigxml" id="overwriteconfigxml" checked="checked" /> <?=gettext("do not restore config.xml."); ?>
-						<br/>
+						<br />
 						<input name="Restore" type="submit" class="formbtn" id="restore" value="<?=gettext("Restore"); ?>" />
 					</td>
 				</tr>
diff --git a/usr/local/www/system_firmware_settings.php b/usr/local/www/system_firmware_settings.php
old mode 100755
new mode 100644
index d244ae07a0..827bf66bb5
--- a/usr/local/www/system_firmware_settings.php
+++ b/usr/local/www/system_firmware_settings.php
@@ -150,7 +150,7 @@ function enable_altfirmwareurl(enable_over) {
 					}
 				?>
 			</select>
-		<br/><br/><?php echo sprintf(gettext("Entries denoted by \"Current architecture\" match the architecture of your current installation, such as %s. Changing architectures during an upgrade is not recommended, and may require a manual reboot after the update completes."), php_uname("m")); ?>
+		<br /><br /><?php echo sprintf(gettext("Entries denoted by \"Current architecture\" match the architecture of your current installation, such as %s. Changing architectures during an upgrade is not recommended, and may require a manual reboot after the update completes."), php_uname("m")); ?>
 		</td>
 	</tr>
 <?php endif; ?>
@@ -163,7 +163,7 @@ function enable_altfirmwareurl(enable_over) {
 			</table>
 			<span class="vexpl">
 				<?=gettext("This is where"); ?> <?php echo $g['product_name'] ?> <?=gettext("will check for newer firmware versions when the"); ?> <a href="system_firmware_check.php"><?=gettext("System: Firmware: Auto Update"); ?></a> <?=gettext("page is viewed."); ?>
-				<br/>
+				<br />
 				<b><?=gettext("NOTE:"); ?></b> <?php printf(gettext("When a custom URL is configured, the system will not verify the image has an official digital signature")); ?>
 				</span>
 				</td>
diff --git a/usr/local/www/system_gateway_groups.php b/usr/local/www/system_gateway_groups.php
old mode 100755
new mode 100644
index d5b1be222c..a725166f47
--- a/usr/local/www/system_gateway_groups.php
+++ b/usr/local/www/system_gateway_groups.php
@@ -108,7 +108,7 @@ include("head.inc");
 <input type="hidden" name="y1" value="1" />
 <?php if ($savemsg) print_info_box($savemsg); ?>
 <?php if (is_subsystem_dirty('staticroutes')): ?><p>
-<?php print_info_box_np(sprintf(gettext("The gateway configuration has been changed.%sYou must apply the changes in order for them to take effect."), "<br/>"));?><br/></p>
+<?php print_info_box_np(sprintf(gettext("The gateway configuration has been changed.%sYou must apply the changes in order for them to take effect."), "<br />"));?><br /></p>
 <?php endif; ?>
 	<table width="100%" border="0" cellpadding="0" cellspacing="0" summary="system groups">
 		<tr>
@@ -165,7 +165,7 @@ include("head.inc");
                     <?php
 			foreach($gateway_group['item'] as $item) {
 				$itemsplit = explode("|", $item);
-				echo htmlspecialchars(strtoupper($itemsplit[0])) . "<br/>\n";
+				echo htmlspecialchars(strtoupper($itemsplit[0])) . "<br />\n";
 			}
 		    ?>
                   </td>
@@ -173,7 +173,7 @@ include("head.inc");
 		    <?php
 			foreach($gateway_group['item'] as $item) {
 				$itemsplit = explode("|", $item);
-				echo "Tier ". htmlspecialchars($itemsplit[1]) . "<br/>\n";
+				echo "Tier ". htmlspecialchars($itemsplit[1]) . "<br />\n";
 			}
 		    ?>
                   </td>
diff --git a/usr/local/www/system_gateway_groups_edit.php b/usr/local/www/system_gateway_groups_edit.php
old mode 100755
new mode 100644
index 11a35d22b1..dc547b6f94
--- a/usr/local/www/system_gateway_groups_edit.php
+++ b/usr/local/www/system_gateway_groups_edit.php
@@ -232,7 +232,7 @@ jQuery(function ($) {
                   <td width="22%" valign="top" class="vncellreq"><?=gettext("Group Name"); ?></td>
                   <td width="78%" class="vtable"> 
                     <input name="name" type="text" class="formfld unknown" id="name" size="20" value="<?=htmlspecialchars($pconfig['name']);?>" />
-                    <br/> <span class="vexpl"><?=gettext("Group Name"); ?></span></td>
+                    <br /> <span class="vexpl"><?=gettext("Group Name"); ?></span></td>
                 </tr>
 		<tr>
                   <td width="22%" valign="top" class="vncellreq"><?=gettext("Gateway Priority"); ?></td>
@@ -307,7 +307,7 @@ jQuery(function ($) {
 		 	}
 		?>
 			</table>
-			<br/><span class="vexpl">
+			<br /><span class="vexpl">
 			<strong><?=gettext("Link Priority"); ?></strong> <br />
 			<?=gettext("The priority selected here defines in what order failover and balancing of links will be done. " .
 			"Multiple links of the same priority will balance connections until all links in the priority will be exhausted. " .
@@ -330,13 +330,13 @@ jQuery(function ($) {
 				}
 			?>
 			</select>
-                    <br/> <span class="vexpl"><?=gettext("When to trigger exclusion of a member"); ?></span></td>
+                    <br /> <span class="vexpl"><?=gettext("When to trigger exclusion of a member"); ?></span></td>
                 </tr>
 		<tr>
                   <td width="22%" valign="top" class="vncell"><?=gettext("Description"); ?></td>
                   <td width="78%" class="vtable"> 
                     <input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>" />
-                    <br/> <span class="vexpl"><?=gettext("You may enter a description here for your reference (not parsed)."); ?></span></td>
+                    <br /> <span class="vexpl"><?=gettext("You may enter a description here for your reference (not parsed)."); ?></span></td>
                 </tr>
                 <tr>
                   <td width="22%" valign="top">&nbsp;</td>
diff --git a/usr/local/www/system_gateways.php b/usr/local/www/system_gateways.php
old mode 100755
new mode 100644
index b4129a88a4..8a66e3a206
--- a/usr/local/www/system_gateways.php
+++ b/usr/local/www/system_gateways.php
@@ -192,7 +192,7 @@ include("head.inc");
 <script type="text/javascript" language="javascript" src="/javascript/row_toggle.js"></script>
 <?php if ($savemsg) print_info_box($savemsg); ?>
 <?php if (is_subsystem_dirty('staticroutes')): ?><p>
-<?php print_info_box_np(gettext("The gateway configuration has been changed.") . "<br/>" . gettext("You must apply the changes in order for them to take effect."));?><br/></p>
+<?php print_info_box_np(gettext("The gateway configuration has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect."));?><br /></p>
 <?php endif; ?>
 	<table width="100%" border="0" cellpadding="0" cellspacing="0" summary="system gatewyas">
 		<tr>
diff --git a/usr/local/www/system_gateways_edit.php b/usr/local/www/system_gateways_edit.php
old mode 100755
new mode 100644
index a3357eff91..1e5ccfc7dd
--- a/usr/local/www/system_gateways_edit.php
+++ b/usr/local/www/system_gateways_edit.php
@@ -667,7 +667,7 @@ function enable_change() {
 							echo ">" . gettext("Use BGPD") . "</option>";
 						}
 					?>
-					</select><br/>
+					</select><br />
 					<span class="vexpl"><?=gettext("Choose which interface this gateway applies to."); ?></span>
 				</td>
 			</tr>
@@ -684,7 +684,7 @@ function enable_change() {
 							echo ">" . htmlspecialchars($string) . "</option>\n";
 						}
 					?>
-					</select><br/>
+					</select><br />
 					<span class="vexpl"><?=gettext("Choose the Internet Protocol this gateway uses."); ?></span>
 				</td>
 			</tr>
@@ -692,14 +692,14 @@ function enable_change() {
 				<td width="22%" valign="top" class="vncellreq"><?=gettext("Name"); ?></td>
 				<td width="78%" class="vtable">
 					<input name="name" type="text" class="formfld unknown" id="name" size="20" value="<?=htmlspecialchars($pconfig['name']);?>" />
-					<br/><span class="vexpl"><?=gettext("Gateway name"); ?></span>
+					<br /><span class="vexpl"><?=gettext("Gateway name"); ?></span>
 				</td>
 			</tr>
 			<tr>
 				<td width="22%" valign="top" class="vncellreq"><?=gettext("Gateway"); ?></td>
 				<td width="78%" class="vtable">
 					<input name="gateway" type="text" class="formfld host" id="gateway" size="28" value="<?php if ($pconfig['dynamic']) echo "dynamic"; else echo htmlspecialchars($pconfig['gateway']); ?>" />
-					<br/><span class="vexpl"><?=gettext("Gateway IP address"); ?></span>
+					<br /><span class="vexpl"><?=gettext("Gateway IP address"); ?></span>
 				</td>
 			</tr>
 			<tr>
@@ -777,7 +777,7 @@ function enable_change() {
 									<?=gettext("To");?>
 									<input name="latencyhigh" type="text" class="formfld unknown" id="latencyhigh" size="2"
 										value="<?=htmlspecialchars($pconfig['latencyhigh']);?>" />
-									<br/><span class="vexpl"><?=gettext(sprintf("Low and high thresholds for latency in milliseconds. Default is %d/%d.", $apinger_default['latencylow'], $apinger_default['latencyhigh']));?></span>
+									<br /><span class="vexpl"><?=gettext(sprintf("Low and high thresholds for latency in milliseconds. Default is %d/%d.", $apinger_default['latencylow'], $apinger_default['latencyhigh']));?></span>
 								</td>
 							</tr>
 							<tr>
@@ -797,8 +797,8 @@ function enable_change() {
 								<td width="78%" class="vtable">
 									<input name="interval" type="text" class="formfld unknown" id="interval" size="2"
 										value="<?=htmlspecialchars($pconfig['interval']);?>" onchange="interval_change(this)" />
-									<br/><span class="vexpl">
-										<?=gettext(sprintf("How often that an ICMP probe will be sent in seconds. Default is %d.", $apinger_default['interval']));?><br/><br/>
+									<br /><span class="vexpl">
+										<?=gettext(sprintf("How often that an ICMP probe will be sent in seconds. Default is %d.", $apinger_default['interval']));?><br /><br />
 										<?=gettext("NOTE: The quality graph is averaged over seconds, not intervals, so as the probe interval is increased the accuracy of the quality graph is decreased.");?>
 									</span>
 								</td>
@@ -808,7 +808,7 @@ function enable_change() {
 								<td width="78%" class="vtable">
 									<input name="down" type="text" class="formfld unknown" id="down" size="2"
 										value="<?=htmlspecialchars($pconfig['down']);?>" />
-									<br/><span class="vexpl"><?=gettext(sprintf("The number of seconds of failed probes before the alarm will fire. Default is %d.", $apinger_default['down']));?></span>
+									<br /><span class="vexpl"><?=gettext(sprintf("The number of seconds of failed probes before the alarm will fire. Default is %d.", $apinger_default['down']));?></span>
 								</td>
 							</tr>
 							<tr>
@@ -818,7 +818,7 @@ function enable_change() {
 										value="<?=htmlspecialchars($pconfig['avg_delay_samples']);?>" onchange="samples_change(document.iform.avg_delay_samples_calculated, this)" /> 
 									<input name="avg_delay_samples_calculated" type="checkbox" id="avg_delay_samples_calculated" value="yes" <?php if ($pconfig['avg_delay_samples_calculated'] == true) echo "checked=\"checked\""; ?> onclick="calculated_change(this, document.iform.avg_delay_samples)" />
 										<?=gettext("Use calculated value."); ?>
-									<br/><span class="vexpl"><?=gettext(sprintf("How many replies should be used to compute average delay for controlling \"delay\" alarms?  Default is %d.", $apinger_default['avg_delay_samples']));?><br/><br/></span>
+									<br /><span class="vexpl"><?=gettext(sprintf("How many replies should be used to compute average delay for controlling \"delay\" alarms?  Default is %d.", $apinger_default['avg_delay_samples']));?><br /><br /></span>
 								</td>
 							</tr>
 							<tr>
@@ -828,7 +828,7 @@ function enable_change() {
 										value="<?=htmlspecialchars($pconfig['avg_loss_samples']);?>" onchange="samples_change(document.iform.avg_loss_samples_calculated, this)" />
 									<input name="avg_loss_samples_calculated" type="checkbox" id="avg_loss_samples_calculated" value="yes" <?php if ($pconfig['avg_loss_samples_calculated'] == true) echo "checked=\"checked\""; ?> onclick="calculated_change(this, document.iform.avg_loss_samples)" />
 										<?=gettext("Use calculated value."); ?>
-									<br/><span class="vexpl"><?=gettext(sprintf("How many probes should be useds to compute average packet loss?  Default is %d.", $apinger_default['avg_loss_samples']));?><br/><br/></span>
+									<br /><span class="vexpl"><?=gettext(sprintf("How many probes should be useds to compute average packet loss?  Default is %d.", $apinger_default['avg_loss_samples']));?><br /><br /></span>
 								</td>
 							</tr>
 							<tr>
@@ -838,13 +838,13 @@ function enable_change() {
 										value="<?=htmlspecialchars($pconfig['avg_loss_delay_samples']);?>" onchange="samples_change(document.iform.avg_loss_delay_samples_calculated, this)" />
 									<input name="avg_loss_delay_samples_calculated" type="checkbox" id="avg_loss_delay_samples_calculated" value="yes" <?php if ($pconfig['avg_loss_delay_samples_calculated'] == true) echo "checked=\"checked\""; ?> onclick="calculated_change(this, document.iform.avg_loss_delay_samples)" />
 										<?=gettext("Use calculated value."); ?>
-									<br/><span class="vexpl"><?=gettext(sprintf("The delay (in qty of probe samples) after which loss is computed.  Without this, delays longer than the probe interval would be treated as packet loss.  Default is %d.", $apinger_default['avg_loss_delay_samples']));?><br/><br/></span>
+									<br /><span class="vexpl"><?=gettext(sprintf("The delay (in qty of probe samples) after which loss is computed.  Without this, delays longer than the probe interval would be treated as packet loss.  Default is %d.", $apinger_default['avg_loss_delay_samples']));?><br /><br /></span>
 								</td>
 							</tr>
 							<tr>
 								<td colspan="2">
-									<?= gettext("The probe interval must be less than the down time, otherwise the gateway will seem to go down then come up again at the next probe."); ?><br/><br/>
-									<?= gettext("The down time defines the length of time before the gateway is marked as down, but the accuracy is controlled by the probe interval. For example, if your down time is 40 seconds but on a 30 second probe interval, only one probe would have to fail before the gateway is marked down at the 40 second mark. By default, the gateway is considered down after 10 seconds, and the probe interval is 1 second, so 10 probes would have to fail before the gateway is marked down."); ?><br/>
+									<?= gettext("The probe interval must be less than the down time, otherwise the gateway will seem to go down then come up again at the next probe."); ?><br /><br />
+									<?= gettext("The down time defines the length of time before the gateway is marked as down, but the accuracy is controlled by the probe interval. For example, if your down time is 40 seconds but on a 30 second probe interval, only one probe would have to fail before the gateway is marked down at the 40 second mark. By default, the gateway is considered down after 10 seconds, and the probe interval is 1 second, so 10 probes would have to fail before the gateway is marked down."); ?><br />
 								</td>
 							</tr>
 						</table>
@@ -855,7 +855,7 @@ function enable_change() {
 				<td width="22%" valign="top" class="vncell"><?=gettext("Description"); ?></td>
 				<td width="78%" class="vtable">
 					<input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>" />
-					<br/><span class="vexpl"><?=gettext("You may enter a description here for your reference (not parsed)"); ?>.</span>
+					<br /><span class="vexpl"><?=gettext("You may enter a description here for your reference (not parsed)"); ?>.</span>
 				</td>
 			</tr>
 			<tr>
diff --git a/usr/local/www/system_groupmanager.php b/usr/local/www/system_groupmanager.php
index f7a9e6179e..c62a8c83cd 100644
--- a/usr/local/www/system_groupmanager.php
+++ b/usr/local/www/system_groupmanager.php
@@ -71,7 +71,7 @@ if ($_GET['act'] == "delgroup") {
 	unset($a_group[$_GET['id']]);
 	write_config();
 	$savemsg = gettext("Group")." {$groupdeleted} ".
-				gettext("successfully deleted")."<br/>";
+				gettext("successfully deleted")."<br />";
 }
 
 if ($_GET['act'] == "delpriv") {
@@ -95,7 +95,7 @@ if ($_GET['act'] == "delpriv") {
 	write_config();
 	$_GET['act'] = "edit";
 	$savemsg = gettext("Privilege")." {$privdeleted} ".
-				gettext("successfully deleted")."<br/>";
+				gettext("successfully deleted")."<br />";
 }
 
 if($_GET['act']=="edit"){
@@ -282,7 +282,7 @@ function presubmit() {
 							<td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td>
 							<td width="78%" class="vtable"> 
 								<input name="description" type="text" class="formfld unknown" id="description" size="20" value="<?=htmlspecialchars($pconfig['description']);?>" />
-								<br/>
+								<br />
 								<?=gettext("Group description, for your own information only");?>
 							</td>
 						</tr>
@@ -295,8 +295,8 @@ function presubmit() {
 								<table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0" summary="membership">
 									<tr>
 										<td align="center" width="50%">
-											<strong><?=gettext("Not Members");?></strong><br/>
-											<br/>
+											<strong><?=gettext("Not Members");?></strong><br />
+											<br />
 												<select size="10" style="width: 75%" name="notmembers[]" class="formselect" id="notmembers" onchange="clear_selected('members')" multiple="multiple">
 												<?php
 													foreach ($config['system']['user'] as $user):
@@ -308,21 +308,21 @@ function presubmit() {
 												</option>
 												<?php endforeach; ?>
 											</select>
-											<br/>
+											<br />
 										</td>
 										<td>
-											<br/>
+											<br />
 											<a href="javascript:move_selected('notmembers','members')">
 												<img src="/themes/<?= $g['theme'];?>/images/icons/icon_right.gif" title="<?=gettext("Add Members");?>" alt="<?=gettext("Add Members");?>" width="17" height="17" border="0" />
 											</a>
-											<br/><br/>
+											<br /><br />
 											<a href="javascript:move_selected('members','notmembers')">
 												<img src="/themes/<?= $g['theme'];?>/images/icons/icon_left.gif" title="<?=gettext("Remove Members");?>" alt="<?=gettext("Remove Members");?>" width="17" height="17" border="0" />
 											</a>
 										</td>
 										<td align="center" width="50%">
-											<strong><?=gettext("Members");?></strong><br/>
-											<br/>
+											<strong><?=gettext("Members");?></strong><br />
+											<br />
 											<select size="10" style="width: 75%" name="members[]" class="formselect" id="members" onchange="clear_selected('notmembers')" multiple="multiple">
 												<?php
 													foreach ($config['system']['user'] as $user):
@@ -334,7 +334,7 @@ function presubmit() {
 												</option>
 												<?php endforeach; ?>
 											</select>
-											<br/>
+											<br />
 										</td>
 									</tr>
 								</table>
diff --git a/usr/local/www/system_groupmanager_addprivs.php b/usr/local/www/system_groupmanager_addprivs.php
index ac48a35b7e..a4345c96da 100644
--- a/usr/local/www/system_groupmanager_addprivs.php
+++ b/usr/local/www/system_groupmanager_addprivs.php
@@ -191,7 +191,7 @@ function update_description() {
 									<option value="<?=$pname;?>"><?=$pdata['name'];?></option>
 									<?php endforeach; ?>
 								</select>
-								<br/>
+								<br />
 								<?=gettext("Hold down CTRL (pc)/COMMAND (mac) key to select multiple items");?>
 								</td><td>
 								<a href='#'onClick="selectAll();">Select all</a>
@@ -207,7 +207,7 @@ function update_description() {
 									selectAll();
 								//]]>									
 								</script>
-								<br/>
+								<br />
 								</td>
 								</tr>
 								</table>
diff --git a/usr/local/www/system_routes.php b/usr/local/www/system_routes.php
old mode 100755
new mode 100644
index 96ee9b9384..5f811f67c6
--- a/usr/local/www/system_routes.php
+++ b/usr/local/www/system_routes.php
@@ -207,7 +207,7 @@ include("head.inc");
 <script type="text/javascript" language="javascript" src="/javascript/row_toggle.js"></script>
 <?php if ($savemsg) print_info_box($savemsg); ?>
 <?php if (is_subsystem_dirty('staticroutes')): ?><p>
-<?php print_info_box_np(sprintf(gettext("The static route configuration has been changed.%sYou must apply the changes in order for them to take effect."), "<br/>"));?><br/></p>
+<?php print_info_box_np(sprintf(gettext("The static route configuration has been changed.%sYou must apply the changes in order for them to take effect."), "<br />"));?><br /></p>
 <?php endif; ?>
 
 <table width="100%" border="0" cellpadding="0" cellspacing="0" summary="system routes">
diff --git a/usr/local/www/system_routes_edit.php b/usr/local/www/system_routes_edit.php
old mode 100755
new mode 100644
index e6ab87f0d6..4c58d5370a
--- a/usr/local/www/system_routes_edit.php
+++ b/usr/local/www/system_routes_edit.php
@@ -234,7 +234,7 @@ include("head.inc");
 						</option>
 					<?php endfor; ?>
 					</select>
-					<br/><span class="vexpl"><?=gettext("Destination network for this static route"); ?></span>
+					<br /><span class="vexpl"><?=gettext("Destination network for this static route"); ?></span>
 				</td>
 			</tr>
 			<tr>
@@ -320,7 +320,7 @@ include("head.inc");
 				<td width="22%" valign="top" class="vncell"><?=gettext("Description"); ?></td>
 				<td width="78%" class="vtable">
 					<input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>" />
-					<br/><span class="vexpl"><?=gettext("You may enter a description here for your reference (not parsed)."); ?></span>
+					<br /><span class="vexpl"><?=gettext("You may enter a description here for your reference (not parsed)."); ?></span>
 				</td>
 			</tr>
 			<tr>
diff --git a/usr/local/www/system_usermanager.php b/usr/local/www/system_usermanager.php
index a424932a6c..1dc1e05b38 100644
--- a/usr/local/www/system_usermanager.php
+++ b/usr/local/www/system_usermanager.php
@@ -90,7 +90,7 @@ if ($_GET['act'] == "deluser") {
 	unset($a_user[$id]);
 	write_config();
 	$savemsg = gettext("User")." {$userdeleted} ".
-				gettext("successfully deleted")."<br/>";
+				gettext("successfully deleted")."<br />";
 }
 else if ($_GET['act'] == "delpriv") {
 
@@ -105,7 +105,7 @@ else if ($_GET['act'] == "delpriv") {
 	write_config();
 	$_GET['act'] = "edit";
 	$savemsg = gettext("Privilege")." {$privdeleted} ".
-				gettext("successfully deleted")."<br/>";
+				gettext("successfully deleted")."<br />";
 }
 else if ($_GET['act'] == "expcert") {
 
@@ -158,7 +158,7 @@ else if ($_GET['act'] == "delcert") {
 	write_config();
 	$_GET['act'] = "edit";
 	$savemsg = gettext("Certificate")." {$certdeleted} ".
-				gettext("association removed.")."<br/>";
+				gettext("association removed.")."<br />";
 }
 else if ($_GET['act'] == "new") {
 	/*
@@ -498,7 +498,7 @@ function sshkeyClicked(obj) {
 							<td width="22%" valign="top" class="vncell"><?=gettext("Full name");?></td>
 							<td width="78%" class="vtable">
 								<input name="descr" type="text" class="formfld unknown" id="descr" size="20" value="<?=htmlspecialchars($pconfig['descr']);?>" <?=$ro;?> />
-								<br/>
+								<br />
 								<?=gettext("User's full name, for your own information only");?>
 							</td>
 						</tr>
@@ -506,7 +506,7 @@ function sshkeyClicked(obj) {
 							<td width="22%" valign="top" class="vncell"><?=gettext("Expiration date"); ?></td>
 							<td width="78%" class="vtable">
 								<input name="expires" type="text" class="formfld unknown" id="expires" size="10" value="<?=htmlspecialchars($pconfig['expires']);?>" />
-								<br/>
+								<br />
 								<span class="vexpl"><?=gettext("Leave blank if the account shouldn't expire, otherwise enter the expiration date in the following format: mm/dd/yyyy"); ?></span></td>
 						</tr>
 						<tr>
@@ -515,8 +515,8 @@ function sshkeyClicked(obj) {
 								<table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0" summary="group membership">
 									<tr>
 										<td align="center" width="50%">
-											<strong><?=gettext("Not Member Of"); ?></strong><br/>
-											<br/>
+											<strong><?=gettext("Not Member Of"); ?></strong><br />
+											<br />
 											<select size="10" style="width: 75%" name="notgroups[]" class="formselect" id="notgroups" onchange="clear_selected('groups')" multiple="multiple">
 												<?php
 													foreach ($config['system']['group'] as $group):
@@ -530,21 +530,21 @@ function sshkeyClicked(obj) {
 												</option>
 												<?php endforeach; ?>
 											</select>
-											<br/>
+											<br />
 										</td>
 										<td>
-											<br/>
+											<br />
 											<a href="javascript:move_selected('notgroups','groups')">
 												<img src="/themes/<?= $g['theme'];?>/images/icons/icon_right.gif" title="<?=gettext("Add Groups"); ?>" alt="<?=gettext("Add Groups"); ?>" width="17" height="17" border="0" />
 											</a>
-											<br/><br/>
+											<br /><br />
 											<a href="javascript:move_selected('groups','notgroups')">
 												<img src="/themes/<?= $g['theme'];?>/images/icons/icon_left.gif" title="<?=gettext("Remove Groups"); ?>" alt="<?=gettext("Remove Groups"); ?>" width="17" height="17" border="0" />
 											</a>
 										</td>
 										<td align="center" width="50%">
-											<strong><?=gettext("Member Of"); ?></strong><br/>
-											<br/>
+											<strong><?=gettext("Member Of"); ?></strong><br />
+											<br />
 											<select size="10" style="width: 75%" name="groups[]" class="formselect" id="groups" onchange="clear_selected('nogroups')" multiple="multiple">
 												<?php
 												if (is_array($pconfig['groups'])) {
@@ -560,7 +560,7 @@ function sshkeyClicked(obj) {
 												<?php endforeach;
 												} ?>
 											</select>
-											<br/>
+											<br />
 										</td>
 									</tr>
 								</table>
@@ -760,7 +760,7 @@ function sshkeyClicked(obj) {
 							<td width="22%" valign="top" class="vncell"><?=gettext("Authorized keys");?></td>
 							<td width="78%" class="vtable">
 								<textarea name="authorizedkeys" cols="65" rows="7" id="authorizedkeys" class="formfld_cert" wrap="off"><?=htmlspecialchars($pconfig['authorizedkeys']);?></textarea>
-								<br/>
+								<br />
 								<?=gettext("Paste an authorized keys file here.");?>
 							</td>
 						</tr>
@@ -810,7 +810,7 @@ function sshkeyClicked(obj) {
 									"the webConfigurator can be assigned directly or inherited from group memberships. " .
 									"An icon that appears grey indicates that it is a system defined object. " .
 									"Some system object properties can be modified but they cannot be deleted."); ?>
-									<br/><br/>
+									<br /><br />
 									<?=gettext("Accounts created here are also used for other parts of the system " .
 									"such as OpenVPN, IPsec, and Captive Portal.");?>
 								</p>
diff --git a/usr/local/www/system_usermanager_addprivs.php b/usr/local/www/system_usermanager_addprivs.php
index ff7cc64d52..bf4a02e6d6 100644
--- a/usr/local/www/system_usermanager_addprivs.php
+++ b/usr/local/www/system_usermanager_addprivs.php
@@ -180,7 +180,7 @@ function update_description() {
 									<option value="<?=$pname;?>"><?=$pdata['name'];?></option>
 									<?php endforeach; ?>
 								</select>
-								<br/>
+								<br />
 								<?=gettext("Hold down CTRL (pc)/COMMAND (mac) key to select multiple items");?>
 							</td>
 						</tr>
diff --git a/usr/local/www/system_usermanager_settings.php b/usr/local/www/system_usermanager_settings.php
old mode 100755
new mode 100644
index 8895f0e030..05fb887371
--- a/usr/local/www/system_usermanager_settings.php
+++ b/usr/local/www/system_usermanager_settings.php
@@ -134,7 +134,7 @@ include("head.inc");
 								<td width="78%" class="vtable">
 									<input name="session_timeout" id="session_timeout" type="text" size="8" value="<?=htmlspecialchars($pconfig['session_timeout']);?>" />
 									<br />
-									<?=gettext("Time in minutes to expire idle management sessions. The default is 4 hours (240 minutes).");?><br/>
+									<?=gettext("Time in minutes to expire idle management sessions. The default is 4 hours (240 minutes).");?><br />
 									<?=gettext("Enter 0 to never expire sessions. NOTE: This is a security risk!");?><br />
 								</td>
 							</tr>
diff --git a/usr/local/www/system_usermanager_settings_ldapacpicker.php b/usr/local/www/system_usermanager_settings_ldapacpicker.php
index 91da391862..8a1c8c7b3e 100644
--- a/usr/local/www/system_usermanager_settings_ldapacpicker.php
+++ b/usr/local/www/system_usermanager_settings_ldapacpicker.php
@@ -110,7 +110,7 @@ function post_choices() {
 				$CHECKED=" CHECKED";
 			else 
 				$CHECKED="";
-			echo "			<tr><td><input type='checkbox' value='{$ou}' id='ou' name='ou[]'{$CHECKED}> {$ou}<br/></td></tr>\n";
+			echo "			<tr><td><input type='checkbox' value='{$ou}' id='ou' name='ou[]'{$CHECKED}> {$ou}<br /></td></tr>\n";
 		}
 	}
 ?>
diff --git a/usr/local/www/themes/pfsense_ng_fs/loader.js b/usr/local/www/themes/pfsense_ng_fs/loader.js
index c353eb3e47..4620b66296 100644
--- a/usr/local/www/themes/pfsense_ng_fs/loader.js
+++ b/usr/local/www/themes/pfsense_ng_fs/loader.js
@@ -230,7 +230,7 @@ jQuery(document).ready(function ()
     ///////////////////////////////////////////
     
     // insert add/delete column buttons
-    jQuery('<br/><br/><div id=\"columnModifier\"><div style=\"float:left\"><div id =\"addCol\" style=\"float:left\"><img src=\"./themes/pfsense_ng_fs/images/icons/icon_plus.gif\" style=\"cursor:pointer\" alt=\"Click here to add a column\"/></div>&nbsp;Add column&nbsp;</div><div style=\"float:left\"><div id =\"delCol\" style=\"float:left\"><img src=\"./themes/pfsense_ng_fs/images/icons/icon_x.gif\" style=\"cursor:pointer\" alt=\"Click here to delete a column\"/></div>&nbsp;Delete column</div><div id=\"columnWarningText\" style=\"float:left; margin-left:5em\"></div><br/><br/>').insertBefore('#niftyOutter.fakeClass');
+    jQuery('<br /><br /><div id=\"columnModifier\"><div style=\"float:left\"><div id =\"addCol\" style=\"float:left\"><img src=\"./themes/pfsense_ng_fs/images/icons/icon_plus.gif\" style=\"cursor:pointer\" alt=\"Click here to add a column\"/></div>&nbsp;Add column&nbsp;</div><div style=\"float:left\"><div id =\"delCol\" style=\"float:left\"><img src=\"./themes/pfsense_ng_fs/images/icons/icon_x.gif\" style=\"cursor:pointer\" alt=\"Click here to delete a column\"/></div>&nbsp;Delete column</div><div id=\"columnWarningText\" style=\"float:left; margin-left:5em\"></div><br /><br />').insertBefore('#niftyOutter.fakeClass');
     
     if ( jQuery('#columnModifier').length > 0 ) // only perform resizing on the dashboard page
     {
diff --git a/usr/local/www/vpn_ipsec.php b/usr/local/www/vpn_ipsec.php
old mode 100755
new mode 100644
index 7d5fdfb825..87cf43e6d0
--- a/usr/local/www/vpn_ipsec.php
+++ b/usr/local/www/vpn_ipsec.php
@@ -130,7 +130,7 @@ include("head.inc");
 	if ($savemsg)
 		print_info_box($savemsg);
 	if ($pconfig['enable'] && is_subsystem_dirty('ipsec'))
-		print_info_box_np(gettext("The IPsec tunnel configuration has been changed") . ".<br>" . gettext("You must apply the changes in order for them to take effect."));
+		print_info_box_np(gettext("The IPsec tunnel configuration has been changed") . ".<br />" . gettext("You must apply the changes in order for them to take effect."));
 ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
 	<tr>
@@ -211,9 +211,9 @@ include("head.inc");
 									$if = "WAN";
 
 								if (!isset($ph1ent['mobile']))
-									echo $if."<br>".$ph1ent['remote-gateway'];
+									echo $if."<br />".$ph1ent['remote-gateway'];
 								else
-									echo $if."<br><strong>" . gettext("Mobile Client") . "</strong>";
+									echo $if."<br /><strong>" . gettext("Mobile Client") . "</strong>";
 							?>
 							<?=$spane;?>
 						</td>
@@ -429,10 +429,10 @@ include("head.inc");
 							<p>
 								<span class="vexpl">
 									<span class="red">
-										<strong><?=gettext("Note"); ?>:<br></strong>
+										<strong><?=gettext("Note"); ?>:<br /></strong>
 									</span>
-								<?=gettext("You can check your IPsec status at"); ?> <a href="diag_ipsec.php"><?=gettext("Status:IPsec"); ?></a>.<br/>
-									<?=gettext("IPsec Debug Mode can be enabled at"); ?> <a href="system_advanced_misc.php"><?=gettext("System:Advanced:Miscellaneous"); ?></a>.<br/>
+								<?=gettext("You can check your IPsec status at"); ?> <a href="diag_ipsec.php"><?=gettext("Status:IPsec"); ?></a>.<br />
+									<?=gettext("IPsec Debug Mode can be enabled at"); ?> <a href="system_advanced_misc.php"><?=gettext("System:Advanced:Miscellaneous"); ?></a>.<br />
 									<?=gettext("IPsec can be set to prefer older SAs at"); ?> <a href="system_advanced_misc.php"><?=gettext("System:Advanced:Miscellaneous"); ?></a>.
 								</span>
 							</p>
diff --git a/usr/local/www/vpn_ipsec_keys.php b/usr/local/www/vpn_ipsec_keys.php
index bf2582c709..1f019fb903 100644
--- a/usr/local/www/vpn_ipsec_keys.php
+++ b/usr/local/www/vpn_ipsec_keys.php
@@ -82,7 +82,7 @@ include("head.inc");
 if ($savemsg)
 	print_info_box($savemsg);
 if (is_subsystem_dirty('ipsec'))
-	print_info_box_np(gettext("The IPsec tunnel configuration has been changed") . ".<br>" . gettext("You must apply the changes in order for them to take effect."));
+	print_info_box_np(gettext("The IPsec tunnel configuration has been changed") . ".<br />" . gettext("You must apply the changes in order for them to take effect."));
 
 ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
diff --git a/usr/local/www/vpn_ipsec_keys_edit.php b/usr/local/www/vpn_ipsec_keys_edit.php
index 2983954c23..3339f7f58d 100644
--- a/usr/local/www/vpn_ipsec_keys_edit.php
+++ b/usr/local/www/vpn_ipsec_keys_edit.php
@@ -128,7 +128,7 @@ include("head.inc");
                   <td valign="top" class="vncellreq"><?=gettext("Identifier"); ?></td>
                   <td class="vtable">
 					<?=$mandfldhtml;?><input name="ident" type="text" class="formfld unknown" id="ident" size="30" value="<?=htmlspecialchars($pconfig['ident']);?>">
-                    <br>
+                    <br />
 <?=gettext("This can be either an IP address, fully qualified domain name or an e-mail address"); ?>.       
                   </td>
                 </tr>
diff --git a/usr/local/www/vpn_ipsec_mobile.php b/usr/local/www/vpn_ipsec_mobile.php
old mode 100755
new mode 100644
index d483f8b9da..59225da40e
--- a/usr/local/www/vpn_ipsec_mobile.php
+++ b/usr/local/www/vpn_ipsec_mobile.php
@@ -327,12 +327,12 @@ function login_banner_change() {
 	if ($savemsg)
 		print_info_box($savemsg);
 	if (isset($config['ipsec']['enable']) && is_subsystem_dirty('ipsec'))
-		print_info_box_np(gettext("The IPsec tunnel configuration has been changed") . ".<br>" . gettext("You must apply the changes in order for them to take effect."));
+		print_info_box_np(gettext("The IPsec tunnel configuration has been changed") . ".<br />" . gettext("You must apply the changes in order for them to take effect."));
 	foreach ($a_phase1 as $ph1ent)
 		if (isset($ph1ent['mobile']))
 			$ph1found = true;
 	if ($pconfig['enable'] && !$ph1found)
-		print_info_box_np(gettext("Support for IPsec Mobile clients is enabled but a Phase1 definition was not found") . ".<br>" . gettext("Please click Create to define one."),gettext("create"),gettext("Create Phase1"));
+		print_info_box_np(gettext("Support for IPsec Mobile clients is enabled but a Phase1 definition was not found") . ".<br />" . gettext("Please click Create to define one."),gettext("create"),gettext("Create Phase1"));
 	if ($input_errors)
 		print_input_errors($input_errors);
 ?>
@@ -423,7 +423,7 @@ function login_banner_change() {
 										<input name="pool_enable" type="checkbox" id="pool_enable" value="yes" <?=$chk;?> onClick="pool_change()">
 									</td>
 									<td>
-										<?=gettext("Provide a virtual IP address to clients"); ?><br>
+										<?=gettext("Provide a virtual IP address to clients"); ?><br />
 									</td>
 								</tr>
 							</table>
@@ -455,7 +455,7 @@ function login_banner_change() {
 										<input name="net_list_enable" type="checkbox" id="net_list_enable" value="yes" <?=$chk;?>>
 									</td>
 									<td>
-										<?=gettext("Provide a list of accessible networks to clients"); ?><br>
+										<?=gettext("Provide a list of accessible networks to clients"); ?><br />
 									</td>
 								</tr>
 							</table>
@@ -471,8 +471,8 @@ function login_banner_change() {
 										<input name="save_passwd_enable" type="checkbox" id="save_passwd_enable" value="yes" <?=$chk;?>>
 									</td>
 									<td>
-										<?=gettext("Allow clients to save Xauth passwords (Cisco VPN client only)."); ?><br>
-										<?=gettext("NOTE: With iPhone clients, this does not work when deployed via the iPhone configuration utility, only by manual entry."); ?><br>
+										<?=gettext("Allow clients to save Xauth passwords (Cisco VPN client only)."); ?><br />
+										<?=gettext("NOTE: With iPhone clients, this does not work when deployed via the iPhone configuration utility, only by manual entry."); ?><br />
 									</td>
 								</tr>
 							</table>
@@ -488,7 +488,7 @@ function login_banner_change() {
 										<input name="dns_domain_enable" type="checkbox" id="dns_domain_enable" value="yes" <?=$chk;?> onClick="dns_domain_change()">
 									</td>
 									<td>
-										<?=gettext("Provide a default domain name to clients"); ?><br>
+										<?=gettext("Provide a default domain name to clients"); ?><br />
 									</td>
 								</tr>
 							</table>
@@ -511,7 +511,7 @@ function login_banner_change() {
 										<input name="dns_split_enable" type="checkbox" id="dns_split_enable" value="yes" <?=$chk;?> onClick="dns_split_change()">
 									</td>
 									<td>
-										<?=gettext("Provide a list of split DNS domain names to clients. Enter a comma separated list."); ?><br>
+										<?=gettext("Provide a list of split DNS domain names to clients. Enter a comma separated list."); ?><br />
 										<?=gettext("NOTE: If left blank, and a default domain is set, it will be used for this value."); ?>
 									</td>
 								</tr>
@@ -535,7 +535,7 @@ function login_banner_change() {
 										<input name="dns_server_enable" type="checkbox" id="dns_server_enable" value="yes" <?=$chk;?> onClick="dns_server_change()">
 									</td>
 									<td>
-										<?=gettext("Provide a DNS server list to clients"); ?><br>
+										<?=gettext("Provide a DNS server list to clients"); ?><br />
 									</td>
 								</tr>
 							</table>
@@ -577,7 +577,7 @@ function login_banner_change() {
 										<input name="wins_server_enable" type="checkbox" id="wins_server_enable" value="yes" <?=$chk;?> onClick="wins_server_change()">
 									</td>
 									<td>
-										<?=gettext("Provide a WINS server list to clients"); ?><br>
+										<?=gettext("Provide a WINS server list to clients"); ?><br />
 									</td>
 								</tr>
 							</table>
@@ -607,7 +607,7 @@ function login_banner_change() {
 										<input name="pfs_group_enable" type="checkbox" id="pfs_group_enable" value="yes" <?=$chk;?> onClick="pfs_group_change()">
 									</td>
 									<td>
-										<?=gettext("Provide the Phase2 PFS group to clients ( overrides all mobile phase2 settings )"); ?><br>
+										<?=gettext("Provide the Phase2 PFS group to clients ( overrides all mobile phase2 settings )"); ?><br />
 									</td>
 								</tr>
 							</table>
@@ -637,7 +637,7 @@ function login_banner_change() {
 										<input name="login_banner_enable" type="checkbox" id="login_banner_enable" value="yes" <?=$chk;?> onClick="login_banner_change()">
 									</td>
 									<td>
-										<?=gettext("Provide a login banner to clients"); ?><br>
+										<?=gettext("Provide a login banner to clients"); ?><br />
 									</td>
 								</tr>
 							</table>
diff --git a/usr/local/www/vpn_ipsec_phase1.php b/usr/local/www/vpn_ipsec_phase1.php
index d59534ed68..b64d7e1d64 100644
--- a/usr/local/www/vpn_ipsec_phase1.php
+++ b/usr/local/www/vpn_ipsec_phase1.php
@@ -521,7 +521,7 @@ function dpdchkbox_change() {
 						<td width="22%" valign="top" class="vncellreq"><?=gettext("Disabled"); ?></td>
 						<td width="78%" class="vtable">
 							<input name="disabled" type="checkbox" id="disabled" value="yes" <?php if ($pconfig['disabled']) echo "checked"; ?>>
-							<strong><?=gettext("Disable this phase1 entry"); ?></strong><br>
+							<strong><?=gettext("Disable this phase1 entry"); ?></strong><br />
 							<span class="vexpl">
 								<?=gettext("Set this option to disable this phase1 without " .
 								"removing it from the list"); ?>.
@@ -540,7 +540,7 @@ function dpdchkbox_change() {
 									<?=htmlspecialchars($name);?>
 								</option>
 							<?php endforeach; ?>
-							</select> <br> <span class="vexpl"><?=gettext("Select the Internet Protocol family from this dropdown"); ?>.</span>
+							</select> <br /> <span class="vexpl"><?=gettext("Select the Internet Protocol family from this dropdown"); ?>.</span>
 						</td>
 					</tr>
 					<tr>
@@ -575,7 +575,7 @@ function dpdchkbox_change() {
 								</option>
 							<?php endforeach; ?>
 							</select>
-							<br>
+							<br />
 							<span class="vexpl"><?=gettext("Select the interface for the local endpoint of this phase1 entry"); ?>.</span>
 						</td>
 					</tr>
@@ -586,7 +586,7 @@ function dpdchkbox_change() {
 						<td width="22%" valign="top" class="vncellreq"><?=gettext("Remote gateway"); ?></td>
 						<td width="78%" class="vtable">
 							<?=$mandfldhtml;?><input name="remotegw" type="text" class="formfld unknown" id="remotegw" size="28" value="<?=htmlspecialchars($pconfig['remotegw']);?>">
-							<br>
+							<br />
 							<?=gettext("Enter the public IP address or host name of the remote gateway"); ?>
 						</td>
 					</tr>
@@ -597,7 +597,7 @@ function dpdchkbox_change() {
 						<td width="22%" valign="top" class="vncell"><?=gettext("Description"); ?></td>
 						<td width="78%" class="vtable">
 							<input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>">
-							<br>
+							<br />
 							<span class="vexpl">
 								<?=gettext("You may enter a description here " .
 								"for your reference (not parsed)"); ?>.
@@ -626,7 +626,7 @@ function dpdchkbox_change() {
 								</option>
 							<?php endforeach; ?>
 							</select>
-							<br>
+							<br />
 							<span class="vexpl">
 								<?=gettext("Must match the setting chosen on the remote side"); ?>.
 							</span>
@@ -644,7 +644,7 @@ function dpdchkbox_change() {
 									<?=htmlspecialchars($mode);?>
 								</option>
 							<?php endforeach; ?>
-							</select> <br> <span class="vexpl"><?=gettext("Aggressive is more flexible, but less secure"); ?>.</span>
+							</select> <br /> <span class="vexpl"><?=gettext("Aggressive is more flexible, but less secure"); ?>.</span>
 						</td>
 					</tr>
 					<tr>
@@ -676,7 +676,7 @@ function dpdchkbox_change() {
 							</select>
 							<input name="peerid_data" type="text" class="formfld unknown" id="peerid_data" size="30" value="<?=htmlspecialchars($pconfig['peerid_data']);?>">
 						<?php if ($pconfig['mobile']) { ?>
-							<br/><br/><?=gettext("NOTE: This is known as the \"group\" setting on some VPN client implementations"); ?>.
+							<br /><br /><?=gettext("NOTE: This is known as the \"group\" setting on some VPN client implementations"); ?>.
 						<?php } ?>
 						</td>
 					</tr>
@@ -686,7 +686,7 @@ function dpdchkbox_change() {
 							<?=$mandfldhtml;?>
 							<input name="pskey" type="text" class="formfld unknown" id="pskey" size="40" value="<?=htmlspecialchars($pconfig['pskey']);?>">
 							<span class="vexpl">
-							<br>
+							<br />
 								<?=gettext("Input your Pre-Shared Key string"); ?>.
 							</span>
 						</td>
@@ -701,7 +701,7 @@ function dpdchkbox_change() {
 								<option value="require" <?php if ($pconfig['generate_policy'] == "require") echo "selected"; ?>>Require</option>
 								<option value="unique" <?php if ($pconfig['generate_policy'] == "unique") echo "selected"; ?>>Unique</option>
 							</select>
-							<br>
+							<br />
 							<span class="vexpl">
 								<?=gettext("When working as a responder (as with mobile clients), this controls how policies are generated based on SA proposals."); ?>
 							</span>
@@ -717,7 +717,7 @@ function dpdchkbox_change() {
 								<option value="claim" <?php if ($pconfig['proposal_check'] == "claim") echo "selected"; ?>>Claim</option>
 								<option value="exact" <?php if ($pconfig['proposal_check'] == "exact") echo "selected"; ?>>Exact</option>
 							</select>
-							<br>
+							<br />
 							<span class="vexpl">
 								<?=gettext("Specifies the action of lifetime length, key length, and PFS of the phase 2 selection on the responder side, and the action of lifetime check in phase 1."); ?>
 							</span>
@@ -752,7 +752,7 @@ function dpdchkbox_change() {
 								</option>
 							<?php endforeach; ?>
 							</select>
-							<br>
+							<br />
 							<span class="vexpl">
 								<?=gettext("Must match the setting chosen on the remote side"); ?>.
 							</span>
@@ -768,7 +768,7 @@ function dpdchkbox_change() {
 								</option>
 							<?php endforeach; ?>
 							</select>
-							<br>
+							<br />
 							<span class="vexpl">
 								<?=gettext("Must match the setting chosen on the remote side"); ?>.
 							</span>
@@ -794,7 +794,7 @@ function dpdchkbox_change() {
 								<option value="<?=$cert['refid'];?>" <?=$selected;?>><?=$cert['descr'];?></option>
 							<?php endforeach; ?>
 							</select>
-							<br>
+							<br />
 							<span class="vexpl">
 								<?=gettext("Select a certificate previously configured in the Certificate Manager"); ?>.
 							</span>
@@ -813,7 +813,7 @@ function dpdchkbox_change() {
 								<option value="<?=$ca['refid'];?>" <?=$selected;?>><?=$ca['descr'];?></option>
 							<?php endforeach; ?>
 							</select>
-							<br>
+							<br />
 							<span class="vexpl">
 								<?=gettext("Select a certificate authority previously configured in the Certificate Manager"); ?>.
 							</span>
@@ -833,7 +833,7 @@ function dpdchkbox_change() {
 								<option value="on" <?php if ($pconfig['nat_traversal'] == "on") echo "selected"; ?>><?=gettext("Enable"); ?></option>
 								<option value="force" <?php if ($pconfig['nat_traversal'] == "force") echo "selected"; ?>><?=gettext("Force"); ?></option>
 							</select>
-							<br/>
+							<br />
 							<span class="vexpl">
 								<?=gettext("Set this option to enable the use of NAT-T (i.e. the encapsulation of ESP in UDP packets) if needed, " .
 								"which can help with clients that are behind restrictive firewalls"); ?>.
@@ -844,21 +844,21 @@ function dpdchkbox_change() {
 						<td width="22%" valign="top" class="vncell"><?=gettext("Dead Peer Detection"); ?></td>
 						<td width="78%" class="vtable">
 							<input name="dpd_enable" type="checkbox" id="dpd_enable" value="yes" <?php if (isset($pconfig['dpd_enable'])) echo "checked"; ?> onClick="dpdchkbox_change()">
-							<?=gettext("Enable DPD"); ?><br>
+							<?=gettext("Enable DPD"); ?><br />
 							<div id="opt_dpd">
-								<br>
+								<br />
 								<input name="dpd_delay" type="text" class="formfld unknown" id="dpd_delay" size="5" value="<?=htmlspecialchars($pconfig['dpd_delay']);?>">
-								<?=gettext("seconds"); ?><br>
+								<?=gettext("seconds"); ?><br />
 								<span class="vexpl">
 									<?=gettext("Delay between requesting peer acknowledgement"); ?>.
-								</span><br>
-								<br>
+								</span><br />
+								<br />
 								<input name="dpd_maxfail" type="text" class="formfld unknown" id="dpd_maxfail" size="5" value="<?=htmlspecialchars($pconfig['dpd_maxfail']);?>">
-								<?=gettext("retries"); ?><br>
+								<?=gettext("retries"); ?><br />
 								<span class="vexpl">
 									<?=gettext("Number of consecutive failures allowed before disconnect"); ?>.
 								</span>
-								<br>
+								<br />
 							</div>
 						</td>
 					</tr>
diff --git a/usr/local/www/vpn_ipsec_phase2.php b/usr/local/www/vpn_ipsec_phase2.php
index 79c7ae205f..ff887234d6 100644
--- a/usr/local/www/vpn_ipsec_phase2.php
+++ b/usr/local/www/vpn_ipsec_phase2.php
@@ -508,7 +508,7 @@ function change_protocol() {
 						<td width="78%" class="vtable">
 							<input name="disabled" type="checkbox" id="disabled" value="yes" <?php if ($pconfig['disabled']) echo "checked"; ?>>
 							<strong><?=gettext("Disable this phase2 entry"); ?></strong>
-							<br>
+							<br />
 							<span class="vexpl"><?=gettext("Set this option to disable this phase2 entry without " .
 							  "removing it from the list"); ?>.
 							</span>
@@ -565,7 +565,7 @@ function change_protocol() {
 									</td>
 								</tr>
 								<tr> <td colspan="3">
-								<br/>
+								<br />
 								<?php echo gettext("In case you need NAT/BINAT on this network specify the address to be translated"); ?>
 								</td></tr>
 								<tr>
@@ -646,7 +646,7 @@ function change_protocol() {
 						<td width="22%" valign="top" class="vncell"><?=gettext("Description"); ?></td>
 						<td width="78%" class="vtable">
 							<input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>">
-							<br>
+							<br />
 							<span class="vexpl">
 								<?=gettext("You may enter a description here " .
 								"for your reference (not parsed)"); ?>.
@@ -671,7 +671,7 @@ function change_protocol() {
 								</option>
 							<?php endforeach; ?>
 							</select>
-							<br>
+							<br />
 							<span class="vexpl">
 								<?=gettext("ESP is encryption, AH is authentication only"); ?>
 							</span>
@@ -719,7 +719,7 @@ function change_protocol() {
 								<?php endforeach; ?>
 								
 							</table>
-							<br>
+							<br />
 							<?=gettext("Hint: use 3DES for best compatibility or if you have a hardware " . 
 							"crypto accelerator card. Blowfish is usually the fastest in " .
 							"software encryption"); ?>.
@@ -731,7 +731,7 @@ function change_protocol() {
 						<?php foreach ($p2_halgos as $algo => $algoname): ?>
 							<input type="checkbox" name="halgos[]" value="<?=$algo;?>" <?php if (in_array($algo, $pconfig['halgos'])) echo "checked"; ?>>
 							<?=htmlspecialchars($algoname);?>
-							<br>
+							<br />
 						<?php endforeach; ?>
 						</td>
 					</tr>
@@ -746,14 +746,14 @@ function change_protocol() {
 								</option>
 							<?php endforeach; ?>
 							</select>
-							<br>
+							<br />
 							<?php else: ?>
 
 							<select class="formselect" disabled>
 								<option selected><?=$p2_pfskeygroups[$a_client['pfs_group']];?></option>
 							</select>
 							<input name="pfsgroup" type="hidden" value="<?=htmlspecialchars($pconfig['pfsgroup']);?>">
-							<br>
+							<br />
 							<span class="vexpl"><em><?=gettext("Set globally in mobile client options"); ?></em></span>
 						<?php endif; ?>
 						</td>
diff --git a/usr/local/www/vpn_l2tp.php b/usr/local/www/vpn_l2tp.php
index 47228c15af..c6b6d31abc 100644
--- a/usr/local/www/vpn_l2tp.php
+++ b/usr/local/www/vpn_l2tp.php
@@ -325,12 +325,12 @@ function enable_change(enable_over) {
                   <td width="22%" valign="top" class="vncellreq"><?=gettext("Server Address");?></td>
                   <td width="78%" class="vtable">
                     <?=$mandfldhtml;?><input name="localip" type="text" class="formfld unknown" id="localip" size="20" value="<?=htmlspecialchars($pconfig['localip']);?>" />
-			<br/>
+			<br />
 			<?=gettext("Enter the IP address the L2TP server should give to clients for use as their \"gateway\""); ?>.
-			<br/>
+			<br />
 			<?=gettext("Typically this is set to an unused IP just outside of the client range"); ?>.
-			<br/>
-			<br/>
+			<br />
+			<br />
 			<?=gettext("NOTE: This should NOT be set to any IP address currently in use on this firewall"); ?>.</td>
                 </tr>
                 <tr>
@@ -355,7 +355,7 @@ function enable_change(enable_over) {
                      }
                     ?>
                     </select>
-                    <br><?=gettext("Hint:"); ?> 24 <?=gettext("is"); ?> 255.255.255.0
+                    <br /><?=gettext("Hint:"); ?> 24 <?=gettext("is"); ?> 255.255.255.0
                   </td>
                 </tr>
                 <tr>
@@ -372,7 +372,7 @@ function enable_change(enable_over) {
                      }
                     ?>
                     </select>
-                    <br><?=gettext("Hint:"); ?> 10 <?=gettext("is ten L2TP clients"); ?>
+                    <br /><?=gettext("Hint:"); ?> 10 <?=gettext("is ten L2TP clients"); ?>
                   </td>
                 </tr>
 		<tr>
@@ -398,10 +398,10 @@ function enable_change(enable_over) {
 		  <td width="22%" valign="top" class="vncell"><?=gettext("L2TP DNS Servers"); ?></td>
 		  <td width="78%" class="vtable">
 		    <?=$mandfldhtml;?><input name="l2tp_dns1" type="text" class="formfld unknown" id="l2tp_dns1" size="20" value="<?=htmlspecialchars($pconfig['l2tp_dns1']);?>">
-		   	<br>
+		   	<br />
 				<input name="l2tp_dns2" type="text" class="formfld unknown" id="l2tp_dns2" size="20" value="<?=htmlspecialchars($pconfig['l2tp_dns2']);?>">
-			<br>
-		   <?=gettext("primary and secondary DNS servers assigned to L2TP clients"); ?><br>
+			<br />
+		   <?=gettext("primary and secondary DNS servers assigned to L2TP clients"); ?><br />
 		  </td>
 		</tr>
 		<tr>
diff --git a/usr/local/www/vpn_openvpn_client.php b/usr/local/www/vpn_openvpn_client.php
index ff5c555478..ce2cd8eb07 100644
--- a/usr/local/www/vpn_openvpn_client.php
+++ b/usr/local/www/vpn_openvpn_client.php
@@ -84,7 +84,7 @@ if ($_GET['act'] == "del") {
 		openvpn_delete('client', $a_client[$id]);
 	unset($a_client[$id]);
 	write_config();
-	$savemsg = gettext("Client successfully deleted")."<br/>";
+	$savemsg = gettext("Client successfully deleted")."<br />";
 }
 
 if($_GET['act']=="new"){
@@ -431,7 +431,7 @@ if ($savemsg)
 									<td>
 										&nbsp;
 										<span class="vexpl">
-											<strong><?=gettext("Disable this client"); ?></strong><br>
+											<strong><?=gettext("Disable this client"); ?></strong><br />
 										</span>
 									</td>
 								</tr>
@@ -517,14 +517,14 @@ if ($savemsg)
 										<?=htmlspecialchars($ifacename);?>
 									</option>
 								<?php endforeach; ?>
-							</select> <br>
+							</select> <br />
 						</td>
 					</tr>
 					<tr>
 						<td width="22%" valign="top" class="vncell"><?=gettext("Local port");?></td>
 						<td width="78%" class="vtable">
 							<input name="local_port" type="text" class="formfld unknown" size="5" value="<?=htmlspecialchars($pconfig['local_port']);?>"/>
-							<br/>
+							<br />
 							<?=gettext("Set this option if you would like to bind to a specific port. Leave this blank or enter 0 for a random dynamic port."); ?>
 						</td>
 					</tr>
@@ -621,7 +621,7 @@ if ($savemsg)
 						<td width="22%" valign="top" class="vncell"><?=gettext("Description"); ?></td>
 						<td width="78%" class="vtable"> 
 							<input name="description" type="text" class="formfld unknown" size="30" value="<?=htmlspecialchars($pconfig['description']);?>">
-							<br>
+							<br />
 							<?=gettext("You may enter a description here for your reference (not parsed)"); ?>.
 						</td>
 					</tr>
@@ -666,7 +666,7 @@ if ($savemsg)
 								<tr>
 									<td>
 										<textarea name="tls" cols="65" rows="7" class="formpre"><?=htmlspecialchars($pconfig['tls']);?></textarea>
-										<br/>
+										<br />
 										<?=gettext("Paste your shared key here"); ?>.
 									</td>
 								</tr>
@@ -688,7 +688,7 @@ if ($savemsg)
 							<?php endforeach; ?>
 							</select>
 							<?php else: ?>
-								<b>No Certificate Authorities defined.</b> <br/>Create one under <a href="system_camanager.php">System &gt; Cert Manager</a>.
+								<b>No Certificate Authorities defined.</b> <br />Create one under <a href="system_camanager.php">System &gt; Cert Manager</a>.
 							<?php endif; ?>
 							</td>
 					</tr>
@@ -717,7 +717,7 @@ if ($savemsg)
 							<?php endforeach; ?>
 							</select>
 							<?php else: ?>
-								<b>No Certificates defined.</b> <br/>Create one under <a href="system_certmanager.php">System &gt; Cert Manager</a>.
+								<b>No Certificates defined.</b> <br />Create one under <a href="system_certmanager.php">System &gt; Cert Manager</a>.
 							<?php endif; ?>
 						</td>
 					</tr>
@@ -743,7 +743,7 @@ if ($savemsg)
 								<tr>
 									<td>
 										<textarea name="shared_key" cols="65" rows="7" class="formpre"><?=htmlspecialchars($pconfig['shared_key']);?></textarea>
-										<br/>
+										<br />
 										<?=gettext("Paste your shared key here"); ?>.
 									</td>
 								</tr>
@@ -814,7 +814,7 @@ if ($savemsg)
 						<td width="22%" valign="top" class="vncell"><?=gettext("IPv4 Tunnel Network"); ?></td>
 						<td width="78%" class="vtable">
 							<input name="tunnel_network" type="text" class="formfld unknown" size="20" value="<?=htmlspecialchars($pconfig['tunnel_network']);?>">
-							<br>
+							<br />
 							<?=gettext("This is the virtual network used for private " .
 							"communications between this client and the " .
 							"server expressed using CIDR (eg. 10.0.8.0/24). " .
@@ -828,7 +828,7 @@ if ($savemsg)
 						<td width="22%" valign="top" class="vncell"><?=gettext("IPv6 Tunnel Network"); ?></td>
 						<td width="78%" class="vtable">
 							<input name="tunnel_networkv6" type="text" class="formfld unknown" size="20" value="<?=htmlspecialchars($pconfig['tunnel_networkv6']);?>">
-							<br>
+							<br />
 							<?=gettext("This is the IPv6 virtual network used for private " .
 							"communications between this client and the " .
 							"server expressed using CIDR (eg. fe80::/64). " .
@@ -842,7 +842,7 @@ if ($savemsg)
 						<td width="22%" valign="top" class="vncell"><?=gettext("IPv4 Remote Network/s"); ?></td>
 						<td width="78%" class="vtable">
 							<input name="remote_network" type="text" class="formfld unknown" size="40" value="<?=htmlspecialchars($pconfig['remote_network']);?>">
-							<br>
+							<br />
 							<?=gettext("These are the IPv4 networks that will be routed through " .
 							"the tunnel, so that a site-to-site VPN can be " .
 							"established without manually changing the routing tables. " .
@@ -856,7 +856,7 @@ if ($savemsg)
 						<td width="22%" valign="top" class="vncell"><?=gettext("IPv6 Remote Network/s"); ?></td>
 						<td width="78%" class="vtable">
 							<input name="remote_networkv6" type="text" class="formfld unknown" size="40" value="<?=htmlspecialchars($pconfig['remote_networkv6']);?>">
-							<br>
+							<br />
 							<?=gettext("These are the IPv6 networks that will be routed through " .
 							"the tunnel, so that a site-to-site VPN can be " .
 							"established without manually changing the routing tables. " .
@@ -870,7 +870,7 @@ if ($savemsg)
 						<td width="22%" valign="top" class="vncell"><?=gettext("Limit outgoing bandwidth");?></td>
 						<td width="78%" class="vtable">
 							<input name="use_shaper" type="text" class="formfld unknown" size="5" value="<?=htmlspecialchars($pconfig['use_shaper']);?>"/>
-							<br/>
+							<br />
 							<?=gettext("Maximum outgoing bandwidth for this tunnel. " .
 							"Leave empty for no limit. The input value has " .
 							"to be something between 100 bytes/sec and 100 " .
@@ -890,7 +890,7 @@ if ($savemsg)
 								<option value="<?= $cmode ?>" <?= $selected ?>><?= $cmodedesc ?></option>
 								<?php endforeach; ?>
 							</select>
-							<br/>
+							<br />
 							<?=gettext("Compress tunnel packets using the LZO algorithm. Adaptive compression will dynamically disable compression for a period of time if OpenVPN detects that the data in the packets is not being compressed efficiently."); ?>.
 						</td>
 					</tr>
@@ -927,8 +927,8 @@ if ($savemsg)
 							<table border="0" cellpadding="2" cellspacing="0">
 								<tr>
 									<td>
-										<textarea rows="6" cols="78" name="custom_options" id="custom_options"><?=htmlspecialchars($pconfig['custom_options']);?></textarea><br/>
-										<?=gettext("Enter any additional options you would like to add to the OpenVPN client configuration here, separated by a semicolon"); ?><br/>
+										<textarea rows="6" cols="78" name="custom_options" id="custom_options"><?=htmlspecialchars($pconfig['custom_options']);?></textarea><br />
+										<?=gettext("Enter any additional options you would like to add to the OpenVPN client configuration here, separated by a semicolon"); ?><br />
 										<?=gettext("EXAMPLE:"); ?> <strong>remote server.mysite.com 1194;</strong> or <strong>remote 1.2.3.4 1194;</strong>
 									</td>
 								</tr>
@@ -937,7 +937,7 @@ if ($savemsg)
 					</tr>
 				</table>
 
-				<br/>
+				<br />
 				<table width="100%" border="0" cellpadding="6" cellspacing="0">
 					<tr>
 						<td width="22%" valign="top">&nbsp;</td>
diff --git a/usr/local/www/vpn_openvpn_csc.php b/usr/local/www/vpn_openvpn_csc.php
index 50e63eb04f..8d0fba660b 100644
--- a/usr/local/www/vpn_openvpn_csc.php
+++ b/usr/local/www/vpn_openvpn_csc.php
@@ -64,7 +64,7 @@ if ($_GET['act'] == "del") {
 	openvpn_delete_csc($a_csc[$id]);
 	unset($a_csc[$id]);
 	write_config();
-	$savemsg = gettext("Client Specific Override successfully deleted")."<br/>";
+	$savemsg = gettext("Client Specific Override successfully deleted")."<br />";
 }
 
 if($_GET['act']=="edit"){
@@ -345,7 +345,7 @@ function netbios_change() {
 									<td>
 										&nbsp;
 										<span class="vexpl">
-											<strong><?=gettext("Disable this override"); ?></strong><br>
+											<strong><?=gettext("Disable this override"); ?></strong><br />
 										</span>
 									</td>
 								</tr>
@@ -357,7 +357,7 @@ function netbios_change() {
 						<td width="22%" valign="top" class="vncellreq"><?=gettext("Common name"); ?></td>
 						<td width="78%" class="vtable"> 
 							<input name="common_name" type="text" class="formfld unknown" size="30" value="<?=htmlspecialchars($pconfig['common_name']);?>">
-							<br>
+							<br />
 							<?=gettext("Enter the client's X.509 common name here"); ?>.
 						</td>
 					</tr>
@@ -365,7 +365,7 @@ function netbios_change() {
 						<td width="22%" valign="top" class="vncell"><?=gettext("Description"); ?></td>
 						<td width="78%" class="vtable"> 
 							<input name="description" type="text" class="formfld unknown" size="30" value="<?=htmlspecialchars($pconfig['description']);?>">
-							<br>
+							<br />
 							<?=gettext("You may enter a description here for your reference (not parsed)"); ?>.
 						</td>
 					</tr>
@@ -400,7 +400,7 @@ function netbios_change() {
 						<td width="22%" valign="top" class="vncell"><?=gettext("Tunnel Network"); ?></td>
 						<td width="78%" class="vtable">
 							<input name="tunnel_network" type="text" class="formfld unknown" size="20" value="<?=htmlspecialchars($pconfig['tunnel_network']);?>">
-							<br>
+							<br />
 							<?=gettext("This is the virtual network used for private " .
 							"communications between this client and the " .
 							"server expressed using CIDR (eg. 10.0.8.0/24). " .
@@ -414,10 +414,10 @@ function netbios_change() {
 						<td width="22%" valign="top" class="vncell"><?=gettext("IPv4 Local Network/s"); ?></td>
 						<td width="78%" class="vtable">
 							<input name="local_network" type="text" class="formfld unknown" size="40" value="<?=htmlspecialchars($pconfig['local_network']);?>">
-							<br>
+							<br />
 							<?=gettext("These are the IPv4 networks that will be accessible " .
 							"from this particular client. Expressed as a comma-separated list of one or more CIDR ranges."); ?>
-							<br/><?=gettext("NOTE: You do not need to specify networks here if they have " .
+							<br /><?=gettext("NOTE: You do not need to specify networks here if they have " .
 							"already been defined on the main server configuration.");?>
 						</td>
 					</tr>
@@ -425,10 +425,10 @@ function netbios_change() {
 						<td width="22%" valign="top" class="vncell"><?=gettext("IPv6 Local Network/s"); ?></td>
 						<td width="78%" class="vtable">
 							<input name="local_networkv6" type="text" class="formfld unknown" size="40" value="<?=htmlspecialchars($pconfig['local_networkv6']);?>">
-							<br>
+							<br />
 							<?=gettext("These are the IPv6 networks that will be accessible " .
 							"from this particular client. Expressed as a comma-separated list of one or more IP/PREFIX networks."); ?>
-							<br/><?=gettext("NOTE: You do not need to specify networks here if they have " .
+							<br /><?=gettext("NOTE: You do not need to specify networks here if they have " .
 							"already been defined on the main server configuration.");?>
 						</td>
 					</tr>
@@ -436,14 +436,14 @@ function netbios_change() {
 						<td width="22%" valign="top" class="vncell"><?=gettext("IPv4 Remote Network/s"); ?></td>
 						<td width="78%" class="vtable">
 							<input name="remote_network" type="text" class="formfld unknown" size="40" value="<?=htmlspecialchars($pconfig['remote_network']);?>">
-							<br>
+							<br />
 							<?=gettext("These are the IPv4 networks that will be routed " .
 							"to this client specifically using iroute, so that a site-to-site " .
 							"VPN can be established. " .
 							"Expressed as a comma-separated list of one or more CIDR ranges. " .
 							"You may leave this blank if there are no client-side networks to " .
 							"be routed"); ?>.
-							<br/><?=gettext("NOTE: Remember to add these subnets to the " .
+							<br /><?=gettext("NOTE: Remember to add these subnets to the " .
 							"IPv4 Remote Networks list on the corresponding OpenVPN server settings.");?>
 						</td>
 					</tr>
@@ -451,14 +451,14 @@ function netbios_change() {
 						<td width="22%" valign="top" class="vncell"><?=gettext("IPv6 Remote Network/s"); ?></td>
 						<td width="78%" class="vtable">
 							<input name="remote_networkv6" type="text" class="formfld unknown" size="40" value="<?=htmlspecialchars($pconfig['remote_networkv6']);?>">
-							<br>
+							<br />
 							<?=gettext("These are the IPv6 networks that will be routed " .
 							"to this client specifically using iroute, so that a site-to-site " .
 							"VPN can be established. " .
 							"Expressed as a comma-separated list of one or more IP/PREFIX networks. " .
 							"You may leave this blank if there are no client-side networks to " .
 							"be routed"); ?>.
-							<br/><?=gettext("NOTE: Remember to add these subnets to the " .
+							<br /><?=gettext("NOTE: Remember to add these subnets to the " .
 							"IPv6 Remote Networks list on the corresponding OpenVPN server settings.");?>
 						</td>
 					</tr>
@@ -515,7 +515,7 @@ function netbios_change() {
 									</td>
 									<td>
 										<span class="vexpl">
-	                                        <?=gettext("Provide a default domain name to clients"); ?><br>
+	                                        <?=gettext("Provide a default domain name to clients"); ?><br />
 										</span>
 									</td>
 								</tr>
@@ -540,7 +540,7 @@ function netbios_change() {
 									</td>
 									<td>
 										<span class="vexpl">
-											<?=gettext("Provide a DNS server list to clients"); ?><br>
+											<?=gettext("Provide a DNS server list to clients"); ?><br />
 										</span>
 									</td>
 								</tr>
@@ -592,7 +592,7 @@ function netbios_change() {
 									</td>
 									<td>
 										<span class="vexpl">
-											<?=gettext("Provide a NTP server list to clients"); ?><br>
+											<?=gettext("Provide a NTP server list to clients"); ?><br />
 										</span>
 									</td>
 								</tr>
@@ -628,17 +628,17 @@ function netbios_change() {
 									</td>
 									<td>
 										<span class="vexpl">
-											<?=gettext("Enable NetBIOS over TCP/IP"); ?><br>
+											<?=gettext("Enable NetBIOS over TCP/IP"); ?><br />
 										</span>
 									</td>
 								</tr>
 							</table>
 							<?=gettext("If this option is not set, all NetBIOS-over-TCP/IP options (including WINS) will be disabled"); ?>.
-							<br/>
+							<br />
 							<table border="0" cellpadding="2" cellspacing="0" id="netbios_data">
 								<tr>
 									<td>
-										<br/>
+										<br />
 										<span class="vexpl">
 											<?=gettext("Node Type"); ?>:&nbsp;
 										</span>
@@ -652,7 +652,7 @@ function netbios_change() {
 											<option value="<?=$type;?>" <?=$selected;?>><?=$name;?></option>
 										<?php endforeach; ?>
 										</select>
-										<br/>
+										<br />
 										<?=gettext("Possible options: b-node (broadcasts), p-node " .
 										"(point-to-point name queries to a WINS server), " .
 										"m-node (broadcast then query name server), and " .
@@ -661,12 +661,12 @@ function netbios_change() {
 								</tr>
 								<tr>
 									<td>
-										<br/>
+										<br />
 										<span class="vexpl">
 											Scope ID:&nbsp;
 										</span>
 										<input name="netbios_scope" type="text" class="formfld unknown" id="netbios_scope" size="30" value="<?=htmlspecialchars($pconfig['netbios_scope']);?>">
-										<br/>
+										<br />
 										<?=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 " .
@@ -688,7 +688,7 @@ function netbios_change() {
 									</td>
 									<td>
 										<span class="vexpl">
-											<?=gettext("Provide a WINS server list to clients"); ?><br>
+											<?=gettext("Provide a WINS server list to clients"); ?><br />
 										</span>
 									</td>
 								</tr>
@@ -719,8 +719,8 @@ function netbios_change() {
 							<table border="0" cellpadding="2" cellspacing="0">
 								<tr>
 									<td>
-										<textarea rows="6" cols="70" name="custom_options" id="custom_options"><?=$pconfig['custom_options'];?></textarea><br/>
-										<?=gettext("Enter any additional options you would like to add for this client specific override, separated by a semicolon"); ?><br/>
+										<textarea rows="6" cols="70" name="custom_options" id="custom_options"><?=$pconfig['custom_options'];?></textarea><br />
+										<?=gettext("Enter any additional options you would like to add for this client specific override, separated by a semicolon"); ?><br />
 										<?=gettext("EXAMPLE: push \"route 10.0.0.0 255.255.255.0\""); ?>;
 									</td>
 								</tr>
diff --git a/usr/local/www/vpn_openvpn_server.php b/usr/local/www/vpn_openvpn_server.php
index 0ae84212a2..c1f1a7446c 100644
--- a/usr/local/www/vpn_openvpn_server.php
+++ b/usr/local/www/vpn_openvpn_server.php
@@ -85,7 +85,7 @@ if ($_GET['act'] == "del") {
 		openvpn_delete('server', $a_server[$id]);
 	unset($a_server[$id]);
 	write_config();
-	$savemsg = gettext("Server successfully deleted")."<br/>";
+	$savemsg = gettext("Server successfully deleted")."<br />";
 }
 
 if($_GET['act']=="new"){
@@ -755,7 +755,7 @@ if ($savemsg)
 									<td>
 										&nbsp;
 										<span class="vexpl">
-											<strong><?=gettext("Disable this server"); ?></strong><br>
+											<strong><?=gettext("Disable this server"); ?></strong><br />
 										</span>
 									</td>
 								</tr>
@@ -863,7 +863,7 @@ if ($savemsg)
 										<?=htmlspecialchars($ifacename);?>
 									</option>
 								<?php endforeach; ?>
-							</select> <br>
+							</select> <br />
 						</td>
 					</tr>
 					<tr>
@@ -876,7 +876,7 @@ if ($savemsg)
 						<td width="22%" valign="top" class="vncell"><?=gettext("Description"); ?></td>
 						<td width="78%" class="vtable"> 
 							<input name="description" type="text" class="formfld unknown" size="30" value="<?=htmlspecialchars($pconfig['description']);?>">
-							<br>
+							<br />
 							<?=gettext("You may enter a description here for your reference (not parsed)"); ?>.
 						</td>
 					</tr>
@@ -921,7 +921,7 @@ if ($savemsg)
 								<tr>
 									<td>
 										<textarea name="tls" cols="65" rows="7" class="formpre"><?=htmlspecialchars($pconfig['tls']);?></textarea>
-										<br/>
+										<br />
 										<?=gettext("Paste your shared key here"); ?>.
 									</td>
 								</tr>
@@ -943,7 +943,7 @@ if ($savemsg)
 							<?php endforeach; ?>
 							</select>
 							<?php else: ?>
-								<b>No Certificate Authorities defined.</b> <br/>Create one under <a href="system_camanager.php">System &gt; Cert Manager</a>.
+								<b>No Certificate Authorities defined.</b> <br />Create one under <a href="system_camanager.php">System &gt; Cert Manager</a>.
 							<?php endif; ?>
 							</td>
 					</tr>
@@ -968,7 +968,7 @@ if ($savemsg)
 							<?php endforeach; ?>
 							</select>
 							<?php else: ?>
-								<b>No Certificate Revocation Lists (CRLs) defined.</b> <br/>Create one under <a href="system_crlmanager.php">System &gt; Cert Manager</a>.
+								<b>No Certificate Revocation Lists (CRLs) defined.</b> <br />Create one under <a href="system_crlmanager.php">System &gt; Cert Manager</a>.
 							<?php endif; ?>
 							</td>
 					</tr>
@@ -997,7 +997,7 @@ if ($savemsg)
 							<?php endforeach; ?>
 							</select>
 							<?php else: ?>
-								<b>No Certificates defined.</b> <br/>Create one under <a href="system_certmanager.php">System &gt; Cert Manager</a>.
+								<b>No Certificates defined.</b> <br />Create one under <a href="system_certmanager.php">System &gt; Cert Manager</a>.
 							<?php endif; ?>
 						</td>
 					</tr>
@@ -1041,7 +1041,7 @@ if ($savemsg)
 								<tr>
 									<td>
 										<textarea name="shared_key" cols="65" rows="7" class="formpre"><?=htmlspecialchars($pconfig['shared_key']);?></textarea>
-										<br/>
+										<br />
 										<?=gettext("Paste your shared key here"); ?>.
 									</td>
 								</tr>
@@ -1155,7 +1155,7 @@ if ($savemsg)
 						<td width="22%" valign="top" class="vncellreq" id="ipv4_tunnel_network"><?=gettext("IPv4 Tunnel Network"); ?></td>
 						<td width="78%" class="vtable">
 							<input name="tunnel_network" type="text" class="formfld unknown" size="20" value="<?=htmlspecialchars($pconfig['tunnel_network']);?>">
-							<br>
+							<br />
 							<?=gettext("This is the IPv4 virtual network used for private " .
 							"communications between this server and client " .
 							"hosts expressed using CIDR (eg. 10.0.8.0/24). " .
@@ -1169,7 +1169,7 @@ if ($savemsg)
 						<td width="22%" valign="top" class="vncell"><?=gettext("IPv6 Tunnel Network"); ?></td>
 						<td width="78%" class="vtable">
 							<input name="tunnel_networkv6" type="text" class="formfld unknown" size="20" value="<?=htmlspecialchars($pconfig['tunnel_networkv6']);?>">
-							<br>
+							<br />
 							<?=gettext("This is the IPv6 virtual network used for private " .
 							"communications between this server and client " .
 							"hosts expressed using CIDR (eg. fe80::/64). " .
@@ -1190,7 +1190,7 @@ if ($savemsg)
 									</td>
 									<td>
 										<span class="vexpl">
-											<?=gettext("Allow clients on the bridge to obtain DHCP."); ?><br>
+											<?=gettext("Allow clients on the bridge to obtain DHCP."); ?><br />
 										</span>
 									</td>
 								</tr>
@@ -1219,7 +1219,7 @@ if ($savemsg)
 										<?=htmlspecialchars($ifacename);?>
 									</option>
 								<?php endforeach; ?>
-							</select> <br>
+							</select> <br />
 							<?=gettext("The interface to which this tap instance will be " .
 							"bridged. This is not done automatically. You must assign this " .
 							"interface and create the bridge separately. " .
@@ -1232,7 +1232,7 @@ if ($savemsg)
 						<td width="22%" valign="top" class="vncell"><?=gettext("Server Bridge DHCP Start"); ?></td>
 						<td width="78%" class="vtable">
 							<input name="serverbridge_dhcp_start" type="text" class="formfld unknown" size="20" value="<?=htmlspecialchars($pconfig['serverbridge_dhcp_start']);?>">
-							<br>
+							<br />
 							<?=gettext("When using tap mode as a multi-point server, " .
 							"you may optionally supply a DHCP range to use on the " .
 							"interface to which this tap instance is bridged. " .
@@ -1245,7 +1245,7 @@ if ($savemsg)
 						<td width="22%" valign="top" class="vncell"><?=gettext("Server Bridge DHCP End"); ?></td>
 						<td width="78%" class="vtable">
 							<input name="serverbridge_dhcp_end" type="text" class="formfld unknown" size="20" value="<?=htmlspecialchars($pconfig['serverbridge_dhcp_end']);?>">
-							<br>
+							<br />
 						</td>
 					</tr>
 					<tr id="gwredir_opts">
@@ -1270,7 +1270,7 @@ if ($savemsg)
 						<td width="22%" valign="top" class="vncell"><?=gettext("IPv4 Local Network/s"); ?></td>
 						<td width="78%" class="vtable">
 							<input name="local_network" type="text" class="formfld unknown" size="40" value="<?=htmlspecialchars($pconfig['local_network']);?>">
-							<br>
+							<br />
 							<?=gettext("These are the IPv4 networks that will be accessible " .
 							"from the remote endpoint. Expressed as a comma-separated list of one or more CIDR ranges. " .
 							"You may leave this blank if you don't " .
@@ -1283,7 +1283,7 @@ if ($savemsg)
 						<td width="22%" valign="top" class="vncell"><?=gettext("IPv6 Local Network/s"); ?></td>
 						<td width="78%" class="vtable">
 							<input name="local_networkv6" type="text" class="formfld unknown" size="40" value="<?=htmlspecialchars($pconfig['local_networkv6']);?>">
-							<br>
+							<br />
 							<?=gettext("These are the IPv6 networks that will be accessible " .
 							"from the remote endpoint. Expressed as a comma-separated list of one or more IP/PREFIX. " .
 							"You may leave this blank if you don't " .
@@ -1296,7 +1296,7 @@ if ($savemsg)
 						<td width="22%" valign="top" class="vncell"><?=gettext("IPv4 Remote Network/s"); ?></td>
 						<td width="78%" class="vtable">
 							<input name="remote_network" type="text" class="formfld unknown" size="40" value="<?=htmlspecialchars($pconfig['remote_network']);?>">
-							<br>
+							<br />
 							<?=gettext("These are the IPv4 networks that will be routed through " .
 							"the tunnel, so that a site-to-site VPN can be " .
 							"established without manually changing the routing tables. " .
@@ -1310,7 +1310,7 @@ if ($savemsg)
 						<td width="22%" valign="top" class="vncell"><?=gettext("IPv6 Remote Network/s"); ?></td>
 						<td width="78%" class="vtable">
 							<input name="remote_networkv6" type="text" class="formfld unknown" size="40" value="<?=htmlspecialchars($pconfig['remote_networkv6']);?>">
-							<br>
+							<br />
 							<?=gettext("These are the IPv6 networks that will be routed through " .
 							"the tunnel, so that a site-to-site VPN can be " .
 							"established without manually changing the routing tables. " .
@@ -1324,7 +1324,7 @@ if ($savemsg)
 						<td width="22%" valign="top" class="vncell"><?=gettext("Concurrent connections");?></td>
 						<td width="78%" class="vtable">
 							<input name="maxclients" type="text" class="formfld unknown" size="5" value="<?=htmlspecialchars($pconfig['maxclients']);?>"/>
-							<br/>
+							<br />
 							<?=gettext("Specify the maximum number of clients allowed to concurrently connect to this server"); ?>.
 						</td>
 					</tr>
@@ -1341,7 +1341,7 @@ if ($savemsg)
 								<option value="<?= $cmode ?>" <?= $selected ?>><?= $cmodedesc ?></option>
 								<?php endforeach; ?>
 							</select>
-							<br/>
+							<br />
 							<?=gettext("Compress tunnel packets using the LZO algorithm. Adaptive compression will dynamically disable compression for a period of time if OpenVPN detects that the data in the packets is not being compressed efficiently."); ?>.
 						</td>
 					</tr>
@@ -1392,7 +1392,7 @@ if ($savemsg)
 									</td>
 									<td>
 										<span class="vexpl">
-											<?=gettext("Allow multiple concurrent connections from clients using the same Common Name.<br/>NOTE: This is not generally recommended, but may be needed for some scenarios."); ?>
+											<?=gettext("Allow multiple concurrent connections from clients using the same Common Name.<br />NOTE: This is not generally recommended, but may be needed for some scenarios."); ?>
 										</span>
 									</td>
 								</tr>
@@ -1419,7 +1419,7 @@ if ($savemsg)
 									</td>
 									<td>
 										<span class="vexpl">
-											<?=gettext("Allow connected clients to retain their connections if their IP address changes"); ?>.<br>
+											<?=gettext("Allow connected clients to retain their connections if their IP address changes"); ?>.<br />
 										</span>
 									</td>
 								</tr>
@@ -1437,7 +1437,7 @@ if ($savemsg)
 									</td>
 									<td>
 										<span class="vexpl">
-											<?=gettext("Provide a virtual adapter IP address to clients (see Tunnel Network)"); ?><br>
+											<?=gettext("Provide a virtual adapter IP address to clients (see Tunnel Network)"); ?><br />
 										</span>
 									</td>
 								</tr>
@@ -1455,15 +1455,15 @@ if ($savemsg)
 									</td>
 									<td>
 										<span class="vexpl">
-											<?=gettext("Allocate only one IP per client (topology subnet), rather than an isolated subnet per client (topology net30)."); ?><br/>
+											<?=gettext("Allocate only one IP per client (topology subnet), rather than an isolated subnet per client (topology net30)."); ?><br />
 										</span>
 									</td>
 								</tr>
 								<tr>
 									<td>&nbsp;</td>
 									<td>
-										<?=gettext("Relevant when supplying a virtual adapter IP address to clients when using tun mode on IPv4."); ?><br/>
-										<?=gettext("Some clients may require this even for IPv6, such as OpenVPN Connect (iOS/Android). Others may break if it is present, such as older versions of OpenVPN or clients such as Yealink phones."); ?><br>
+										<?=gettext("Relevant when supplying a virtual adapter IP address to clients when using tun mode on IPv4."); ?><br />
+										<?=gettext("Some clients may require this even for IPv6, such as OpenVPN Connect (iOS/Android). Others may break if it is present, such as older versions of OpenVPN or clients such as Yealink phones."); ?><br />
 									</td>
 								</tr>
 							</table>
@@ -1480,7 +1480,7 @@ if ($savemsg)
 									</td>
 									<td>
 										<span class="vexpl">
-	                                        <?=gettext("Provide a default domain name to clients"); ?><br>
+	                                        <?=gettext("Provide a default domain name to clients"); ?><br />
 										</span>
 									</td>
 								</tr>
@@ -1505,7 +1505,7 @@ if ($savemsg)
 									</td>
 									<td>
 										<span class="vexpl">
-											<?=gettext("Provide a DNS server list to clients"); ?><br>
+											<?=gettext("Provide a DNS server list to clients"); ?><br />
 										</span>
 									</td>
 								</tr>
@@ -1557,7 +1557,7 @@ if ($savemsg)
 									</td>
 									<td>
 										<span class="vexpl">
-											<?=gettext("Provide a NTP server list to clients"); ?><br>
+											<?=gettext("Provide a NTP server list to clients"); ?><br />
 										</span>
 									</td>
 								</tr>
@@ -1593,17 +1593,17 @@ if ($savemsg)
 									</td>
 									<td>
 										<span class="vexpl">
-											<?=gettext("Enable NetBIOS over TCP/IP"); ?><br>
+											<?=gettext("Enable NetBIOS over TCP/IP"); ?><br />
 										</span>
 									</td>
 								</tr>
 							</table>
 							<?=gettext("If this option is not set, all NetBIOS-over-TCP/IP options (including WINS) will be disabled"); ?>.
-							<br/>
+							<br />
 							<table border="0" cellpadding="2" cellspacing="0" id="netbios_data">
 								<tr>
 									<td>
-										<br/>
+										<br />
 										<span class="vexpl">
 											<?=gettext("Node Type"); ?>:&nbsp;
 										</span>
@@ -1617,7 +1617,7 @@ if ($savemsg)
 											<option value="<?=$type;?>" <?=$selected;?>><?=$name;?></option>
 										<?php endforeach; ?>
 										</select>
-										<br/>
+										<br />
 										<?=gettext("Possible options: b-node (broadcasts), p-node " .
 										"(point-to-point name queries to a WINS server), " .
 										"m-node (broadcast then query name server), and " .
@@ -1626,12 +1626,12 @@ if ($savemsg)
 								</tr>
 								<tr>
 									<td>
-										<br/>
+										<br />
 										<span class="vexpl">
 											<?=gettext("Scope ID"); ?>:&nbsp;
 										</span>
 										<input name="netbios_scope" type="text" class="formfld unknown" id="netbios_scope" size="30" value="<?=htmlspecialchars($pconfig['netbios_scope']);?>">
-										<br/>
+										<br />
 										<?=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 " .
@@ -1653,7 +1653,7 @@ if ($savemsg)
 									</td>
 									<td>
 										<span class="vexpl">
-											<?=gettext("Provide a WINS server list to clients"); ?><br>
+											<?=gettext("Provide a WINS server list to clients"); ?><br />
 										</span>
 									</td>
 								</tr>
@@ -1689,7 +1689,7 @@ if ($savemsg)
 									</td>
 									<td>
 										<span class="vexpl">
-	                                        <?=gettext("Use a different management port on clients. The default port is 166. Specify a different port if the client machines need to select from multiple OpenVPN links."); ?><br>
+	                                        <?=gettext("Use a different management port on clients. The default port is 166. Specify a different port if the client machines need to select from multiple OpenVPN links."); ?><br />
 										</span>
 									</td>
 								</tr>
@@ -1718,8 +1718,8 @@ if ($savemsg)
 							<table border="0" cellpadding="2" cellspacing="0">
 								<tr>
 									<td>
-										<textarea rows="6" cols="78" name="custom_options" id="custom_options"><?=htmlspecialchars($pconfig['custom_options']);?></textarea><br/>
-										<?=gettext("Enter any additional options you would like to add to the OpenVPN server configuration here, separated by a semicolon"); ?><br/>
+										<textarea rows="6" cols="78" name="custom_options" id="custom_options"><?=htmlspecialchars($pconfig['custom_options']);?></textarea><br />
+										<?=gettext("Enter any additional options you would like to add to the OpenVPN server configuration here, separated by a semicolon"); ?><br />
 										<?=gettext("EXAMPLE: push \"route 10.0.0.0 255.255.255.0\""); ?>;
 									</td>
 								</tr>
@@ -1728,7 +1728,7 @@ if ($savemsg)
 					</tr>
 				</table>
 
-				<br/>
+				<br />
 				<table width="100%" border="0" cellpadding="6" cellspacing="0">
 					<tr>
 						<td width="22%" valign="top">&nbsp;</td>
@@ -1771,8 +1771,8 @@ if ($savemsg)
 						<?=htmlspecialchars($server['protocol']);?> / <?=htmlspecialchars($server['local_port']);?>
 					</td>
 					<td class="listr" ondblclick="document.location='vpn_openvpn_server.php?act=edit&id=<?=$i;?>'">
-						<?=htmlspecialchars($server['tunnel_network']);?><br/>
-						<?=htmlspecialchars($server['tunnel_networkv6']);?><br/>
+						<?=htmlspecialchars($server['tunnel_network']);?><br />
+						<?=htmlspecialchars($server['tunnel_networkv6']);?><br />
 					</td>
 					<td class="listbg" ondblclick="document.location='vpn_openvpn_server.php?act=edit&id=<?=$i;?>'">
 						<?=htmlspecialchars($server['description']);?>
diff --git a/usr/local/www/vpn_pppoe.php b/usr/local/www/vpn_pppoe.php
old mode 100755
new mode 100644
index b91e6d2f00..94b0650685
--- a/usr/local/www/vpn_pppoe.php
+++ b/usr/local/www/vpn_pppoe.php
@@ -95,7 +95,7 @@ include("head.inc");
 <form action="vpn_pppoe.php" method="post">
 <?php if ($savemsg) print_info_box($savemsg); ?>
 <?php if (is_subsystem_dirty('vpnpppoe')): ?><p>
-<?php print_info_box_np(gettext("The PPPoE entry list has been changed") . ".<br>" . gettext("You must apply the changes in order for them to take effect."));?>
+<?php print_info_box_np(gettext("The PPPoE entry list has been changed") . ".<br />" . gettext("You must apply the changes in order for them to take effect."));?>
 <?php endif; ?>
 
 <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
diff --git a/usr/local/www/vpn_pptp.php b/usr/local/www/vpn_pptp.php
old mode 100755
new mode 100644
index ac3dc8cd33..06b132fe18
--- a/usr/local/www/vpn_pptp.php
+++ b/usr/local/www/vpn_pptp.php
@@ -297,7 +297,7 @@ function enable_change(enable_over) {
 <form action="vpn_pptp.php" method="post" name="iform" id="iform">
 <?php if ($input_errors) print_input_errors($input_errors); ?>
 <?php if ($savemsg) print_info_box($savemsg); ?>
-<?php print_info_box(gettext("PPTP is no longer considered a secure VPN technology because it relies upon MS-CHAPv2 which has been compromised. If you continue to use PPTP be aware that intercepted traffic can be decrypted by a third party, so it should be considered unencrypted. We advise migrating to another VPN type such as OpenVPN or IPsec.<br/><br/><a href=\"https://isc.sans.edu/diary/End+of+Days+for+MS-CHAPv2/13807\">Read More</a>")); ?>
+<?php print_info_box(gettext("PPTP is no longer considered a secure VPN technology because it relies upon MS-CHAPv2 which has been compromised. If you continue to use PPTP be aware that intercepted traffic can be decrypted by a third party, so it should be considered unencrypted. We advise migrating to another VPN type such as OpenVPN or IPsec.<br /><br /><a href=\"https://isc.sans.edu/diary/End+of+Days+for+MS-CHAPv2/13807\">Read More</a>")); ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
   <tr><td class="tabnavtbl">
 <?php
@@ -327,7 +327,7 @@ function enable_change(enable_over) {
 				  <td width="22%" valign="top" class="vncellreq"><?=gettext("PPTP redirection");?></td>
                   <td width="78%" class="vtable"> 
                     <?=$mandfldhtml;?><input name="redir" type="text" class="formfld unknown" id="redir" size="20" value="<?=htmlspecialchars($pconfig['redir']);?>"> 
-                    <br>
+                    <br />
                     <?=gettext("Enter the IP address of a host which will accept incoming " .
                     "PPTP connections"); ?>.</td>
                 <tr> 
@@ -351,19 +351,19 @@ function enable_change(enable_over) {
 								}
 							?>
 						</select>
-						<br><?=gettext("Hint: 10 is ten PPTP clients"); ?>
+						<br /><?=gettext("Hint: 10 is ten PPTP clients"); ?>
 					</td>
 				</tr>
                 <tr> 
                   <td width="22%" valign="top" class="vncellreq"><?=gettext("Server address"); ?></td>
                   <td width="78%" class="vtable"> 
                     <?=$mandfldhtml;?><input name="localip" type="text" class="formfld unknown" id="localip" size="20" value="<?=htmlspecialchars($pconfig['localip']);?>"> 
-			<br/>
+			<br />
 			<?=gettext("Enter the IP address the PPTP server should give to clients for use as their \"gateway\""); ?>.
-			<br/>
+			<br />
 			<?=gettext("Typically this is set to an unused IP just outside of the client range"); ?>.
-			<br/>
-			<br/>
+			<br />
+			<br />
 			<?=gettext("NOTE: This should NOT be set to any IP address currently in use on this firewall"); ?>.</td>
                 </tr>
                 <tr> 
@@ -371,17 +371,17 @@ function enable_change(enable_over) {
                     "range"); ?></td>
                   <td width="78%" class="vtable"> 
                     <?=$mandfldhtml;?><input name="remoteip" type="text" class="formfld unknown" id="remoteip" size="20" value="<?=htmlspecialchars($pconfig['remoteip']);?>">
-                    <br>
-                    <?=gettext("Specify the starting address for the client IP subnet"); ?>.<br>
+                    <br />
+                    <?=gettext("Specify the starting address for the client IP subnet"); ?>.<br />
                 </tr>
                 <tr> 
                   <td width="22%" valign="top" class="vncell"><?=gettext("PPTP DNS Servers"); ?></td>
                   <td width="78%" class="vtable"> 
                     <?=$mandfldhtml;?><input name="pptp_dns1" type="text" class="formfld unknown" id="pptp_dns1" size="20" value="<?=htmlspecialchars($pconfig['pptp_dns1']);?>">
-                    <br>
+                    <br />
 					<input name="pptp_dns2" type="text" class="formfld unknown" id="pptp_dns2" size="20" value="<?=htmlspecialchars($pconfig['pptp_dns2']);?>">
-                    <br>
-                   <?=gettext("primary and secondary DNS servers assigned to PPTP clients"); ?><br>
+                    <br />
+                   <?=gettext("primary and secondary DNS servers assigned to PPTP clients"); ?><br />
                 </tr>
                 <tr> 
                   <td width="22%" valign="top" class="vncell"><?=gettext("WINS Server"); ?></td>
@@ -393,22 +393,22 @@ function enable_change(enable_over) {
                   <td width="22%" valign="top" class="vncell"><?=gettext("RADIUS"); ?></td>
                   <td width="78%" class="vtable"> 
                       <input name="radiusenable" type="checkbox" id="radiusenable" onclick="enable_change(false)" value="yes" <?php if ($pconfig['radiusenable']) echo "checked"; ?>>
-                      <strong><?=gettext("Use a RADIUS server for authentication"); ?></strong><br>
+                      <strong><?=gettext("Use a RADIUS server for authentication"); ?></strong><br />
                       <?=gettext("When set, all users will be authenticated using " .
                       "the RADIUS server specified below. The local user database " .
-                      "will not be used"); ?>.<br>
-                      <br>
+                      "will not be used"); ?>.<br />
+                      <br />
                       <input name="radacct_enable" type="checkbox" id="radacct_enable" onclick="enable_change(false)" value="yes" <?php if ($pconfig['radacct_enable']) echo "checked"; ?>>
-                      <strong><?=gettext("Enable RADIUS accounting"); ?> <br>
-                      </strong><?=gettext("Sends accounting packets to the RADIUS server"); ?>.<br>
-			 <br>
+                      <strong><?=gettext("Enable RADIUS accounting"); ?> <br />
+                      </strong><?=gettext("Sends accounting packets to the RADIUS server"); ?>.<br />
+			 <br />
                       <input name="radiussecenable" type="checkbox" id="radiussecenable" onclick="enable_change(false)" value="yes" <?php if ($pconfig['radiussecenable']) echo "checked"; ?>>
-                      <strong><?=gettext("Secondary RADIUS server for failover authentication"); ?></strong><br>
-                      <?=gettext("When set, all requests will go to the secondary server when primary fails"); ?><br>
-		      <br>
+                      <strong><?=gettext("Secondary RADIUS server for failover authentication"); ?></strong><br />
+                      <?=gettext("When set, all requests will go to the secondary server when primary fails"); ?><br />
+		      <br />
                       <input name="radiusissueips" value="yes" type="checkbox" class="formfld" id="radiusissueips"<?php if($pconfig['radiusissueips']) echo " CHECKED"; ?>>
 		      <strong><?=gettext("RADIUS issued IPs"); ?></strong>
-                      <br><?=gettext("Issue IP addresses via RADIUS server"); ?>.
+                      <br /><?=gettext("Issue IP addresses via RADIUS server"); ?>.
 		      </td>
                  </td>
                 </tr>
@@ -430,14 +430,14 @@ function enable_change(enable_over) {
                       <input name="radiusserver" type="text" class="formfld unknown" id="radiusserver" size="20" value="<?=htmlspecialchars($pconfig['radiusserver']);?>">
                       <input name="radiusserverport" type="text" class="formfld unknown" id="radiusserverport" size="4" value="<?=htmlspecialchars($pconfig['radiusserverport']);?>">
                       <input name="radiusserveracctport" type="text" class="formfld unknown" id="radiusserveracctport" size="4" value="<?=htmlspecialchars($pconfig['radiusserveracctport']);?>">
-                      <br>
+                      <br />
                       <?=gettext("Enter the IP address, RADIUS port, and RADIUS accounting port of the RADIUS server"); ?>.</td>
                 </tr>
                 <tr> 
                   <td width="22%" valign="top" class="vncell"><?=gettext("RADIUS shared secret"); ?></td>
                   <td width="78%" valign="top" class="vtable">
                       <input name="radiussecret" type="password" class="formfld pwd" id="radiussecret" size="20" value="<?=htmlspecialchars($pconfig['radiussecret']);?>">
-                      <br>
+                      <br />
                       <?=gettext("Enter the shared secret that will be used to authenticate " .
                       "to the RADIUS server"); ?>.</td>
                 </tr>
@@ -447,14 +447,14 @@ function enable_change(enable_over) {
                       <input name="radiusserver2" type="text" class="formfld unknown" id="radiusserver2" size="20" value="<?=htmlspecialchars($pconfig['radiusserver2']);?>">
                       <input name="radiusserver2port" type="text" class="formfld unknown" id="radiusserver2port" size="4" value="<?=htmlspecialchars($pconfig['radiusserver2port']);?>">
                       <input name="radiusserver2acctport" type="text" class="formfld unknown" id="radiusserver2acctport" size="4" value="<?=htmlspecialchars($pconfig['radiusserver2acctport']);?>">
-                      <br>
+                      <br />
                       <?=gettext("Enter the IP address, RADIUS port, and RADIUS accounting port of the RADIUS server"); ?>.</td>
                 </tr>
                 <tr> 
                   <td width="22%" valign="top" class="vncell"><?=gettext("Secondary RADIUS shared secret"); ?></td>
                   <td width="78%" valign="top" class="vtable">
                       <input name="radiussecret2" type="password" class="formfld pwd" id="radiussecret2" size="20" value="<?=htmlspecialchars($pconfig['radiussecret2']);?>">
-                      <br>
+                      <br />
                       <?=gettext("Enter the shared secret that will be used to authenticate " .
                       "to the secondary RADIUS server"); ?>.</td>
                 </tr>
@@ -465,7 +465,7 @@ function enable_change(enable_over) {
                   <td width="22%" valign="middle">&nbsp;</td>
                   <td width="78%" class="vtable"> 
                     <input name="req128" type="checkbox" id="req128" value="yes" <?php if ($pconfig['req128']) echo "checked"; ?>> 
-                    <strong><?=gettext("Require 128-bit encryption"); ?></strong><br>
+                    <strong><?=gettext("Require 128-bit encryption"); ?></strong><br />
                     <?=gettext("When set, only 128-bit encryption will be accepted. Otherwise " .
                     "40-bit and 56-bit encryption will be accepted as well. Note that " .
                     "encryption will always be forced on PPTP connections (i.e. " .
@@ -479,7 +479,7 @@ function enable_change(enable_over) {
                 </tr>
                 <tr> 
                   <td width="22%" valign="top">&nbsp;</td>
-                  <td width="78%"><span class="vexpl"><span class="red"><strong><?=gettext("Note");?>:<br>
+                  <td width="78%"><span class="vexpl"><span class="red"><strong><?=gettext("Note");?>:<br />
                     </strong></span><?=gettext("don't forget to ");?><a href="firewall_rules.php?if=pptp"><?=gettext("add a firewall rule"); ?></a> <?=gettext("to permit ". 
                     "traffic from PPTP clients");?>!</span></td>
                  </tr>
diff --git a/usr/local/www/vpn_pptp_users.php b/usr/local/www/vpn_pptp_users.php
old mode 100755
new mode 100644
index 29a3b407e9..d75142bb6e
--- a/usr/local/www/vpn_pptp_users.php
+++ b/usr/local/www/vpn_pptp_users.php
@@ -81,7 +81,7 @@ include("head.inc");
 <?php if (isset($config['pptpd']['radius']['enable']))
 	print_info_box(gettext("Warning: RADIUS is enabled. The local user database will not be used.")); ?>
 <?php if (is_subsystem_dirty('pptpusers')): ?><p>
-<?php print_info_box_np(gettext("The PPTP user list has been modified").".<br>".gettext("You must apply the changes in order for them to take effect").".<br><b>".gettext("Warning: this will terminate all current PPTP sessions")."!</b>");?><br>
+<?php print_info_box_np(gettext("The PPTP user list has been modified").".<br />".gettext("You must apply the changes in order for them to take effect").".<br /><b>".gettext("Warning: this will terminate all current PPTP sessions")."!</b>");?><br />
 <?php endif; ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
   <tr><td class="tabnavtbl">
diff --git a/usr/local/www/vpn_pptp_users_edit.php b/usr/local/www/vpn_pptp_users_edit.php
old mode 100755
new mode 100644
index e32ab9c118..9777f5ecc7
--- a/usr/local/www/vpn_pptp_users_edit.php
+++ b/usr/local/www/vpn_pptp_users_edit.php
@@ -153,8 +153,8 @@ include("head.inc");
                   <td width="22%" valign="top" class="vncellreq"><?=gettext("Password");?></td>
                   <td width="78%" class="vtable">
                     <?=$mandfldhtml;?><input name="password" type="password" class="formfld pwd" id="password" size="20">
-                    <br><?=$mandfldhtml;?><input name="password2" type="password" class="formfld pwd" id="password2" size="20">
-                    &nbsp;(<?=gettext("confirmation");?>)<?php if (isset($id) && $a_secret[$id]): ?><br>
+                    <br /><?=$mandfldhtml;?><input name="password2" type="password" class="formfld pwd" id="password2" size="20">
+                    &nbsp;(<?=gettext("confirmation");?>)<?php if (isset($id) && $a_secret[$id]): ?><br />
                     <span class="vexpl"><?=gettext("If you want to change the users' password, ".
                     "enter it here twice.");?></span><?php endif; ?></td>
                 </tr>
@@ -162,7 +162,7 @@ include("head.inc");
                   <td width="22%" valign="top" class="vncell"><?=gettext("IP address");?></td>
                   <td width="78%" class="vtable">
                     <input name="ip" type="text" class="formfld unknown" id="ip" size="20" value="<?=htmlspecialchars($pconfig['ip']);?>">
-                    <br><span class="vexpl"><?=gettext("If you want the user to be assigned a specific IP address, enter it here.");?></span></td>
+                    <br /><span class="vexpl"><?=gettext("If you want the user to be assigned a specific IP address, enter it here.");?></span></td>
                 </tr>
                 <tr>
                   <td class="vncell" width="22%" valign="top">&nbsp;</td>
diff --git a/usr/local/www/widgets/widgets/installed_packages.widget.php b/usr/local/www/widgets/widgets/installed_packages.widget.php
index 800bb58ee8..3b15a2ba0a 100644
--- a/usr/local/www/widgets/widgets/installed_packages.widget.php
+++ b/usr/local/www/widgets/widgets/installed_packages.widget.php
@@ -78,18 +78,18 @@ $updateavailable = false;
 				$latest_package = $currentvers[$pkg['name']]['version'];
 				if($latest_package == false) {
 					// We can't determine this package's version status.
-					echo "Current: Unknown.<br/>Installed: " . $pkg['version'];
+					echo "Current: Unknown.<br />Installed: " . $pkg['version'];
 				} elseif(strcmp($pkg['version'], $latest_package) > 0) {
 					/* we're running a newer version of the package */
 					echo "Current: {$latest_package}";
-					echo "<br/>Installed: {$pkg['version']}";
+					echo "<br />Installed: {$pkg['version']}";
 				} elseif(strcmp($pkg['version'], $latest_package) < 0) {
 					/* our package is out of date */
 					$updateavailable = true;
 					?>
 					<div id="updatediv-<?php echo $y; ?>" style="color:red">
 						<b>Update Available!</b></div><div style="float:left">
-						Current: <?php echo $latest_package; ?><br/>
+						Current: <?php echo $latest_package; ?><br />
 						Installed: <?php echo $pkg['version']; ?></div><div style="float:right">
 					<a href="pkg_mgr_install.php?mode=reinstallpkg&amp;pkg=<?= $pkg['name']; ?>"><img title="Update this package." src="./themes/<?= $g['theme']; ?>/images/icons/icon_reinstall_pkg.gif" width="17" height="17" border="0" alt="reinstall" /></a>
 					</div>
diff --git a/usr/local/www/widgets/widgets/interfaces.widget.php b/usr/local/www/widgets/widgets/interfaces.widget.php
index 34737833ea..28c0d43e6b 100644
--- a/usr/local/www/widgets/widgets/interfaces.widget.php
+++ b/usr/local/www/widgets/widgets/interfaces.widget.php
@@ -95,7 +95,7 @@ require_once("/usr/local/www/widgets/include/interfaces.inc");
 						<tr>
 							<td class="vncellt" width="100%">
 								<div id="<?php echo $ifname;?>-ip" style="display:inline"><?=htmlspecialchars($ifinfo['ipaddr']);?> </div>
-								<br/>
+								<br />
 								<div id="<?php echo $ifname;?>-ipv6" style="display:inline"><?=htmlspecialchars($ifinfo['ipaddrv6']);?> </div>
 							</td>
 						</tr>
diff --git a/usr/local/www/widgets/widgets/ipsec.widget.php b/usr/local/www/widgets/widgets/ipsec.widget.php
index b46445fb29..15d1612b02 100644
--- a/usr/local/www/widgets/widgets/ipsec.widget.php
+++ b/usr/local/www/widgets/widgets/ipsec.widget.php
@@ -137,7 +137,7 @@ if (isset($config['ipsec']['phase1'])){?>
 			</div>
 			<div class="listr"  style="display:table-cell;width:100px"><?php echo $spans;?>
 				<?php echo $ipsec['remote-subnet'];?>
-				<br/>
+				<br />
 				(<?php echo htmlspecialchars($ipsec['dest']);?>)<?php echo $spane;?>
 			</div>
 			<div class="listr"  style="display:table-cell;width:90px"><?php echo $spans;?><?php echo htmlspecialchars($ipsec['descr']);?><?php echo $spane;?></div>
@@ -171,11 +171,11 @@ if (isset($config['ipsec']['phase1'])){?>
 <?php	foreach ($mobile as $muser) : ?>
 		<div style="display:table-row;">
 			<div class="listlr" style="display:table-cell;width:139px">
-				<?php echo htmlspecialchars($muser['username']);?><br/>
+				<?php echo htmlspecialchars($muser['username']);?><br />
 				<?php echo htmlspecialchars($muser['logintime']);?>
 			</div>
 			<div class="listr"  style="display:table-cell;width:130px">
-				<?php echo htmlspecialchars($muser['local']);?><br/>
+				<?php echo htmlspecialchars($muser['local']);?><br />
 				<?php echo htmlspecialchars($muser['remote']);?>
 			</div>
 			<div class="listr"  style="display:table-cell;width:30px" align="center">
diff --git a/usr/local/www/widgets/widgets/load_balancer_status.widget.php b/usr/local/www/widgets/widgets/load_balancer_status.widget.php
index 47da7439e4..c5a3d2e943 100644
--- a/usr/local/www/widgets/widgets/load_balancer_status.widget.php
+++ b/usr/local/www/widgets/widgets/load_balancer_status.widget.php
@@ -86,9 +86,9 @@ if (!$nentries)
 		}
 		?>
 		<td class="listlr">
-			<?=$vsent['name'];?><br/>
+			<?=$vsent['name'];?><br />
 			<span style="background-color: <?=$bgcolor?>; display: block"><i><?=$rdr_a[$vsent['name']]['status']?></i></span>
-			<?=$vsent['ipaddr'].":".$vsent['port'];?><br/>
+			<?=$vsent['ipaddr'].":".$vsent['port'];?><br />
 		</td>
 		<td class="listr" align="center" >
 		<table border="0" cellpadding="0" cellspacing="2" summary="status">
diff --git a/usr/local/www/widgets/widgets/log.widget.php b/usr/local/www/widgets/widgets/log.widget.php
index b099789eae..0362e622bf 100644
--- a/usr/local/www/widgets/widgets/log.widget.php
+++ b/usr/local/www/widgets/widgets/log.widget.php
@@ -145,7 +145,7 @@ function format_log_line(row) {
 		<input id="actpass"   name="actpass"   type="checkbox" value="Pass"   <?php if (in_arrayi('Pass',   $Include_Act)) echo "checked=\"checked\""; ?> /> Pass
 		<input id="actblock"  name="actblock"  type="checkbox" value="Block"  <?php if (in_arrayi('Block',  $Include_Act)) echo "checked=\"checked\""; ?> /> Block
 		<input id="actreject" name="actreject" type="checkbox" value="Reject" <?php if (in_arrayi('Reject', $Include_Act)) echo "checked=\"checked\""; ?> /> Reject
-		<br/>
+		<br />
 		Interfaces:
 		<select id="filterlogentriesinterfaces" name="filterlogentriesinterfaces" class="formselect">
 			<option value="All">ALL</option>
diff --git a/usr/local/www/widgets/widgets/openvpn.widget.php b/usr/local/www/widgets/widgets/openvpn.widget.php
index 5c7d756789..fc24948026 100644
--- a/usr/local/www/widgets/widgets/openvpn.widget.php
+++ b/usr/local/www/widgets/widgets/openvpn.widget.php
@@ -60,7 +60,7 @@ $sk_servers = openvpn_get_active_servers("p2p");
 $clients = openvpn_get_active_clients();
 ?>
 
-<br/>
+<br />
 <script type="text/javascript">
 	function killClient(mport, remipp) {
 		var busy = function(index,icon) {
@@ -248,7 +248,7 @@ $clients = openvpn_get_active_clients();
 }
 
 if ($DisplayNote) {
-	echo "<br/><b>NOTE:</b> You need to bind each OpenVPN client to enable its management daemon: use 'Local port' setting in the OpenVPN client screen";
+	echo "<br /><b>NOTE:</b> You need to bind each OpenVPN client to enable its management daemon: use 'Local port' setting in the OpenVPN client screen";
 }
 
 if ((empty($clients)) && (empty($servers)) && (empty($sk_servers))) {
diff --git a/usr/local/www/widgets/widgets/rss.widget.php b/usr/local/www/widgets/widgets/rss.widget.php
index 5f06422067..45b2d41197 100644
--- a/usr/local/www/widgets/widgets/rss.widget.php
+++ b/usr/local/www/widgets/widgets/rss.widget.php
@@ -81,7 +81,7 @@ else
 <div id="rss-settings" class="widgetconfigdiv" style="display:none;">
 	<form action="/widgets/widgets/rss.widget.php" method="post" name="iformc">
 		<textarea name="rssfeed" class="formfld unknown textarea_widget" id="rssfeed" cols="40" rows="3"><?=$textarea_txt;?></textarea>
-		<br/>
+		<br />
 		<table summary="rss widget">
 			<tr>
 				<td align="right">
@@ -161,11 +161,11 @@ else
 	foreach($feed->get_items() as $item) {
 		$feed = $item->get_feed();
 		$feed->strip_htmltags();
-		echo "<a target='blank' href='" . $item->get_permalink() . "'>" . $item->get_title() . "</a><br/>";
+		echo "<a target='blank' href='" . $item->get_permalink() . "'>" . $item->get_title() . "</a><br />";
 		$content = $item->get_content();
 		$content = strip_tags($content);
-		echo textLimit($content, $rsswidgettextlength) . "<br/>";
-		echo "Source: <a target='_blank' href='" . $item->get_permalink() . "'><img src='" . $feed->get_favicon() . "' alt='" . $feed->get_title() . "' title='" . $feed->get_title() . "' border='0' width='16' height='16' /></a><br/>";
+		echo textLimit($content, $rsswidgettextlength) . "<br />";
+		echo "Source: <a target='_blank' href='" . $item->get_permalink() . "'><img src='" . $feed->get_favicon() . "' alt='" . $feed->get_title() . "' title='" . $feed->get_title() . "' border='0' width='16' height='16' /></a><br />";
 		$counter++;
 		if($counter > $max_items)
 			break;
diff --git a/usr/local/www/widgets/widgets/system_information.widget.php b/usr/local/www/widgets/widgets/system_information.widget.php
index c2cf67afde..a2499e34e5 100644
--- a/usr/local/www/widgets/widgets/system_information.widget.php
+++ b/usr/local/www/widgets/widgets/system_information.widget.php
@@ -70,7 +70,7 @@ if($_REQUEST['getupdatestatus']) {
 		else {
 			$needs_system_upgrade = false;
 			if (pfs_version_compare($current_installed_buildtime, $current_installed_version, $remote_version) == -1) {
-				echo "<br/><span class=\"red\" id=\"updatealert\"><b>Update available. </b></span><a href=\"/system_firmware_check.php\">Click Here</a> to view update.";
+				echo "<br /><span class=\"red\" id=\"updatealert\"><b>Update available. </b></span><a href=\"/system_firmware_check.php\">Click Here</a> to view update.";
 				echo "<script type=\"text/javascript\">";
 				echo "jQuery('#updatealert').effect('pulsate',{times: 30},10000);";
 
@@ -121,7 +121,7 @@ $curcfg = $config['system']['firmware'];
 		<div id="uname"><a href="#" onclick='swapuname(); return false;'><?php echo php_uname("s") . " " . php_uname("r"); ?></a></div>
 		<?php endif; ?>
 		<?php if(!isset($config['system']['firmware']['disablecheck'])): ?>
-		<div id='updatestatus'><br/><?php echo gettext("Obtaining update status"); ?> ...</div>
+		<div id='updatestatus'><br /><?php echo gettext("Obtaining update status"); ?> ...</div>
 		<?php endif; ?>
 			</td>
 		</tr>
@@ -149,7 +149,7 @@ $curcfg = $config['system']['firmware'];
 			<td width="75%" class="listr">
 				<?=htmlspecialchars(nanobsd_friendly_slice_name($BOOT_DEVICE));?> / <?=htmlspecialchars($BOOTFLASH);?> <?php echo $rw; ?>
 				<?php if ($BOOTFLASH != $ACTIVE_SLICE): ?>
-				<br/><br/>Next Boot:<br/>
+				<br /><br />Next Boot:<br />
 				<?=htmlspecialchars(nanobsd_friendly_slice_name($GLABEL_SLICE));?> / <?=htmlspecialchars($ACTIVE_SLICE);?>
 				<?php endif; ?>
 			</td>
@@ -194,7 +194,7 @@ $curcfg = $config['system']['firmware'];
 					<?php
 						$dns_servers = get_dns_servers();
 						foreach($dns_servers as $dns) {
-							echo "{$dns}<br/>";
+							echo "{$dns}<br />";
 						}
 					?>
 			</td>
diff --git a/usr/local/www/widgets/widgets/traffic_graphs.widget.php b/usr/local/www/widgets/widgets/traffic_graphs.widget.php
index 931c2a52a5..effe045282 100644
--- a/usr/local/www/widgets/widgets/traffic_graphs.widget.php
+++ b/usr/local/www/widgets/widgets/traffic_graphs.widget.php
@@ -124,13 +124,13 @@ if (isset($a_config["scale_type"])) {
 			}
 		?>
 	<input name="scale_type" class="radio" type="radio" id="scale_type" value="up" <?php echo $scale_type_up; ?> onchange="updateGraphDisplays();" /> <span>up</span>
-	<input name="scale_type" class="radio" type="radio" id="scale_type" value="follow" <?php echo $scale_type_follow; ?> onchange="updateGraphDisplays();" /> <span>follow</span><br><br>
+	<input name="scale_type" class="radio" type="radio" id="scale_type" value="follow" <?php echo $scale_type_follow; ?> onchange="updateGraphDisplays();" /> <span>follow</span><br /><br />
 	Refresh Interval:
 	<select name="refreshinterval" class="formfld" id="refreshinterval" onchange="updateGraphDisplays();">
 		<?php for ($i = 1; $i <= 10; $i += 1) { ?>
 			<option value="<?= $i ?>" <?php if ($refreshinterval == $i) echo "selected='selected'";?>><?= $i ?></option>
 		<?php } ?>
-	</select>&nbsp; Seconds<br>&nbsp; &nbsp; &nbsp; <b>Note:</b> changing this setting will increase CPU utilization<br><br>
+	</select>&nbsp; Seconds<br />&nbsp; &nbsp; &nbsp; <b>Note:</b> changing this setting will increase CPU utilization<br /><br />
 	<input id="submit" name="submit" type="submit" onclick="return updatePref();" class="formbtn" value="Save Settings" />
 </form>
 </div>
diff --git a/usr/local/www/wizard.php b/usr/local/www/wizard.php
old mode 100755
new mode 100644
index f56d994558..586404a282
--- a/usr/local/www/wizard.php
+++ b/usr/local/www/wizard.php
@@ -308,7 +308,7 @@ function showchange() {
 
 <center>
 
-&nbsp;<br/>
+&nbsp;<br />
 
 <?php
 	if($title == "Reload in progress") {
@@ -647,7 +647,7 @@ function showchange() {
 
 				break;
 			case "submit":
-				echo "<td>&nbsp;<br/></td></tr>";
+				echo "<td>&nbsp;<br /></td></tr>";
 				echo "<tr><td colspan=\"2\" align=\"center\">";
 				echo "<input type='submit' name='" . $name . "' value=\"" . htmlspecialchars($field['name']) . "\" />\n";
 
@@ -772,7 +772,7 @@ function showchange() {
 		</td>
 	</tr>
 </table>
-<br/>&nbsp;
+<br />&nbsp;
 </div>
 </center>
 </form>
