diff --git a/apps/routerconsole/jsp/config.jsp b/apps/routerconsole/jsp/config.jsp
index ba783d37d..428933d51 100644
--- a/apps/routerconsole/jsp/config.jsp
+++ b/apps/routerconsole/jsp/config.jsp
@@ -29,7 +29,7 @@
  <img src="/themes/console/images/itoopie_xsm.png" alt="">
  <b><%=intl._("I2P will work best if you configure your rates to match the speed of your internet connection.")%></b>
  </p>
-   <div class="wideload"><p><table><tr><td><input style="text-align: right; width: 5em;" name="inboundrate" type="text" size="5" maxlength="5" value="<jsp:getProperty name="nethelper" property="inboundRate" />" >
+   <div class="wideload"><table><tr><td><input style="text-align: right; width: 5em;" name="inboundrate" type="text" size="5" maxlength="5" value="<jsp:getProperty name="nethelper" property="inboundRate" />" >
           <%=intl._("KBps In")%>
         </td><td>(<jsp:getProperty name="nethelper" property="inboundRateBits" />)</td>
 <% /********
@@ -55,8 +55,8 @@
     </tr><tr>
         <td><jsp:getProperty name="nethelper" property="sharePercentageBox" /> <%=intl._("Share")%></td>
         <td>(<jsp:getProperty name="nethelper" property="shareRateBits" />)
-</td></tr></table></p></div></p><p>
- <% int share = nethelper.getShareBandwidth();
+</td></tr></table></div>
+<p><% int share = nethelper.getShareBandwidth();
     if (share < 12) {
         out.print("<b>");
         out.print(intl._("NOTE"));
@@ -73,11 +73,11 @@
 
         out.print(intl._("The higher the share bandwidth the more you improve your anonymity and help the network."));
     }
- %>
+ %></p>
 <p><a href="confignet"><%=intl._("Advanced network configuration page")%></a></p><hr>
 <div class="formaction">
 <input type="reset" class="cancel" value="<%=intl._("Cancel")%>" >
 <input type="submit" class="accept" name="save" value="<%=intl._("Save changes")%>" >
 </div>
-</div></form>
+</form>
 </div></div></body></html>
diff --git a/apps/routerconsole/jsp/configkeyring.jsp b/apps/routerconsole/jsp/configkeyring.jsp
index df49cfb08..57367780d 100644
--- a/apps/routerconsole/jsp/configkeyring.jsp
+++ b/apps/routerconsole/jsp/configkeyring.jsp
@@ -22,9 +22,9 @@
 <div class="configure"><h2><%=intl._("Keyring")%></h2><p>
  <%=intl._("The router keyring is used to decrypt encrypted leaseSets.")%>
  <%=intl._("The keyring may contain keys for local or remote encrypted destinations.")%></p>
- <div class="wideload"><p>
+ <div class="wideload">
  <jsp:getProperty name="keyringhelper" property="summary" />
-</p></div>
+</div>
 
  <form action="" method="POST">
  <input type="hidden" name="nonce" value="<jsp:getProperty name="formhandler" property="newNonce" />" >
@@ -33,7 +33,7 @@
  <%=intl._("Keys for local destinations must be entered on the")%> <a href="i2ptunnel/"><%=intl._("I2PTunnel page")%></a>.
 </p>
   <div class="wideload">
-      <p><table><tr>
+      <table><tr>
           <td class="mediumtags" align="right"><%=intl._("Dest. name, hash, or full key")%>:</td>
           <td><textarea name="peer" cols="44" rows="1" style="height: 3em;" wrap="off" spellcheck="false"></textarea></td>
         </tr><tr>
@@ -44,4 +44,4 @@
 <input type="reset" class="cancel" value="<%=intl._("Cancel")%>" >
 <input type="submit" name="action" class="delete" value="<%=intl._("Delete key")%>" >
 <input type="submit" name="action" class="add" value="<%=intl._("Add key")%>" >
-</td></tr></table></p></div></form></div></div></body></html>
+</td></tr></table></div></form></div></div></body></html>
diff --git a/apps/routerconsole/jsp/confignet.jsp b/apps/routerconsole/jsp/confignet.jsp
index e67f6fe3a..d11dfba91 100644
--- a/apps/routerconsole/jsp/confignet.jsp
+++ b/apps/routerconsole/jsp/confignet.jsp
@@ -122,6 +122,7 @@
 <p>
  <%=intl._("UPnP is used to communicate with Internet Gateway Devices (IGDs) to detect the external IP address and forward ports.")%>
    <%=intl._("UPnP support is beta, and may not work for any number of reasons")%>:
+</p>
 <ul>
 <li class="tidylist"><%=intl._("No UPnP-compatible device present")%>
 <li class="tidylist"><%=intl._("UPnP disabled on the device")%>
@@ -129,8 +130,8 @@
 <li class="tidylist"><%=intl._("Bugs in the device's UPnP implementation")%>
 <li class="tidylist"><%=intl._("Multiple firewall/routers in the internet connection path")%>
 <li class="tidylist"><%=intl._("UPnP device change, reset, or address change")%>
-</ul></p><p>
-<a href="peers#upnp"><%=intl._("Review the UPnP status here.")%></a>
+</ul>
+<p><a href="peers#upnp"><%=intl._("Review the UPnP status here.")%></a>
 <%=intl._("UPnP may be enabled or disabled above, but a change requires a router restart to take effect.")%></p>
 <p><%=intl._("Hostnames entered above will be published in the network database.")%>
     <%=intl._("They are <b>not private</b>.")%>
@@ -142,6 +143,7 @@
  <%=intl._("While I2P will work fine behind most firewalls, your speeds and network integration will generally improve if the I2P port is forwarded for both UDP and TCP.")%>
  <%=intl._("If you think you have opened up your firewall and I2P still thinks you are firewalled, remember that you may have multiple firewalls, for example both software packages and external hardware routers.")%>
  <%=intl._("If there is an error, the <a href=\"logs.jsp\">logs</a> may also help diagnose the problem.")%>
+</p>
  <ul>
 <li class="tidylist"><b><%=intl._("OK")%></b> - 
      <%=intl._("Your UDP port does not appear to be firewalled.")%>
@@ -193,7 +195,7 @@
 <li class="tidylist"><b><%=intl._("ERR - Client Manager I2CP Error - check logs")%></b> -
      <%=intl._("This is usually due to a port 7654 conflict. Check the logs to verify.")%> 
      <%=intl._("Do you have another I2P instance running? Stop the conflicting program and restart I2P.")%>
- </ul></p><hr>
+ </ul><hr>
 <% /********
       <!--
  <b>Dynamic Router Keys: </b>