diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
index 3e55cf665..555a13ced 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
@@ -84,7 +84,7 @@
             <Authentication VisibleName="Authentication" url="/diag_authentication.php"/>
             <Factory VisibleName="Factory Defaults" url="/diag_defaults.php"/>
             <Halt VisibleName="Halt System" url="/diag_halt.php"/>
-            <Reboot VisibleName="Reboot System" url="/diag_reboot.php"/>
+            <Reboot VisibleName="Reboot System" url="/reboot.php"/>
             <SmartStatus VisibleName="SMART Status" url="/diag_smart.php"/>
         </Diagnostics>
     </System>
diff --git a/src/www/diag_backup.php b/src/www/diag_backup.php
index 7c9ad093d..f35858ad0 100644
--- a/src/www/diag_backup.php
+++ b/src/www/diag_backup.php
@@ -710,13 +710,13 @@ function backuparea_change(obj) {
                                                                                           </thead>
                                                                                           <tbody>
                                                                                              <tr><td><?=gettext("Enable"); ?> </td> <td><input name="GDriveEnabled" class="formcheckbox" id="GDriveEnabled" type="checkbox" <?php if( $config['system']['remotebackup']['GDriveEnabled'] == "on" ) echo "checked";?> >  </td></tr>
-                                                                                             <tr><td><?=gettext("Email Address"); ?> </td><td><input name="GDriveEmail" class="formfld" size="20" value="<? echo $config['system']['remotebackup']['GDriveEmail'];?>" type="text"> </td> </tr>
-                                                                                             <tr><td><?=gettext("P12 key"); ?> <? if (isset($config['system']['remotebackup']['GDriveP12key'])) echo gettext("(replace)"); else echo gettext("(not loaded)"); ?> </td><td> <input name="GDriveP12file" class="formbtn" id="P12file" size="40" type="file"></td> </tr>
-                                                                                             <tr><td><?=gettext("Folder ID"); ?> </td><td> <input name="GDriveFolderID" class="formbtn" id="GDriveFolderID" value="<? echo $config['system']['remotebackup']['GDriveFolderID'];?>" size="40" type="text"></td> </tr>
-                                                                                             <tr><td><?=gettext("Backup Count"); ?> </td><td> <input name="GDriveBackupCount" class="formbtn" id="GDriveBackupCount" value="<? echo $config['system']['remotebackup']['GDriveBackupCount'];?>" size="40" type="text"></td> </tr>
+                                                                                             <tr><td><?=gettext("Email Address"); ?> </td><td><input name="GDriveEmail" class="formfld" size="20" value="<?= $config['system']['remotebackup']['GDriveEmail'] ?>" type="text"> </td> </tr>
+                                                                                             <tr><td><?=gettext("P12 key"); ?> <?php if (isset($config['system']['remotebackup']['GDriveP12key'])) echo gettext("(replace)"); else echo gettext("(not loaded)"); ?> </td><td> <input name="GDriveP12file" class="formbtn" id="P12file" size="40" type="file"></td> </tr>
+                                                                                             <tr><td><?=gettext("Folder ID"); ?> </td><td> <input name="GDriveFolderID" class="formbtn" id="GDriveFolderID" value="<?= $config['system']['remotebackup']['GDriveFolderID'] ?>" size="40" type="text"></td> </tr>
+                                                                                             <tr><td><?=gettext("Backup Count"); ?> </td><td> <input name="GDriveBackupCount" class="formbtn" id="GDriveBackupCount" value="<?= $config['system']['remotebackup']['GDriveBackupCount'] ?>" size="40" type="text"></td> </tr>
                                                                                              <tr><td colspan=2><?=gettext("Password protect your data"); ?> :</td></tr>
-                                                                                             <tr><td><?=gettext("Password :"); ?></td> <td> <input name="GDrivePassword" type="password" class="formfld pwd" size="20" value="<? echo $config['system']['remotebackup']['GDrivePassword'] ;?>" /> </td></tr>
-                                                                                             <tr><td><?=gettext("Confirm :"); ?></td> <td> <input name="GDrivePasswordConfirm" type="password" class="formfld pwd" size="20" value="<? echo $config['system']['remotebackup']['GDrivePassword'] ;?>" /> </td></tr>
+                                                                                             <tr><td><?=gettext("Password :"); ?></td> <td> <input name="GDrivePassword" type="password" class="formfld pwd" size="20" value="<?= $config['system']['remotebackup']['GDrivePassword'] ?>" /> </td></tr>
+                                                                                             <tr><td><?=gettext("Confirm :"); ?></td> <td> <input name="GDrivePasswordConfirm" type="password" class="formfld pwd" size="20" value="<?= $config['system']['remotebackup']['GDrivePassword'] ?>" /> </td></tr>
                                                                                              <tr><td><input name="Submit" class="btn btn-primary" id="Gdrive" value="<?=gettext("Setup/Test Google Drive");?>" type="submit"></td><td></td></tr>
                                                                                           </tbody>
                                                                                     </table>
diff --git a/src/www/diag_confbak.php b/src/www/diag_confbak.php
index 5ce3ede9a..483d04a94 100644
--- a/src/www/diag_confbak.php
+++ b/src/www/diag_confbak.php
@@ -146,39 +146,39 @@ include("head.inc");
 			    <section class="col-xs-12">
 					    <div class="container-fluid tab-content">
 							<div class="tab-pane active" id="system">
-									<?PHP if ($_GET["newver"] || $_GET["rmver"]): ?>
+									<?php if ($_GET["newver"] || $_GET["rmver"]): ?>
 									<form action="<?=explode("?", $_SERVER['REQUEST_URI'])[0];?>" method="post">
 									<section>
 				                        <div class="content-box">
 
 				                            <header class="content-box-head container-fluid">
-									        <h3><?PHP echo gettext("Confirm Action"); ?></h3>
+									        <h3><?= gettext('Confirm Action') ?></h3>
 									    </header>
 
 									    <div class="content-box-main col-xs-12">
 
-										    <strong><?PHP echo gettext("Please confirm the selected action"); ?></strong>:
+										    <strong><?= gettext('Please confirm the selected action') ?></strong>:
 												<br />
-												<br /><strong><?PHP echo gettext("Action"); ?>:</strong>
-											<?PHP	if (!empty($_GET["newver"])) {
+												<br /><strong><?= gettext('Action') ?>:</strong>
+											<?php if (!empty($_GET["newver"])) {
 												echo gettext("Restore from Configuration Backup");
 												$target_config = $_GET["newver"]; ?>
-												<input type="hidden" name="newver" value="<?PHP echo htmlspecialchars($_GET["newver"]); ?>" />
-											<?PHP	} elseif (!empty($_GET["rmver"])) {
+												<input type="hidden" name="newver" value="<?= htmlspecialchars($_GET['newver']) ?>" />
+											<?php } elseif (!empty($_GET["rmver"])) {
 												echo gettext("Remove Configuration Backup");
 												$target_config = $_GET["rmver"]; ?>
-												<input type="hidden" name="rmver" value="<?PHP echo htmlspecialchars($_GET["rmver"]); ?>" />
-											<?PHP	} ?>
-												<br /><strong><?PHP echo gettext("Target Configuration"); ?>:</strong>
-												<?PHP echo sprintf(gettext('Timestamp %1$s'), date(gettext("n/j/y H:i:s"), $target_config)); ?>
-												<br /><input type="submit" name="confirm" class="btn btn-primary" value="<?PHP echo gettext("Confirm"); ?>" />
+												<input type="hidden" name="rmver" value="<?= htmlspecialchars($_GET['rmver']) ?>" />
+											<?php } ?>
+												<br /><strong><?= gettext('Target Configuration') ?>:</strong>
+												<?= sprintf(gettext('Timestamp %1$s'), date(gettext('n/j/y H:i:s'), $target_config)) ?>
+												<br /><input type="submit" name="confirm" class="btn btn-primary" value="<?= gettext('Confirm') ?>" />
 
 									    </div>
 				                        </div>
 									</section>
 									</form>
 
-									<? else: ?>
+									<?php else: ?>
 
 									<form action="<?=$_SERVER['REQUEST_URI'];?>" method="post">
 									<section style="margin-bottom:15px;">
@@ -325,7 +325,7 @@ include("head.inc");
 										</div>
 									</section>
 									</form>
-									<? endif; endif; ?>
+									<?php endif; endif; ?>
 					</div>
 				</section>
 			</div>
diff --git a/src/www/diag_dns.php b/src/www/diag_dns.php
index bbc098aa3..d8ea4628c 100644
--- a/src/www/diag_dns.php
+++ b/src/www/diag_dns.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
 	Copyright (C) 2014 Deciso B.V.
 	Copyright (C) 2009 Jim Pingle (jpingle@gmail.com)
@@ -205,8 +206,8 @@ include("head.inc"); ?>
 											  ?>
 							          </td>
 							          <td>
-								      <? if($found > 0): ?>
-											  <?PHP	if($alias_exists): ?>
+								      <?php if($found > 0): ?>
+											  <?php	if($alias_exists): ?>
 												<?= sprintf(gettext('An alias already exists for the hostname %s.'), htmlspecialchars($host)) ?>. <br />
 												<input type="hidden" name="override" value="true"/>
 												<input type="submit" class="btn btn-default" name="create_alias" value="Overwrite Alias"/>
@@ -215,11 +216,11 @@ include("head.inc"); ?>
 												<input type="submit" class="btn btn-default" name="create_alias" value="Create Alias"/>
 											  <?php else: ?>
 											   <?= sprintf(gettext('Alias created with name %s.'), htmlspecialchars($newalias['name'])) ?>
-											  <? endif; endif; endif; ?>
+											  <?php endif; endif; endif; ?>
 											  </td>
-							          <? else: ?>
+							          <?php else: ?>
 							          <td></td><td></td>
-							          <? endif; ?>
+							          <?php endif; ?>
 							        </tr>
 							        <?php if (!empty($_POST)): ?>
 							        <tr>
diff --git a/src/www/diag_logs_pills.inc b/src/www/diag_logs_pills.inc
index b51c22515..fd18d0a5a 100644
--- a/src/www/diag_logs_pills.inc
+++ b/src/www/diag_logs_pills.inc
@@ -42,7 +42,7 @@ if ($tab_group == 'vpn') {
 }
 
 ?><ul class="nav nav-pills" role="tablist">
-<? foreach ($tab_array as $tab): ?>
-	<li role="presentation" <? if (str_replace('amp;','', $tab[2]) == $_SERVER['REQUEST_URI']):?>class="active"<? endif; ?>><a href="<?=$tab[2];?>"><?=$tab[0];?></a></li>
-<? endforeach; ?>
+<?php foreach ($tab_array as $tab): ?>
+	<li role="presentation" <?php if (str_replace('amp;','', $tab[2]) == $_SERVER['REQUEST_URI']):?>class="active"<?php endif; ?>><a href="<?=$tab[2];?>"><?=$tab[0];?></a></li>
+<?php endforeach; ?>
 </ul>
diff --git a/src/www/diag_logs_vpn.php b/src/www/diag_logs_vpn.php
index e76122f7b..79b8cf08f 100644
--- a/src/www/diag_logs_vpn.php
+++ b/src/www/diag_logs_vpn.php
@@ -124,7 +124,7 @@ include("head.inc");
 
 							 <div class="table-responsive">
 								<table class="table table-striped table-sort">
-									<tr><td colspan="4"><? $tab_group = 'vpn'; include('diag_logs_pills.inc'); ?></td></tr>
+									<tr><td colspan="4"><?php $tab_group = 'vpn'; include('diag_logs_pills.inc'); ?></td></tr>
 									 <?php if ($mode != "raw"): ?>
 										<tr>
 											<td class="listhdrr"><?=gettext("Time");?></td>
diff --git a/src/www/diag_packet_capture.php b/src/www/diag_packet_capture.php
index f5c2a7f0c..ce8e85f60 100644
--- a/src/www/diag_packet_capture.php
+++ b/src/www/diag_packet_capture.php
@@ -445,7 +445,7 @@ if (!empty($title)): ?>
 	                <header class="content-box-head container-fluid">
 				        <h3><?=$title; ?></h3>
 				    </header>
-				    <? if (!empty($show_data)): ?>
+				    <?php if (!empty($show_data)): ?>
 				    <div class="content-box-main col-xs-12">
 
 						<script type="text/javascript">
@@ -479,11 +479,11 @@ if (!empty($title)): ?>
 
 
 			</div>
-			<? endif; ?>
+			<?php endif; ?>
                 </div>
 			</section>
 
-<? endif; ?>
+<?php endif; ?>
 		</div>
 
 	</div>
diff --git a/src/www/diag_ping.php b/src/www/diag_ping.php
index 984995152..a199ef05e 100644
--- a/src/www/diag_ping.php
+++ b/src/www/diag_ping.php
@@ -185,7 +185,7 @@ include("head.inc"); ?>
 					</div>
 				</div>
 			</section>
-			<? endif; ?>
+			<?php endif; ?>
 		</div>
 	</div>
 </section>
diff --git a/src/www/diag_reboot.php b/src/www/diag_reboot.php
deleted file mode 100644
index b24a9bc8f..000000000
--- a/src/www/diag_reboot.php
+++ /dev/null
@@ -1 +0,0 @@
-<? include("reboot.php"); ?>
diff --git a/src/www/diag_testport.php b/src/www/diag_testport.php
index 7ae3658f7..25bb52ecb 100644
--- a/src/www/diag_testport.php
+++ b/src/www/diag_testport.php
@@ -284,7 +284,7 @@ include("head.inc"); ?>
 					</div>
 				</div>
 			</section>
-			<? endif; ?>
+			<?php endif; ?>
 		</div>
 	</div>
 </section>
diff --git a/src/www/diag_traceroute.php b/src/www/diag_traceroute.php
index 9d4deb94e..fd9f4a56f 100644
--- a/src/www/diag_traceroute.php
+++ b/src/www/diag_traceroute.php
@@ -210,7 +210,7 @@ if (!isset($do_traceroute)) {
 					</div>
 				</div>
 			</section>
-			<? endif; ?>
+			<?php endif; ?>
 		</div>
 	</div>
 </section>
diff --git a/src/www/fbegin.inc b/src/www/fbegin.inc
index 7295239e8..3d53ab1c5 100644
--- a/src/www/fbegin.inc
+++ b/src/www/fbegin.inc
@@ -246,17 +246,17 @@ if($need_alert_display == true) {
 
 						?>
 
-						<? if (!empty($main_buttons)): foreach ($main_buttons as $button): ?>
+						<?php if (!empty($main_buttons)): foreach ($main_buttons as $button): ?>
 							<a href="<?=$button['href'];?>" class="btn btn-primary"><span class="glyphicon glyphicon-plus-sign __iconspacer"></span><?=$button['label'];?></a>
-						<? endforeach; endif; ?>
+						<?php endforeach; endif; ?>
 
-						<? if (isset($widgetfiles)): ?>
+						<?php if (isset($widgetfiles)): ?>
 
 
 							<a href="#" id="updatepref" style="display:none" onclick="return updatePref();" class="btn btn-primary"><?=gettext("Save Settings");?></a>
 
 							<button type="button" class="btn btn-default" data-toggle="modal" data-target="#modal_widgets"><span class="glyphicon glyphicon-plus-sign __iconspacer"></span><?= gettext('Add widget') ?></button>
-						<? endif; ?>
+						<?php endif; ?>
 					</li>
 				</ul>
 			    </form>
diff --git a/src/www/firewall_nat.php b/src/www/firewall_nat.php
index cdbb450c0..eb46df053 100644
--- a/src/www/firewall_nat.php
+++ b/src/www/firewall_nat.php
@@ -304,12 +304,12 @@ $( document ).ready(function() {
 <?php                     if (!empty($natent['associated-rule-id'])): ?>
 <?php                     if(isset($natent['disabled'])):?>
                           <span class="glyphicon glyphicon-resize-horizontal text-muted"></span>
-<?                        else:?>
+<?php                        else:?>
                           <span class="glyphicon glyphicon-resize-horizontal text-success"></span>
 <?php                     endif; ?>
-<?                        elseif(isset($natent['disabled'])):?>
+<?php                        elseif(isset($natent['disabled'])):?>
                           <span class="glyphicon glyphicon-play text-muted"></span>
-<?                        else:?>
+<?php                        else:?>
                           <span class="glyphicon glyphicon-play text-success"></span>
 <?php                     endif; ?>
                         </a>
diff --git a/src/www/firewall_nat_npt.php b/src/www/firewall_nat_npt.php
index d87b14648..edc618cf6 100644
--- a/src/www/firewall_nat_npt.php
+++ b/src/www/firewall_nat_npt.php
@@ -214,7 +214,7 @@ $main_buttons = array(
                         <a href="#" class="act_toggle" id="toggle_<?=$i;?>" data-toggle="tooltip" data-placement="left" title="<?=gettext("click to toggle enabled/disabled status");?>">
 <?php                     if(isset($natent['disabled'])):?>
                           <span class="glyphicon glyphicon-play text-muted"></span>
-<?                        else:?>
+<?php                        else:?>
                           <span class="glyphicon glyphicon-play text-success"></span>
 <?php                     endif; ?>
                         </a>
diff --git a/src/www/firewall_nat_out_edit.php b/src/www/firewall_nat_out_edit.php
index eea3a0907..0346f4493 100644
--- a/src/www/firewall_nat_out_edit.php
+++ b/src/www/firewall_nat_out_edit.php
@@ -572,13 +572,11 @@ include("head.inc");
                             <select name="targetip" id="targetip" class="selectpicker" data-live-search="true" data-size="5" data-width="auto">
                                 <option data-other=true value="" <?= empty($pconfig['targetip']) ? "selected=\"selected\"" : "";?> > <?=gettext("Interface address");?> </option>
                                 <option data-other=true value="<?=$pconfig['targetip'];?>" <?= !empty($pconfig['target']) && !array_key_exists($pconfig['targetip'], formTranslateAddresses() ) ? "selected=\"selected\"" : "";?>><?=gettext("Single host or Network"); ?></option>
-<?                              foreach (formTranslateAddresses() as $optKey => $optValue):
-?>
+<?php                              foreach (formTranslateAddresses() as $optKey => $optValue): ?>
                                     <option value="<?=$optKey;?>" <?= $pconfig['target'] == $optKey ? "selected=\"selected\"" : ""; ?>>
                                       <?=$optValue;?>
                                     </option>
-<?                              endforeach;
-?>
+<?php                              endforeach; ?>
                             </select>
                           </td>
                         </tr>
diff --git a/src/www/head.inc b/src/www/head.inc
index 351a140dd..cbf77f72a 100644
--- a/src/www/head.inc
+++ b/src/www/head.inc
@@ -160,7 +160,7 @@ $pagetitle = gentitle( $pgtitle );
 		//]]>
 		</script>
 
-		<? endif; ?>
+		<?php endif; ?>
 
 
-<?php if (!isset($closehead) || !$closehead):?></head><? endif;?>
+<?php if (!isset($closehead) || !$closehead):?></head><?php endif;?>
diff --git a/src/www/interfaces_gif_edit.php b/src/www/interfaces_gif_edit.php
index 1b32878ca..7da42f9ab 100644
--- a/src/www/interfaces_gif_edit.php
+++ b/src/www/interfaces_gif_edit.php
@@ -223,14 +223,14 @@ include("head.inc");
 										<tr>
 						                  <td valign="top" class="vncell"><?=gettext("Route caching  "); ?></td>
 						                  <td class="vtable">
-						                    <input name="link0" type="checkbox" id="link0" <?if ($pconfig['link0']) echo "checked=\"checked\"";?> />
+						                    <input name="link0" type="checkbox" id="link0" <?php if ($pconfig['link0']) echo "checked=\"checked\"";?> />
 						                    <br />
 						                    <span class="vexpl"><?=gettext("Specify if route caching can be enabled. Be careful with these settings on dynamic networks. "); ?></span></td>
 									    </tr>
 										<tr>
 						                  <td valign="top" class="vncell"><?=gettext("ECN friendly behavior"); ?></td>
 						                  <td class="vtable">
-						                    <input name="link1" type="checkbox" id="link1" <?if ($pconfig['link1']) echo "checked=\"checked\"";?> />
+						                    <input name="link1" type="checkbox" id="link1" <?php if ($pconfig['link1']) echo "checked=\"checked\"";?> />
 						                    <br />
 						                    <span class="vexpl">
 						     <?=gettext("Note that the ECN friendly behavior violates RFC2893.  This should be " .
diff --git a/src/www/interfaces_gre_edit.php b/src/www/interfaces_gre_edit.php
index bbbc6c4c6..de3bed575 100644
--- a/src/www/interfaces_gre_edit.php
+++ b/src/www/interfaces_gre_edit.php
@@ -218,14 +218,14 @@ include("head.inc");
 										<tr>
 						                  <td valign="top" class="vncell"><?=gettext("Mobile tunnel");?></td>
 						                  <td class="vtable">
-						                    <input name="link0" type="checkbox" id="link0" <?if ($pconfig['link0']) echo "checked=\"checked\"";?> />
+						                    <input name="link0" type="checkbox" id="link0" <?php if ($pconfig['link0']) echo "checked=\"checked\"";?> />
 						                    <br />
 						                    <span class="vexpl"><?=gettext("Specify which encapsulation method the tunnel should use. ");?></span></td>
 									    </tr>
 										<tr>
 						                  <td valign="top" class="vncell"><?=gettext("Route search type");?></td>
 						                  <td class="vtable">
-						                    <input name="link1" type="checkbox" id="link1" <?if ($pconfig['link1']) echo "checked=\"checked\"";?> />
+						                    <input name="link1" type="checkbox" id="link1" <?php if ($pconfig['link1']) echo "checked=\"checked\"";?> />
 						                    <br />
 						                    <span class="vexpl">
 						     <?=gettext("For correct operation, the GRE device needs a route to the destination".
@@ -237,7 +237,7 @@ include("head.inc");
 										<tr>
 						                  <td valign="top" class="vncell"><?=gettext("WCCP version");?></td>
 						                  <td class="vtable">
-						                    <input name="link2" type="checkbox" id="link2" <?if ($pconfig['link2']) echo "checked=\"checked\"";?> />
+						                    <input name="link2" type="checkbox" id="link2" <?php if ($pconfig['link2']) echo "checked=\"checked\"";?> />
 						                    <br />
 						                    <span class="vexpl"><?=gettext("Check this box for WCCP encapsulation version 2, or leave unchecked for version 1.");?></span></td>
 									    </tr>
diff --git a/src/www/interfaces_groups_edit.php b/src/www/interfaces_groups_edit.php
index 557e0812d..48bd75c5b 100644
--- a/src/www/interfaces_groups_edit.php
+++ b/src/www/interfaces_groups_edit.php
@@ -324,8 +324,8 @@ function removeRow(el) {
 												</a>
 									      </a>
 											<br /><br />
-											<strong><?PHP echo gettext("NOTE:");?></strong>
-											<?PHP echo gettext("Rules for WAN type interfaces in groups do not contain the reply-to mechanism upon which Multi-WAN typically relies.");?>
+											<strong><?= gettext('NOTE:') ?></strong>
+											<?= gettext('Rules for WAN type interfaces in groups do not contain the reply-to mechanism upon which Multi-WAN typically relies.') ?>
 											</td>
 									  </tr>
 									  <tr>
diff --git a/src/www/load_balancer_monitor_edit.php b/src/www/load_balancer_monitor_edit.php
index 9fa286c5d..7824f1341 100644
--- a/src/www/load_balancer_monitor_edit.php
+++ b/src/www/load_balancer_monitor_edit.php
@@ -303,13 +303,13 @@ $types = array("icmp" => gettext("ICMP"), "tcp" => gettext("TCP"), "http" => get
 									<tr align="left">
 										<td width="22%" valign="top" class="vncellreq"><?=gettext("Name"); ?></td>
 										<td width="78%" class="vtable" colspan="2">
-											<input name="name" type="text" <?if(isset($pconfig['name'])) echo "value=\"" . htmlspecialchars($pconfig['name']) . "\"";?> size="16" maxlength="16" />
+											<input name="name" type="text" <?php if(isset($pconfig['name'])) echo "value=\"" . htmlspecialchars($pconfig['name']) . "\"";?> size="16" maxlength="16" />
 										</td>
 									</tr>
 									<tr align="left">
 										<td width="22%" valign="top" class="vncellreq"><?=gettext("Description"); ?></td>
 										<td width="78%" class="vtable" colspan="2">
-											<input name="descr" type="text" <?if(isset($pconfig['descr'])) echo "value=\"" . htmlspecialchars($pconfig['descr']) . "\"";?> size="64" />
+											<input name="descr" type="text" <?php if(isset($pconfig['descr'])) echo "value=\"" . htmlspecialchars($pconfig['descr']) . "\"";?> size="64" />
 										</td>
 									</tr>
 									<tr align="left">
@@ -340,13 +340,13 @@ $types = array("icmp" => gettext("ICMP"), "tcp" => gettext("TCP"), "http" => get
 												<tr align="left">
 													<td valign="top" align="right" class="vtable"><?=gettext("Path"); ?></td>
 													<td class="vtable" colspan="2">
-														<input name="http_options_path" type="text" <?if(isset($pconfig['options']['path'])) echo "value=\"" . htmlspecialchars($pconfig['options']['path']) . "\"";?> size="64" />
+														<input name="http_options_path" type="text" <?php if(isset($pconfig['options']['path'])) echo "value=\"" . htmlspecialchars($pconfig['options']['path']) . "\"";?> size="64" />
 													</td>
 												</tr>
 												<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" <?php if(isset($pconfig['options']['host'])) echo "value=\"" . htmlspecialchars($pconfig['options']['host']) . "\"";?> size="64" /><br /><?=gettext("Hostname for Host: header if needed."); ?>
 													</td>
 												</tr>
 												<tr align="left">
@@ -359,7 +359,7 @@ $types = array("icmp" => gettext("ICMP"), "tcp" => gettext("TCP"), "http" => get
 												<tr align="left">
 													<td width="22%" valign="top" class="vncell">MD5 Page Digest</td>
 													<td width="78%" class="vtable" colspan="2">
-														<input name="digest" type="text" <?if(isset($pconfig['digest'])) echo "value=\"" . htmlspecialchars($pconfig['digest']) . "\"";?>size="32"><br /><b>TODO: add fetch functionality here</b>
+														<input name="digest" type="text" <?php if(isset($pconfig['digest'])) echo "value=\"" . htmlspecialchars($pconfig['digest']) . "\"";?>size="32"><br /><b>TODO: add fetch functionality here</b>
 													</td>
 												</tr>
 							-->
@@ -373,13 +373,13 @@ $types = array("icmp" => gettext("ICMP"), "tcp" => gettext("TCP"), "http" => get
 												<tr align="left">
 													<td valign="top"  align="right" class="vtable"><?=gettext("Path"); ?></td>
 													<td class="vtable" colspan="2">
-														<input name="https_options_path" type="text" <?if(isset($pconfig['options']['path'])) echo "value=\"" . htmlspecialchars($pconfig['options']['path']) ."\"";?> size="64" />
+														<input name="https_options_path" type="text" <?php if(isset($pconfig['options']['path'])) echo "value=\"" . htmlspecialchars($pconfig['options']['path']) ."\"";?> size="64" />
 													</td>
 												</tr>
 												<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" <?php if(isset($pconfig['options']['host'])) echo "value=\"" . htmlspecialchars($pconfig['options']['host']) . "\"";?> size="64" /><br /><?=gettext("Hostname for Host: header if needed."); ?>
 													</td>
 												</tr>
 												<tr align="left">
@@ -393,7 +393,7 @@ $types = array("icmp" => gettext("ICMP"), "tcp" => gettext("TCP"), "http" => get
 												<tr align="left">
 													<td width="22%" valign="top" class="vncellreq">MD5 Page Digest</td>
 													<td width="78%" class="vtable" colspan="2">
-														<input name="digest" type="text" <?if(isset($pconfig['digest'])) echo "value=\"" . htmlspecialchars($pconfig['digest']) . "\"";?>size="32"><br /><b>TODO: add fetch functionality here</b>
+														<input name="digest" type="text" <?php if(isset($pconfig['digest'])) echo "value=\"" . htmlspecialchars($pconfig['digest']) . "\"";?>size="32"><br /><b>TODO: add fetch functionality here</b>
 													</td>
 												</tr>
 							-->
@@ -407,13 +407,13 @@ $types = array("icmp" => gettext("ICMP"), "tcp" => gettext("TCP"), "http" => get
 												<tr align="left">
 													<td valign="top"  align="right" class="vtable"><?=gettext("Send string"); ?></td>
 													<td class="vtable" colspan="2">
-														<input name="send_options_send" type="text" <?if(isset($pconfig['options']['send'])) echo "value=\"" . htmlspecialchars($pconfig['options']['send']) . "\"";?> size="64" />
+														<input name="send_options_send" type="text" <?php if(isset($pconfig['options']['send'])) echo "value=\"" . htmlspecialchars($pconfig['options']['send']) . "\"";?> size="64" />
 													</td>
 												</tr>
 												<tr align="left">
 													<td valign="top" align="right"  class="vtable"><?=gettext("Expect string"); ?></td>
 													<td class="vtable" colspan="2">
-														<input name="send_options_expect" type="text" <?if(isset($pconfig['options']['expect'])) echo "value=\"" . htmlspecialchars($pconfig['options']['expect']) . "\"";?> size="64" />
+														<input name="send_options_expect" type="text" <?php if(isset($pconfig['options']['expect'])) echo "value=\"" . htmlspecialchars($pconfig['options']['expect']) . "\"";?> size="64" />
 													</td>
 												</tr>
 											</table>
diff --git a/src/www/load_balancer_pool_edit.php b/src/www/load_balancer_pool_edit.php
index 62b211dfc..e7f33efc5 100644
--- a/src/www/load_balancer_pool_edit.php
+++ b/src/www/load_balancer_pool_edit.php
@@ -192,29 +192,29 @@ include("head.inc");
 									<tr align="left">
 										<td width="22%" valign="top" class="vncellreq"><?=gettext("Name"); ?></td>
 										<td width="78%" class="vtable" colspan="2">
-											<input name="name" type="text" <?if(isset($pconfig['name'])) echo "value=\"{$pconfig['name']}\"";?> size="16" maxlength="16" />
+											<input name="name" type="text" <?php if(isset($pconfig['name'])) echo "value=\"{$pconfig['name']}\"";?> size="16" maxlength="16" />
 										</td>
 									</tr>
 									<tr align="left">
 										<td width="22%" valign="top" class="vncellreq"><?=gettext("Mode"); ?></td>
 										<td width="78%" class="vtable" colspan="2">
 											<select id="mode" name="mode" onchange="enforceFailover(); checkPoolControls();">
-												<option value="loadbalance" <?if(!isset($pconfig['mode']) || ($pconfig['mode'] == "loadbalance")) echo "selected=\"selected\"";?>><?=gettext("Load Balance");?></option>
-												<option value="failover"  <?if($pconfig['mode'] == "failover") echo "selected=\"selected\"";?>><?=gettext("Manual Failover");?></option>
+												<option value="loadbalance" <?php if(!isset($pconfig['mode']) || ($pconfig['mode'] == "loadbalance")) echo "selected=\"selected\"";?>><?=gettext("Load Balance");?></option>
+												<option value="failover"  <?php if($pconfig['mode'] == "failover") echo "selected=\"selected\"";?>><?=gettext("Manual Failover");?></option>
 											</select>
 										</td>
 									</tr>
 									<tr align="left">
 										<td width="22%" valign="top" class="vncell"><?=gettext("Description"); ?></td>
 										<td width="78%" class="vtable" colspan="2">
-											<input name="descr" type="text" <?if(isset($pconfig['descr'])) echo "value=\"{$pconfig['descr']}\"";?> size="64" />
+											<input name="descr" type="text" <?php if(isset($pconfig['descr'])) echo "value=\"{$pconfig['descr']}\"";?> size="64" />
 										</td>
 									</tr>
 
 									<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" <?php 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."); ?>
@@ -230,7 +230,7 @@ include("head.inc");
 									<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" <?php 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>
diff --git a/src/www/load_balancer_relay_action_edit.php b/src/www/load_balancer_relay_action_edit.php
index c466cf108..a6e0c0298 100644
--- a/src/www/load_balancer_relay_action_edit.php
+++ b/src/www/load_balancer_relay_action_edit.php
@@ -404,13 +404,13 @@ jQuery(document).ready(function() {
 									<tr align="left" id="name">
 										<td width="22%" valign="top" class="vncellreq"><?=gettext("Name"); ?></td>
 										<td width="78%" class="vtable" colspan="2">
-											<input name="name" type="text" <?if(isset($pconfig['name'])) echo "value=\"{$pconfig['name']}\"";?> size="16" maxlength="16">
+											<input name="name" type="text" <?php if(isset($pconfig['name'])) echo "value=\"{$pconfig['name']}\"";?> size="16" maxlength="16">
 										</td>
 									</tr>
 									<tr align="left">
 										<td width="22%" valign="top" class="vncellreq"><?=gettext("Description"); ?></td>
 										<td width="78%" class="vtable" colspan="2">
-											<input name="descr" type="text" <?if(isset($pconfig['descr'])) echo "value=\"{$pconfig['descr']}\"";?>size="64">
+											<input name="descr" type="text" <?php if(isset($pconfig['descr'])) echo "value=\"{$pconfig['descr']}\"";?>size="64">
 										</td>
 									</tr>
 							<!-- Protocol -->
@@ -497,11 +497,11 @@ jQuery(document).ready(function() {
 											</select>
 							<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="input_action_value"><?=gettext("Value"); ?>&nbsp;<input id="option_action_value" name="option_action_value" type="text" <?php if(isset($pconfig['options']['value'])) echo "value=\"{$pconfig['options']['value']}\"";?>size="20"></div></td>
 							<td><div id="action_action_value"></div></td>
-							<td><div id="input_action_key"><?=gettext("Key"); ?>&nbsp;<input id="option_action_key" name="option_action_key" type="text" <?if(isset($pconfig['options']['akey'])) echo "value=\"{$pconfig['options']['akey']}\"";?>size="20"></div></td>
+							<td><div id="input_action_key"><?=gettext("Key"); ?>&nbsp;<input id="option_action_key" name="option_action_key" type="text" <?php if(isset($pconfig['options']['akey'])) echo "value=\"{$pconfig['options']['akey']}\"";?>size="20"></div></td>
 							<td><div id="action_action_id"></div></td>
-							<td><div id="input_action_id"><?=gettext("ID"); ?>&nbsp;<input id="option_action_id" name="option_action_id" type="text" <?if(isset($pconfig['options']['id'])) echo "value=\"{$pconfig['options']['id']}\"";?>size="20"></div></td>
+							<td><div id="input_action_id"><?=gettext("ID"); ?>&nbsp;<input id="option_action_id" name="option_action_id" type="text" <?php if(isset($pconfig['options']['id'])) echo "value=\"{$pconfig['options']['id']}\"";?>size="20"></div></td>
 							</tr></table>
 										</td>
 									</tr>
diff --git a/src/www/load_balancer_relay_protocol_edit.php b/src/www/load_balancer_relay_protocol_edit.php
index baf2cb989..3e06f6502 100644
--- a/src/www/load_balancer_relay_protocol_edit.php
+++ b/src/www/load_balancer_relay_protocol_edit.php
@@ -186,7 +186,7 @@ jQuery(document).ready(function(){
 									<tr align="left">
 										<td width="22%" valign="top" class="vncellreq"><?=gettext("Name"); ?></td>
 										<td width="78%" class="vtable" colspan="2">
-											<input name="name" type="text" <?if(isset($pconfig['name'])) echo "value=\"{$pconfig['name']}\"";?> size="16" maxlength="16">
+											<input name="name" type="text" <?php if(isset($pconfig['name'])) echo "value=\"{$pconfig['name']}\"";?> size="16" maxlength="16">
 										</td>
 									</tr>
 									<tr align="left">
@@ -209,7 +209,7 @@ jQuery(document).ready(function(){
 									<tr align="left">
 										<td width="22%" valign="top" class="vncellreq"><?=gettext("Description"); ?></td>
 										<td width="78%" class="vtable" colspan="2">
-											<input name="descr" type="text" <?if(isset($pconfig['descr'])) echo "value=\"{$pconfig['descr']}\"";?>size="64">
+											<input name="descr" type="text" <?php if(isset($pconfig['descr'])) echo "value=\"{$pconfig['descr']}\"";?>size="64">
 										</td>
 									</tr>
 									<tr>
diff --git a/src/www/load_balancer_virtual_server_edit.php b/src/www/load_balancer_virtual_server_edit.php
index 766c81ef6..3f4766a07 100644
--- a/src/www/load_balancer_virtual_server_edit.php
+++ b/src/www/load_balancer_virtual_server_edit.php
@@ -163,19 +163,19 @@ include("head.inc");
 					                <tr align="left">
 										<td width="22%" valign="top" class="vncellreq"><?=gettext("Name"); ?></td>
 					                  <td width="78%" class="vtable" colspan="2">
-					                    <input name="name" type="text" <?if(isset($pconfig['name'])) echo "value=\"" . htmlspecialchars($pconfig['name']) . "\"";?> size="32" maxlength="32" />
+					                    <input name="name" type="text" <?php if(isset($pconfig['name'])) echo "value=\"" . htmlspecialchars($pconfig['name']) . "\"";?> size="32" maxlength="32" />
 					                  </td>
 								</tr>
 					                <tr align="left">
 										<td width="22%" valign="top" class="vncell"><?=gettext("Description"); ?></td>
 					                  <td width="78%" class="vtable" colspan="2">
-					                    <input name="descr" type="text" <?if(isset($pconfig['descr'])) echo "value=\"" . htmlspecialchars($pconfig['descr']) . "\"";?> size="64" />
+					                    <input name="descr" type="text" <?php if(isset($pconfig['descr'])) echo "value=\"" . htmlspecialchars($pconfig['descr']) . "\"";?> size="64" />
 					                  </td>
 								</tr>
 					                <tr align="left">
 										<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" />
+					                    <input class="formfldalias" id="ipaddr" name="ipaddr" type="text" <?php 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."); ?>
 										<script type="text/javascript">
@@ -189,7 +189,7 @@ include("head.inc");
 					                <tr align="left">
 										<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" />
+					                    <input class="formfldalias" name="port" id="port" type="text" <?php 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."); ?>
diff --git a/src/www/services_dhcp.php b/src/www/services_dhcp.php
index 7a079fe26..7e6427ea6 100644
--- a/src/www/services_dhcp.php
+++ b/src/www/services_dhcp.php
@@ -1177,7 +1177,7 @@ include("head.inc");
 									</table>
 									<?php endif; ?>
 								</div>
-								<? endif; ?>
+								<?php endif; ?>
 		                        </form>
 
 						</div>
diff --git a/src/www/services_dhcp_relay.php b/src/www/services_dhcp_relay.php
index 491a87c89..f47ae901c 100644
--- a/src/www/services_dhcp_relay.php
+++ b/src/www/services_dhcp_relay.php
@@ -138,7 +138,7 @@ function enable_change(enable_over) {
 
 				<?php if ($dhcpd_enabled): ?>
 								<p>DHCP Server is currently enabled. Cannot enable the DHCP Relay service while the DHCP Server is enabled on any interface.</p>
-							<? else: ?>
+							<?php else: ?>
 
 							<header class="content-box-head container-fluid">
 					        <h3><?=gettext("DHCP Relay configuration"); ?></h3>
@@ -196,7 +196,7 @@ function enable_change(enable_over) {
 								</table>
 						  </div>
 					    </div>
-					    <? endif; ?>
+					    <?php endif; ?>
                         </form>
 				</div>
 			    </section>
diff --git a/src/www/services_dhcpv6.php b/src/www/services_dhcpv6.php
index ca9ebfc27..f7cbc88f3 100644
--- a/src/www/services_dhcpv6.php
+++ b/src/www/services_dhcpv6.php
@@ -509,11 +509,11 @@ include("head.inc");
 
 							<?php if ($dhcrelay_enabled): ?>
 								<p>DHCP Relay is currently enabled. Cannot enable the DHCP Server service while the DHCP Relay is enabled on any interface.</p>
-							<? else: ?>
+							<?php else: ?>
 
-						    <!--<ul class="nav nav-pills" role="tablist"><? foreach ($tab_array as $tab): ?>
-									<li role="presentation" <? if ($tab[1]):?>class="active"<? endif; ?>><a href="<?=$tab[2];?>"><?=$tab[0];?></a></li>
-								<? endforeach; ?></ul><br />-->
+						    <!--<ul class="nav nav-pills" role="tablist"><?php foreach ($tab_array as $tab): ?>
+									<li role="presentation" <?php if ($tab[1]):?>class="active"<?php endif; ?>><a href="<?=$tab[2];?>"><?=$tab[0];?></a></li>
+								<?php endforeach; ?></ul><br />-->
 
 						    <div class="table-responsive">
 									<table class="table table-striped table-sort">
@@ -887,7 +887,7 @@ include("head.inc");
 										</tr>
 										</table>
 									</div>
-					    <? endif; ?>
+					    <?php endif; ?>
                         </form>
 				</div>
 			    </section>
diff --git a/src/www/services_dhcpv6_relay.php b/src/www/services_dhcpv6_relay.php
index 4d103209e..742b6755a 100644
--- a/src/www/services_dhcpv6_relay.php
+++ b/src/www/services_dhcpv6_relay.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
 	Copyright (C) 2014-2015 Deciso B.V.
 	Copyright (C) 2003-2004 Justin Ellison <justin@techadvise.com>.
@@ -133,7 +134,7 @@ function enable_change(enable_over) {
 
 				<?php if ($dhcpd_enabled): ?>
 								<p>DHCPv6 Server is currently enabled.  Cannot enable the DHCPv6 Relay service while the DHCPv6 Server is enabled on any interface.</p>
-							<? else: ?>
+							<?php else: ?>
 
 							<header class="content-box-head container-fluid">
 					        <h3><?=gettext("DHCPv6 Relay configuration"); ?></h3>
@@ -192,7 +193,7 @@ function enable_change(enable_over) {
 								</table>
 								</div>
 					    </div>
-					    <? endif; ?>
+					    <?php endif; ?>
                         </form>
 				</div>
 			    </section>