diff --git a/apps/routerconsole/jsp/configservice.jsp b/apps/routerconsole/jsp/configservice.jsp
index 38ea13d8c8..a0575d487a 100644
--- a/apps/routerconsole/jsp/configservice.jsp
+++ b/apps/routerconsole/jsp/configservice.jsp
@@ -39,9 +39,11 @@
  <hr><div class="formaction" id="restart">
  <input type="submit" class="reload" name="action" value="<%=intl._t("Graceful restart")%>" >
  <input type="submit" class="reload" name="action" value="<%=intl._t("Hard restart")%>" >
- <% } %></div>
-
-<% if (formhandler.shouldShowSystray()) { %>
+ </div>
+<%
+    }
+    if (formhandler.shouldShowSystray()) {
+%>
  <h3 class="ptitle" id="systray"><%=intl._t("Systray integration")%></h3>
  <p class="infohelp"><%=intl._t("Control the system tray icon")%></p>
  <hr><div class="formaction" id="systray">
@@ -69,11 +71,14 @@
  <% } %>
 
  <h3 class="ptitle" id="servicedebug"><%=intl._t("Debugging")%>&nbsp;<a href="/jobs">[<%=intl._t("View the job queue")%>]</a></h3>
-<% if (System.getProperty("wrapper.version") != null) { %>
  <p class="infohelp">
-    <%=intl._t("At times, it may be helpful to debug I2P by getting a thread dump. To do so, please select the following option and review the thread dumped to <a href=\"logs.jsp#servicelogs\">wrapper.log</a>.")%></p>
- <hr>
+<% if (System.getProperty("wrapper.version") != null) { %>
+    <%=intl._t("At times, it may be helpful to debug I2P by getting a thread dump. To do so, please select the following option and review the thread dumped to <a href=\"logs.jsp#servicelogs\">wrapper.log</a>.")%>
+<% } else { // hack to make layout work for non-wrapper %>
+    &nbsp;
 <% } %>
+ </p>
+ <hr>
  <div class="formaction" id="dumpthreads">
  <input type="submit" class="reload" name="action" value="<%=intl._t("Force GC")%>" >
 <% if (System.getProperty("wrapper.version") != null) { %>
diff --git a/history.txt b/history.txt
index 4eebe28f95..0ee9d6cd97 100644
--- a/history.txt
+++ b/history.txt
@@ -1,5 +1,10 @@
+2018-07-16 zzz
+ * Console: Fix HTML error on /configservice w/o wrapper
+
 2018-07-15 zzz
+ * I2CP: Add option for forcing gzip on/off per-message
  * NTCP: Increase failsafe sleep threshold (ticket #2251)
+ * Router: Add CLI tool to generate family keys
 
 2018-07-14 zzz
  * i2psnark: Recreate deleted files on recheck/reopen (ticket #2125)
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 7f4edb9752..31c35f8c3e 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 = 13;
+    public final static long BUILD = 14;
 
     /** for example "-test" */
     public final static String EXTRA = "";