diff --git a/apps/routerconsole/jsp/config.jsp b/apps/routerconsole/jsp/config.jsp
index edd02bba6b..3374cc07a0 100644
--- a/apps/routerconsole/jsp/config.jsp
+++ b/apps/routerconsole/jsp/config.jsp
@@ -24,12 +24,12 @@
  <% String prev = System.getProperty("net.i2p.router.web.ConfigNetHandler.nonce");
     if (prev != null) System.setProperty("net.i2p.router.web.ConfigNetHandler.noncePrev", prev);
     System.setProperty("net.i2p.router.web.ConfigNetHandler.nonce", new java.util.Random().nextLong()+""); %>
- <input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigNetHandler.nonce")%>" />
- <input type="hidden" name="action" value="blah" />
+ <input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigNetHandler.nonce")%>" >
+ <input type="hidden" name="action" value="blah" >
  <h3><%=intl._("Bandwidth limiter")%></h3><p>
  <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"><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" />" >
           <%=intl._("KBps In")%>
         </td><td>(<jsp:getProperty name="nethelper" property="inboundRateBits" />)</td>
 <% /********
@@ -40,7 +40,7 @@
 -->
 *********/ %>
     </tr><tr>
-        <td><input style="text-align: right; width: 5em;" name="outboundrate" type="text" size="5" maxlength="5" value="<jsp:getProperty name="nethelper" property="outboundRate" />" />
+        <td><input style="text-align: right; width: 5em;" name="outboundrate" type="text" size="5" maxlength="5" value="<jsp:getProperty name="nethelper" property="outboundRate" />" >
          <%=intl._("KBps Out")%>
         </td><td>(<jsp:getProperty name="nethelper" property="outboundRateBits" />)</td>
 <% /********
@@ -76,7 +76,10 @@
     }
  %>
 <div class="formaction">
-<input type="submit" name="save" value="<%=intl._("Save changes")%>" /> <input type="reset" value="<%=intl._("Cancel")%>" /></div>
+<input type="reset" value="<%=intl._("Cancel")%>" >
+<input type="submit" name="save" value="<%=intl._("Save changes")%>" >
+</div>
+<% /********
  <!--
  <b>Enable load testing: </b>
 <input type="checkbox" class="optbox" name="enableloadtesting" value="true" <jsp:getProperty name="nethelper" property="enableLoadTesting" /> />
@@ -87,25 +90,26 @@
  <a href="oldstats.jsp#test.rtt">test.rtt</a> and related stats.</p>
  <br>
 -->
+*********/ %>
  <h3><%=intl._("IP and Transport Configuration")%></h3><p>
  <b><%=intl._("The default settings will work for most people.")%>
  <a href="#chelp"><%=intl._("There is help below.")%></a></b>
  </p><p><b><%=intl._("UPnP Configuration")%>:</b><br>
-    <input type="checkbox" class="optbox" name="upnp" value="true" <jsp:getProperty name="nethelper" property="upnpChecked" /> />
+    <input type="checkbox" class="optbox" name="upnp" value="true" <jsp:getProperty name="nethelper" property="upnpChecked" /> >
     <%=intl._("Enable UPnP to open firewall ports")%> - <a href="peers.jsp#upnp"><%=intl._("UPnP status")%></a>
  </p><p><b><%=intl._("IP Configuration")%>:</b><br>
  <%=intl._("Externally reachable hostname or IP address")%>:<br>
-    <input type="radio" class="optbox" name="udpAutoIP" value="local,upnp,ssu" <%=nethelper.getUdpAutoIPChecked(3) %> />
+    <input type="radio" class="optbox" name="udpAutoIP" value="local,upnp,ssu" <%=nethelper.getUdpAutoIPChecked(3) %> >
     <%=intl._("Use all auto-detect methods")%><br>
-    <input type="radio" class="optbox" name="udpAutoIP" value="local,ssu" <%=nethelper.getUdpAutoIPChecked(4) %> />
+    <input type="radio" class="optbox" name="udpAutoIP" value="local,ssu" <%=nethelper.getUdpAutoIPChecked(4) %> >
     <%=intl._("Disable UPnP IP address detection")%><br>
-    <input type="radio" class="optbox" name="udpAutoIP" value="upnp,ssu" <%=nethelper.getUdpAutoIPChecked(5) %> />
+    <input type="radio" class="optbox" name="udpAutoIP" value="upnp,ssu" <%=nethelper.getUdpAutoIPChecked(5) %> >
     <%=intl._("Ignore local interface IP address")%><br>
-    <input type="radio" class="optbox" name="udpAutoIP" value="ssu" <%=nethelper.getUdpAutoIPChecked(0) %> />
+    <input type="radio" class="optbox" name="udpAutoIP" value="ssu" <%=nethelper.getUdpAutoIPChecked(0) %> >
     <%=intl._("Use SSU IP address detection only")%><br>
-    <input type="radio" class="optbox" name="udpAutoIP" value="fixed" <%=nethelper.getUdpAutoIPChecked(1) %> />
+    <input type="radio" class="optbox" name="udpAutoIP" value="fixed" <%=nethelper.getUdpAutoIPChecked(1) %> >
     <%=intl._("Specify hostname or IP")%>:
-    <input name ="udpHost1" type="text" size="16" value="<jsp:getProperty name="nethelper" property="udphostname" />" />
+    <input name ="udpHost1" type="text" size="16" value="<jsp:getProperty name="nethelper" property="udphostname" />" >
     <% String[] ips = nethelper.getAddresses();
        if (ips.length > 0) {
            out.print(intl._("or") + " <select name=\"udpHost2\"><option value=\"\" selected=\"true\">"+intl._("Select Interface")+"</option>\n");
@@ -120,16 +124,16 @@
        }
     %>
     <br>
-    <input type="radio" class="optbox" name="udpAutoIP" value="hidden" <%=nethelper.getUdpAutoIPChecked(2) %> />
+    <input type="radio" class="optbox" name="udpAutoIP" value="hidden" <%=nethelper.getUdpAutoIPChecked(2) %> >
     <%=intl._("Hidden mode - do not publish IP")%> <i><%=intl._("(prevents participating traffic)")%></i><br>
  </p><p>
  <%=intl._("Action when IP changes")%>:<br>
-    <input type="checkbox" class="optbox" name="laptop" value="true" <jsp:getProperty name="nethelper" property="laptopChecked" /> />
+    <input type="checkbox" class="optbox" name="laptop" value="true" <jsp:getProperty name="nethelper" property="laptopChecked" /> >
     <%=intl._("Laptop mode - Change router identity and UDP port when IP changes for enhanced anonymity")%>
     (<i><%=intl._("Experimental")%></i>)
  </p><p><b><%=intl._("UDP Configuration:")%></b><br>
  <%=intl._("UDP port:")%>
- <input name ="udpPort" type="text" size="5" maxlength="5" value="<jsp:getProperty name="nethelper" property="configuredUdpPort" />" /><br>
+ <input name ="udpPort" type="text" size="5" maxlength="5" value="<jsp:getProperty name="nethelper" property="configuredUdpPort" />" ><br>
 <% /********
 <!-- let's keep this simple...
 <input type="checkbox" class="optbox" name="requireIntroductions" value="true" <jsp:getProperty name="nethelper" property="requireIntroductionsChecked" /> />
@@ -142,30 +146,31 @@
  </p><p>
  <b><%=intl._("TCP Configuration")%>:</b><br>
  <%=intl._("Externally reachable hostname or IP address")%>:<br>
-    <input type="radio" class="optbox" name="ntcpAutoIP" value="true" <%=nethelper.getTcpAutoIPChecked(2) %> />
+    <input type="radio" class="optbox" name="ntcpAutoIP" value="true" <%=nethelper.getTcpAutoIPChecked(2) %> >
     <%=intl._("Use auto-detected IP address")%>
     <i>(<%=intl._("currently")%> <jsp:getProperty name="nethelper" property="udpIP" />)</i>
     <%=intl._("if we are not firewalled")%><br>
-    <input type="radio" class="optbox" name="ntcpAutoIP" value="always" <%=nethelper.getTcpAutoIPChecked(3) %> />
+    <input type="radio" class="optbox" name="ntcpAutoIP" value="always" <%=nethelper.getTcpAutoIPChecked(3) %> >
     <%=intl._("Always use auto-detected IP address (Not firewalled)")%><br>
-    <input type="radio" class="optbox" name="ntcpAutoIP" value="false" <%=nethelper.getTcpAutoIPChecked(1) %> />
+    <input type="radio" class="optbox" name="ntcpAutoIP" value="false" <%=nethelper.getTcpAutoIPChecked(1) %> >
     <%=intl._("Specify hostname or IP")%>:
-    <input name ="ntcphost" type="text" size="16" value="<jsp:getProperty name="nethelper" property="ntcphostname" />" /><br>
-    <input type="radio" class="optbox" name="ntcpAutoIP" value="false" <%=nethelper.getTcpAutoIPChecked(0) %> />
+    <input name ="ntcphost" type="text" size="16" value="<jsp:getProperty name="nethelper" property="ntcphostname" />" ><br>
+    <input type="radio" class="optbox" name="ntcpAutoIP" value="false" <%=nethelper.getTcpAutoIPChecked(0) %> >
     <%=intl._("Disable inbound (Firewalled)")%><br>
-    <input type="radio" class="optbox" name="ntcpAutoIP" value="disabled" <%=nethelper.getTcpAutoIPChecked(4) %> />
+    <input type="radio" class="optbox" name="ntcpAutoIP" value="disabled" <%=nethelper.getTcpAutoIPChecked(4) %> >
     <%=intl._("Completely disable")%> <i><%=intl._("(select only if behind a firewall that throttles or blocks outbound TCP)")%></i><br>
  </p><p>
  <%=intl._("Externally reachable TCP port")%>:<br>
-    <input type="radio" class="optbox" name="ntcpAutoPort" value="2" <%=nethelper.getTcpAutoPortChecked(2) %> />
+    <input type="radio" class="optbox" name="ntcpAutoPort" value="2" <%=nethelper.getTcpAutoPortChecked(2) %> >
     <%=intl._("Use the same port configured for UDP")%>
     <i>(<%=intl._("currently")%> <jsp:getProperty name="nethelper" property="udpPort" />)</i><br>
-    <input type="radio" class="optbox" name="ntcpAutoPort" value="1" <%=nethelper.getTcpAutoPortChecked(1) %> />
+    <input type="radio" class="optbox" name="ntcpAutoPort" value="1" <%=nethelper.getTcpAutoPortChecked(1) %> >
     <%=intl._("Specify Port")%>:
-    <input name ="ntcpport" type="text" size="5" maxlength="5" value="<jsp:getProperty name="nethelper" property="ntcpport" />" /><br>
+    <input name ="ntcpport" type="text" size="5" maxlength="5" value="<jsp:getProperty name="nethelper" property="ntcpport" />" ><br>
  </p><p><b><%=intl._("Note")%>: <%=intl._("Changing these settings will restart your router.")%></b></p>
 <hr><div class="formaction">
- <input type="submit" name="save" value="<%=intl._("Save changes")%>" /> <input type="reset" value="<%=intl._("Cancel")%>" />
+<input type="reset" value="<%=intl._("Cancel")%>" >
+<input type="submit" name="save" value="<%=intl._("Save changes")%>" >
 </div><h3><a name="chelp"><%=intl._("Configuration Help")%>:</a></h3><div align="justify"><p>
  <%=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.")%>
  </p><p>
@@ -254,6 +259,7 @@
      <%=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>
+<% /********
       <!--
  <b>Dynamic Router Keys: </b>
  <input type="checkbox" class="optbox" name="dynamicKeys" value="true" <jsp:getProperty name="nethelper" property="dynamicKeysChecked" /> /><br>
@@ -273,4 +279,5 @@
  </p>
  <br>
 -->
+*********/ %>
 </div></form></div></div></body></html>
diff --git a/apps/routerconsole/jsp/configadvanced.jsp b/apps/routerconsole/jsp/configadvanced.jsp
index d015df0b31..727bb08467 100644
--- a/apps/routerconsole/jsp/configadvanced.jsp
+++ b/apps/routerconsole/jsp/configadvanced.jsp
@@ -27,12 +27,12 @@
  <% String prev = System.getProperty("net.i2p.router.web.ConfigAdvancedHandler.nonce");
     if (prev != null) System.setProperty("net.i2p.router.web.ConfigAdvancedHandler.noncePrev", prev);
     System.setProperty("net.i2p.router.web.ConfigAdvancedHandler.nonce", new java.util.Random().nextLong()+""); %>
- <input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigAdvancedHandler.nonce")%>" />
- <input type="hidden" name="action" value="blah" />
+ <input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigAdvancedHandler.nonce")%>" >
+ <input type="hidden" name="action" value="blah" >
  <h3><%=intl._("Advanced I2P Configuration")%></h3>
  <textarea rows="32" cols="60" name="config" wrap="off"><jsp:getProperty name="advancedhelper" property="settings" /></textarea><br><hr>
       <div class="formaction">
-        <input type="submit" name="shouldsave" value="<%=intl._("Apply")%>" />
-        <input type="reset" value="<%=intl._("Cancel")%>" /><br>
- <b><%=intl._("NOTE")%>:</b> <%=intl._("Some changes may require a restart to take effect.")%>
+        <input type="reset" value="<%=intl._("Cancel")%>" >
+        <input type="submit" name="shouldsave" value="<%=intl._("Save changes")%>" >
+ <br><b><%=intl._("NOTE")%>:</b> <%=intl._("Some changes may require a restart to take effect.")%>
  </div></form></div></div></div></body></html>
diff --git a/apps/routerconsole/jsp/configkeyring.jsp b/apps/routerconsole/jsp/configkeyring.jsp
index 038b2c778a..dc265ba1b5 100644
--- a/apps/routerconsole/jsp/configkeyring.jsp
+++ b/apps/routerconsole/jsp/configkeyring.jsp
@@ -29,7 +29,7 @@
  <% String prev = System.getProperty("net.i2p.router.web.ConfigKeyringHandler.nonce");
     if (prev != null) System.setProperty("net.i2p.router.web.ConfigKeyringHandler.noncePrev", prev);
     System.setProperty("net.i2p.router.web.ConfigKeyringHandler.nonce", new java.util.Random().nextLong()+""); %>
- <input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigKeyringHandler.nonce")%>" />
+ <input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigKeyringHandler.nonce")%>" >
  <h3><%=intl._("Manual Keyring Addition")%></h3><p>
  <%=intl._("Enter keys for encrypted remote destinations here.")%>
  <%=intl._("Keys for local destinations must be entered on the")%> <a href="i2ptunnel/index.jsp"><%=intl._("I2PTunnel page")%></a>.
@@ -40,8 +40,10 @@
           <td><textarea name="peer" cols="44" rows="1" style="height: 3em;" wrap="off"></textarea></td>
         </tr><tr>
           <td class="mediumtags" align="right"><%=intl._("Encryption Key")%>:</td>
-          <td><input type="text" size="55" name="key" /></td>
+          <td><input type="text" size="55" name="key" ></td>
         </tr><tr>
-          <td align="right" colspan="2"><input type="submit" name="action" value="<%=intl._("Add key")%>" />
-             <input type="submit" name="action" value="<%=intl._("Delete key")%>" /> <input type="reset" value="<%=intl._("Cancel")%>" /></td>
-</tr></table></p></div></form></div></div></body></html>
+          <td align="right" colspan="2">
+<input type="reset" value="<%=intl._("Cancel")%>" >
+<input type="submit" name="action" value="<%=intl._("Delete key")%>" >
+<input type="submit" name="action" value="<%=intl._("Add key")%>" >
+</td></tr></table></p></div></form></div></div></body></html>
diff --git a/apps/routerconsole/jsp/configlogging.jsp b/apps/routerconsole/jsp/configlogging.jsp
index c2f3a7ba5f..3de8d95bee 100644
--- a/apps/routerconsole/jsp/configlogging.jsp
+++ b/apps/routerconsole/jsp/configlogging.jsp
@@ -23,24 +23,24 @@
  <% String prev = System.getProperty("net.i2p.router.web.ConfigLoggingHandler.nonce");
     if (prev != null) System.setProperty("net.i2p.router.web.ConfigLoggingHandler.noncePrev", prev);
     System.setProperty("net.i2p.router.web.ConfigLoggingHandler.nonce", new java.util.Random().nextLong()+""); %>
- <input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigLoggingHandler.nonce")%>" />
- <input type="hidden" name="action" value="blah" />
+ <input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigLoggingHandler.nonce")%>" >
+ <input type="hidden" name="action" value="blah" >
  <h3><%=intl._("Configure I2P Logging Options")%></h3>
  <div class="wideload">
       <table border="0" cellspacing="5">
         <tr><td class="mediumtags" align="right"><b><%=intl._("Logging filename")%>:</b></td>
-          <td><input type="text" name="logfilename" size="40" value="<jsp:getProperty name="logginghelper" property="logFilePattern" />" />
+          <td><input type="text" name="logfilename" size="40" value="<jsp:getProperty name="logginghelper" property="logFilePattern" />" >
             <br> <i><%=intl._("(the symbol '@' will be replaced during log rotation)")%></i></td>
         </tr><tr><td class="mediumtags" align="right"><b><%=intl._("Log record format")%>:</b></td>
-          <td><input type="text" name="logformat" size="20" value="<jsp:getProperty name="logginghelper" property="recordPattern" />" />
+          <td><input type="text" name="logformat" size="20" value="<jsp:getProperty name="logginghelper" property="recordPattern" />" >
             <br> <i><%=intl._("(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)")%>
             </i></td>
         </tr><tr><td class="mediumtags" align="right"><b><%=intl._("Log date format")%>:</b></td>
-          <td><input type="text" name="logdateformat" size="20" value="<jsp:getProperty name="logginghelper" property="datePattern" />" />
+          <td><input type="text" name="logdateformat" size="20" value="<jsp:getProperty name="logginghelper" property="datePattern" />" >
             <br> <i><%=intl._("('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' = millisecond)")%>
             </i></td>
         </tr><tr><td class="mediumtags" align="right"><b><%=intl._("Max log file size")%>:</b></td>
-          <td><input type="text" name="logfilesize" size="4" value="<jsp:getProperty name="logginghelper" property="maxFileSize" />" /><br></td>
+          <td><input type="text" name="logfilesize" size="4" value="<jsp:getProperty name="logginghelper" property="maxFileSize" />" ><br></td>
         </tr><tr><td class="mediumtags" align="right"><b><%=intl._("Default log level")%>:</b></td>
           <td><jsp:getProperty name="logginghelper" property="defaultLogLevelBox" /><br><i><%=intl._("(DEBUG and INFO are not recommended defaults, as they will drastically slow down your router)")%>
           </i></td>
@@ -48,6 +48,6 @@
           <td><jsp:getProperty name="logginghelper" property="logLevelTable" /></td>
         </tr><tr><td colspan="2"><hr></td>
         </tr><tr class="tablefooter"><td colspan="2"> <div class="formaction">
-          <input type="submit" name="shouldsave" value="<%=intl._("Save changes")%>" />
-          <input type="reset" value="<%=intl._("Cancel")%>" />
+          <input type="reset" value="<%=intl._("Cancel")%>" >
+          <input type="submit" name="shouldsave" value="<%=intl._("Save changes")%>" >
 </div></td></tr></table></div></form></div></div></body></html>
diff --git a/apps/routerconsole/jsp/configstats.jsp b/apps/routerconsole/jsp/configstats.jsp
index 1c1158407a..20db1726cb 100644
--- a/apps/routerconsole/jsp/configstats.jsp
+++ b/apps/routerconsole/jsp/configstats.jsp
@@ -69,14 +69,14 @@ function toggleAll(category)
  <% String prev = System.getProperty("net.i2p.router.web.ConfigStatsHandler.nonce");
     if (prev != null) System.setProperty("net.i2p.router.web.ConfigStatsHandler.noncePrev", prev);
     System.setProperty("net.i2p.router.web.ConfigStatsHandler.nonce", new java.util.Random().nextLong()+""); %>
- <input type="hidden" name="action" value="foo" />
- <input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigStatsHandler.nonce")%>" />
+ <input type="hidden" name="action" value="foo" >
+ <input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigStatsHandler.nonce")%>" >
  <h3><%=intl._("Configure I2P Stat Collection")%></h3>
  <p><%=intl._("Enable full stats?")%>
  <input type="checkbox" class="optbox" name="isFull" value="true" <%
- if (statshelper.getIsFull()) { %>checked="true" <% } %>/>
+ if (statshelper.getIsFull()) { %>checked="true" <% } %> >
  (<%=intl._("change requires restart to take effect")%>)<br>
- <%=intl._("Stat file")%>: <input type="text" name="filename" value="<%=statshelper.getFilename()%>" /><br>
+ <%=intl._("Stat file")%>: <input type="text" name="filename" value="<%=statshelper.getFilename()%>" ><br>
 <%=intl._("Filter")%>: (<a href="javascript: void(null);" onclick="toggleAll('*')"><%=intl._("toggle all")%></a>)<br></p>
  <div class="wideload">
  <p><table>
@@ -96,17 +96,20 @@ function toggleAll(category)
  <tr><td align="center">
      <a name="<%=statshelper.getCurrentStatName()%>"></a>
      <input id="<%=statshelper.getCurrentGroupName()%>" type="checkbox" class="optbox" name="statList" value="<%=statshelper.getCurrentStatName()%>" <%
-     if (statshelper.getCurrentIsLogged()) { %>checked="true" <% } %>/></td>
+     if (statshelper.getCurrentIsLogged()) { %>checked="true" <% } %> ></td>
      <td align="center">
      <% if (statshelper.getCurrentCanBeGraphed()) { %>
        <input id="<%=statshelper.getCurrentGroupName()%>" type="checkbox" class="optbox" name="graphList" value="<%=statshelper.getCurrentGraphName()%>" <%
-       if (statshelper.getCurrentIsGraphed()) { %>checked="true" <% } %>/><% } %></td>
+       if (statshelper.getCurrentIsGraphed()) { %>checked="true" <% } %> ><% } %></td>
      <td align="left"><b><%=statshelper.getCurrentStatName()%>:</b><br>
      <%=statshelper.getCurrentStatDescription()%></td></tr><%
     } // end iterating over all stats %>
  <tr><td colspan="3"></td></tr>
- <tr><td align="center"><input type="checkbox" class="optbox" name="explicitFilter" /></td>
+ <tr><td align="center"><input type="checkbox" class="optbox" name="explicitFilter" ></td>
      <td colspan="2"><%=intl._("Advanced filter")%>:
-     <input type="text" name="explicitFilterValue" value="<%=statshelper.getExplicitFilter()%>" size="40" /></td></tr>
-     <tr class="tablefooter"><td colspan="3" align="right"><input type="submit" name="shouldsave" value="<%=intl._("Save changes")%>" /><input type="reset" value="<%=intl._("Cancel")%>" /></td></tr>
+     <input type="text" name="explicitFilterValue" value="<%=statshelper.getExplicitFilter()%>" size="40" ></td></tr>
+     <tr class="tablefooter"><td colspan="3" align="right">
+<input type="reset" value="<%=intl._("Cancel")%>" >
+<input type="submit" name="shouldsave" value="<%=intl._("Save changes")%>" >
+</td></tr>
  </table></p></div></form></div></div></body></html>
diff --git a/apps/routerconsole/jsp/configtunnels.jsp b/apps/routerconsole/jsp/configtunnels.jsp
index 269f2186e0..d505b741a9 100644
--- a/apps/routerconsole/jsp/configtunnels.jsp
+++ b/apps/routerconsole/jsp/configtunnels.jsp
@@ -33,11 +33,14 @@
  <% String prev = System.getProperty("net.i2p.router.web.ConfigTunnelsHandler.nonce");
     if (prev != null) System.setProperty("net.i2p.router.web.ConfigTunnelsHandler.noncePrev", prev);
     System.setProperty("net.i2p.router.web.ConfigTunnelsHandler.nonce", new java.util.Random().nextLong()+""); %>
- <input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigTunnelsHandler.nonce")%>" />
- <input type="hidden" name="action" value="blah" />
+ <input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigTunnelsHandler.nonce")%>" >
+ <input type="hidden" name="action" value="blah" >
  <jsp:getProperty name="tunnelshelper" property="form" />
  <%=intl._("Note")%>: <%=intl._("Exploratory tunnel setting changes are stored in the router.config file.")%>
  <%=intl._("Client tunnel changes are temporary and are not saved.")%>
 <%=intl._("To make permanent client tunnel changes see the")%> <a href="i2ptunnel/index.jsp"><%=intl._("i2ptunnel page")%></a>.
- <hr><div class="formaction"><input type="submit" name="shouldsave" value="<%=intl._("Save changes")%>" /> <input type="reset" value="<%=intl._("Cancel")%>" /></div>
+ <hr><div class="formaction">
+<input type="reset" value="<%=intl._("Cancel")%>" >
+<input type="submit" name="shouldsave" value="<%=intl._("Save changes")%>" >
+</div>
  </form></p></div></div></div></body></html>
diff --git a/apps/routerconsole/jsp/configui.jsp b/apps/routerconsole/jsp/configui.jsp
index 7484880ce7..19cd125fa5 100644
--- a/apps/routerconsole/jsp/configui.jsp
+++ b/apps/routerconsole/jsp/configui.jsp
@@ -42,6 +42,7 @@
 <jsp:getProperty name="uihelper" property="langSettings" />
 <%=uihelper._("Please contribute to the router console translation project! Contact the developers on IRC #i2p to help.")%>
 <hr><div class="formaction">
-<input type="submit" name="shouldsave" value="<%=intl._("Apply")%>" > <input type="reset" value="<%=intl._("Cancel")%>" >
+<input type="reset" value="<%=intl._("Cancel")%>" >
+<input type="submit" name="shouldsave" value="<%=intl._("Apply")%>" >
 </div></form></div>
 </div></body></html>
diff --git a/history.txt b/history.txt
index b9c2c00bac..0729267675 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,10 @@
+2010-04-05 zzz
+    * Console:
+      - Add tooltip support for plugin links
+      - Make target=_blank for plugin links
+      - More HTML transitional fixes
+      - Standardize on 'save' to the right of 'cancel'
+
 2010-04-02 zzz
     * FloodfillPeerSelector: Adjust rankings again
 
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 4e28a2c8d2..c10128fe62 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 5;
+    public final static long BUILD = 6;
 
     /** for example "-test" */
     public final static String EXTRA = "";