diff --git a/usr/local/www/services_rfc2136.php b/usr/local/www/services_rfc2136.php
index 4a6c060779..fb38005dde 100644
--- a/usr/local/www/services_rfc2136.php
+++ b/usr/local/www/services_rfc2136.php
@@ -60,7 +60,7 @@ include("head.inc");
 <?php include("fbegin.inc"); ?>
 <form action="services_rfc2136.php" method="post" name="iform" id="iform">
 <?php if ($input_errors) print_input_errors($input_errors); ?>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
+<table width="100%" border="0" cellpadding="0" cellspacing="0" summary="rfc2136">
   <tr>
 	<td>
 <?php
@@ -74,7 +74,7 @@ include("head.inc");
   <tr>
 	<td>
 	  <div id="mainarea">
-	  <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
+	  <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0" summary="main area">
 		<tr>
 		  <td width="5%"  class="listhdrr"><?=gettext("If");?></td>
 		  <td width="15%" class="listhdrr"><?=gettext("Server");?></td>
@@ -102,7 +102,7 @@ include("head.inc");
 		  <td class="listr">
 		  <?php
 			if (!isset($rfc2136['enable']))
-				echo "<span class=\"gray\">".htmlspecialchars($rfc2136['server'])."</span>";
+				echo "<span class=\"gray\">" . htmlspecialchars($rfc2136['server']) . "</span>";
 			else
 				echo htmlspecialchars($rfc2136['server']);
 		  ?>
@@ -110,7 +110,7 @@ include("head.inc");
 		  <td class="listr">
 		  <?php
 			if (!isset($rfc2136['enable']))
-				echo "<span class=\"gray\">".htmlspecialchars($rfc2136['host'])."</span>";
+				echo "<span class=\"gray\">" . htmlspecialchars($rfc2136['host']) . "</span>";
 			else
 				echo htmlspecialchars($rfc2136['host']);
 		  ?>
@@ -155,20 +155,20 @@ include("head.inc");
 		  <td class="listbg">
 		  <?php
 			if (!isset($rfc2136['enable']))
-				echo "<span class=\"gray\">".htmlspecialchars($rfc2136['descr'])."</span>";
+				echo "<span class=\"gray\">" . htmlspecialchars($rfc2136['descr']) . "</span>";
 			else
 				echo htmlspecialchars($rfc2136['descr']);
 		  ?>
 		  </td>
-		  <td valign="middle" nowrap class="list">
-			<a href="services_rfc2136_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0"></a>
-			&nbsp;<a href="services_rfc2136.php?act=del&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this client?");?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a>
+		  <td valign="middle" class="list nowrap">
+			<a href="services_rfc2136_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" alt="edit" /></a>
+			&nbsp;<a href="services_rfc2136.php?act=del&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this client?");?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="delete" /></a>
 		  </td>
 		</tr>
 		<?php $i++; endforeach; ?>
 		<tr>
 		  <td class="list" colspan="5">&nbsp;</td>
-		  <td class="list"> <a href="services_rfc2136_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td>
+		  <td class="list"><a href="services_rfc2136_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="add" /></a></td>
 		</tr>
 		<tr>
 		  <td colspan="3" class="list">
@@ -184,4 +184,4 @@ include("head.inc");
 </form>
 <?php include("fend.inc"); ?>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/usr/local/www/services_rfc2136_edit.php b/usr/local/www/services_rfc2136_edit.php
index 95cf6c7945..6489cf6dc7 100644
--- a/usr/local/www/services_rfc2136_edit.php
+++ b/usr/local/www/services_rfc2136_edit.php
@@ -122,10 +122,10 @@ include("head.inc");
 <?php if ($input_errors) print_input_errors($input_errors); ?>
 <?php if ($savemsg) print_info_box($savemsg); ?>
             <form action="services_rfc2136_edit.php" method="post" name="iform" id="iform">
-              <table width="100%" border="0" cellpadding="6" cellspacing="0">
+              <table width="100%" border="0" cellpadding="6" cellspacing="0" summary="rfs2136 edit">
 			  	<tr>
                   <td colspan="2" valign="top" class="optsect_t">
-				  <table border="0" cellspacing="0" cellpadding="0" width="100%">
+				  <table border="0" cellspacing="0" cellpadding="0" width="100%" summary="title">
 				  	<tr><td class="optsect_s"><strong><?=gettext("RFC 2136 client");?></strong></td></tr>
 				  </table>
 				  </td>
@@ -133,7 +133,7 @@ include("head.inc");
                 <tr>
                   <td width="22%" valign="top" class="vncellreq"><?=gettext("Enable");?></td>
 				  <td width="78%" class="vtable">
-				    <input name="enable" type="checkbox" id="enable" value="yes" <?php if ($pconfig['enable']) echo "checked"; ?>>
+				    <input name="enable" type="checkbox" id="enable" value="yes" <?php if ($pconfig['enable']) echo "checked=\"checked\""; ?> />
 				  </td>
                 </tr>
 				<tr>
@@ -142,79 +142,79 @@ include("head.inc");
 				   <select name="interface" class="formselect" id="interface">
 				   <?php $iflist = get_configured_interface_with_descr();
 				   		foreach ($iflist as $if => $ifdesc):?>
-							<option value="<?=$if;?>" <?php if ($pconfig['interface'] == $if) echo "selected";?>><?=$ifdesc;?></option>
+							<option value="<?=$if;?>" <?php if ($pconfig['interface'] == $if) echo "selected=\"selected\"";?>><?=$ifdesc;?></option>
 					<?php endforeach; ?>
 					</select>
 					</td>
-					</td>
 				</tr>	
                 <tr>
                   <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']);?>">
+                    <input name="host" type="text" class="formfld unknown" id="host" size="30" value="<?=htmlspecialchars($pconfig['host']);?>" />
 			<br /><span>Fully qualified hostname of the host to be updated</span>
                   </td>
 				</tr>
                 <tr>
                   <td valign="top" class="vncellreq"><?=gettext("TTL"); ?></td>
                   <td class="vtable">
-                    <input name="ttl" type="text" class="formfld unknown" id="ttl" size="6" value="<?=htmlspecialchars($pconfig['ttl']);?>">
+                    <input name="ttl" type="text" class="formfld unknown" id="ttl" size="6" value="<?=htmlspecialchars($pconfig['ttl']);?>" />
                   <?=gettext("seconds");?></td>
                 </tr>
                 <tr>
                   <td valign="top" class="vncellreq"><?=gettext("Key name");?></td>
                   <td class="vtable">
-                    <input name="keyname" type="text" class="formfld unknown" id="keyname" size="30" value="<?=htmlspecialchars($pconfig['keyname']);?>">
+                    <input name="keyname" type="text" class="formfld unknown" id="keyname" size="30" value="<?=htmlspecialchars($pconfig['keyname']);?>" />
                     <br />
                     <?=gettext("This must match the setting on the DNS server.");?></td>
                 </tr>
                 <tr>
                   <td valign="top" class="vncellreq"><?=gettext("Key type");?> </td>
                   <td class="vtable">
-				  <input name="keytype" type="radio" value="zone" <?php if ($pconfig['keytype'] == "zone") echo "checked"; ?>> <?=gettext("Zone");?> &nbsp;
-                  <input name="keytype" type="radio" value="host" <?php if ($pconfig['keytype'] == "host") echo "checked"; ?>> <?=gettext("Host");?> &nbsp;
-                  <input name="keytype" type="radio" value="user" <?php if ($pconfig['keytype'] == "user") echo "checked"; ?>><?=gettext(" User");?>
-				</tr>
+				  <input name="keytype" type="radio" value="zone" <?php if ($pconfig['keytype'] == "zone") echo "checked=\"checked\""; ?> /> <?=gettext("Zone");?> &nbsp;
+                  <input name="keytype" type="radio" value="host" <?php if ($pconfig['keytype'] == "host") echo "checked=\"checked\""; ?> /> <?=gettext("Host");?> &nbsp;
+                  <input name="keytype" type="radio" value="user" <?php if ($pconfig['keytype'] == "user") echo "checked=\"checked\""; ?> /><?=gettext(" User");?>
+				</td>
+                </tr>
                 <tr>
                   <td valign="top" class="vncellreq"><?=gettext("Key");?></td>
                   <td class="vtable">
-                    <input name="keydata" type="text" class="formfld unknown" id="keydata" size="70" value="<?=htmlspecialchars($pconfig['keydata']);?>">
+                    <input name="keydata" type="text" class="formfld unknown" id="keydata" size="70" value="<?=htmlspecialchars($pconfig['keydata']);?>" />
                     <br />
                     <?=gettext("Paste an HMAC-MD5 key here.");?></td>
 				</tr>
                 <tr>
                   <td width="22%" valign="top" class="vncellreq"><?=gettext("Server");?></td>
                   <td width="78%" class="vtable">
-                    <input name="server" type="text" class+"formfld" id="server" size="30" value="<?=htmlspecialchars($pconfig['server'])?>">
+                    <input name="server" type="text" class="formfld" id="server" size="30" value="<?=htmlspecialchars($pconfig['server'])?>" />
                   </td>
                 </tr>
                 <tr>
                   <td width="22%" valign="top" class="vncellreq"><?=gettext("Protocol");?></td>
                   <td width="78%" class="vtable">
-                    <input name="usetcp" type="checkbox" id="usetcp" value="<?=gettext("yes");?>" <?php if ($pconfig['usetcp']) echo "checked"; ?>>
+                    <input name="usetcp" type="checkbox" id="usetcp" value="<?=gettext("yes");?>" <?php if ($pconfig['usetcp']) echo "checked=\"checked\""; ?> />
                     <strong><?=gettext("Use TCP instead of UDP");?></strong></td>
 				</tr>
 		<tr>
 			<td width="22%" valign="top" class="vncellreq"><?=gettext("Use Public IP");?></td>
 			<td width="78%" class="vtable">
-				<input name="usepublicip" type="checkbox" id="usepublicip" value="<?=gettext("yes");?>" <?php if ($pconfig['usepublicip']) echo "checked"; ?>>
+				<input name="usepublicip" type="checkbox" id="usepublicip" value="<?=gettext("yes");?>" <?php if ($pconfig['usepublicip']) echo "checked=\"checked\""; ?> />
 				<strong><?=gettext("If the interface IP is private, attempt to fetch and use the public IP instead.");?></strong>
 			</td>
 		</tr>
                 <tr>
                   <td width="22%" valign="top" class="vncellreq"><?=gettext("Description");?></td>
                   <td width="78%" class="vtable">
-                    <input name="descr" type="text" class="formfld unknown" id="descr" size="60" value="<?=htmlspecialchars($pconfig['descr']);?>">
+                    <input name="descr" type="text" class="formfld unknown" id="descr" size="60" value="<?=htmlspecialchars($pconfig['descr']);?>" />
                   </td>
                 </tr>
                 <tr>
                   <td width="22%" valign="top">&nbsp;</td>
                   <td width="78%">
-					<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" onClick="enable_change(true)">
-					<a href="services_rfc2136.php"><input name="Cancel" type="button" class="formbtn" value="<?=gettext("Cancel");?>"></a>
-					<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save & Force Update");?>" onClick="enable_change(true)">
+					<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" onclick="enable_change(true)" />
+					<a href="services_rfc2136.php"><input name="Cancel" type="button" class="formbtn" value="<?=gettext("Cancel");?>" /></a>
+					<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save &amp; Force Update");?>" onclick="enable_change(true)" />
 					<?php if (isset($id) && $a_rfc2136[$id]): ?>
-						<input name="id" type="hidden" value="<?=htmlspecialchars($id);?>">
+						<input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
 					<?php endif; ?>
                   </td>
                 </tr>