diff --git a/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java
index 02736a3dd4..d1ed9935bd 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java
@@ -203,6 +203,7 @@ class NetDbRenderer {
                 }
             }
             if (notFound) {
+                buf.append("<div class=\"netdbnotfound\">");
                 buf.append(_t("Router")).append(' ');
                 if (routerPrefix != null)
                     buf.append(routerPrefix);
@@ -213,6 +214,7 @@ class NetDbRenderer {
                 else if (family != null)
                     buf.append(_t("Family")).append(' ').append(family);
                 buf.append(' ').append(_t("not found in network database"));
+                buf.append("</div>");
             }
         }
         out.write(buf.toString());
@@ -303,6 +305,7 @@ class NetDbRenderer {
           }
 
           long now = _context.clock().now();
+          buf.append("<div class=\"leasesets_container\">");
           for (LeaseSet ls : leases) {
             Destination dest = ls.getDestination();
             Hash key = dest.calculateHash();
@@ -312,7 +315,7 @@ class NetDbRenderer {
                 buf.append("<th><a href=\"tunnels#" + key.toBase64().substring(0,4) + "\">" + _t("Local") + "</a> ");
                 boolean unpublished = ! _context.clientManager().shouldPublishLeaseSet(key);
                 if (unpublished)
-                    buf.append(_t("Unpublished") + ' ');
+                    buf.append("<b>").append(_t("Unpublished")).append("</b> ");
                 buf.append("<b>").append(_t("Destination")).append(":</b> ");
                 TunnelPoolSettings in = _context.tunnelManager().getInboundSettings(key);
                 if (in != null && in.getDestinationNickname() != null)
@@ -365,17 +368,17 @@ class NetDbRenderer {
             if (debug) {
                 buf.append("<tr><td colspan=\"2\">");
                 buf.append("<b>RAP?</b> ").append(ls.getReceivedAsPublished());
-                buf.append(" <b>RAR?</b> ").append(ls.getReceivedAsReply());
+                buf.append("&nbsp;&nbsp;<b>RAR?</b> ").append(ls.getReceivedAsReply());
                 BigInteger dist = HashDistance.getDistance(ourRKey, ls.getRoutingKey());
                 if (ls.getReceivedAsPublished()) {
                     if (c++ == medianCount)
                         median = dist;
                 }
-                buf.append(" <b>Distance: </b><span id=\"distance\">").append(fmt.format(biLog2(dist))).append("</span>");
+                buf.append("&nbsp;&nbsp;<b>Distance: </b>").append(fmt.format(biLog2(dist)));
                 buf.append("</td></tr>\n<tr><td colspan=\"2\">");
                 //buf.append(dest.toBase32()).append("<br>");
                 buf.append("<b>Signature type:</b> ").append(dest.getSigningPublicKey().getType());
-                buf.append(" <b>Encryption Key:</b> ").append(ls.getEncryptionKey().toBase64().substring(0, 20)).append("&hellip;");
+                buf.append("&nbsp;&nbsp;<b>Encryption Key:</b> ").append(ls.getEncryptionKey().toBase64().substring(0, 20)).append("&hellip;");
                 buf.append("</td></tr>\n<tr><td colspan=\"2\">");
                 buf.append("<b>Routing Key:</b> ").append(ls.getRoutingKey().toBase64());
                 buf.append("</td></tr>");
@@ -390,9 +393,9 @@ class NetDbRenderer {
                 if (debug) {
                     long exl = lease.getEndDate().getTime() - now;
                     if (exl > 0)
-                        buf.append("<b>").append(_t("Expires in {0}", DataHelper.formatDuration2(exl))).append("</b>");
+                        buf.append("<b class=\"netdb_expiry\">").append(_t("Expires in {0}", DataHelper.formatDuration2(exl))).append("</b>");
                     else
-                        buf.append("<b>").append(_t("Expired {0} ago", DataHelper.formatDuration2(0-exl))).append("</b>");
+                        buf.append("<b class=\"netdb_expiry\">").append(_t("Expired {0} ago", DataHelper.formatDuration2(0-exl))).append("</b>");
                 }
                 buf.append("</td></tr>\n");
             }
@@ -400,6 +403,7 @@ class NetDbRenderer {
             out.write(buf.toString());
             buf.setLength(0);
           } // for each
+          buf.append("</div>");
         }  // !empty
         out.write(buf.toString());
         out.flush();
@@ -427,18 +431,20 @@ class NetDbRenderer {
      */
     public void renderStatusHTML(Writer out, int mode) throws IOException {
         if (!_context.netDb().isInitialized()) {
+            out.write("<div id=\"notinitialized\">");
             out.write(_t("Not initialized"));
+            out.write("</div>");
             out.flush();
             return;
         }
         Log log = _context.logManager().getLog(NetDbRenderer.class);
         long start = System.currentTimeMillis();
-        
+
         boolean full = mode == 1;
         boolean shortStats = mode == 2;
         boolean showStats = full || shortStats;  // this means show the router infos
         Hash us = _context.routerHash();
-        
+
         StringBuilder buf = new StringBuilder(8192);
         if (showStats) {
             RouterInfo ourInfo = _context.router().getRouterInfo();
@@ -446,11 +452,11 @@ class NetDbRenderer {
             out.write(buf.toString());
             buf.setLength(0);
         }
-        
+
         ObjectCounter<String> versions = new ObjectCounter<String>();
         ObjectCounter<String> countries = new ObjectCounter<String>();
         int[] transportCount = new int[TNAMES.length];
-        
+
         Set<RouterInfo> routers = new TreeSet<RouterInfo>(new RouterInfoComparator());
         routers.addAll(_context.netDb().getRouters());
         for (RouterInfo ri : routers) {
@@ -475,7 +481,7 @@ class NetDbRenderer {
         if (log.shouldWarn())
             log.warn("part 1 took " + (end - start));
         start = end;
-            
+
      //
      // don't bother to reindent
      //
@@ -506,7 +512,7 @@ class NetDbRenderer {
         if (log.shouldWarn())
             log.warn("part 2 took " + (end - start));
         start = end;
-            
+
         // transports table
         buf.append("<table id=\"netdbtransports\">\n");
         buf.append("<tr><th align=\"left\">" + _t("Transports") + "</th><th>" + _t("Count") + "</th></tr>\n");
@@ -591,6 +597,7 @@ class NetDbRenderer {
      *  Be careful to use stripHTML for any displayed routerInfo data
      *  to prevent vulnerabilities
      */
+
     private void renderRouterInfo(StringBuilder buf, RouterInfo info, boolean isUs, boolean full) {
         String hash = info.getIdentity().getHash().toBase64();
         buf.append("<table class=\"netdbentry\">")
@@ -599,6 +606,13 @@ class NetDbRenderer {
             buf.append("<a name=\"our-info\" ></a><b>" + _t("Our info") + ":</b>&nbsp;<code>").append(hash).append("</code></th><th>");
         } else {
             buf.append("<b>" + _t("Peer info for") + ":</b>&nbsp;<code>").append(hash).append("</code></th><th>");
+            String country = _context.commSystem().getCountry(info.getIdentity().getHash());
+            if (country != null) {
+                buf.append("<a href=\"/netdb?c=").append(country).append("\">");
+                buf.append("<img height=\"11\" width=\"16\" alt=\"").append(country.toUpperCase(Locale.US)).append('\"');
+                buf.append(" title=\"").append(getTranslatedCountry(country)).append('\"');
+                buf.append(" src=\"/flags.jsp?c=").append(country).append("\"> ").append("</a>");
+            }
             if (!full) {
                 buf.append("<a title=\"").append(_t("View extended router info"))
                    .append("\" class=\"viewfullentry\" href=\"netdb?r=").append(hash.substring(0, 6))
@@ -609,43 +623,36 @@ class NetDbRenderer {
         long age = _context.clock().now() - info.getPublished();
         if (isUs && _context.router().isHidden()) {
             buf.append("<td><b>").append(_t("Hidden")).append(", ").append(_t("Updated")).append(":</b></td>")
-               .append("<td colspan=\"2\">")
+               .append("<td colspan=\"2\"><span class=\"netdb_info\">")
                .append(_t("{0} ago", DataHelper.formatDuration2(age)))
-               .append("</td>");
+               .append("</span>&nbsp;&nbsp;");
         } else if (age > 0) {
             buf.append("<td><b>").append(_t("Published")).append(":</b></td>")
-               .append("<td colspan=\"2\">")
+               .append("<td colspan=\"2\"><span class=\"netdb_info\">")
                .append(_t("{0} ago", DataHelper.formatDuration2(age)))
-               .append("</td>");
+               .append("</span>&nbsp;&nbsp;");
         } else {
             // shouldnt happen
-            buf.append("<td colspan=\"2\"><b>").append(_t("Published")).append(":</b> in ").append(DataHelper.formatDuration2(0-age)).append("???</td>");
+            buf.append("<td><b>").append(_t("Published")).append("</td><td colspan=\"2\">:</b> in ")
+               .append(DataHelper.formatDuration2(0-age)).append("<span class=\"netdb_info\">???</span>&nbsp;&nbsp;");
         }
-        buf.append("</tr>\n<tr><td>");
         buf.append("<b>").append(_t("Signing Key")).append(":</b> ")
-           .append("</td><td colspan=\"2\">")
            .append(info.getIdentity().getSigningPublicKey().getType().toString());
         buf.append("</td></tr>\n<tr>")
            .append("<td><b>" + _t("Address(es)") + ":</b></td>")
-           .append("<td colspan=\"2\">");
-        String country = _context.commSystem().getCountry(info.getIdentity().getHash());
-        if(country != null) {
-            buf.append("<a href=\"/netdb?c=").append(country).append("\">");
-            buf.append("<img height=\"11\" width=\"16\" alt=\"").append(country.toUpperCase(Locale.US)).append('\"');
-            buf.append(" title=\"").append(getTranslatedCountry(country)).append('\"');
-            buf.append(" src=\"/flags.jsp?c=").append(country).append("\"> ").append("</a>");
-        }
+           .append("<td colspan=\"2\" class=\"netdb_addresses\">");
         for (RouterAddress addr : info.getAddresses()) {
             String style = addr.getTransportStyle();
-            buf.append("<b>").append(DataHelper.stripHTML(style)).append(":</b> ");
+            buf.append("<br><b class=\"netdb_transport\">").append(DataHelper.stripHTML(style)).append(":</b>");
             int cost = addr.getCost();
             if (!((style.equals("SSU") && cost == 5) || (style.equals("NTCP") && cost == 10)))
-                buf.append('[').append(_t("cost")).append('=').append("" + cost).append("] ");
+                buf.append("&nbsp;<span class=\"netdb_name\">").append(_t("cost")).append("</span>: <span class=\"netdb_info\">").append("" + cost).append("</span>&nbsp;");
             Map<Object, Object> p = addr.getOptionsMap();
             for (Map.Entry<Object, Object> e : p.entrySet()) {
                 String name = (String) e.getKey();
                 String val = (String) e.getValue();
-                buf.append('[').append(_t(DataHelper.stripHTML(name))).append('=').append(DataHelper.stripHTML(val)).append("] ");
+                buf.append(" <span class=\"nowrap\"><span class=\"netdb_name\">").append(_t(DataHelper.stripHTML(name)))
+                   .append(":</span> <span class=\"netdb_info\">").append(DataHelper.stripHTML(val)).append("</span></span>&nbsp;");
             }
         }
         buf.append("</td></tr>\n");
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SybilRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/SybilRenderer.java
index 2ac4d5c519..7ed429b833 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/SybilRenderer.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/SybilRenderer.java
@@ -271,11 +271,11 @@ class SybilRenderer {
                 double p = pp.points;
                 if (p < MIN_DISPLAY_POINTS)
                     break;  // sorted
-                buf.append("<p class=\"threatpoints\"><b>Threat Points: " + fmt.format(p) + "</b><ul>");
+                buf.append("<p class=\"threatpoints\"><b>Threat Points: " + fmt.format(p) + "</b></p><ul>");
                 for (String s : pp.reasons) {
                     buf.append("<li>").append(s).append("</li>");
                 }
-                buf.append("</ul></p>");
+                buf.append("</ul>");
                 renderRouterInfo(buf, ri, null, false, false);
             }
         }
@@ -586,7 +586,7 @@ class SybilRenderer {
     }
 
     private void renderIPGroupsFamily(Writer out, StringBuilder buf, List<RouterInfo> ris, Map<Hash, Points> points) throws IOException {
-        buf.append("<h3 id=\"samefamily\" class=\"sybils\">Floodfills in the Same Declared Family</h3>");
+        buf.append("<h3 id=\"samefamily\" class=\"sybils\">Floodfills in the Same Declared Family</h3><div class=\"sybil_container\">");
         ObjectCounter<String> oc = new ObjectCounter<String>();
         for (RouterInfo info : ris) {
             String fam = info.getOption("family");
@@ -602,7 +602,7 @@ class SybilRenderer {
         for (String s : foo) {
             int count = oc.count(s);
             String ss = DataHelper.escapeHTML(s);
-            buf.append("<p class=\"family\"><b>").append(count).append(" floodfills in family:&nbsp;&nbsp;<a href=\"/netdb?fam=")
+            buf.append("<p class=\"family\"><b>").append(count).append(" floodfills in family: &nbsp;<a href=\"/netdb?fam=")
                .append(ss).append("&amp;sybil\">").append(ss).append("</a></b></p>");
             for (RouterInfo info : ris) {
                 String fam = info.getOption("family");
@@ -628,6 +628,7 @@ class SybilRenderer {
         }
         if (!found)
             buf.append("<p class=\"notfound\">None</p>");
+        buf.append("</div>");
         out.write(buf.toString());
         out.flush();
         buf.setLength(0);
@@ -754,7 +755,8 @@ class SybilRenderer {
                 break;
         }
         double avg = tot / count;
-        buf.append("<p id=\"sybil_totals\"><b>Totals for " + count + " floodfills: </b>MIN=" + fmt.format(min) + " AVG=" + fmt.format(avg) + " MEDIAN=" + fmt.format(median) + " MAX=" + fmt.format(max) + "</p>\n");
+        buf.append("<p id=\"sybil_totals\"><b>Totals for " + count + " floodfills: &nbsp;</b><span class=\"netdb_name\">MIN:</span > " + fmt.format(min) + "&nbsp; <span class=\"netdb_name\">AVG:</span> " +
+            fmt.format(avg) + "&nbsp; <span class=\"netdb_name\">MEDIAN:</span> " + fmt.format(median) + "&nbsp; <span class=\"netdb_name\">MAX:</span> " + fmt.format(max) + "</p>\n");
         out.write(buf.toString());
         out.flush();
         buf.setLength(0);
@@ -789,36 +791,53 @@ class SybilRenderer {
      */
     private double renderRouterInfo(StringBuilder buf, RouterInfo info, Hash us, boolean isUs, boolean full) {
         String hash = info.getIdentity().getHash().toBase64();
-        buf.append("<table class=\"sybil_routerinfo\"><a name=\"").append(hash.substring(0, 6)).append("\" ></a><tr>");
+        buf.append("<a name=\"").append(hash.substring(0, 6)).append("\"></a><table class=\"sybil_routerinfo\"><tr>");
         double distance = 0;
         if (isUs) {
-            buf.append("<th colspan=\"4\"><a name=\"our-info\" ></a><b>" + _t("Our info") + ":</b> <code>").append(hash).append("</code></th></tr>\n");
+            buf.append("<th colspan=\"2\"><a name=\"our-info\" ></a><b>" + _t("Our info") + ":</b> <code>").append(hash)
+               .append("</code></th></tr>\n<tr><td class=\"sybilinfo_params\" colspan=\"2\"><div class=\"sybilinfo_container\">");
         } else {
-            buf.append("<th colspan=\"2\"><b>" + _t("Router") + ":</b> <code>").append(hash).append("</code>\n");
+            buf.append("<th><b>" + _t("Router") + ":</b> <code>").append(hash).append("</code>\n");
+
+            String country = _context.commSystem().getCountry(info.getIdentity().getHash());
+            buf.append("</th><th>");
+            if(country != null) {
+                buf.append("<a href=\"/netdb?c=").append(country).append("\">");
+                buf.append("<img height=\"11\" width=\"16\" alt=\"").append(country.toUpperCase(Locale.US)).append('\"');
+                buf.append(" title=\"").append(getTranslatedCountry(country)).append('\"');
+                buf.append(" src=\"/flags.jsp?c=").append(country).append("\"> ").append("</a>");
+            }
             if (!full) {
-                buf.append("</th><th><a title=\"View extended router info\" class=\"viewfullentry\" href=\"netdb?r=").append(hash.substring(0, 6)).append("\" >[").append(_t("Full entry")).append("]</a></th><th>");
+                buf.append("<a title=\"View extended router info\" class=\"viewfullentry\" href=\"netdb?r=")
+                   .append(hash.substring(0, 6)).append("\" >[").append(_t("Full entry")).append("]</a></th><th>");
             }
             buf.append("<img src=\"/imagegen/id?s=32&amp;c=" + hash.replace("=", "%3d") + "\" height=\"32\" width=\"32\"> ");
-            buf.append("</th></tr>\n");
+            buf.append("</th></tr>\n<tr><td class=\"sybilinfo_params\" colspan=\"3\"><div class=\"sybilinfo_container\">");
             if (us != null) {
                 BigInteger dist = HashDistance.getDistance(us, info.getHash());
                 distance = biLog2(dist);
-                buf.append("<tr><td><b>Hash Distance:</b></td><td colspan=\"3\">").append(fmt.format(distance)).append("</td></tr>\n");
+                buf.append("<p><b>Hash Distance:</b> ").append(fmt.format(distance)).append("</p>\n");
             }
         }
-        buf.append("<tr><td><b>Routing Key:</b></td><td colspan=\"3\">").append(info.getRoutingKey().toBase64()).append("</td></tr>\n");
-        buf.append("<tr><td><b>Version:</b></td><td colspan=\"3\">").append(DataHelper.stripHTML(info.getVersion())).append("</td></tr>\n");
-        buf.append("<tr><td><b>Caps:</b></td><td colspan=\"3\">").append(DataHelper.stripHTML(info.getCapabilities())).append("</td></tr>\n");
-        String fam = info.getOption("family");
-        if (fam != null)
-            buf.append("<tr><td><b>Family:</b></td><td colspan=\"3\">").append(DataHelper.escapeHTML(fam)).append("</td></tr>\n");
-        String kls = info.getOption("netdb.knownLeaseSets");
-        if (kls != null)
-            buf.append("<tr><td><b>Lease Sets:</b></td><td colspan=\"3\">").append(DataHelper.stripHTML(kls)).append("</td></tr>\n");
+        buf.append("<p><b>Version:</b> ").append(DataHelper.stripHTML(info.getVersion())).append("</p>\n");
+        buf.append("<p><b>Caps:</b> ").append(DataHelper.stripHTML(info.getCapabilities())).append("</p>\n");
         String kr = info.getOption("netdb.knownRouters");
-        if (kr != null)
-            buf.append("<tr><td><b>Routers:</b></td><td colspan=\"3\">").append(DataHelper.stripHTML(kr)).append("</td></tr>\n");
-        
+;
+        if (kr != null) {
+            buf.append("<p><b>Routers:</b> ").append(DataHelper.stripHTML(kr)).append("</p>");
+        } else {
+            buf.append("<p class=\"sybil_filler\"><b>Routers:</b> ").append(_t("n/a")).append("</p>");
+        }
+        String kls = info.getOption("netdb.knownLeaseSets");
+        if (kls != null) {
+            buf.append("<p class=\"sybilinfo_leasesets\"><b>Lease Sets:</b> ").append(DataHelper.stripHTML(kls)).append("</p>\n");
+        } else {
+            buf.append("<p class=\"sybilinfo_leasesets filler\"><b>Lease Sets:</b> ").append(_t("n/a")).append("</p>");
+        }
+        String fam = info.getOption("family");
+        if (fam != null) {
+            buf.append("<p><b>Family:</b> <span class=\"sybilinfo_familyname\">").append(DataHelper.escapeHTML(fam)).append("</span></p>\n");
+        }
         long now = _context.clock().now();
         if (!isUs) {
             PeerProfile prof = _context.profileOrganizer().getProfileNonblocking(info.getHash());
@@ -826,46 +845,53 @@ class SybilRenderer {
                 long heard = prof.getFirstHeardAbout();
                 if (heard > 0) {
                     long age = Math.max(now - heard, 1);
-                    buf.append("<tr><td><b>First heard about:</b></td><td colspan=\"3\">")
-                       .append(_t("{0} ago", DataHelper.formatDuration2(age))).append("</td></tr>\n");
+                    buf.append("<p><b>First heard about:</b> ").append(_t("{0} ago", DataHelper.formatDuration2(age))).append("</p>");
+                } else {
+                    buf.append("<p class=\"sybil_filler\"><b>First heard about:</b> ").append(_t("n/a")).append("</p>");
                 }
                 heard = prof.getLastHeardAbout();
                 if (heard > 0) {
                     long age = Math.max(now - heard, 1);
-                    buf.append("<tr><td><b>Last heard about:</b></td><td colspan=\"3\">")
-                       .append(_t("{0} ago", DataHelper.formatDuration2(age))).append("</td></tr>\n");
+                    buf.append("<p><b>Last heard about:</b> ").append(_t("{0} ago", DataHelper.formatDuration2(age))).append("</p>");
+                } else {
+                    buf.append("<p class=\"sybil_filler\"><b>Last heard about:</b> ").append(_t("n/a")).append("</p>");
                 }
                 heard = prof.getLastHeardFrom();
                 if (heard > 0) {
                     long age = Math.max(now - heard, 1);
-                    buf.append("<tr><td><b>Last heard from:</b></td><td colspan=\"3\">")
-                       .append(_t("{0} ago", DataHelper.formatDuration2(age))).append("</td></tr>\n");
+                    buf.append("<p><b>Last heard from:</b> ").append(_t("{0} ago", DataHelper.formatDuration2(age))).append("</p>\n");
+                } else {
+                    buf.append("<p class=\"sybil_filler\"><b>Last heard from:</b> ").append(_t("n/a")).append("</p>");
                 }
                 DBHistory dbh = prof.getDBHistory();
                 if (dbh != null) {
                     heard = dbh.getLastLookupSuccessful();
                     if (heard > 0) {
                         long age = Math.max(now - heard, 1);
-                        buf.append("<tr><td><b>Last lookup successful:</b></td><td colspan=\"3\">")
-                           .append(_t("{0} ago", DataHelper.formatDuration2(age))).append("</td></tr>\n");
+                        buf.append("<p><b>Last lookup successful:</b> ").append(_t("{0} ago", DataHelper.formatDuration2(age))).append("</p>");
+                    } else {
+                        buf.append("<p class=\"sybil_filler\"><b>Last lookup successful:</b> ").append(_t("n/a")).append("</p>");
                     }
                     heard = dbh.getLastLookupFailed();
                     if (heard > 0) {
                         long age = Math.max(now - heard, 1);
-                        buf.append("<tr><td><b>Last lookup failed:</b></td><td colspan=\"3\"> ")
-                           .append(_t("{0} ago", DataHelper.formatDuration2(age))).append("</td></tr>\n");
+                        buf.append("<p><b>Last lookup failed:</b> ").append(_t("{0} ago", DataHelper.formatDuration2(age))).append("</p>");
+                    } else {
+                        buf.append("<p class=\"sybil_filler\"><b>Last lookup failed:</b> ").append(_t("n/a")).append("</p>");
                     }
                     heard = dbh.getLastStoreSuccessful();
                     if (heard > 0) {
                         long age = Math.max(now - heard, 1);
-                        buf.append("<tr><td><b>Last store successful:</b></td><td colspan=\"3\">")
-                           .append(_t("{0} ago", DataHelper.formatDuration2(age))).append("</td></tr>\n");
+                        buf.append("<p><b>Last store successful:</b> ").append(_t("{0} ago", DataHelper.formatDuration2(age))).append("</p>");
+                    } else {
+                        buf.append("<p class=\"sybil_filler\"><b>Last store successful:</b> ").append(_t("n/a")).append("</p>");
                     }
                     heard = dbh.getLastStoreFailed();
                     if (heard > 0) {
                         long age = Math.max(now - heard, 1);
-                        buf.append("<tr><td><b>Last store failed:</b></td><td colspan=\"3\">")
-                           .append(_t("{0} ago", DataHelper.formatDuration2(age))).append("</td></tr>\n");
+                        buf.append("<p><b>Last store failed:</b> ").append(_t("{0} ago", DataHelper.formatDuration2(age))).append("</p>");
+                    } else {
+                        buf.append("<p class=\"sybil_filler\"><b>Last store failed:</b> ").append(_t("n/a")).append("</p>");
                     }
                 }
                 // any other profile stuff?
@@ -873,25 +899,18 @@ class SybilRenderer {
         }
         long age = Math.max(now - info.getPublished(), 1);
         if (isUs && _context.router().isHidden()) {
-            buf.append("<tr><td><b>").append(_t("Hidden")).append(", ").append(_t("Updated")).append(":</b></td><td colspan=\"3\">")
-               .append(_t("{0} ago", DataHelper.formatDuration2(age))).append("</td></tr>\n");
+            buf.append("<p><b>").append(_t("Hidden")).append(", ").append(_t("Updated")).append(":</b> ")
+               .append(_t("{0} ago", DataHelper.formatDuration2(age))).append("</p>\n");
         } else {
-            buf.append("<tr><td><b>").append(_t("Published")).append(":</b></td><td colspan=\"3\">")
-               .append(_t("{0} ago", DataHelper.formatDuration2(age))).append("</td></tr>\n");
-        }
-        buf.append("<tr><td><b>").append(_t("Signing Key")).append(":</b></td><td colspan=\"3\">")
-           .append(info.getIdentity().getSigningPublicKey().getType().toString()).append("</td></tr>\n");
-        buf.append("<tr><td><b>" + _t("Addresses") + ":</b></td><td colspan=\"3\">");
-        String country = _context.commSystem().getCountry(info.getIdentity().getHash());
-        if(country != null) {
-            buf.append("<a href=\"/netdb?c=").append(country).append("\">");
-            buf.append("<img height=\"11\" width=\"16\" alt=\"").append(country.toUpperCase(Locale.US)).append('\"');
-            buf.append(" title=\"").append(getTranslatedCountry(country)).append('\"');
-            buf.append(" src=\"/flags.jsp?c=").append(country).append("\"> ").append("</a>");
+            buf.append("<p><b>").append(_t("Published")).append(":</b> ").append(_t("{0} ago", DataHelper.formatDuration2(age))).append("</p>\n");
         }
+        buf.append("<p><b>").append(_t("Signing Key")).append(":</b> ")
+           .append(info.getIdentity().getSigningPublicKey().getType().toString()).append("</p>\n");
+        buf.append("<p class=\"sybil_filler\">&nbsp;</p>");
+        buf.append("</div></td></tr><tr><td class=\"sybil_addresses\" colspan=\"3\"><table><tr><td><b>" + _t("Addresses") + ":</b></td><td>");
         for (RouterAddress addr : info.getAddresses()) {
             String style = addr.getTransportStyle();
-            buf.append("<b>").append(DataHelper.stripHTML(style)).append(":</b> ");
+            buf.append("<br><b class=\"netdb_transport\">").append(DataHelper.stripHTML(style)).append(":</b> ");
             Map<Object, Object> p = addr.getOptionsMap();
             for (Map.Entry<Object, Object> e : p.entrySet()) {
                 String name = (String) e.getKey();
@@ -899,15 +918,12 @@ class SybilRenderer {
                     name.startsWith("iport") || name.equals("mtu"))
                     continue;
                 String val = (String) e.getValue();
-                buf.append('[').append(_t(DataHelper.stripHTML(name))).append('=');
-                if (name.equals("host"))
-                    buf.append("<b>");
-                buf.append(DataHelper.stripHTML(val)).append("] ");
-                if (name.equals("host"))
-                    buf.append("</b>");
+                buf.append(" <span class=\"nowrap\"><span class=\"netdb_name\">").append(_t(DataHelper.stripHTML(name))).append(":</span> <span class=\"netdb_info\">");
+                buf.append(DataHelper.stripHTML(val));
+                buf.append("</span></span>&nbsp;");
             }
         }
-        buf.append("</td></tr>\n");
+        buf.append("</table></td></tr>\n");
         buf.append("</table>\n");
         return distance;
     }
diff --git a/history.txt b/history.txt
index 54b4a02e56..f915b401d5 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,20 @@
 2017-07-01 str4d
+ * Console:
+   - /netdb:
+     - All Routers/Leasesets/Sybil sections:
+       - Each transport instance on own line
+       - Better presentation of address characteristics
+       - Place flag in table header
+     - Container div for leasesets to allow 2 column display at wider viewport width
+     - Increased spacing of lease information in leaseset tables
+     - Add div for "not initialized" message
+     - Reorganize content display in sybil database to reduce horizontal whitespace:
+       - Conditional 2-column display of sybil families
+       - Sybil router characteristics & threatpoints presented in multi-column view
+       - Added empty (n/a) fields to maintain visual consistency in column view
+   - /tunnels:
+     - Tag "Local" for translation (and convert to lowercase in CSS)
+     - Arabic: ensure our tunnel tables display correctly
  * I2PSnark: Fix unclosed <label>
 
 2017-06-19 str4d
diff --git a/installer/resources/themes/console/classic/console.css b/installer/resources/themes/console/classic/console.css
index 2d66490e0d..2ef0774813 100644
--- a/installer/resources/themes/console/classic/console.css
+++ b/installer/resources/themes/console/classic/console.css
@@ -675,8 +675,212 @@ div.refresh {
      filter: drop-shadow(0 0 1px #f60) saturate(200%);
 }
 
+/* network status */
+
+.routersummary .error, .routersummary .warn, .routersummary .testing, .routersummary .hidden,
+.routersummary .running, .routersummary .firewalled, .routersummary .vmcomm, .routersummary .clockskew, .tunnelBuildStatus {
+     display: inline-block;
+     vertical-align: middle;
+     border: 1px solid #88f;
+     border-radius: 2px;
+     padding: 6px 3px;
+     width: calc(100% - 10px);
+     margin: -5px 0 -6px;
+     box-shadow: inset 0 0 0 1px #fff, 0 0 1px rgba(96,96,96,0.5);
+     text-shadow: 0 1px 1px #fff;
+}
+
+.routersummary .firewalled {
+     background: rgba(255,220,255,0.3);
+     background: repeating-linear-gradient(135deg, rgba(220,255,220,0.5) 2px, rgba(110,255,110,0.1) 3px, rgba(220,255,220,0.5) 5px);
+}
+
+.routersummary .error {
+     background: rgba(255,110,110,0.1);
+     box-shadow: inset 0 0 0 1px rgba(255,0,0,0.3), 0 0 1px rgba(96,96,96,0.5);
+}
+
+.routersummary .warn, .routersummary .clockskew {
+     background: rgba(255,255,200,0.4);
+     box-shadow: inset 0 0 0 1px #ff0, 0 0 1px rgba(96,96,96,0.5);
+}
+
+.routersummary .testing {
+     background: rgba(255,220,110,0.1);
+}
+
+.routersummary .hidden, .routersummary .vmcomm {
+     background: rgba(220,220,220,0.4);
+}
+
+.routersummary .running {
+     background: rgba(220,255,220,0.2);
+}
+
+.routersummary .error::before, .routersummary .warn::before, .routersummary .testing::before, .routersummary .hidden::before,
+.routersummary .running::before, .routersummary .firewalled::before, .routersummary .vmcomm::before, .routersummary .clockskew::before {
+     padding-right: 2px;
+     vertical-align: middle;
+     display: inline-block;
+     filter: drop-shadow(0 0 1px rgba(96,96,96,0.5));
+}
+
+.routersummary .error::before, .routersummary .clockskew::before {
+     content: url(/themes/console/images/info/network_status/network_error.png);
+}
+
+.routersummary .warn::before {
+     content: url(/themes/console/images/info/network_status/network_warning.png);
+}
+
+.routersummary .testing::before {
+     content: url(/themes/console/images/info/network_status/network_testing.png);
+}
+
+.routersummary .hidden::before {
+     content: url(/themes/console/images/info/network_status/network_hidden.png);
+}
+
+.routersummary .running::before {
+     content: url(/themes/console/images/info/network_status/network_ok.png);
+}
+
+.routersummary .firewalled::before {
+     content: url(/themes/console/images/info/network_status/network_firewalled.png);
+}
+
+.routersummary .vmcomm::before {
+     content: url(/themes/console/images/info/network_status/network_vm.png);
+}
+
+.routersummary .clockskew::before {
+     content: url(/themes/console/images/info/network_status/network_clockskew.png);
+}
+
+/* end network status */
+
 /* end sidebar */
 
+/* welcome */
+
+div[lang="ar"] li {
+     margin: 0 10px 0 30px;
+}
+
+div[lang="ar"] h3, div[lang="ar"] li {
+     text-align: right;
+}
+
+div[lang="de"] .twocol {
+     margin-left: 50px !important;
+}
+
+#console .links {
+     margin-left: 0;
+}
+
+#console li:first-child {
+     padding-top: 10px;
+}
+
+.langbox {
+     margin: 3.5px 2px 0;
+     color: #001;
+     font-size: 7pt;
+     width: 360px;
+     text-align: right;
+     float: right;
+     padding: 1px;
+     overflow: hidden;
+}
+
+.langbox img {
+     padding: 0 !important;
+     margin: 0 1px -1px;
+     opacity: 0.9;
+     border: 1px solid #999;
+     transform: none !important;
+}
+
+.langbox img:hover, .langbox a:focus img {
+     opacity: 1;
+     transform: scale(1.1) !important;
+}
+
+.links {
+     padding-bottom: 0;
+     text-align: justify;
+     margin-top: 5px !important;
+}
+
+.links li {
+     list-style-image: url(images/link.png) !important;
+     padding: 5px 10px 0 !important;
+}
+
+.links li:first-child {
+     padding: 14px 10px 5px !important;
+}
+
+.links li:last-child {
+     margin-bottom: 0 !important;
+     margin-top: 0;
+}
+
+.links b {
+     font-size: 10pt;
+     line-height: 150%;
+     letter-spacing: 0.02em;
+}
+
+.twocol {
+     -moz-columns: 2 400px;
+     -webkit-columns: 2 400px;
+     columns: 2 400px;
+     -moz-column-gap: 20px !important;
+     -webkit-column-gap: 20px !important;
+     column-gap: 20px !important;
+     display: block;
+     margin: 10px 0 !important;
+}
+
+p + .twocol {
+     margin: 10px 30px !important;
+}
+
+.twocol li {
+     break-inside: avoid;
+     page-break-inside: avoid;
+     -webkit-column-break-inside: avoid;
+}
+
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+#console .twocol {
+     margin-left: -20px !important;
+}
+
+#console div[lang="de"] .twocol {
+     margin-left: 30px !important;
+}
+
+.twocol li {
+     margin-left: 20px;
+}
+}
+
+.twocol li:first-child {
+     margin-top: 0 !important
+     padding-top: 0 !important;
+     padding-bottom: 0 !important;
+}
+
+.main#console p {
+     padding-top: 0;
+     padding-bottom: 0;
+}
+
+/* end welcome */
+
 a:link {
      color: #33a;
      text-decoration: none;
@@ -1279,7 +1483,7 @@ button.download.control:hover, button.download.control:focus {
      background: url(/themes/console/images/buttons/download.png) center center no-repeat, linear-gradient(to bottom, #ddd, #fff);
 }
 
-button::-moz-focus-inner, input[type="submit"]::-moz-focus-inner, input[type="reset"]::-moz-focus-inner  {
+button::-moz-focus-inner, input[type="submit"]::-moz-focus-inner, input[type="reset"]::-moz-focus-inner {
      outline: none;
      border: none;
 }
@@ -1515,7 +1719,7 @@ div.wideload h3 {
      margin-bottom: 0 !important;
 }
 
-div.wideload p  {
+div.wideload p {
      margin-top: 5px !important;
 }
 
@@ -1761,8 +1965,9 @@ table.configtable, #permabanned, #loggingoptions, #configstats, ul#banlist {
      text-transform: none;
 }
 
-#configstats td:first-child:empty + td > label { /* remove pointer from inert labels */
+#configstats td:first-child:empty + td > label, #configstats td:first-child:empty + td > label:hover { /* remove pointer from inert labels */
      cursor: default;
+     color: #2c354f;
 }
 
 #configstats td:last-child { /* epiphany fix */
@@ -2443,7 +2648,7 @@ div.configure h2:first-child {
      border-bottom: 1px solid #89f;
 }
 
-#sidebarconf tr:last-child, #sidebarconf tr:last-child:hover  {
+#sidebarconf tr:last-child, #sidebarconf tr:last-child:hover {
      border-top: 1px solid #89f;
      background: #eff1ff;
 }
@@ -3417,7 +3622,7 @@ p#pluginconfigtext {
      padding-right: 3px !important;
 }
 
-.configtable tr:last-child, #addkeyring tr:last-child, #loggingoptions tr:last-child  {
+.configtable tr:last-child, #addkeyring tr:last-child, #loggingoptions tr:last-child {
      background: #fff;
      border-top: 1px solid #89f;
 }
@@ -3448,7 +3653,7 @@ p#enablefullstats {
      padding-right: 3px !important;
 }
 
-.configtable tr:last-child, #addkeyring tr:last-child, #loggingoptions tr:last-child  {
+.configtable tr:last-child, #addkeyring tr:last-child, #loggingoptions tr:last-child {
      background: #fff;
      border-top: 1px solid #89f;
 }
@@ -3516,56 +3721,6 @@ p#enablefullstats {
      margin: 0 -5px;
 }
 
-.langbox {
-     margin: 3.5px 2px 0;
-     color: #001;
-     font-size: 7pt;
-     width: 360px;
-     text-align: right;
-     float: right;
-     padding: 1px;
-     overflow: hidden;
-}
-
-.langbox img {
-     padding: 0 !important;
-     margin: 0 1px -1px;
-     opacity: 0.9;
-     border: 1px solid #999;
-     transform: none !important;
-}
-
-.langbox img:hover, .langbox a:focus img {
-     opacity: 1;
-     transform: scale(1.1) !important;
-}
-
-.links {
-     padding-bottom: 0;
-     text-align: justify;
-     margin-top: 5px !important;
-}
-
-.links li {
-     list-style-image: url(images/link.png) !important;
-     padding: 5px 10px 0 !important;
-}
-
-.links li:first-child {
-     padding: 14px 10px 5px !important;
-}
-
-.links li:last-child {
-     margin-bottom: 0 !important;
-     margin-top: 0;
-}
-
-.links b {
-     font-size: 10pt;
-     line-height: 150%;
-     letter-spacing: 0.02em;
-}
-
 .main#logs code {
      font-size: 8pt;
 }
@@ -3753,7 +3908,7 @@ p#graphopts + p {
      border-right: none;
      background-size: 20px 20px !important;
      padding: 5px 5px 5px 40px !important;
-     background: url(/themes/console/images/info/infohelp.png) 15px center no-repeat #eaeaff;
+     background: url(/themes/console/images/info/infohelp.png) 15px center no-repeat #f1f3ff;
      text-align: left;
 }
 
@@ -3831,7 +3986,7 @@ body.iframed {
      border-radius: 2px;
      background: #fff;
      background: linear-gradient(to bottom, #fff, #ddf);
-     transition: all 0.3s ease 0s;
+     transition: ease all 0.3s;
      box-shadow: 0 0 1px #fff;
 }
 
@@ -3843,7 +3998,7 @@ body.iframed {
 .themechoice:hover > object ~ .themelabel {
      border-top: 1px solid #f60 !important;
      background: #fff;
-     transition: all 0.1s ease 0s;
+     transition: ease all 0.1s;
 }
 
 .themechoice:hover > object {
@@ -3986,14 +4141,14 @@ p#helptranslate {
      border-radius: 2px;
      background: #fff;
      background: linear-gradient(to bottom, #fff, #ddf);
-     transition: all 0.3s ease 0s;
+     transition: ease all 0.3s;
      box-shadow: 0 0 1px #fff;
 }
 
 .langselect:hover {
      border: 1px solid #f60;
      background: #fff;
-     transition: ease all 0.3s 0s;
+     transition: ease all 0.3s;
 }
 
 .langselect .optbox {
@@ -4034,7 +4189,7 @@ p#helptranslate {
      border-top: 1px solid #f60;
      font-weight: bold;
      background: #fff !important;
-     transition: all 0.1s ease 0s;
+     transition: ease all 0.1s;
 }
 
 .langselect input[name="lang"]:checked + img + .ui_lang {
@@ -4068,10 +4223,6 @@ p#helptranslate {
      background: #f60 !important;
 }
 
-div.flagradio {
-     margin-top: 2px;
-}
-
 .langselect + br {
      display: none !important;
 }
@@ -4235,13 +4386,13 @@ a.viewfullentry:hover {
      filter: drop-shadow(0 0 1px #f60);
 }
 
-.netdbentry th:first-child, .netdbentry td:first-child  {
+.netdbentry th:first-child, .netdbentry td:first-child {
      white-space: nowrap;
      padding: 4px 6px !important;
      text-align: left;
 }
 
-.netdbentry td:first-child  {
+.netdbentry td:first-child {
      width: 80px;
 }
 
@@ -4360,7 +4511,7 @@ a.viewfullentry:hover {
      filter: drop-shadow(0 0 1px #f60);
 }
 
-#noleasesets {
+#noleasesets, #notinitialized, .netdbnotfound {
      border: 1px solid #89f;
      padding: 20px;
      font-weight: bold;
@@ -4369,32 +4520,6 @@ a.viewfullentry:hover {
      text-align: center;
 }
 
-#sybilnav, #sybils_summary {
-     border: 1px solid #89f;
-     padding: 10px;
-     margin-bottom: 10px;
-     background: #fff;
-}
-
-#sybilnav {
-     padding: 5px 5px 0;
-}
-
-#sybilnav ul li:first-child {
-     margin-top: -10px;
-}
-
-#sybilnav ul li:last-child {
-     margin-bottom: 0;
-}
-
-#sybilnav li a {
-     display: inline-block;
-     width: calc(100% - 34px);
-     vertical-align: middle;
-     line-height: 100%;
-}
-
 .sybil_routerinfo {
      margin-bottom: 10px;
 }
@@ -4443,12 +4568,27 @@ a.viewfullentry:hover {
      font-weight: normal;
 }
 
+#sybilnav, #sybils_summary {
+     border: 1px solid #89f;
+     padding: 10px;
+     margin-bottom: 10px;
+     background: #fff;
+}
+
 #sybilnav {
      background: #eff1ff;
-     -moz-columns: 4 200px;
-     -webkit-columns: 4 200px;
-     columns: 4 200px;
-     padding: 10px 0 0 5px;
+     padding-bottom: 8px;
+     -moz-columns: 4 250px;
+     -webkit-columns: 4 250px;
+     columns: 4 250px;
+     -moz-column-gap: 10px;
+     -webkit-column-gap: 10px;
+     column-gap: 10px;
+}
+
+#sybilnav ul {
+     margin: 0;
+     padding: 0;
 }
 
 #sybilnav li {
@@ -4456,23 +4596,34 @@ a.viewfullentry:hover {
      border-bottom: 2px solid #ccf;
      list-style: none;
      margin-bottom: 5px;
-     margin-left: -15px;
+     margin-left: 0;
+     margin-right: 0;
      padding: 3px;
      background: #fff;
      background: linear-gradient(to bottom, #fff 0%, #eef 100%);
      border-radius: 2px 2px 0 0;
-     min-width: 170px;
      box-sizing: border-box;
      break-inside: avoid;
-     page-break-before: right;
+     page-break-inside: avoid;
      -webkit-column-break-inside: avoid;
 }
 
 #sybilnav li:first-child {
-     margin-top: 10px !important;
+     margin-top: 0 !important;
 }
 
-#sybilnav ul li::before {
+#sybilnav li:last-child {
+     margin-bottom: 0;
+}
+
+#sybilnav li a {
+     display: inline-block;
+     vertical-align: middle;
+     line-height: 100%;
+     width: calc(100% - 30px);
+}
+
+#sybilnav li::before {
      content: '\00A0\1F441\00A0';
      content: url(images/eye.png);
      padding: 0 5px;
@@ -4481,7 +4632,7 @@ a.viewfullentry:hover {
      vertical-align: middle;
 }
 
-p.sybil_info, p.family, p.threatpoints, p.hashdist, p.notfound {
+p.sybil_info, p.family, p.threatpoints, p.hashdist, p.notfound, p#sybil_totals {
      border: 1px solid #89f;
      padding: 5px 5px 5px 30px;
      margin: 3px 0;
@@ -4491,6 +4642,10 @@ p.sybil_info, p.family, p.threatpoints, p.hashdist, p.notfound {
      background: url(images/eye.png) 8px center no-repeat, linear-gradient(to right, #fff 40%, #dde1ff);
 }
 
+p#sybil_totals {
+     font-weight: normal;
+}
+
 p.family a {
      display: inline-block;
 }
@@ -4499,7 +4654,7 @@ p.family + p.family, p.sybil_info + p.sybil_info {
      margin-top: -4px;
 }
 
-p.sybil_info + a[name] + table.sybil_routerinfo, p.hashdist + a[name] + table.sybil_routerinfo  {
+p.sybil_info + a[name] + table.sybil_routerinfo, p.hashdist + a[name] + table.sybil_routerinfo {
      margin-top: 10px !important;
 }
 
@@ -4523,10 +4678,8 @@ p.sybil_info + a[name] + table.sybil_routerinfo, p.hashdist + a[name] + table.sy
      margin-bottom: 6px;
 }
 
-p#sybil_totals {
-     padding: 15px;
-     border: 1px solid #89f;
-     background: #fff;
+.sybil_routerinfo + .threatpoints + ul + a[name] + table {
+     margin-top: -11px;
 }
 
 p:empty { /* empty paragraph nuke */
@@ -4604,7 +4757,7 @@ h3.stats {
      display: none !important;
 }
 
-.statlist li b, .statlist b a:hover, h3.stats a:hover  {
+.statlist li b, .statlist b a:hover, h3.stats a:hover {
      color: #2c354f !important;
 }
 
@@ -5232,6 +5385,7 @@ p#enablefullstats, p#gatherstats {
       background-size: 28px 28px;
       margin-bottom: -1px !important;
 }
+
 /* end informational images */
 
 /* login inputs */
@@ -5312,6 +5466,8 @@ p#enablefullstats, p#gatherstats {
      background: #000099;
 }
 
+/* end logs */
+
 /* peers, profiles, tunnels */
 
 .cells tt, #profilelist tt {
@@ -5320,8 +5476,453 @@ p#enablefullstats, p#gatherstats {
 
 /* end peers, profiles, tunnels dests */
 
+/* /tunnels */
 
-/* end logs */
+tt a, .cells tt {
+     letter-spacing: 0.07em;
+}
+
+.tunnel_cap {
+     background: rgba(0,0,64,0.3);
+     color: #fff;
+     border: 1px solid rgba(0,0,64,0.2);
+     border-radius: 2px;
+     min-width: 12px;
+     padding: 0 2px;
+     display:inline-block;
+     margin: 1px 2px 1px 8px;
+     text-align: center !important;
+     text-shadow: 0 1px 1px #555;
+}
+
+.tunnel_cap:empty {
+     border: none;
+}
+
+.tunnel_id {
+     display: inline-block;
+     min-width: 78px;
+     text-align: right;
+}
+
+.tunnel_id:empty {
+     min-width: 0;
+}
+
+.tunnel_id:empty + .tunnel_cap {
+     margin-left: 12px !important;
+     display: inline-block;
+}
+
+.tunnel_peer {
+     display: inline-block;
+     min-width: 56px;
+     text-align: right;
+}
+
+.tunnel_local {
+     font-size: 8pt;
+     text-transform: lowercase;
+     background: rgba(187, 187, 255, 0.3);
+     background: #d5d5ff;
+     border-radius: 2px;
+     text-align: center;
+     padding: 2px 0;
+     margin-left: -4px;
+     margin-right: 4px;
+}
+
+.tunnel_peer:empty {
+     vertical-align: top;
+}
+
+.tunneldisplay td {
+     padding-top: 4px;
+     padding-bottom: 4px;
+}
+
+#tunnel_defs td:nth-child(even), #tunnel_defs td:first-child {
+     width: 1%;
+}
+
+@media screen and (max-width: 1100px) {
+.tunnel_id, .tunnel_peer {
+     min-width: 0 !important;
+     text-align: center !important;
+}
+
+.tunnel_local {
+     margin-right: 5px;
+     margin-left: 2px;
+     padding: 2px 4px;
+}
+
+.tunnel_peer:empty {
+     vertical-align: middle;
+}
+
+.tunnel_peer:empty::before {
+     margin: 1px 6px 1px 2px;
+}
+
+.tunnel_cap {
+     margin-left: 5px !important;
+}
+}
+
+@media screen and (min-width: 1500px) {
+.tunnel_cap {
+     margin-left: 10px;
+     padding: 0 1px;
+     min-width: 14px;
+}
+
+.tunnel_id:empty {
+     margin-right: -10px;
+}
+}
+
+/* end tunnels */
+
+/* /peers */
+
+#ntcpconnections th:nth-child(6), #ntcpconnections th:nth-child(7), #ntcpconnections th:nth-child(8), #ntcpconnections th:nth-child(9), #ntcpconnections th:nth-child(10),
+#ntcpconnections td:nth-child(6), #ntcpconnections td:nth-child(7), #ntcpconnections td:nth-child(8), #ntcpconnections td:nth-child(9), #ntcpconnections td:nth-child(10),
+#udpconnections td:nth-child(6), #udpconnections td:nth-child(7), #udpconnections td:nth-child(9), #udpconnections td:nth-child(10), #udpconnections td:nth-child(11),
+#udpconnections td:nth-child(13), #udpconnections td:nth-child(14), #udpconnections td:nth-child(15), #udpconnections td:nth-child(16) {
+     text-align: right;
+     white-space: nowrap;
+}
+
+#ntcpconnections .tablefooter td:nth-child(3), #ntcpconnections .tablefooter td:nth-child(4), #ntcpconnections .tablefooter td:nth-child(5), #ntcpconnections .tablefooter td:nth-child(6),
+#udpconnections .tablefooter td:nth-child(3), #udpconnections .tablefooter td:nth-child(4), #udpconnections .tablefooter td:nth-child(7), #udpconnections .tablefooter td:nth-child(8),
+#udpconnections .tablefooter td:nth-child(10), #udpconnections .tablefooter td:nth-child(11), #udpconnections .tablefooter td:nth-child(12), #udpconnections .tablefooter td:nth-child(13) {
+     text-align: right;
+}
+
+#udpconnections .tablefooter td:nth-child(9) {
+     text-align: center !important;
+}
+
+#ntcpconnections td:nth-child(4), #ntcpconnections td:nth-child(5), #udpconnections td:nth-child(4),
+#udpconnections td:nth-child(5), #udpconnections td:nth-child(8), #udpconnections td:nth-child(12) {
+     white-space: nowrap;
+}
+
+#udpconnections .tablefooter td, #ntcpconnections .tablefooter td {
+     padding-left: 5px;
+     padding-right: 5px;
+}
+
+
+#ntcpconnections th:nth-child(6), #ntcpconnections th:nth-child(7), #ntcpconnections th:nth-child(8), #ntcpconnections th:nth-child(9), #ntcpconnections th:nth-child(10) {
+     text-align: right;
+}
+
+#udpconnections th:nth-child(6), #udpconnections th:nth-child(7), #udpconnections th:nth-child(n+9) {
+     text-align: right;
+}
+
+#udpconnections th:nth-child(12) {
+     text-align: center;
+}
+
+.peersort {
+     text-align: center;
+     display: inline-block;
+}
+
+.right {
+     text-align: right;
+     margin: 0 1px;
+     display: inline-block;
+     width: 40%
+}
+
+.left {
+     text-align: left;
+     margin: 0 1px;
+     display: inline-block;
+     width: 40%
+}
+
+.peeripv6:empty {
+     padding: 0;
+     width: 0;
+}
+
+.cwnd .left, .cwnd .right {
+     width: auto;
+}
+
+#udpconnections td:nth-child(n+13), #udpconnections .tablefooter td:nth-child(n+10) {
+     padding-right: 1% !important;
+}
+
+#peerdefs {
+     line-height: 140%;
+     padding: 5px;
+}
+
+.peer_arrow {
+     display: inline-block;
+     width: 18px;
+     text-align: center;
+     margin-right: 3px;
+}
+
+/* end peers */
+
+/* netdb router address info */
+
+.leasesets_container {
+     -moz-columns: 680px 2;
+     -webkit-columns: 680px 2;
+     columns: 680px 2;
+     -moz-column-gap: 10px;
+     -webkit-column-gap: 10px;
+     column-gap: 10px;
+}
+
+th code {
+     -moz-user-select: all;
+     -webkit-user-select: all;
+     user-select: all;
+}
+
+@media screen and (min-width: 1634px) {
+.leasesets_container {
+     margin-bottom: 2px;
+}
+
+th code {
+     font-size: 9pt !important;
+}
+}
+
+.leasesets_container table:first-child {
+     margin-top: 0;
+}
+
+.leasesets_container table {
+     break-inside: avoid;
+     page-break-inside: avoid;
+     -webkit-column-break-inside: avoid;
+}
+
+.netdb_addresses br:first-child, .sybil_routerinfo tr:last-child td br:first-child {
+     display: none;
+}
+
+.netdbentry th:first-child::after {
+     content: "";
+     display: inline-block;
+     min-height: 20px;
+     vertical-align: middle;
+}
+
+.netdbentry th:last-child > *, .sybil_routerinfo th:nth-child(2) > * {
+     display: inline-block;
+     vertical-align: middle !important;
+}
+
+.netdbentry th a img, .sybil_routerinfo th a img {
+     display: inline-block;
+     vertical-align: middle;
+     margin-right: 5px;
+}
+
+.netdbentry a.viewfullentry::after {
+     display: inline-block;
+     vertical-align: middle !important;
+     margin-left: 3px;
+}
+
+.netdbentry td:first-child {
+     text-align: right;
+}
+
+.netdbentry .netdb_addresses {
+     padding-left: 40px;
+}
+
+b.netdb_transport {
+     display: inline-block;
+     width: 50px;
+     text-align: right;
+     margin-left: -50px;
+     margin-right: 5px;
+}
+
+#netdb code {
+    font-weight: normal !important;
+}
+
+.netdb_name {
+     color: #335;
+     text-transform: capitalize;
+     font-weight: bold;
+}
+
+.netdb_info {
+     margin-right: 1px;
+}
+
+.netdb_expiry {
+     margin-left: 5px;
+}
+
+.sybil_routerinfo th img[src^="/flags"] {
+     height: 11px;
+     width: 16px;
+}
+
+.sybil_routerinfo b.netdb_transport {
+     margin-left: -13px;
+     margin-right: 0;
+}
+
+.sybil_routerinfo td:first-child, .netdbentry td:first-child {
+     text-align: right !important;
+     padding-right: 0;
+}
+
+.sybil_routerinfo td[colspan="3"] {
+     white-space: normal;
+}
+
+.sybil_container {
+     -moz-columns: 680px 2;
+     -webkit-columns: 680px 2;
+     columns: 680px 2;
+     margin: 10px 0;
+}
+
+.sybil_container p {
+     break-inside: avoid;
+     page-break-inside: avoid;
+     -webkit-column-break-inside: avoid;
+}
+
+.sybil_container p:first-child {
+     margin-top: 0;
+}
+
+.sybil_container p:last-child {
+     margin-bottom: 0;
+}
+
+/* end netdb router address */
+
+/* sybils */
+
+.leaseset th:last-child, .leaseset td:last-child, .sybil_routerinfo th:last-child, .sybil_routerinfo td:last-child {
+     border-right: 1px solid #89f !important;
+}
+
+.sybil_routerinfo table td:last-child {
+     border-right: none !important;
+}
+
+.sybilinfo_params {
+     padding: 0;
+     border-bottom: 1px solid #89f;
+}
+
+.sybilinfo_container {
+     columns: 240px auto;
+     -moz-columns: 240px auto;
+     -webkit-columns: 240px auto;
+     -moz-column-gap: 0;
+     -webkit-column-gap: 0;
+     column-gap: 0;
+     background: rgba(255, 255, 255, 0.5);
+     padding: 4px 5px;
+}
+
+.sybilinfo_container b {
+     color: #335;
+}
+
+.sybil_routerinfo tr:last-child {
+     border-top: none;
+}
+
+.sybil_routerinfo p {
+     margin: 0;
+     padding: 1px 0;
+     break-inside: avoid;
+     page-break-inside: avoid;
+     -webkit-column-break-inside: avoid;
+}
+
+.sybilinfo_familyname {
+     display: inline-block;
+     vertical-align: top;
+     max-width: 150px;
+     white-space: nowrap;
+     overflow: hidden;
+     text-overflow: ellipsis;
+}
+
+.sybil_addresses td:first-child {
+     max-width: 155px;
+     font-weight: bold;
+     padding-right: 9px;
+}
+
+.sybil_addresses table {
+     width: 100%;
+     margin: 0;
+}
+
+.sybil_addresses {
+     padding: 0;
+     border-bottom: 1px solid #89f;
+}
+
+.sybil_addresses table, .sybil_addresses td {
+     border: none;
+}
+
+.threatpoints + ul {
+     -moz-columns: auto 500px;
+     -webkit-columns: auto 500px;
+     columns: auto 500px;
+     -moz-column-gap: 55px;
+     -webkit-column-gap: 55px;
+     column-gap: 55px;
+     -moz-column-rule: 1px solid #89f;
+     -webkit-column-rule: 1px solid #89f;
+     column-rule: 1px solid #89f;
+     padding-top: 3px;
+     padding-bottom: 3px;
+}
+
+.threatpoints + ul li:first-child {
+     margin-top: 0 !important;
+     padding-top: 0 !important;
+}
+
+.threatpoints + ul li:last-child {
+     margin-bottom: 0 !important;
+     padding-bottom: 0 !important;
+}
+
+.threatpoints + ul li {
+     list-style: none;
+     margin-left: -15px;
+     line-height: 120%;
+     break-inside: avoid;
+     page-break-inside: avoid;
+     -webkit-column-break-inside: avoid;
+}
+
+.threatpoints + ul li a {
+     white-space: nowrap;
+}
+
+/* end sybils */
 
 /* responsive layout */
 
@@ -5982,345 +6583,3 @@ _:-ms-lang(x), .tunnels_client th:first-child::after {
 
 /* end Edge/IE tweaks */
 
-/* network status */
-
-.routersummary .error, .routersummary .warn, .routersummary .testing, .routersummary .hidden,
-.routersummary .running, .routersummary .firewalled, .routersummary .vmcomm, .routersummary .clockskew, .tunnelBuildStatus {
-     display: inline-block;
-     vertical-align: middle;
-     border: 1px solid #88f;
-     border-radius: 2px;
-     padding: 6px 3px;
-     width: calc(100% - 10px);
-     margin: -5px 0 -6px;
-     box-shadow: inset 0 0 0 1px #fff, 0 0 1px rgba(96,96,96,0.5);
-     text-shadow: 0 1px 1px #fff;
-}
-
-.routersummary .firewalled {
-     background: rgba(255,220,255,0.3);
-     background: repeating-linear-gradient(135deg, rgba(220,255,220,0.5) 2px, rgba(110,255,110,0.1) 3px, rgba(220,255,220,0.5) 5px);
-}
-
-.routersummary .error {
-     background: rgba(255,110,110,0.1);
-     box-shadow: inset 0 0 0 1px rgba(255,0,0,0.3), 0 0 1px rgba(96,96,96,0.5);
-}
-
-.routersummary .warn, .routersummary .clockskew {
-     background: rgba(255,255,200,0.4);
-     box-shadow: inset 0 0 0 1px #ff0, 0 0 1px rgba(96,96,96,0.5);
-}
-
-.routersummary .testing {
-     background: rgba(255,220,110,0.1);
-}
-
-.routersummary .hidden, .routersummary .vmcomm {
-     background: rgba(220,220,220,0.4);
-}
-
-.routersummary .running {
-     background: rgba(220,255,220,0.2);
-}
-
-.routersummary .error::before, .routersummary .warn::before, .routersummary .testing::before, .routersummary .hidden::before,
-.routersummary .running::before, .routersummary .firewalled::before, .routersummary .vmcomm::before, .routersummary .clockskew::before {
-     padding-right: 2px;
-     vertical-align: middle;
-     display: inline-block;
-     filter: drop-shadow(0 0 1px rgba(96,96,96,0.5));
-}
-
-.routersummary .error::before, .routersummary .clockskew::before {
-     content: url(/themes/console/images/info/network_status/network_error.png);
-}
-
-.routersummary .warn::before {
-     content: url(/themes/console/images/info/network_status/network_warning.png);
-}
-
-.routersummary .testing::before {
-     content: url(/themes/console/images/info/network_status/network_testing.png);
-}
-
-.routersummary .hidden::before {
-     content: url(/themes/console/images/info/network_status/network_hidden.png);
-}
-
-.routersummary .running::before {
-     content: url(/themes/console/images/info/network_status/network_ok.png);
-}
-
-.routersummary .firewalled::before {
-     content: url(/themes/console/images/info/network_status/network_firewalled.png);
-}
-
-.routersummary .vmcomm::before {
-     content: url(/themes/console/images/info/network_status/network_vm.png);
-}
-
-.routersummary .clockskew::before {
-     content: url(/themes/console/images/info/network_status/network_clockskew.png);
-}
-
-/* end network status */
-
-/* welcome */
-
-div[lang="ar"] li {
-     margin: 0 10px 0 30px;
-}
-
-div[lang="ar"] h3, div[lang="ar"] li {
-     text-align: right;
-}
-
-div[lang="de"] .twocol {
-     margin-left: 50px !important;
-}
-
-.main#console li:first-child {
-     padding-top: 10px;
-}
-
-#console .links {
-     margin-left: 0;
-}
-
-.twocol {
-     columns: 2 400px;
-     column-gap: 20px !important;
-     display: block;
-     margin: 10px 0 !important;
-}
-
-p + .twocol {
-     margin: 10px 30px !important;
-}
-
-.twocol li {
-     break-inside: avoid;
-     page-break-inside: avoid;
-     -webkit-break-inside: avoid;
-}
-
-@media screen and (-webkit-min-device-pixel-ratio:0) {
-#console .twocol {
-     margin-left: -20px !important;
-}
-
-#console div[lang="de"] .twocol {
-     margin-left: 30px !important;
-}
-
-.twocol li {
-     margin-left: 20px;
-}
-}
-
-.twocol li:first-child {
-     margin-top: 0 !important
-     padding-top: 0 !important;
-     padding-bottom: 0 !important;
-}
-
-.main#console p {
-     padding-top: 0;
-     padding-bottom: 0;
-}
-
-/* end welcome */
-
-/* /tunnels */
-
-tt a, .cells tt {
-     letter-spacing: 0.07em;
-}
-
-.tunnel_cap {
-     background: rgba(0,0,64,0.3);
-     color: #fff;
-     border: 1px solid rgba(0,0,64,0.2);
-     border-radius: 2px;
-     min-width: 12px;
-     padding: 0 2px;
-     display:inline-block;
-     margin: 1px 2px 1px 8px;
-     text-align: center !important;
-     text-shadow: 0 1px 1px #555;
-}
-
-.tunnel_cap:empty {
-     border: none;
-}
-
-.tunnel_id {
-     display: inline-block;
-     min-width: 78px;
-     text-align: right;
-}
-
-.tunnel_id:empty {
-     min-width: 0;
-}
-
-.tunnel_id:empty + .tunnel_cap {
-     margin-left: 12px !important;
-     display: inline-block;
-}
-
-.tunnel_peer {
-     display: inline-block;
-     min-width: 56px;
-     text-align: right;
-}
-
-.tunnel_local {
-     font-size: 8pt;
-     background: rgba(187, 187, 255, 0.3);
-     background: #d5d5ff;
-     border-radius: 2px;
-     text-align: center;
-     padding: 2px 0;
-     margin-left: -4px;
-     margin-right: 4px;
-}
-
-.tunnel_peer:empty {
-     vertical-align: top;
-}
-
-.tunneldisplay td {
-     padding-top: 4px;
-     padding-bottom: 4px;
-}
-
-@media screen and (max-width: 1100px) {
-.tunnel_id, .tunnel_peer {
-     min-width: 0 !important;
-     text-align: center !important;
-}
-
-.tunnel_local {
-     margin-right: 5px;
-     margin-left: 2px;
-     padding: 2px 4px;
-}
-
-.tunnel_peer:empty {
-     vertical-align: middle;
-}
-
-.tunnel_peer:empty::before {
-     margin: 1px 6px 1px 2px;
-}
-
-.tunnel_cap {
-     margin-left: 5px !important;
-}
-}
-
-@media screen and (min-width: 1500px) {
-.tunnel_cap {
-     margin-left: 10px;
-     padding: 0 1px;
-     min-width: 14px;
-}
-
-.tunnel_id:empty {
-     margin-right: -10px;
-}
-}
-
-/* end tunnels */
-
-/* /peers */
-
-#ntcpconnections th:nth-child(6), #ntcpconnections th:nth-child(7), #ntcpconnections th:nth-child(8), #ntcpconnections th:nth-child(9), #ntcpconnections th:nth-child(10),
-#ntcpconnections td:nth-child(6), #ntcpconnections td:nth-child(7), #ntcpconnections td:nth-child(8), #ntcpconnections td:nth-child(9), #ntcpconnections td:nth-child(10),
-#udpconnections td:nth-child(6), #udpconnections td:nth-child(7), #udpconnections td:nth-child(9), #udpconnections td:nth-child(10), #udpconnections td:nth-child(11),
-#udpconnections td:nth-child(13), #udpconnections td:nth-child(14), #udpconnections td:nth-child(15), #udpconnections td:nth-child(16) {
-     text-align: right;
-     white-space: nowrap;
-}
-
-#ntcpconnections .tablefooter td:nth-child(3), #ntcpconnections .tablefooter td:nth-child(4), #ntcpconnections .tablefooter td:nth-child(5), #ntcpconnections .tablefooter td:nth-child(6),
-#udpconnections .tablefooter td:nth-child(3), #udpconnections .tablefooter td:nth-child(4), #udpconnections .tablefooter td:nth-child(7), #udpconnections .tablefooter td:nth-child(8),
-#udpconnections .tablefooter td:nth-child(10), #udpconnections .tablefooter td:nth-child(11), #udpconnections .tablefooter td:nth-child(12), #udpconnections .tablefooter td:nth-child(13) {
-     text-align: right;
-}
-
-#udpconnections .tablefooter td:nth-child(9) {
-     text-align: center !important;
-}
-
-#ntcpconnections td:nth-child(4), #ntcpconnections td:nth-child(5), #udpconnections td:nth-child(4),
-#udpconnections td:nth-child(5), #udpconnections td:nth-child(8), #udpconnections td:nth-child(12) {
-     white-space: nowrap;
-}
-
-#udpconnections .tablefooter td, #ntcpconnections .tablefooter td {
-     padding-left: 5px;
-     padding-right: 5px;
-}
-
-
-#ntcpconnections th:nth-child(6), #ntcpconnections th:nth-child(7), #ntcpconnections th:nth-child(8), #ntcpconnections th:nth-child(9), #ntcpconnections th:nth-child(10) {
-     text-align: right;
-}
-
-#udpconnections th:nth-child(6), #udpconnections th:nth-child(7), #udpconnections th:nth-child(n+9) {
-     text-align: right;
-}
-
-#udpconnections th:nth-child(12) {
-     text-align: center;
-}
-
-.peersort {
-     text-align: center;
-     display: inline-block;
-}
-
-.right {
-     text-align: right;
-     margin: 0 1px;
-     display: inline-block;
-     width: 40%
-}
-
-.left {
-     text-align: left;
-     margin: 0 1px;
-     display: inline-block;
-     width: 40%
-}
-
-.peeripv6:empty {
-     padding: 0;
-     width: 0;
-}
-
-.cwnd .left, .cwnd .right {
-     width: auto;
-}
-
-#udpconnections td:nth-child(n+13), #udpconnections .tablefooter td:nth-child(n+10) {
-     padding-right: 1% !important;
-}
-
-#peerdefs {
-     line-height: 140%;
-     padding: 5px;
-}
-
-.peer_arrow {
-     display: inline-block;
-     width: 18px;
-     text-align: center;
-     margin-right: 3px;
-}
-
-/* end peers */
-
diff --git a/installer/resources/themes/console/classic/mobile.css b/installer/resources/themes/console/classic/mobile.css
index 779c62d847..96e5f5d104 100644
--- a/installer/resources/themes/console/classic/mobile.css
+++ b/installer/resources/themes/console/classic/mobile.css
@@ -1,29 +1,23 @@
 /* Console Theme "Classic" - Mobile Override */
 
-div.routersummaryouter {
+body {
+     margin: 2px 1px !important;
+}
+
+.routersummaryouter {
      float: none;
      margin: 0 !important;
      position: relative;
      width: auto;
 }
 
-div.routersummary {
+.routersummary {
      float: none;
      width: auto;
      max-width: 600px;
      margin: 0 auto -6px;
 }
 
-@media screen and (min-width: 1500px) {
-div.routersummary {
-     width: 600px !important;
-}
-
-.routersummary table[id^="sb_"] {
-     width: 600px !important;
-}
-}
-
 #xhr {
      margin-top: 9px !important;
 }
@@ -49,7 +43,11 @@ div.routersummary {
      font-size: 9pt !important;
 }
 
-div.routersummary table, table[id^="sb_"] {
+.routersummary h3, .routersummary h3 a {
+     font-size: 10.5pt !important;
+}
+
+.routersummary table, table[id^="sb_"] {
      width: 100% !important;
      margin: -6px 0 -7px !important;
 }
@@ -152,4 +150,16 @@ div.main {
 .sorry {
      margin: -1px 0 0 !important;
 }
+
+.routersummary {
+     width: 600px !important;
+}
+
+.routersummary div[style="height: 36px;"] {
+     margin-top: 2px !important;
+}
+
+.routersummary table[id^="sb_"] {
+     width: 600px !important;
+}
 }
diff --git a/installer/resources/themes/console/dark/console.css b/installer/resources/themes/console/dark/console.css
index d1ff9f17d2..4de463a064 100644
--- a/installer/resources/themes/console/dark/console.css
+++ b/installer/resources/themes/console/dark/console.css
@@ -45,7 +45,7 @@ img {
      border: none;
 }
 
-a img:hover, a:focus img  {
+a img:hover, a:focus img {
      filter: drop-shadow(0 0 1px #f60);
 }
 
@@ -1415,7 +1415,11 @@ a:active {
 /* welcome */
 
 .twocol {
+     -moz-columns: 2 400px;
+     -webkit-columns: 2 400px;
      columns: 2 400px;
+     -moz-column-gap: 0 !important;
+     -webkit-column-gap: 0 !important;
      column-gap: 0 !important;
      display: block;
 }
@@ -1423,7 +1427,7 @@ a:active {
 .twocol li {
      break-inside: avoid;
      page-break-inside: avoid;
-     -webkit-break-inside: avoid;
+     -webkit-column-break-inside: avoid;
 }
 
 .twocol li:first-child {
@@ -1761,7 +1765,7 @@ label {
      cursor: default;
 }
 
-input[type="file"]  {
+input[type="file"] {
      box-shadow: none;
      border: none !important;
      background: #000;
@@ -2086,7 +2090,7 @@ table#schedjobs {
      font-weight: bold;
 }
 
-#schedjobs th:first-child, #schedjobs td:first-child, #jobstats th:first-child, #jobstats td:first-child  {
+#schedjobs th:first-child, #schedjobs td:first-child, #jobstats th:first-child, #jobstats td:first-child {
      text-align: left;
      padding-left: 10px;
      font-weight: bold;
@@ -2498,7 +2502,7 @@ tr#addnew, tr#addnew:hover {
 .themechoice {
      background: #000;
      background: linear-gradient(to bottom, #010 0%, #000 100%);
-     width: 110px;
+     width: 120px;
      overflow: hidden;
      text-overflow: ellipsis;
      white-space: nowrap;
@@ -2571,11 +2575,11 @@ tr#addnew, tr#addnew:hover {
 }
 
 .themechoice .optbox {
-     min-width: 114px !important;
+     min-width: 124px !important;
      min-height: 80px !important;
      outline: 1px !important; /* placement guide */
      opacity: 0; /* hide the radio icon so we can use thumbnail img instead */
-     margin-left: -33px;
+     margin-left: -38px;
      z-index: 999;
      position: absolute;
 }
@@ -2633,7 +2637,7 @@ p#helptranslate {
      min-height: 16px;
 }
 
-div.themelabel {
+.themelabel {
      border-top: 1px solid #262 !important;
      margin-left: -4px;
      margin-right: -4px;
@@ -2658,7 +2662,7 @@ h3#themeheading, h3#langheading, h3#passwordheading {
      background: linear-gradient(to right, #000 0%, #001000 70%, #001300 90%);
 }
 
-div#themesettings {
+#themesettings {
      clear: both;
      border: 1px solid #494;
      padding: 8px 7px 0;
@@ -2680,7 +2684,7 @@ td#themeselect {
 .langselect { /* containing box for lang selection */
      background: #000;
      background: linear-gradient(to bottom, #010 0%, #000 80%);
-     width: 110px;
+     width: 120px;
      float: left;
      margin: 4px;
      text-align: center;
@@ -2705,7 +2709,7 @@ td#themeselect {
 .langselect .optbox {
      opacity: 0;
      outline: 1px dotted !important;
-     min-width: 111px !important;
+     min-width: 124px !important;
      margin: -7px 0 -34px -2px;
      min-height: 66px;
      vertical-align: text-bottom;
@@ -2716,7 +2720,7 @@ td#themeselect {
 .langselect img {
      border: 1px solid #002000;
      margin-bottom: 0;
-     margin-left: -65px;
+     margin-left: -71px;
      margin-top: 7px !important;
      position: absolute;
 }
@@ -2765,7 +2769,7 @@ td#themeselect {
      border: 1px solid #f60;
      box-shadow: 0 0 1px #f30;
      margin-top: 6px !important;
-     margin-left: -67px;
+     margin-left: -72px;
 }
 
 .langselect input[name="lang"]:checked + img + div.ui_lang {
@@ -2774,6 +2778,18 @@ td#themeselect {
      font-weight: bold;
 }
 
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+.langselect img {
+     margin-left: -9px;
+     margin-top: -17px !important;
+}
+
+.langselect input[name="lang"]:checked + img, .langselect input[name="lang"]:checked + #config_ui img[src="/flags.jsp?c=a1"] {
+     margin-left: -10px;
+     margin-top: -18px !important;
+}
+}
+
 /* end flag as radio icons */
 
 div.ui_lang { /* lang text label */
@@ -4189,7 +4205,7 @@ table#floodfills th {
      padding: 3px 6px;
 }
 
-table#floodfills td  {
+table#floodfills td {
      color: #bb7;
      padding: 3px 4px !important;
      vertical-align: middle;
@@ -4197,7 +4213,7 @@ table#floodfills td  {
      white-space: nowrap;
 }
 
-table#floodfills th:first-child, table#floodfills td:first-child  {
+table#floodfills th:first-child, table#floodfills td:first-child {
      width: 52px;
      white-space: nowrap;
      padding: 3px 3px 3px 0 !important;
@@ -4682,11 +4698,11 @@ table.netdbentry th:last-child {
      width: 50px;
 }
 
-table.netdbentry th:first-child  {
+table.netdbentry th:first-child {
      white-space: nowrap;
 }
 
-table.netdbentry td:first-child  {
+table.netdbentry td:first-child {
      width: 80px;
 }
 
@@ -4900,7 +4916,7 @@ div.debugcontainer {
 }
 
 #leasesetdebug, #leasesetsummary {
-     margin-bottom: 10px;
+     margin-bottom: 14px;
 }
 
 .leaseset th {
@@ -4978,7 +4994,7 @@ div.debugcontainer {
      width: 10px;
 }
 
-#noleasesets {
+#noleasesets, #notinitialized, .netdbnotfound {
      background: #000 url(images/infohelp.png) 12px center no-repeat;
      padding: 15px 15px 15px 50px;
      border: 1px solid #494;
@@ -5105,6 +5121,10 @@ p.sybil_info, p.family, p.threatpoints, p.hashdist, p#sybil_totals, p.notfound {
      box-shadow: inset 0 0 0 1px #300;
 }
 
+p#sybil_totals {
+     font-weight: normal;
+}
+
 p.family + p.family, p.sybil_info + p.sybil_info {
      margin-top: -4px;
 }
@@ -5113,19 +5133,25 @@ p#sybilinfo {
      line-height: 140%;
 }
 
-p.sybil_info + a[name] + table.sybil_routerinfo, p.hashdist + a[name] + table.sybil_routerinfo  {
+p.sybil_info + a[name] + table.sybil_routerinfo, p.hashdist + a[name] + table.sybil_routerinfo {
      margin-top: 10px !important;
 }
 
 .threatpoints + ul {
+     background: #000;
      border: 1px solid #494;
      padding: 5px 5px 0;
      margin: -4px 0 10px;
 }
+
 .threatpoints + ul li:last-child {
      margin-bottom: 5px;
 }
 
+.sybil_routerinfo + .threatpoints + ul + a[name] + table {
+     margin-top: -11px;
+}
+
 h3#known {
      margin-bottom: 0 !important;
 }
@@ -5738,6 +5764,538 @@ p#profiles_overview {
 
 /* end profiles/peers */
 
+/* network status */
+
+.routersummary h4 a {
+     width: auto !important;
+     vertical-align: middle;
+     display: inline;
+}
+
+.routersummary .error, .routersummary .warn, .routersummary .testing, .routersummary .hidden,
+.routersummary .running, .routersummary .firewalled, .routersummary .vmcomm, .routersummary .clockskew, .tunnelBuildStatus {
+     display: inline-block;
+     vertical-align: middle;
+     border: 1px solid #316f30;
+     box-sizing: border-box;
+     border: 1px solid rgba(49, 111, 48, 0.6);
+     padding: 6px 3px;
+     width: 100%;
+     margin: -5px 0;
+     box-shadow: inset 0 0 0 1px #000;
+     text-shadow: 0 1px 1px #000;
+}
+
+.routersummary .firewalled {
+     border: 1px dotted #316f30;
+     border: 1px dotted rgba(49, 111, 48, 0.6);
+}
+
+.routersummary .error {
+     border: 1px solid #900;
+     border: 1px solid rgba(153, 0, 0, 0.6);
+}
+
+.routersummary .warn, .routersummary .clockskew {
+     border: 1px solid #aa0;
+     border: 1px solid rgba(170, 170, 0, 0.6);
+}
+
+.routersummary .testing {
+     border: 1px solid #fa0;
+     border: 1px solid rgba(255, 170, 0, 0.6);
+}
+
+.routersummary .hidden, .routersummary .vmcomm {
+     border: 1px dotted #777;
+     border: 1px solid rgba(119, 119, 119, 0.6);
+}
+
+.routersummary .running {
+     border: 1px solid #316f30;
+     border: 1px solid rgba(49, 111, 48, 0.6);
+}
+
+.routersummary .error::before, .routersummary .warn::before, .routersummary .testing::before, .routersummary .hidden::before,
+.routersummary .running::before, .routersummary .firewalled::before, .routersummary .vmcomm::before, .routersummary .clockskew::before {
+     padding: 0 2px;
+     vertical-align: middle;
+     display: inline-block;
+     filter: drop-shadow(0 0 1px rgba(192,192,192,0.5));
+}
+
+.routersummary .error::before, .routersummary .clockskew::before {
+     content: url(/themes/console/images/info/network_status/network_error.png);
+}
+
+.routersummary .warn::before {
+     content: url(/themes/console/images/info/network_status/network_warning.png);
+}
+
+.routersummary .testing::before {
+     content: url(/themes/console/images/info/network_status/network_testing.png);
+}
+
+.routersummary .hidden::before {
+     content: url(/themes/console/images/info/network_status/network_hidden.png);
+     padding: 0 3px;
+}
+
+.routersummary .running::before {
+     content: url(/themes/console/images/info/network_status/network_ok.png);
+}
+
+.routersummary .firewalled::before {
+     content: url(/themes/console/images/info/network_status/network_firewalled.png);
+}
+
+.routersummary .vmcomm::before {
+     content: url(/themes/console/images/info/network_status/network_vm.png);
+}
+
+.routersummary .clockskew::before {
+     content: url(/themes/console/images/info/network_status/network_clockskew.png);
+}
+
+/* end network status */
+
+/* /tunnels */
+
+tt a {
+     letter-spacing: 0.07em;
+}
+
+.tunnel_cap {
+     background: rgba(0,96,0,0.3);
+     color: #bb7;
+     border: 1px solid rgba(0,64,0,0.2);
+     border-radius: 2px;
+     min-width: 12px;
+     padding: 0 2px;
+     display:inline-block;
+     margin: 1px 2px 1px 8px;
+     text-align: center !important;
+     text-shadow: 0 1px 1px #555;
+}
+
+.tunnel_cap:empty {
+     border: none;
+}
+
+.tunnel_id {
+     display: inline-block;
+     min-width: 78px;
+     text-align: right;
+}
+
+.tunnel_id:empty {
+     min-width: 0;
+}
+
+.tunnel_id:empty + .tunnel_cap {
+     margin-left: 12px !important;
+     display: inline-block;
+}
+
+.tunnel_peer {
+     display: inline-block;
+     min-width: 56px;
+     text-align: right;
+}
+
+.tunnel_local {
+     font-size: 8pt;
+     text-transform: lowercase;
+     background: rgba(0,96,0,0.3);
+     border-radius: 2px;
+     text-align: center;
+     padding: 2px 0;
+     margin-left: -4px;
+     margin-right: 4px;
+}
+
+.tunnel_peer:empty {
+     vertical-align: top;
+}
+
+#tunnel_defs {
+     margin-top: -1px;
+     margin-bottom: 10px;
+}
+
+#tunnel_defs td:first-child, #tunnel_defs td:nth-child(even) {
+     width: 1%;
+     white-space: nowrap;
+}
+
+@media screen and (max-width: 1100px) {
+.tunnel_id, .tunnel_peer {
+     min-width: 0 !important;
+     text-align: center !important;
+}
+
+.tunnel_local {
+     margin-right: 5px;
+     margin-left: 2px;
+     padding: 2px 4px;
+}
+
+.tunnel_peer:empty {
+     vertical-align: middle;
+}
+
+.tunnel_peer:empty::before {
+     margin: 1px 6px 1px 2px;
+}
+
+.tunnel_cap {
+     margin-left: 5px !important;
+}
+}
+
+@media screen and (max-width: 1200px) {
+#tunnel_defs {
+     margin-bottom: 5px;
+}
+}
+
+@media screen and (min-width: 1500px) {
+.tunnel_cap {
+     margin-left: 10px;
+     padding: 0 1px;
+     min-width: 14px;
+}
+
+.tunnel_id:empty {
+     margin-right: -10px;
+}
+}
+
+/* end tunnels */
+
+/* /peers */
+
+#ntcpconnections th:nth-child(6), #ntcpconnections th:nth-child(7), #ntcpconnections th:nth-child(8), #ntcpconnections th:nth-child(9), #ntcpconnections th:nth-child(10),
+#ntcpconnections td:nth-child(6), #ntcpconnections td:nth-child(7), #ntcpconnections td:nth-child(8), #ntcpconnections td:nth-child(9), #ntcpconnections td:nth-child(10),
+#udpconnections td:nth-child(6), #udpconnections td:nth-child(7), #udpconnections td:nth-child(9), #udpconnections td:nth-child(10), #udpconnections td:nth-child(11),
+#udpconnections td:nth-child(13), #udpconnections td:nth-child(14), #udpconnections td:nth-child(15), #udpconnections td:nth-child(16) {
+     text-align: right;
+     white-space: nowrap;
+}
+
+#ntcpconnections .tablefooter td:nth-child(3), #ntcpconnections .tablefooter td:nth-child(4), #ntcpconnections .tablefooter td:nth-child(5), #ntcpconnections .tablefooter td:nth-child(6),
+#udpconnections .tablefooter td:nth-child(3), #udpconnections .tablefooter td:nth-child(4), #udpconnections .tablefooter td:nth-child(7), #udpconnections .tablefooter td:nth-child(8),
+#udpconnections .tablefooter td:nth-child(10), #udpconnections .tablefooter td:nth-child(11), #udpconnections .tablefooter td:nth-child(12), #udpconnections .tablefooter td:nth-child(13) {
+     text-align: right;
+}
+
+#udpconnections .tablefooter td:nth-child(9) {
+     text-align: center !important;
+}
+
+#ntcpconnections td:nth-child(4), #ntcpconnections td:nth-child(5), #udpconnections td:nth-child(4),
+#udpconnections td:nth-child(5), #udpconnections td:nth-child(8), #udpconnections td:nth-child(12) {
+     white-space: nowrap;
+}
+
+#udpconnections .tablefooter td, #ntcpconnections .tablefooter td {
+     padding-left: 5px;
+     padding-right: 5px;
+}
+
+#ntcpconnections th:nth-child(6), #ntcpconnections th:nth-child(7), #ntcpconnections th:nth-child(8), #ntcpconnections th:nth-child(9), #ntcpconnections th:nth-child(10) {
+     text-align: right;
+}
+
+#udpconnections th:nth-child(6), #udpconnections th:nth-child(7), #udpconnections th:nth-child(n+9) {
+     text-align: right;
+}
+
+#udpconnections th:nth-child(12) {
+     text-align: center;
+}
+
+.peersort {
+     text-align: center;
+     display: inline-block;
+}
+
+.right {
+     text-align: right;
+     margin: 0 1px;
+     display: inline-block;
+     width: 40%
+}
+
+.left {
+     text-align: left;
+     margin: 0 1px;
+     display: inline-block;
+     width: 40%
+}
+
+.peeripv6:empty {
+     padding: 0;
+     width: 0;
+}
+
+.cwnd .left, .cwnd .right {
+     width: auto;
+}
+
+#udpconnections th:nth-child(n+13), #udpconnections .tablefooter th:nth-child(n+10),
+#udpconnections td:nth-child(n+13), #udpconnections .tablefooter td:nth-child(n+10) {
+     padding-right: 1% !important;
+}
+
+/* end peers */
+
+/* netdb router address info */
+
+.leasesets_container {
+     -moz-columns: 680px 2;
+     -webkit-columns: 680px 2;
+     columns: 680px 2;
+     -moz-column-gap: 10px;
+     -webkit-column-gap: 10px;
+     column-gap: 10px;
+}
+
+th code {
+     -moz-user-select: all;
+     -webkit-user-select: all;
+     user-select: all;
+}
+
+@media screen and (min-width: 1634px) {
+.leasesets_container {
+     margin-bottom: 8px;
+}
+
+th code {
+     font-size: 9pt !important;
+}
+}
+
+.leasesets_container table:first-child {
+     margin-top: 0;
+}
+
+.leasesets_container table {
+     break-inside: avoid;
+     page-break-inside: avoid;
+     -webkit-column-break-inside: avoid;
+}
+
+.netdb_addresses br:first-child, .sybil_routerinfo tr:last-child td br:first-child {
+     display: none;
+}
+
+.netdbentry th:first-child::after {
+     content: "";
+     display: inline-block;
+     min-height: 20px;
+     vertical-align: middle;
+}
+
+.netdbentry th:last-child > *, .sybil_routerinfo th:nth-child(2) > * {
+     display: inline-block;
+     vertical-align: middle !important;
+}
+
+.netdbentry th a img {
+     display: inline-block;
+     vertical-align: middle;
+     margin-right: 1px;
+     margin-bottom: 2px;
+}
+
+.netdbentry a.viewfullentry::after {
+     display: inline-block;
+     vertical-align: middle !important;
+     margin-left: 3px;
+}
+
+.netdbentry td:first-child {
+     text-align: right;
+     min-width: 100px;
+     padding-right: 5px !important
+}
+
+b.netdb_transport {
+     display: inline-block;
+     width: 50px;
+     text-align: right;
+     margin-right: 5px;
+}
+
+#netdb code {
+    font-weight: normal !important;
+}
+
+.netdb_name {
+     color: #bb3;
+     text-transform: capitalize;
+     font-weight: bold;
+}
+
+.netdb_info {
+     margin-right: 1px;
+}
+
+.netdb_expiry {
+     margin-left: 5px;
+}
+
+.sybil_routerinfo th img[src^="/flags"] {
+     height: 11px;
+     width: 16px;
+     margin-right: 5px;
+}
+
+.sybil_routerinfo b.netdb_transport {
+     margin-left: -13px;
+     margin-right: 0;
+}
+
+.sybil_routerinfo td:first-child, .netdbentry td:first-child {
+     text-align: right !important;
+     padding-right: 0;
+}
+
+.sybil_routerinfo td[colspan="3"] {
+     white-space: normal;
+}
+
+.sybil_container {
+     -moz-columns: 680px 2;
+     -webkit-columns: 680px 2;
+     columns: 680px 2;
+     margin: 10px 0;
+}
+
+.sybil_container p {
+     break-inside: avoid;
+     page-break-inside: avoid;
+     -webkit-column-break-inside: avoid;
+}
+
+.sybil_container p:first-child {
+     margin-top: 0;
+}
+
+.sybil_container p:last-child {
+     margin-bottom: 0;
+}
+
+/* end netdb router address */
+
+/* sybils */
+
+.leaseset th:last-child, .leaseset td:last-child, .sybil_routerinfo th:last-child, .sybil_routerinfo td:last-child {
+     border-right: 1px solid #494 !important;
+}
+
+.sybil_routerinfo table td:last-child {
+     border-right: none !important;
+}
+
+.sybilinfo_params {
+     padding: 0;
+     border-bottom: 1px solid #494
+}
+
+.sybilinfo_container {
+     columns: 240px auto;
+     -moz-columns: 240px auto;
+     -webkit-columns: 240px auto;
+     -moz-column-gap: 0;
+     -webkit-column-gap: 0;
+     column-gap: 0;
+     background: #010;
+     padding: 4px 5px;
+}
+
+.sybilinfo_container b {
+     color: #bb3;
+}
+
+.sybil_routerinfo tr:last-child {
+     border-top: none;
+}
+
+.sybil_routerinfo p {
+     margin: 0;
+     padding: 0;
+     line-height: 140%;
+     break-inside: avoid;
+     page-break-inside: avoid;
+     -webkit-column-break-inside: avoid;
+}
+
+.sybilinfo_familyname {
+     display: inline-block;
+     vertical-align: top;
+     max-width: 150px;
+     white-space: nowrap;
+     overflow: hidden;
+     text-overflow: ellipsis;
+}
+
+.sybil_addresses td:first-child {
+     max-width: 155px;
+     font-weight: bold;
+     padding-right: 9px;
+}
+
+.sybil_addresses table {
+     width: 100%;
+     margin: 0;
+}
+
+.sybil_addresses {
+     padding: 0;
+     border-bottom: 1px solid #494
+}
+
+.sybil_addresses table, .sybil_addresses td {
+     border: none;
+}
+
+.threatpoints + ul {
+     -moz-columns: auto 600px;
+     -webkit-columns: auto 600px;
+     columns: auto 600px;
+     -moz-column-rule: 1px solid #2a5f29;
+     -webkit-column-rule: 1px solid #2a5f29;
+     column-rule: 1px solid #2a5f29;
+     padding-top: 3px;
+     padding-bottom: 3px;
+}
+
+.threatpoints + ul li:first-child {
+     margin-top: 0 !important;
+}
+
+.threatpoints + ul li:last-child {
+     margin-bottom: 0 !important;
+}
+
+.threatpoints + ul li {
+     list-style: none;
+     margin-left: 5px;
+     line-height: 100%;
+     break-inside: avoid !important;
+     page-break-inside: avoid !important;
+     -webkit-column-break-inside: avoid !important;
+}
+
+.threatpoints + ul li a {
+     white-space: nowrap;
+}
+
+/* end sybils */
+
 /* responsive layout */
 
 @media screen and (max-width: 900px) {
@@ -5821,7 +6379,7 @@ td.optionsave {
 }
 
 @media screen and (max-width: 1220px) {
-#udpconnections tr:nth-last-child(n+3):hover td:nth-child(n+2)  {
+#udpconnections tr:nth-last-child(n+3):hover td:nth-child(n+2) {
      transform: scale(1.05);
      text-align: center !important;
 }
@@ -6202,283 +6760,3 @@ _:-ms-lang(x), .tunnels_client th:first-child::after {
 
 /* end Edge/IE tweaks */
 
-/* network status */
-
-.routersummary h4 a {
-     width: auto !important;
-     vertical-align: middle;
-     display: inline;
-}
-
-.routersummary .error, .routersummary .warn, .routersummary .testing, .routersummary .hidden,
-.routersummary .running, .routersummary .firewalled, .routersummary .vmcomm, .routersummary .clockskew, .tunnelBuildStatus {
-     display: inline-block;
-     vertical-align: middle;
-     border: 1px solid #316f30;
-     box-sizing: border-box;
-     border: 1px solid rgba(49, 111, 48, 0.6);
-     padding: 6px 3px;
-     width: 100%;
-     margin: -5px 0;
-     box-shadow: inset 0 0 0 1px #000;
-     text-shadow: 0 1px 1px #000;
-}
-
-.routersummary .firewalled {
-     border: 1px dotted #316f30;
-     border: 1px dotted rgba(49, 111, 48, 0.6);
-}
-
-.routersummary .error {
-     border: 1px solid #900;
-     border: 1px solid rgba(153, 0, 0, 0.6);
-}
-
-.routersummary .warn, .routersummary .clockskew {
-     border: 1px solid #aa0;
-     border: 1px solid rgba(170, 170, 0, 0.6);
-}
-
-.routersummary .testing {
-     border: 1px solid #fa0;
-     border: 1px solid rgba(255, 170, 0, 0.6);
-}
-
-.routersummary .hidden, .routersummary .vmcomm {
-     border: 1px dotted #777;
-     border: 1px solid rgba(119, 119, 119, 0.6);
-}
-
-.routersummary .running {
-     border: 1px solid #316f30;
-     border: 1px solid rgba(49, 111, 48, 0.6);
-}
-
-.routersummary .error::before, .routersummary .warn::before, .routersummary .testing::before, .routersummary .hidden::before,
-.routersummary .running::before, .routersummary .firewalled::before, .routersummary .vmcomm::before, .routersummary .clockskew::before {
-     padding: 0 2px;
-     vertical-align: middle;
-     display: inline-block;
-     filter: drop-shadow(0 0 1px rgba(192,192,192,0.5));
-}
-
-.routersummary .error::before, .routersummary .clockskew::before {
-     content: url(/themes/console/images/info/network_status/network_error.png);
-}
-
-.routersummary .warn::before {
-     content: url(/themes/console/images/info/network_status/network_warning.png);
-}
-
-.routersummary .testing::before {
-     content: url(/themes/console/images/info/network_status/network_testing.png);
-}
-
-.routersummary .hidden::before {
-     content: url(/themes/console/images/info/network_status/network_hidden.png);
-     padding: 0 3px;
-}
-
-.routersummary .running::before {
-     content: url(/themes/console/images/info/network_status/network_ok.png);
-}
-
-.routersummary .firewalled::before {
-     content: url(/themes/console/images/info/network_status/network_firewalled.png);
-}
-
-.routersummary .vmcomm::before {
-     content: url(/themes/console/images/info/network_status/network_vm.png);
-}
-
-.routersummary .clockskew::before {
-     content: url(/themes/console/images/info/network_status/network_clockskew.png);
-}
-
-/* end network status */
-
-/* /tunnels */
-
-tt a {
-     letter-spacing: 0.07em;
-}
-
-.tunnel_cap {
-     background: rgba(0,96,0,0.3);
-     color: #bb7;
-     border: 1px solid rgba(0,64,0,0.2);
-     border-radius: 2px;
-     min-width: 12px;
-     padding: 0 2px;
-     display:inline-block;
-     margin: 1px 2px 1px 8px;
-     text-align: center !important;
-     text-shadow: 0 1px 1px #555;
-}
-
-.tunnel_cap:empty {
-     border: none;
-}
-
-.tunnel_id {
-     display: inline-block;
-     min-width: 78px;
-     text-align: right;
-}
-
-.tunnel_id:empty {
-     min-width: 0;
-}
-
-.tunnel_id:empty + .tunnel_cap {
-     margin-left: 12px !important;
-     display: inline-block;
-}
-
-.tunnel_peer {
-     display: inline-block;
-     min-width: 56px;
-     text-align: right;
-}
-
-.tunnel_local {
-     font-size: 8pt;
-     background: rgba(0,96,0,0.3);
-     border-radius: 2px;
-     text-align: center;
-     padding: 2px 0;
-     margin-left: -4px;
-     margin-right: 4px;
-}
-
-.tunnel_peer:empty {
-     vertical-align: top;
-}
-
-#tunnel_defs {
-     margin-top: -1px;
-     margin-bottom: 10px;
-}
-
-@media screen and (max-width: 1100px) {
-.tunnel_id, .tunnel_peer {
-     min-width: 0 !important;
-     text-align: center !important;
-}
-
-.tunnel_local {
-     margin-right: 5px;
-     margin-left: 2px;
-     padding: 2px 4px;
-}
-
-.tunnel_peer:empty {
-     vertical-align: middle;
-}
-
-.tunnel_peer:empty::before {
-     margin: 1px 6px 1px 2px;
-}
-
-.tunnel_cap {
-     margin-left: 5px !important;
-}
-}
-
-@media screen and (max-width: 1200px) {
-#tunnel_defs {
-     margin-bottom: 5px;
-}
-}
-
-@media screen and (min-width: 1500px) {
-.tunnel_cap {
-     margin-left: 10px;
-     padding: 0 1px;
-     min-width: 14px;
-}
-
-.tunnel_id:empty {
-     margin-right: -10px;
-}
-}
-
-/* end tunnels */
-
-/* /peers */
-
-#ntcpconnections th:nth-child(6), #ntcpconnections th:nth-child(7), #ntcpconnections th:nth-child(8), #ntcpconnections th:nth-child(9), #ntcpconnections th:nth-child(10),
-#ntcpconnections td:nth-child(6), #ntcpconnections td:nth-child(7), #ntcpconnections td:nth-child(8), #ntcpconnections td:nth-child(9), #ntcpconnections td:nth-child(10),
-#udpconnections td:nth-child(6), #udpconnections td:nth-child(7), #udpconnections td:nth-child(9), #udpconnections td:nth-child(10), #udpconnections td:nth-child(11),
-#udpconnections td:nth-child(13), #udpconnections td:nth-child(14), #udpconnections td:nth-child(15), #udpconnections td:nth-child(16) {
-     text-align: right;
-     white-space: nowrap;
-}
-
-#ntcpconnections .tablefooter td:nth-child(3), #ntcpconnections .tablefooter td:nth-child(4), #ntcpconnections .tablefooter td:nth-child(5), #ntcpconnections .tablefooter td:nth-child(6),
-#udpconnections .tablefooter td:nth-child(3), #udpconnections .tablefooter td:nth-child(4), #udpconnections .tablefooter td:nth-child(7), #udpconnections .tablefooter td:nth-child(8),
-#udpconnections .tablefooter td:nth-child(10), #udpconnections .tablefooter td:nth-child(11), #udpconnections .tablefooter td:nth-child(12), #udpconnections .tablefooter td:nth-child(13) {
-     text-align: right;
-}
-
-#udpconnections .tablefooter td:nth-child(9) {
-     text-align: center !important;
-}
-
-#ntcpconnections td:nth-child(4), #ntcpconnections td:nth-child(5), #udpconnections td:nth-child(4),
-#udpconnections td:nth-child(5), #udpconnections td:nth-child(8), #udpconnections td:nth-child(12) {
-     white-space: nowrap;
-}
-
-#udpconnections .tablefooter td, #ntcpconnections .tablefooter td {
-     padding-left: 5px;
-     padding-right: 5px;
-}
-
-#ntcpconnections th:nth-child(6), #ntcpconnections th:nth-child(7), #ntcpconnections th:nth-child(8), #ntcpconnections th:nth-child(9), #ntcpconnections th:nth-child(10) {
-     text-align: right;
-}
-
-#udpconnections th:nth-child(6), #udpconnections th:nth-child(7), #udpconnections th:nth-child(n+9) {
-     text-align: right;
-}
-
-#udpconnections th:nth-child(12) {
-     text-align: center;
-}
-
-.peersort {
-     text-align: center;
-     display: inline-block;
-}
-
-.right {
-     text-align: right;
-     margin: 0 1px;
-     display: inline-block;
-     width: 40%
-}
-
-.left {
-     text-align: left;
-     margin: 0 1px;
-     display: inline-block;
-     width: 40%
-}
-
-.peeripv6:empty {
-     padding: 0;
-     width: 0;
-}
-
-.cwnd .left, .cwnd .right {
-     width: auto;
-}
-
-#udpconnections th:nth-child(n+13), #udpconnections .tablefooter th:nth-child(n+10),
-#udpconnections td:nth-child(n+13), #udpconnections .tablefooter td:nth-child(n+10) {
-     padding-right: 1% !important;
-}
-
-/* end peers */
-
diff --git a/installer/resources/themes/console/dark/console_ar.css b/installer/resources/themes/console/dark/console_ar.css
index 527ca73091..1edc189941 100644
--- a/installer/resources/themes/console/dark/console_ar.css
+++ b/installer/resources/themes/console/dark/console_ar.css
@@ -106,14 +106,6 @@ div.routersummary td:first-child {
      text-align: left;
 }
 
-div.tunnels {
-     padding: -3px 0 !important;
-}
-
-div.tunnels table {
-     margin: 0 -7px 0 5px !important;
-}
-
 .langbox {
      float: left;
      text-align: left;
@@ -154,25 +146,37 @@ span.newtab {
 /* lang selection */
 
 .langselect img {
-     margin-right: -61px;
+     margin-right: -71px;
 }
 
 .langselect .optbox:checked + img {
-     margin-right: -63px;
+     margin-right: -73px;
+}
+
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+.langselect img {
+     margin-right: -9px;
+     margin-top: -17px !important;
+}
+
+.langselect input[name="lang"]:checked + img, .langselect input[name="lang"]:checked + #config_ui img[src="/flags.jsp?c=a1"] {
+     margin-right: -10px;
+     margin-top: -18px !important;
+}
 }
 
 /* theme selection */
 
 .themechoice, .langselect {
      float: right !important;
-} 
+}
 
 .themechoice {
      padding: 5px;
 }
 
 .themechoice .optbox {
-     opacity: 0; /* hide the radio icon so we can use thumbnail img instead */
+     opacity: 0;
      outline: 1px dotted #f00;
      position: absolute;
      padding: 2px;
@@ -189,6 +193,8 @@ span.newtab {
      padding: 0 !important;
 }
 
+/* end theme selection */
+
 h3#iptransport a, th#upnpconfig a, h3#bwlimiter a, #config_stats h3 a, #config_logging h3 a, h3#graphdisplay a, #logs h3 a, h3#advancedconfig a {
      float: left;
 }
@@ -210,31 +216,31 @@ h3#iptransport a, th#upnpconfig a, h3#bwlimiter a, #config_stats h3 a, #config_l
      padding: 1px 3px 1px 1px !important;
 }
 
-table#leasesetdebug th:first-child, table#leasesetsummary th:first-child {
+#leasesetdebug th:first-child, #leasesetsummary th:first-child {
      text-align: right;
 }
 
-table#leasesetdebug th:last-child, table#leasesetsummary th:last-child {
+#leasesetdebug th:last-child, #leasesetsummary th:last-child {
      text-align: left;
 }
 
-table#leasesetdebug th, table#leasesetsummary th {
+#leasesetdebug th, #leasesetsummary th {
       padding: 5px;
 }
 
-table.leaseset th {
+.leaseset th {
      text-align: right;
 }
 
-table.leaseset th:first-child b {
+.leaseset th:first-child b {
      float: right;
 }
 
-table.leaseset th:last-child, table.leaseset td:nth-child(2) {
+.leaseset th:last-child, .leaseset td:nth-child(2) {
      text-align: left;
 }
 
-#netdboverview th, table.netdbentry th, table#leasesetdebug td:nth-child(2n) {
+#netdboverview th, table.netdbentry th, #leasesetdebug td:nth-child(2n) {
      text-align: right;
 }
 
@@ -250,7 +256,7 @@ table.leaseset th:last-child, table.leaseset td:nth-child(2) {
      text-align: center;
 }
 
-table.netdbentry th:last-child, table#leasesetdebug td:nth-child(2n+1) {
+table.netdbentry th:last-child, #leasesetdebug td:nth-child(2n+1) {
      text-align: left;
 }
 
@@ -258,11 +264,11 @@ table.netdbentry th:last-child, table#leasesetdebug td:nth-child(2n+1) {
      float: left;
 }
 
-table#enviro td {
+#enviro td {
      padding: 5px 10px 5px 5px !important;
 }
 
-table#enviro td:first-child {
+#enviro td:first-child {
      text-align: left;
 }
 
@@ -451,6 +457,37 @@ div[lang="ar"] ul, div[lang="ar"] p {
      padding: 0;
 }
 
+.tunnel_local {
+     margin-right: -4px;
+     margin-left: 4px;
+}
+
+.tunnel_id:empty + .tunnel_cap {
+    display: inline-block;
+    margin-left: 0;
+    margin-right: 12px;
+}
+
+.sybil_routerinfo th img[src^="/flags"], .netdbentry th a img {
+     margin-left: 5px;
+}
+
+.sybil_routerinfo th:last-child {
+     padding: 1px !important;
+}
+
+.sybil_info, .family {
+     direction: ltr;
+}
+
+.leaseset th:last-child, .leaseset td:last-child, .sybil_routerinfo th:last-child, .sybil_routerinfo td:last-child {
+     border-right: none !important;
+}
+
+a.viewfullentry::after, a[href^="viewprofile"]::after {
+     margin-left: 3px !important;
+}
+
 @media screen and (min-width: 1500px) {
 .main, .news, h1, .sorry {
      margin-right: 232px !important;
@@ -497,4 +534,16 @@ div[lang="ar"], div[lang="ar"] code, div[lang="ar"] b {
     margin-left: 0;
     margin-right: -82px;
 }
+}
+
+@media screen and (-webkit-min-device-pixel-ratio:0) and (min-width: 1500px) {
+.langselect img {
+     margin-right: -9px;
+     margin-top: -18px !important;
+}
+
+.langselect input[name="lang"]:checked + img, .langselect input[name="lang"]:checked + #config_ui img[src="/flags.jsp?c=a1"] {
+     margin-right: -10px;
+     margin-top: -19px !important;
+}
 }
\ No newline at end of file
diff --git a/installer/resources/themes/console/light/console.css b/installer/resources/themes/console/light/console.css
index a8cc712fa9..dbb26e42ec 100644
--- a/installer/resources/themes/console/light/console.css
+++ b/installer/resources/themes/console/light/console.css
@@ -241,7 +241,7 @@ pre {
      display: inline-block;
      width: 100%;
      width: calc(100% - 4px);
-     padding: 2px 0;
+     padding: 3px 0 2px;
      color: #2c4e8f;
      line-height: 110%;
 }
@@ -289,7 +289,6 @@ h3#helpfaq {
 }
 
 .routersummary h4 a {
-/*     display: inline-block;*/
      vertical-align: middle;
 }
 
@@ -357,6 +356,10 @@ h4.sb_info + hr + form {
      background: #fffff0 !important;
 }
 
+#sb_internals, #sb_advanced {
+     margin: -9px -6px -6px;
+}
+
 #sb_internals a, #sb_advanced a {
      padding: 2px;
      display: inline-block;
@@ -372,7 +375,7 @@ h4.sb_info + hr + form {
 }
 
 #sb_general, #sb_shortgeneral {
-     margin-top: -7px !important; 
+     margin-top: -7px !important;
 }
 
 #sb_general td::after, #sb_shortgeneral td::after, #sb_bandwidth td::after,
@@ -512,7 +515,7 @@ p:empty + .sb_notice {
      border: 0 !important;
 }
 
-.routersummary img:first-child  {
+.routersummary img:first-child {
      margin-bottom: -2px !important;
      opacity: 0.7;
 }
@@ -522,8 +525,167 @@ p:empty + .sb_notice {
      opacity: 1;
 }
 
+/* sidebar network status */
+
+.routersummary .error, .routersummary .warn, .routersummary .testing, .routersummary .hidden,
+.routersummary .running, .routersummary .firewalled, .routersummary .vmcomm, .routersummary .clockskew, .tunnelBuildStatus {
+     display: inline-block;
+     vertical-align: middle;
+     border: 1px solid #88f;
+     border-radius: 2px;
+     padding: 6px 3px;
+     width: calc(100% - 10px);
+     width: 100%;
+     margin: -4px -1px;
+     box-sizing: border-box;
+     box-shadow: inset 0 0 0 1px #fff, 0 0 1px rgba(96,96,96,0.5);
+     text-shadow: 0 1px 1px #fff;
+}
+
+.routersummary .firewalled {
+     background: repeating-linear-gradient(135deg, rgba(220,255,220,0.3) 2px, rgba(255,255,220,0.3) 3px, rgba(220,255,220,0.3) 5px);
+}
+
+.routersummary .error {
+     background: rgba(255,110,110,0.1);
+     box-shadow: inset 0 0 0 1px rgba(255,0,0,0.3), 0 0 1px rgba(96,96,96,0.5);
+     background: repeating-linear-gradient(135deg, rgba(255,100,100,0.1) 2px, rgba(255,200,200,0.3) 3px,  rgba(255,100,100,0.1) 5px);
+     border: 1px dotted #d33;
+}
+
+.routersummary .warn, .routersummary .clockskew {
+     background: rgba(255,255,200,0.25);
+     box-shadow: inset 0 0 0 1px #ff0, 0 0 1px rgba(96,96,96,0.5);
+}
+
+.routersummary .testing {
+     background: rgba(255,220,110,0.1);
+}
+
+.routersummary .hidden, .routersummary .vmcomm {
+     background: rgba(220,220,220,0.4);
+}
+
+.routersummary .vmcomm {
+     border: 1px dotted #999;
+}
+
+.routersummary .running {
+     background: rgba(220,255,220,0.15);
+}
+
+.routersummary .error::before, .routersummary .warn::before, .routersummary .testing::before, .routersummary .hidden::before,
+.routersummary .running::before, .routersummary .firewalled::before, .routersummary .vmcomm::before, .routersummary .clockskew::before {
+     padding-right: 3px;
+     vertical-align: middle;
+     display: inline-block;
+     filter: drop-shadow(0 0 1px rgba(96,96,96,0.5));
+}
+
+.routersummary .error::before, .routersummary .clockskew::before {
+     content: url(/themes/console/images/info/network_status/network_error.png);
+}
+
+.routersummary .warn::before {
+     content: url(/themes/console/images/info/network_status/network_warning.png);
+}
+
+.routersummary .testing::before {
+     content: url(/themes/console/images/info/network_status/network_testing.png);
+}
+
+.routersummary .hidden::before {
+     content: url(/themes/console/images/info/network_status/network_hidden.png);
+}
+
+.routersummary .running::before {
+     content: url(/themes/console/images/info/network_status/network_ok.png);
+}
+
+.routersummary .firewalled::before {
+     content: url(/themes/console/images/info/network_status/network_firewalled.png);
+     padding-right: 4px;
+}
+
+.routersummary .vmcomm::before {
+     content: url(/themes/console/images/info/network_status/network_vm.png);
+}
+
+.routersummary .clockskew::before {
+     content: url(/themes/console/images/info/network_status/network_clockskew.png);
+}
+
+/* end network status */
+
+/* tunnel build status */
+
+.tunnelBuildStatus {
+     padding: 7px 2px;
+}
+
+/* TO DO: activate this when we have build status specific spans */
+
+/*
+.tunnelStatusAccept {
+     background: rgba(220,255,220,0.15);
+     color: #070;
+}
+
+.tunnelStatusReject {
+     background: rgba(255,110,110,0.1);
+     color: #070;
+}
+
+.tunnelStatusRejectHidden {
+     background: rgba(220,220,220,0.4);
+     color: #777;
+}
+
+.tunnelBuildStatus::before, .tunnelStatusAccept::before, .tunnelStatusReject::before, .tunnelStatusRejectHidden::before {
+     margin-bottom: 1px;
+     padding-right: 1px;
+     vertical-align: -30%;
+     vertical-align: middle;
+     display: inline-block;
+     filter: drop-shadow(0 0 1px rgba(96,96,96,0.5));
+}
+
+.tunnelBuildStatus::before {
+     content: url(/themes/console/images/info/network_status/accepting.png);
+}
+
+.tunnelStatusAccept::before {
+     content: url(/themes/console/images/info/network_status/accepting.png);
+}
+
+.tunnelStatusReject::before {
+     content: url(/themes/console/images/info/network_status/rejecting.png);
+}
+
+.tunnelStatusRejectHidden::before {
+     content: url(/themes/console/images/info/network_status/rejecting_hidden.png);
+}
+*/
+/* end tunnel build status */
+
+.newsheadings {
+     text-align: right;
+     margin: -5px 0 -3px 8px;
+}
+
+.newsheadings li {
+     list-style: none outside url(images/newsbullet_mini.png);
+     margin: 4px -4px 2px 10px;
+     line-height: 120%;
+}
+
+.newsheadings li:first-child {
+     margin-top: 0;
+}
+
 /* end sidebar */
 
+/*
 div.tunnels td:first-child {
      width: 16px;
      text-align: left;
@@ -539,21 +701,6 @@ div.tunnels img, div.tunnels img:hover {
      opacity: 1 !important;
 }
 
-div.newsheadings {
-     text-align: right;
-     margin: -5px 0 -3px 8px;
-}
-
-div.newsheadings li {
-     list-style: none outside url(images/newsbullet_mini.png);
-     margin: 4px -4px 2px 10px;
-     line-height: 120%;
-}
-
-div.newsheadings li:first-child {
-     margin-top: 0;
-}
-
 div.tunnels {
      margin-top: 6px !important;
      margin-left: -2px !important;
@@ -574,19 +721,21 @@ div.tunnels td, div.tunnels img:first-child {
      padding: 4px 0 !important;
 }
 
-.routersummary p {
-     padding: 0;
-}
-
 div.refresh {
      margin-top: 10px !important;
      margin-bottom: 10px !important;
      padding: 2px 0 0 0 !important;
 }
 
+*/
+
+.routersummary p {
+     padding: 0;
+}
+
 /* proxy error messages */
 
-div.logo {
+.logo {
      float: left;
      padding: 10px;
      text-align: center;
@@ -599,7 +748,7 @@ div.logo {
      box-shadow: inset 0 0 0 1px #bbf;
 }
 
-div.logo:not(old) {
+.logo:not(old) {
      background: linear-gradient(to bottom, rgba(255,255,255,0.8), rgba(255,255,255,0.3)), url(images/noise.png) #fff;
      background-size: 100% 100%, 50px 50px;
 }
@@ -624,8 +773,8 @@ div.logo:not(old) {
      margin: 3px 2px;
 }
 
-div.warning {
-     margin: 20px 20px 30px 240px;
+.warning {
+     margin: 16px 12px 30px 232px;
      padding: 10px 25px 20px 75px;
      background: #fff;
      border: 1px solid #447;
@@ -692,8 +841,7 @@ div.warning {
 
 @media screen and (max-width: 800px) {
 .warning {
-     margin-top: 115px !important;
-     margin: 115px 5px 0 0 !important;
+     margin: 114px 5px 0 !important;
      background: #fff !important;
      background: linear-gradient(to bottom, rgba(255,255,255,0.8), rgba(255,255,255,0.3)), url(images/noise.png) #fff !important;
      background-size: 100% 100%, 50px 50px !important;
@@ -707,9 +855,9 @@ div.warning {
 .logo {
      position: absolute;
      top: 0;
-     width: calc(100% - 39px) !important;
+     width: calc(100% - 40px) !important;
      min-width: 430px;
-     margin: 10px 0 0 !important;
+     margin: 10px 5px 0 !important;
 }
 
 .logo a:link:not(img) {
@@ -853,7 +1001,7 @@ div.warning {
 
 /* console error messages */
 
-div.sorry {
+.sorry {
      margin: -11px 0 10px 214px;
      padding: 20px 25px 20px 70px;
      border: 1px solid #447;
@@ -867,7 +1015,7 @@ div.sorry {
      min-width: 455px;
 }
 
-div.sorry hr {
+.sorry hr {
      color: #531;
      background: #531;
      height: 1px;
@@ -875,7 +1023,7 @@ div.sorry hr {
      margin: 10px 0 !important;
 }
 
-div.main {
+.main {
      margin: -12px 0 8px 214px;
      padding: 0 15px 10px 15px;
      text-align: left;
@@ -891,11 +1039,11 @@ div.main {
      filter: drop-shadow(0 1px 1px #999);
 }
 
-div.main[id^="config_"] {
+.main[id^="config_"] {
      padding-bottom: 5px !important;
 }
 
-div.main li:first-child {
+.main li:first-child {
      margin-top: 10px;
 }
 
@@ -950,7 +1098,7 @@ div.main li:first-child {
      display: none;
 }
 
-div.main hr, hr {
+.main hr, hr {
      color: #113;
      background: #113;
      height: 1px;
@@ -962,7 +1110,7 @@ hr:last-child {
      margin-top: 20px !important;
 }
 
-div.main textarea {
+.main textarea {
      background: #fff;
      color: #001;
      font: 9pt "Droid Sans Mono", "Noto Mono", "Lucida Console", "DejaVu Sans Mono", monospace;
@@ -1175,132 +1323,101 @@ div.newscontent h6 {
      min-width: 576px;
 }
 
-div.main, .routersummary, .logo {
+.main, .routersummary, .logo {
      background: #fff url(images/noise.png) 0 0 / 50px 50px !important;
      background: linear-gradient(to bottom, rgba(255, 255, 255, 0.8), rgba(255, 255, 255, 0.5)) 0 0 / 100% 100%, #fff url("images/noise.png") 0 0 / 50px 50px !important;
 }
 
-/* top navigation bar */
-/*
-.confignav {
-     padding: 12px 10px 0 !important;
-     margin: 2px -14px 12px !important;
-     font-size: 9pt !important;
-     line-height: 160% !important;
-     min-width: 400px;
-     vertical-align: middle;
+/* top navigation */
+
+h1, .confignav {
+     position: relative;
+}
+
+.confignav, .main#help div.confignav {
+     padding: 8px;
+     margin: -1px -16px 5px -16px;
+     border: 1px solid #7778bf;
+     box-shadow: inset 0 0 0 1px #bbf;
+     font-size: 9pt;
      text-align: center;
-     border-bottom: 1px solid #447;
-     box-shadow: 0 1px 1px rgba(221, 221, 255, 0.5);
-     background: #fff;
+     font-weight: bold;
+     color: #000;
+     background: linear-gradient(to bottom, #fff 50%, rgba(255, 255, 255, 0.6) 52%, rgba(240, 240, 240, 0.4)) #efefff !important;
+     background: linear-gradient(to right, rgba(255,255,255,0.7), rgba(255,255,255,0) 15%, rgba(255,255,255,0) 85%, rgba(255,255,255,0.7)), linear-gradient(to bottom, #fff 50%, rgba(255, 255, 255, 0.6) 52%, rgba(240, 240, 240, 0.4)) #efefff !important;
 }
 
 .tab, .tab2 {
-     min-width: 50px;
-     padding: 3px 6px;
-}
-
-.tab {
-     padding: 3px 6px;
-     margin: -5px -1px -1px -3px !important;
-     background: #eef;
-     background: linear-gradient(to bottom, #fff, #eef);
-     box-shadow: inset 0 0 0 1px #fff;
-     border: 1px solid #447;
+     box-sizing: border-box;
      display: inline-block;
-     vertical-align: bottom;
-     text-align: center;
-     font-weight: normal !important;
-     text-decoration: none;
-     z-index: 999 !important;
-     position: relative;
-}
-
-.tab2 {
-     color: #31334f;
-     padding-bottom: 4px;
-     margin: -11px -1px -1px -3px;
+     border: 1px solid #7778bf;
+     margin: 0 -2px -1px -2px !important;
+     padding: 1px 0;
      background: #fff;
-     border: 1px solid #447;
-     border-top-color: #558;
-     border-top-width: 3px;
-     display: inline-block;
-     vertical-align: bottom;
-     text-align: center;
-     font-weight: bold;
-     border-radius: 2px 2px 0 0;
-     filter: drop-shadow(0 0 1px #ccc);
-     position: relative;
-     z-index: 999 !important;
-}
-
-_:-ms-lang(x), .tab {
-     margin-left: -4px !important;
-     margin-right: -2px !important;
-}
-
-.tab:hover, .tab:hover a {
-     background: #558;
-     background: linear-gradient(to bottom, #eef, #fff);
-     color: #f60;
-}
-
-.tab:hover {
-     border-top: 3px solid #77a;
-     border-radius: 2px 2px 0 0 !important;
-     margin-top: -9px !important;
-}
-
-.tab:active {
-     box-shadow: inset 0 0 0 1px #fff;
-}
-
-.tab:active, .tab:active a {
-     background: #f60 !important;
-     color: #fff !important;
-     border-top-width: 1px;
-}
-
-.tab:first-child {
-     border-radius: 2px 0 0 0;
-}
-
-.tab:last-child {
-     border-radius: 0 2px 0 0;
-     padding-right: 6px;
+     min-width: 60px !important;
+     filter: drop-shadow(0 0 1px #ededed);
 }
 
 .tab a {
-     font-weight: normal !important;
-     text-decoration: none !important;
      display: inline-block;
-     width: 100%;
-     padding-top: 0;
-     padding-bottom: 0;
+     padding: 3px 14px;
 }
 
-.tab:last-child:hover {
-     margin-top: -7px !important;
-     margin-bottom: -1px !important;
+.tab:hover a {
+     color: #f60 !important;
 }
 
-.tab:last-child:active {
-     margin-top: -5px !important;
-     margin-bottom: -1px !important;
+.tab {
+     background: linear-gradient(to bottom, #fff 50%, #efefff 50%);
+     background: linear-gradient(to bottom, #fff 50%, rgba(255, 255, 255, 0.6) 50%, rgba(240, 240, 240, 0.4)) #e7e7ff;
+     box-shadow: inset 0 0 0 1px #fff;
 }
-*/
+
+.tab:hover {
+     background: #fff;
+     box-shadow: inset 0 0 0 1px #f90;
+}
+
+.tab:active {
+     box-shadow: inset 0 0 0 1px #fff, inset 3px 3px 3px 1px #5f2400;
+     background: #f60;
+}
+
+.tab:active a {
+     color: #fff !important;
+}
+
+.tab2 {
+     background: #89f;
+     background: #aaf;
+     background: #3b6bbf;
+     background: rgba(59, 107, 191, 0.8);
+     background: #6288cb;
+     box-shadow: inset 0 0 0 1px #fff;
+     color: #fff;
+     padding: 4px 12px;
+}
+
+@media screen and (min-width: 1400px) {
+#help .confignav {
+     position: sticky;
+     top: -1px;
+     z-index: 999;
+}
+}
+
 /* end topnav */
 
 .th_title a, .th_title a:hover {
      color: #31334f !important;
 }
 
-div.configure {
+.configure {
      min-width: 400px;
      margin-bottom: 0;
 }
 
-div.configure h3, .graphspanel h3 {
+.configure h3, .graphspanel h3 {
      border: 1px solid #7778bf;
      border-left: 5px solid #7778bf;
      padding: 5px;
@@ -1653,7 +1770,7 @@ h3#graphdisplay {
 
 /* end new graphs optionbox */
 
-div.messages {
+.messages {
      padding: 15px;
      margin: 15px 0;
      border-radius: 2px;
@@ -1681,11 +1798,11 @@ div.messages {
      margin-bottom: 0;
 }
 
-div.error {
+.error {
      color: #900;
 }
 
-div.notice {
+.notice {
      font-style: italic;
      margin: 0;
      padding: 0;
@@ -1696,7 +1813,7 @@ div.notice {
      margin: 0;
 }
 
-div.messages li, .messages li:first-child, .error li:first-child, .error li {
+.messages li, .messages li:first-child, .error li:first-child, .error li {
      text-align: justify !important;
      font-weight: bold;
      list-style: none;
@@ -2120,7 +2237,7 @@ div.app:active .applabel {
      box-shadow: inset 0 0 0 1px #fff;
 }
 
-div.app:active .applabel, div.app:active .applabel a  {
+div.app:active .applabel, div.app:active .applabel a {
      background: #f60 !important;
      color: #fff !important;
 }
@@ -2260,7 +2377,7 @@ tt::-moz-selection {
      background: #030 !important;
 }
 
-div.main li {
+.main li {
      text-align: left;
      list-style: square;
      margin: 2px 20px 0 40px;
@@ -2269,7 +2386,7 @@ div.main li {
      word-wrap: break-word;
 }
 
-div.main li b, .statlist b a:hover {
+.main li b, .statlist b a:hover {
      color: #335 !important;
 }
 
@@ -2318,7 +2435,7 @@ a, h1, h2, h3, h4, th, input[type="submit"], input[type="reset"], button, select
      text-shadow: 0 1px 1px #fff;
 }
 
-a:hover, a:focus, a:active, .app:hover a, .app:focus a, .app:active a, 
+a:hover, a:focus, a:active, .app:hover a, .app:focus a, .app:active a,
 input[type="submit"]:hover, input[type="submit"]:focus, input[type="submit"]:active,
 input[type="reset"]:hover, input[type="reset"]:focus, input[type="reset"]:active,
 button:hover, button:focus, button:active, select:hover, select:focus, select:active, .graphspanel a {
@@ -2769,7 +2886,7 @@ h1 {
      border: 1px solid #447;
      border-radius: 2px;
      min-width: 546px;
-     filter: drop-shadow(0 0 1px #999);
+     z-index: 999;
 }
 
 span.newtab {
@@ -3057,7 +3174,11 @@ h4 {
 }
 
 .twocol {
+     -moz-columns: 2 400px;
+     -webkit-columns: 2 400px;
      columns: 2 400px;
+     -moz-column-gap: 0 !important;
+     -webkit-column-gap: 0 !important;
      column-gap: 0 !important;
      display: block;
      margin: 10px 0;
@@ -3066,7 +3187,7 @@ h4 {
 .twocol li {
      break-inside: avoid;
      page-break-inside: avoid;
-     -webkit-break-inside: avoid;
+     -webkit-column-break-inside: avoid;
 }
 
 .twocol li:first-child {
@@ -3120,7 +3241,7 @@ input, input:visited, button, button:visited {
      filter: saturate(70%) drop-shadow(0 0 1px rgba(204, 204, 204, 0.6));
 }
 
-button::-moz-focus-inner, input[type="submit"]::-moz-focus-inner, input[type="reset"]::-moz-focus-inner  {
+button::-moz-focus-inner, input[type="submit"]::-moz-focus-inner, input[type="reset"]::-moz-focus-inner {
      outline: none;
      border: none;
 }
@@ -3964,7 +4085,7 @@ body.iframed {
      margin: 0 10px 10px 7px !important;
 }
 
-.iframed div.sorry {
+.iframed .sorry {
      margin: 5px 10px 10px 7px !important;
 }
 
@@ -4260,7 +4381,7 @@ div.langselect br {
      display: block;
 }
 
-div.ui_lang { /* lang text label */
+div.ui_lang {
      text-align: center;
      background: #eef url(images/tinytitle.png) center center !important;
      background: linear-gradient(to bottom, #fff 50%, #eef 50%) !important;
@@ -4366,7 +4487,7 @@ table#addkeyring tr:last-child td {
 #ntcpconnections td:nth-child(6), #ntcpconnections td:nth-child(7), #ntcpconnections td:nth-child(8), #ntcpconnections td:nth-child(9), #ntcpconnections td:nth-child(10),
 #udpconnections td:nth-child(6), #udpconnections td:nth-child(7), #udpconnections td:nth-child(9), #udpconnections td:nth-child(10), #udpconnections td:nth-child(11),
 #udpconnections td:nth-child(13), #udpconnections td:nth-child(14), #udpconnections td:nth-child(15), #udpconnections td:nth-child(16) {
-     text-align: right;
+     text-align: right !important;
      white-space: nowrap;
 }
 
@@ -4390,8 +4511,145 @@ table#addkeyring tr:last-child td {
      padding-right: 5px;
 }
 
+#ntcpconnections th:nth-child(6), #ntcpconnections th:nth-child(7), #ntcpconnections th:nth-child(8), #ntcpconnections th:nth-child(9), #ntcpconnections th:nth-child(10) {
+     text-align: right !important;
+}
+
+#udpconnections th:nth-child(6), #udpconnections th:nth-child(7), #udpconnections th:nth-child(n+9) {
+     text-align: right !important;
+}
+
+#udpconnections th:nth-child(12) {
+     text-align: center !important;
+}
+
+.peersort {
+     text-align: center;
+     display: inline-block;
+}
+
+.right {
+     text-align: right;
+     margin: 0 1px;
+     display: inline-block;
+     width: 40%
+}
+
+.left {
+     text-align: left;
+     margin: 0 1px;
+     display: inline-block;
+     width: 40%
+}
+
+.peeripv6:empty {
+     padding: 0;
+     width: 0;
+}
+
+.cwnd .left, .cwnd .right {
+     width: auto;
+}
+
+#udpconnections td:nth-child(n+13), #udpconnections .tablefooter td:nth-child(n+10) {
+     padding-right: 1%;
+}
+
+#peerdefs td {
+     line-height: 130%;
+}
+
+.peer_arrow {
+     display: inline-block;
+     width: 22px;
+     text-align: center;
+     margin: 2px 1px;
+}
+
 /* end peers */
 
+/* /tunnels */
+
+tt a {
+     letter-spacing: 0.07em;
+}
+
+.tunnel_cap {
+     background: rgba(0,0,64,0.3);
+     color: #fff;
+     border: 1px solid rgba(0,0,64,0.2);
+     border-radius: 2px;
+     min-width: 12px;
+     padding: 0 2px;
+     display:inline-block;
+     margin: 1px 2px 1px 8px;
+     text-align: center !important;
+     text-shadow: 0 1px 1px #555;
+}
+
+.tunnel_cap:empty {
+     border: none;
+}
+
+.tunnel_id {
+     display: inline-block;
+     min-width: 78px;
+     text-align: right;
+}
+
+.tunnel_id:empty {
+     min-width: 0;
+}
+
+.tunnel_id:empty + .tunnel_cap {
+     margin-left: 12px !important;
+     display: inline-block;
+}
+
+.tunnel_peer {
+     display: inline-block;
+     min-width: 64px;
+     text-align: right;
+}
+
+.tunnel_local {
+     font-size: 8pt;
+     background: rgba(187, 187, 255, 0.3);
+     background: #dfdfff;
+     border-radius: 2px;
+     text-align: center;
+     padding: 2px 0;
+     margin-left: -4px;
+     margin-right: 4px;
+     text-transform: lowercase;
+}
+
+.tunnel_peer:empty {
+     vertical-align: top;
+}
+
+#tunnel_defs td {
+     padding: 4px;
+}
+
+#tunnel_defs td:nth-child(even) {
+     text-align: right;
+     padding-right: 0;
+     width: 1%;
+}
+
+#tunnel_defs td:nth-child(3) {
+    border-right: 1px inset #ddf;
+}
+
+#tunnel_defs td:first-child, #tunnel_defs td:last-child {
+     font-size: 0;
+     width: 0;
+     padding: 0;
+}
+
+/* end tunnels */
+
 /* netdb */
 
 .main#netdb, .main#events {
@@ -4411,28 +4669,28 @@ table#addkeyring tr:last-child td {
      margin-top: 15px !important;
 }
 
-table.netdbentry th {
+.netdbentry th {
      font-weight: normal;
 }
 
-table.netdbentry th:last-child {
+.netdbentry th:last-child {
      text-align: right;
      padding: 5px;
      white-space: nowrap;
      width: 50px;
 }
 
-table.netdbentry th:first-child, table.netdbentry td:first-child  {
+.netdbentry th:first-child, .netdbentry td:first-child {
      white-space: nowrap;
      padding: 4px 6px !important;
      text-align: left;
 }
 
-table.netdbentry td:first-child  {
+.netdbentry td:first-child {
      width: 80px;
 }
 
-table.netdbentry td:nth-child(2) {
+.netdbentry td:nth-child(2) {
      word-wrap: break-word;
 }
 
@@ -4477,7 +4735,7 @@ a.viewfullentry:hover {
      margin-top: 10px;
 }
 
-#netdboverview th, #netdblookup th  {
+#netdboverview th, #netdblookup th {
      text-transform: uppercase;
      font-size: 11pt !important;
      letter-spacing: 0.08em;
@@ -4646,7 +4904,7 @@ a.viewfullentry:hover {
      filter: drop-shadow(0 0 1px #f60);
 }
 
-#noleasesets {
+#noleasesets, #notinitialized, .netdbnotfound {
      border: 1px solid #7778bf;
      padding: 20px;
      font-weight: bold;
@@ -4656,6 +4914,10 @@ a.viewfullentry:hover {
      text-align: center;
 }
 
+#notinitialized, .netdbnotfound {
+     margin-top: 15px !important;
+}
+
 #sybilnav {
      -moz-columns: 4;
      -webkit-columns: 4;
@@ -4673,7 +4935,7 @@ a.viewfullentry:hover {
      background: repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(240, 240, 255, 0.3) 3px, #fff 5px), #fff;
 }
 
-h3.sybils  {
+h3.sybils {
      margin-bottom: 9px;
 }
 
@@ -4743,6 +5005,10 @@ p.sybil_info, p.family, p.threatpoints, p.hashdist, p#sybil_totals, p.notfound {
      background: url(images/eye.png) 8px center no-repeat, repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(240, 240, 255, 0.3) 3px, #fff 5px), #fff;
 }
 
+p#sybil_totals {
+     font-weight: normal;
+}
+
 p.family + p.family, p.sybil_info + p.sybil_info {
      margin-top: -4px;
 }
@@ -5152,7 +5418,7 @@ h3#ntcpcon, h3#udpcon {
 }
 
 #profilelist td:last-child {
-     text-align: right;
+     text-align: center;
      padding-right: 5px;
      width: 1%;
      white-space: nowrap;
@@ -5296,10 +5562,6 @@ h3#ntcpcon, h3#udpcon {
      box-shadow: inset 0 0 0 1px #fff;
 }
 
-.main#help div.confignav {
-     background: #fff !important;
-}
-
 .main#console {
      box-shadow: inset 0 0 0 1px #bbf;
 }
@@ -5543,6 +5805,7 @@ a[href^="configpeer?peer"] {
 a[href^="configpeer?peer"]::after {
      content: url(/themes/console/images/buttons/edit.png);
      vertical-align: bottom;
+     margin: 0 0 0 3px;
 }
 
 a[href^="configpeer?peer"]:hover {
@@ -5553,7 +5816,7 @@ a[href^="configpeer?peer"]:hover {
      overflow: auto;
 }
 
-#webappconfigactions, #externali2cp  {
+#webappconfigactions, #externali2cp {
      margin-bottom: 5px !important;
 }
 
@@ -5561,6 +5824,267 @@ a[href^="configpeer?peer"]:hover {
      margin-bottom: 10px !important;
 }
 
+/* netdb router address info */
+
+.leasesets_container {
+     -moz-columns: 680px 2;
+     -webkit-columns: 680px 2;
+     columns: 680px 2;
+     -moz-column-gap: 10px;
+     -webkit-column-gap: 10px;
+     column-gap: 10px;
+}
+
+th code {
+     -moz-user-select: all;
+     -webkit-user-select: all;
+     user-select: all;
+}
+
+@media screen and (min-width: 1634px) {
+.leasesets_container {
+     margin-bottom: 2px;
+}
+
+th code {
+     font-size: 9pt !important;
+}
+}
+
+.leasesets_container table:first-child {
+     margin-top: 0;
+}
+
+.leasesets_container table {
+     break-inside: avoid;
+     page-break-inside: avoid;
+     -webkit-column-break-inside: avoid;
+}
+
+.netdb_addresses br:first-child, .sybil_routerinfo tr:last-child td br:first-child {
+     display: none;
+}
+
+.netdbentry th:first-child::after {
+     content: "";
+     display: inline-block;
+     min-height: 20px;
+     vertical-align: middle;
+}
+
+.netdbentry th:last-child > *, .sybil_routerinfo th:nth-child(2) > * {
+     vertical-align: middle !important;
+}
+
+.netdbentry th a img {
+     display: inline-block;
+     vertical-align: middle;
+     margin-right: 1px;
+     margin-top: -2px;
+}
+
+.netdbentry a.viewfullentry::after {
+     display: inline-block;
+     vertical-align: middle !important;
+     margin-left: 3px;
+}
+
+.netdbentry td:first-child {
+     text-align: right;
+}
+
+.netdbentry .netdb_addresses {
+     padding-left: 40px;
+}
+
+b.netdb_transport {
+     display: inline-block;
+     width: 50px;
+     text-align: right;
+     margin-left: -50px;
+     margin-right: 5px;
+}
+
+#netdb code {
+    font-weight: normal !important;
+}
+
+.netdb_name {
+     color: #335;
+     text-transform: capitalize;
+     font-weight: bold;
+}
+
+.netdb_info {
+     margin-right: 1px;
+}
+
+.netdb_expiry {
+     margin-left: 5px;
+}
+
+.sybil_routerinfo th img[src^="/flags"] {
+     height: 11px;
+     width: 16px;
+     margin-right: 3px;
+}
+.sybil_routerinfo b.netdb_transport {
+     margin-left: -13px;
+     margin-right: 0;
+}
+
+.sybil_routerinfo td:first-child, .netdbentry td:first-child {
+     text-align: right !important;
+     padding-right: 0;
+}
+
+.sybil_routerinfo td[colspan="3"] {
+     white-space: normal;
+}
+
+.sybil_container {
+     -moz-columns: 680px 2;
+     -webkit-columns: 680px 2;
+     columns: 680px 2;
+     margin: 10px 0;
+}
+
+.sybil_container p {
+     break-inside: avoid;
+     page-break-inside: avoid;
+     -webkit-column-break-inside: avoid;
+}
+
+.sybil_container p:first-child {
+     margin-top: 0;
+}
+
+.sybil_container p:last-child {
+     margin-bottom: 0;
+}
+
+/* end netdb router address */
+
+/* sybils */
+
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+.leaseset th:last-child, .leaseset td:last-child, .sybil_routerinfo th:last-child {
+     border-right: 1px solid #7778bf !important;
+}
+}
+
+.sybilinfo_params {
+     padding: 0;
+     border: 1px solid #7778bf;
+}
+
+.sybilinfo_container {
+     columns: 240px auto;
+     -moz-columns: 240px auto;
+     -webkit-columns: 240px auto;
+     -moz-column-gap: 0;
+     -webkit-column-gap: 0;
+     column-gap: 0;
+     background: #efefff;
+     background: rgba(240,240,255,0.5);
+     background: repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(240, 240, 255, 0.3) 3px, #fff 5px), #fff;
+     padding: 4px 5px;
+}
+
+.sybilinfo_container b {
+     color: #335;
+}
+
+.sybil_routerinfo p {
+     margin: 0;
+     padding: 1px 0;
+     break-inside: avoid;
+     page-break-inside: avoid;
+     -webkit-column-break-inside: avoid;
+}
+
+.sybilinfo_familyname {
+     display: inline-block;
+     vertical-align: top;
+     max-width: 150px;
+     white-space: nowrap;
+     overflow: hidden;
+     text-overflow: ellipsis;
+}
+
+.sybil_routerinfo, .sybil_routerinfo tr:nth-child(2) td, .sybil_routerinfo tr:last-child td {
+     border-bottom: none !important;
+}
+
+.sybil_routerinfo tr:last-child td {
+     border-top: none !important;
+}
+
+.sybil_addresses td:first-child {
+     max-width: 155px;
+     font-weight: bold;
+     padding-right: 9px;
+}
+
+.sybil_addresses table {
+     width: 100%;
+     margin: 0;
+     border-top: 1px solid #7778bf !important;
+     border-bottom: 1px solid #7778bf !important;
+}
+
+.sybil_addresses {
+     padding: 0;
+     border-bottom: 1px solid #7778bf;
+}
+
+.sybil_addresses table, .sybil_addresses td {
+     border: none;
+}
+
+.threatpoints + ul {
+     -moz-columns: auto 500px;
+     -webkit-columns: auto 500px;
+     columns: auto 500px;
+     -moz-column-rule: 1px solid #7778bf;
+     -webkit-column-rule: 1px solid #7778bf;
+     column-rule: 1px solid #7778bf;
+     padding-top: 3px;
+     padding-bottom: 3px;
+}
+
+.threatpoints + ul li:first-child {
+     margin-top: 0;
+}
+
+.threatpoints + ul li:last-child {
+     margin-bottom: 0;
+}
+
+.threatpoints + ul li {
+     list-style: none;
+     margin-left: 0;
+     line-height: 120%;
+     break-inside: avoid;
+     page-break-inside: avoid;
+     -webkit-column-break-inside: avoid;
+}
+
+.threatpoints + ul li a {
+     white-space: nowrap;
+     font-size: 8pt !important;
+     background: #eef;
+     margin-left: 2px;
+     border-radius: 1px;
+     padding: 0 2px;
+}
+
+.sybil_routerinfo + .threatpoints + ul + a[name] + table {
+     margin-top: -11px !important;
+}
+
+/* end sybils */
+
 /* responsive layout */
 
 @media screen and (max-width: 900px) {
@@ -5703,6 +6227,31 @@ input[name="pluginURL"] {
 }
 }
 
+@media screen and (max-width: 1100px) {
+.tunnel_id, .tunnel_peer {
+     min-width: 0 !important;
+     text-align: center !important;
+}
+
+.tunnel_local {
+     margin-right: 5px;
+     margin-left: 2px;
+     padding: 2px 4px;
+}
+
+.tunnel_peer:empty {
+     vertical-align: middle;
+}
+
+.tunnel_peer:empty::before {
+     margin: 1px 6px 1px 2px;
+}
+
+.tunnel_cap {
+     margin-left: 5px !important;
+}
+}
+
 @media screen and (max-width: 1200px) {
 #portfaq td:nth-child(2) {
      white-space: normal;
@@ -5775,13 +6324,17 @@ body, .main, .main td, .news p, #news p, .tab, .tab2, .main li b, div.joblog li,
      border-right: none;
 }
 
-tt a, .cells tt, #profilelist tt, .cells tt a, #profilelist tt a {
-     margin-left: 3px !important;
+tt a, .cells tt, #profilelist tt, .cells tt a, #profilelist tt a, .leaseset td tt {
+     margin-left: 0 !important;
      margin-right: 3px !important;
      font-size: 9pt !important;
      letter-spacing: 0.1em !important;
 }
 
+.tunnel_peer tt {
+     margin-left: 3px !important;
+}
+
 .main[id^="config_"] th, h4#updateplugins {
      font-size: 10.5pt !important;
 }
@@ -5795,7 +6348,7 @@ tt a, .cells tt, #profilelist tt, .cells tt a, #profilelist tt a {
 }
 
 .routersummary {
-     width: 207px !important;
+     width: 208px !important;
 }
 
 .routersummary div[style="height: 36px;"] {
@@ -5804,14 +6357,14 @@ tt a, .cells tt, #profilelist tt, .cells tt a, #profilelist tt a {
 }
 
 .routersummary table[id^="sb_"] {
-     width: 216px !important;
+     width: 218px !important;
 }
 
 .routersummary h3::after {
      content: "";
      display: inline-block;
      min-height: 18px;
-     vertical-align: middle
+     vertical-align: middle;
      box-sizing: border-box;
 }
 
@@ -5853,8 +6406,9 @@ h1 {
      font-size: 19pt;
 }
 
-.routersummary h3 a  {
+.routersummary h3 a {
      font-size: 11pt !important;
+     padding: 4px 0 2px;
 }
 
 .routersummary img[src$="i2plogo.png"] {
@@ -5865,7 +6419,7 @@ h1 {
 }
 
 #sb_internals a, #sb_advanced a {
-     max-width: 210px;
+     max-width: 212px;
 }
 
 #sb_general, #sb_shortgeneral, #sb_bandwidth, #sb_peers, #sb_tunnels, #sb_queue {
@@ -5887,11 +6441,6 @@ h1 {
      min-height: 38px !important;
 }
 
-/*
-.confignav {
-     padding-top: 12px !important;
-}
-*/
 .langbox {
      line-height: 120%;
      margin: 4px 2px 0 5px;
@@ -5901,7 +6450,7 @@ h1 {
      margin: -1px 0 2px 2px;
 }
 
-.th_title a  {
+.th_title a {
      font-size: 11pt !important;
 }
 
@@ -5959,6 +6508,16 @@ button.control {
      margin-left: -2px !important;
 }
 
+.tunnel_cap {
+     margin-left: 10px;
+     padding: 0 1px;
+     min-width: 14px;
+}
+
+.tunnel_id:empty {
+     margin-right: -10px;
+}
+
 _:-ms-lang(x), #browseronstart {
      margin-bottom: -15px !important;
 }
@@ -5994,412 +6553,3 @@ _:-ms-lang(x), .tunnels_client th:first-child::after {
 
 /* end Edge/IE tweaks */
 
-/* TODO: Merge with main classes above */
-/* top navigation */
-
-h1, .confignav {
-     position: relative;
-}
-
-h1 {
-     z-index: 999;
-     filter: none;
-}
-
-.confignav, .main#help div.confignav {
-     padding: 8px;
-     margin: -1px -16px 5px -16px;
-     border: 1px solid #7778bf;
-     box-shadow: inset 0 0 0 1px #bbf;
-     font-size: 9pt;
-     text-align: center;
-     font-weight: bold;
-     color: #000;
-     background: linear-gradient(to bottom, #fff 50%, rgba(255, 255, 255, 0.6) 52%, rgba(240, 240, 240, 0.4)) #efefff !important;
-     background: linear-gradient(to right, rgba(255,255,255,0.7), rgba(255,255,255,0) 5%, rgba(255,255,255,0) 95%, rgba(255,255,255,0.7)), linear-gradient(to bottom, #fff 50%, rgba(255, 255, 255, 0.6) 52%, rgba(240, 240, 240, 0.4)) #efefff !important;
-     -moz-user-select: none;
-     -webkit-user-select: none;
-     user-select: none;
-}
-
-.tab, .tab2 {
-     box-sizing: border-box;
-     display: inline-block;
-     border: 1px solid #7778bf;
-     margin: 0 -2px -1px -2px !important;
-     padding: 1px 0;
-     background: #fff;
-     min-width: 60px !important;
-     filter: drop-shadow(0 0 1px #ededed);
-}
-
-.tab a {
-     display: inline-block;
-     padding: 3px 14px;
-}
-
-.tab:hover a {
-     color: #f60 !important;
-}
-
-.tab {
-     background: linear-gradient(to bottom, #fff 50%, #efefff 50%);
-     background: linear-gradient(to bottom, #fff 50%, rgba(255, 255, 255, 0.6) 50%, rgba(240, 240, 240, 0.4)) #e7e7ff;
-     box-shadow: inset 0 0 0 1px #fff;
-}
-
-.tab:hover {
-     background: #fff;
-     box-shadow: inset 0 0 0 1px #f90;
-}
-
-.tab:active {
-     box-shadow: inset 0 0 0 1px #fff, inset 3px 3px 3px 1px #5f2400;
-     background: #f60;
-}
-
-.tab:active a {
-     color: #fff !important;
-}
-
-.tab2 {
-     background: #89f;
-     background: #aaf;
-     background: #3b6bbf;
-     background: rgba(59, 107, 191, 0.8);
-     background: #6288cb;
-     box-shadow: inset 0 0 0 1px #fff;
-     color: #fff;
-     padding: 4px 12px;
-}
-
-@media screen and (min-width: 1400px) {
-#help .confignav {
-     position: sticky;
-     top: -1px;
-     z-index: 999;
-}
-}
-
-/* end topnav */
-
-/* network status */
-
-.routersummary .error, .routersummary .warn, .routersummary .testing, .routersummary .hidden,
-.routersummary .running, .routersummary .firewalled, .routersummary .vmcomm, .routersummary .clockskew, .tunnelBuildStatus {
-     display: inline-block;
-     vertical-align: middle;
-     border: 1px solid #88f;
-     border-radius: 2px;
-     padding: 6px 3px;
-     width: calc(100% - 10px);
-     width: 100%;
-     margin: -4px -1px;
-     box-sizing: border-box;
-     box-shadow: inset 0 0 0 1px #fff, 0 0 1px rgba(96,96,96,0.5);
-     text-shadow: 0 1px 1px #fff;
-}
-
-.routersummary .firewalled {
-     background: repeating-linear-gradient(135deg, rgba(220,255,220,0.3) 2px, rgba(255,255,220,0.3) 3px, rgba(220,255,220,0.3) 5px);
-}
-
-.routersummary .error {
-     background: rgba(255,110,110,0.1);
-     box-shadow: inset 0 0 0 1px rgba(255,0,0,0.3), 0 0 1px rgba(96,96,96,0.5);
-     background: repeating-linear-gradient(135deg, rgba(255,100,100,0.1) 2px, rgba(255,200,200,0.3) 3px,  rgba(255,100,100,0.1) 5px);
-     border: 1px dotted #d33;
-}
-
-.routersummary .warn, .routersummary .clockskew {
-     background: rgba(255,255,200,0.25);
-     box-shadow: inset 0 0 0 1px #ff0, 0 0 1px rgba(96,96,96,0.5);
-}
-
-.routersummary .testing {
-     background: rgba(255,220,110,0.1);
-}
-
-.routersummary .hidden, .routersummary .vmcomm {
-     background: rgba(220,220,220,0.4);
-}
-
-.routersummary .vmcomm {
-     border: 1px dotted #999;
-}
-
-.routersummary .running {
-     background: rgba(220,255,220,0.15);
-}
-
-.routersummary .error::before, .routersummary .warn::before, .routersummary .testing::before, .routersummary .hidden::before,
-.routersummary .running::before, .routersummary .firewalled::before, .routersummary .vmcomm::before, .routersummary .clockskew::before {
-     padding-right: 3px;
-     vertical-align: middle;
-     display: inline-block;
-     filter: drop-shadow(0 0 1px rgba(96,96,96,0.5));
-}
-
-.routersummary .error::before, .routersummary .clockskew::before {
-     content: url(/themes/console/images/info/network_status/network_error.png);
-}
-
-.routersummary .warn::before {
-     content: url(/themes/console/images/info/network_status/network_warning.png);
-}
-
-.routersummary .testing::before {
-     content: url(/themes/console/images/info/network_status/network_testing.png);
-}
-
-.routersummary .hidden::before {
-     content: url(/themes/console/images/info/network_status/network_hidden.png);
-}
-
-.routersummary .running::before {
-     content: url(/themes/console/images/info/network_status/network_ok.png);
-}
-
-.routersummary .firewalled::before {
-     content: url(/themes/console/images/info/network_status/network_firewalled.png);
-     padding-right: 4px;
-}
-
-.routersummary .vmcomm::before {
-     content: url(/themes/console/images/info/network_status/network_vm.png);
-}
-
-.routersummary .clockskew::before {
-     content: url(/themes/console/images/info/network_status/network_clockskew.png);
-}
-
-/* end network status */
-
-/* tunnel build status */
-
-.tunnelBuildStatus {
-     padding: 7px 2px;
-}
-
-/* TO DO: activate this when we have build status specific spans */
-
-/*
-.tunnelStatusAccept {
-     background: rgba(220,255,220,0.15);
-     color: #070;
-}
-
-.tunnelStatusReject {
-     background: rgba(255,110,110,0.1);
-     color: #070;
-}
-
-.tunnelStatusRejectHidden {
-     background: rgba(220,220,220,0.4);
-     color: #777;
-}
-
-.tunnelBuildStatus::before, .tunnelStatusAccept::before, .tunnelStatusReject::before, .tunnelStatusRejectHidden::before {
-     margin-bottom: 1px;
-     padding-right: 1px;
-     vertical-align: -30%;
-     vertical-align: middle;
-     display: inline-block;
-     filter: drop-shadow(0 0 1px rgba(96,96,96,0.5));
-}
-
-.tunnelBuildStatus::before {
-     content: url(/themes/console/images/info/network_status/accepting.png);
-}
-
-.tunnelStatusAccept::before {
-     content: url(/themes/console/images/info/network_status/accepting.png);
-}
-
-.tunnelStatusReject::before {
-     content: url(/themes/console/images/info/network_status/rejecting.png);
-}
-
-.tunnelStatusRejectHidden::before {
-     content: url(/themes/console/images/info/network_status/rejecting_hidden.png);
-}
-*/
-/* end tunnel build status */
-
-/* peers */
-
-#ntcpconnections th:nth-child(6), #ntcpconnections th:nth-child(7), #ntcpconnections th:nth-child(8), #ntcpconnections th:nth-child(9), #ntcpconnections th:nth-child(10) {
-     text-align: right;
-}
-
-#udpconnections th:nth-child(6), #udpconnections th:nth-child(7), #udpconnections th:nth-child(n+9) {
-     text-align: right;
-}
-
-#udpconnections th:nth-child(12) {
-     text-align: center;
-}
-
-.peersort {
-     text-align: center;
-     display: inline-block;
-}
-
-.right {
-     text-align: right;
-     margin: 0 1px;
-     display: inline-block;
-     width: 40%
-}
-
-.left {
-     text-align: left;
-     margin: 0 1px;
-     display: inline-block;
-     width: 40%
-}
-
-.peeripv6:empty {
-     padding: 0;
-     width: 0;
-}
-
-.cwnd .left, .cwnd .right {
-     width: auto;
-}
-
-#udpconnections td:nth-child(n+13), #udpconnections .tablefooter td:nth-child(n+10) {
-     padding-right: 1%;
-}
-
-#peerdefs td {
-     line-height: 130%;
-}
-
-.peer_arrow {
-     display: inline-block;
-     width: 22px;
-     text-align: center;
-     margin: 2px 1px;
-}
-
-/* end peers */
-
-/* /tunnels */
-
-tt a {
-     letter-spacing: 0.07em;
-}
-
-.tunnel_cap {
-     background: rgba(0,0,64,0.3);
-     color: #fff;
-     border: 1px solid rgba(0,0,64,0.2);
-     border-radius: 2px;
-     min-width: 12px;
-     padding: 0 2px;
-     display:inline-block;
-     margin: 1px 2px 1px 8px;
-     text-align: center !important;
-     text-shadow: 0 1px 1px #555;
-}
-
-.tunnel_cap:empty {
-     border: none;
-}
-
-.tunnel_id {
-     display: inline-block;
-     min-width: 78px;
-     text-align: right;
-}
-
-.tunnel_id:empty {
-     min-width: 0;
-}
-
-.tunnel_id:empty + .tunnel_cap {
-     margin-left: 12px !important;
-     display: inline-block;
-}
-
-.tunnel_peer {
-     display: inline-block;
-     min-width: 64px;
-     text-align: right;
-}
-
-.tunnel_local {
-     font-size: 8pt;
-     background: rgba(187, 187, 255, 0.3);
-     background: #dfdfff;
-     border-radius: 2px;
-     text-align: center;
-     padding: 2px 0;
-     margin-left: -4px;
-     margin-right: 4px;
-}
-
-.tunnel_peer:empty {
-     vertical-align: top;
-}
-
-#tunnel_defs td {
-     padding: 4px;
-}
-
-#tunnel_defs td:nth-child(even) {
-     text-align: right;
-     padding-right: 0;
-     width: 1%;
-}
-
-#tunnel_defs td:nth-child(3) {
-    border-right: 1px inset #ddf;
-}
-
-#tunnel_defs td:first-child, #tunnel_defs td:last-child {
-     font-size: 0;
-     width: 0;
-     padding: 0;
-}
-
-@media screen and (max-width: 1100px) {
-.tunnel_id, .tunnel_peer {
-     min-width: 0 !important;
-     text-align: center !important;
-}
-
-.tunnel_local {
-     margin-right: 5px;
-     margin-left: 2px;
-     padding: 2px 4px;
-}
-
-.tunnel_peer:empty {
-     vertical-align: middle;
-}
-
-.tunnel_peer:empty::before {
-     margin: 1px 6px 1px 2px;
-}
-
-.tunnel_cap {
-     margin-left: 5px !important;
-}
-}
-
-@media screen and (min-width: 1500px) {
-.tunnel_cap {
-     margin-left: 10px;
-     padding: 0 1px;
-     min-width: 14px;
-}
-
-.tunnel_id:empty {
-     margin-right: -10px;
-}
-}
-
-/* end tunnels */
-
diff --git a/installer/resources/themes/console/light/console_ar.css b/installer/resources/themes/console/light/console_ar.css
index f5625baafb..26c35f15ba 100644
--- a/installer/resources/themes/console/light/console_ar.css
+++ b/installer/resources/themes/console/light/console_ar.css
@@ -661,7 +661,7 @@ td.subheading {
      text-align: left;
 }
 
-table.leaseset:last-child, table.netdbentry:last-child, #profile_defs {
+table.leaseset:last-child, .netdbentry:last-child, #profile_defs {
      margin-bottom: -10px;
 }
 
@@ -684,18 +684,26 @@ table#leasesetdebug td:first-child, table#leasesetsummary td:first-child {
      padding-right: 5px !important;
 }
 
-table.netdbentry th:first-child {
-     text-align: right;
+.netdbentry th:first-child {
+     text-align: right !important;
 }
 
-table.netdbentry th:last-child {
+.netdbentry th:last-child {
      text-align: left;
 }
 
-table.netdbentry td:nth-child(2) {
+.netdbentry td:nth-child(2) {
      direction: ltr;
 }
 
+.netdbentry th:last-child {
+     border-left: 1px solid #7778bf !important;
+}
+
+.netdbentry th a img {
+     margin-left: 6px;
+}
+
 #sybilnav li {
      background: url(images/eye.png) right 5px center no-repeat, linear-gradient(to right, #eef 30%, #fff);
      padding: 3px 24px 3px 3px;
@@ -705,6 +713,10 @@ table.netdbentry td:nth-child(2) {
      margin-right: 20px;
 }
 
+.leaseset th:last-child, .leaseset td:last-child, .sybil_routerinfo th:last-child, .sybil_routerinfo td:last-child {
+     border-right: none !important;
+}
+
 p#profiles_overview, #profiles .widescroll + h3, #thresholds + h3, #profiles #banlist {
      margin-right: -16px !important;
 }
@@ -745,6 +757,10 @@ p#profiles_overview, #profiles .widescroll + h3, #thresholds + h3, #profiles #ba
      padding-right: 10px;
 }
 
+.sybil_routerinfo th img[src^="/flags"], .netdbentry th a img {
+     margin-left: 5px;
+}
+
 .wideload .confignav {
      margin-left: -3px !important;
      margin-right: -35px !important;
@@ -877,6 +893,25 @@ table#bugreports td.infohelp {
      margin-right: -2px;
 }
 
+.tunnel_local {
+     margin-right: 0;
+     margin-left: 4px;
+}
+
+.tunnel_id:empty + .tunnel_cap {
+    display: inline-block;
+    margin-left: 0;
+    margin-right: 12px;
+}
+
+#tunnel_defs td:nth-child(3) {
+     border-right: none;
+}
+
+#tunnels .cells {
+     text-align: center !important;
+}
+
 @media screen and (min-width: 1500px) {
 .main, .news, h1, .sorry {
      margin-right: 232px !important;
diff --git a/installer/resources/themes/console/light/i2ptunnel.css b/installer/resources/themes/console/light/i2ptunnel.css
index b16f755e4f..66436e880d 100644
--- a/installer/resources/themes/console/light/i2ptunnel.css
+++ b/installer/resources/themes/console/light/i2ptunnel.css
@@ -460,7 +460,7 @@ td.infohelp {
 }
 
 .tunnelConfig td > b {
-     margin-left: 5px;
+     margin: 2px 0 2px 5px;
      min-width: 30px;
      display: inline-block;
 }
diff --git a/installer/resources/themes/console/midnight/console.css b/installer/resources/themes/console/midnight/console.css
index 606a21c996..ec44955fed 100644
--- a/installer/resources/themes/console/midnight/console.css
+++ b/installer/resources/themes/console/midnight/console.css
@@ -161,7 +161,7 @@ textarea[cols="70"], textarea[name="levels"] {
      width: calc(100% - 20px);
 }
 
-button::-moz-focus-inner, input[type="submit"]::-moz-focus-inner, input[type="reset"]::-moz-focus-inner  {
+button::-moz-focus-inner, input[type="submit"]::-moz-focus-inner, input[type="reset"]::-moz-focus-inner {
      outline: none;
      border: none;
 }
@@ -217,7 +217,7 @@ label {
      cursor: default;
 }
 
-input[type="file"]  {
+input[type="file"] {
      box-shadow: none;
      border: none;
      background: none;
@@ -834,7 +834,7 @@ button.download.control:active {
      background: #652787 url(/themes/console/images/buttons/download.png) center center no-repeat !important;
 }
 
-button::-moz-focus-inner, input[type="submit"]::-moz-focus-inner, input[type="reset"]::-moz-focus-inner  {
+button::-moz-focus-inner, input[type="submit"]::-moz-focus-inner, input[type="reset"]::-moz-focus-inner {
      outline: none;
      border: none;
 }
@@ -2431,7 +2431,11 @@ h2, h3, h4, .confignav {
 }
 
 .twocol {
+     -moz-columns: 2 400px;
+     -webkit-columns: 2 400px;
      columns: 2 400px;
+     -moz-column-gap: 0 !important;
+     -webkit-column-gap: 0 !important;
      column-gap: 0 !important;
      display: block;
      margin: 5px 0 -5px;
@@ -2453,7 +2457,7 @@ p + .twocol, div[lang="de"] p + .twocol {
 .twocol li {
      break-inside: avoid;
      page-break-inside: avoid;
-     -webkit-break-inside: avoid;
+     -webkit-column-break-inside: avoid;
 }
 
 .twocol li:first-child {
@@ -2618,7 +2622,7 @@ table#schedjobs {
      padding-right: 8px !important;
 }
 
-#schedjobs th:first-child, #schedjobs td:first-child, #jobstats th:first-child, #jobstats td:first-child  {
+#schedjobs th:first-child, #schedjobs td:first-child, #jobstats th:first-child, #jobstats td:first-child {
      text-align: left;
      padding-left: 10px;
      font-weight: bold;
@@ -4752,7 +4756,7 @@ table#profile_defs + hr {
      display: none;
 }
 
-#floodfills th, #floodfills td  {
+#floodfills th, #floodfills td {
      text-align: right !important;
 }
 
@@ -4761,11 +4765,11 @@ table#profile_defs + hr {
      text-align: center !important;
 }
 
-#floodfills td  {
+#floodfills td {
      padding: 3px !important;
 }
 
-#floodfills th:first-child, #floodfills td:first-child  {
+#floodfills th:first-child, #floodfills td:first-child {
      text-align: center !important;
      width: 52px;
      white-space: nowrap;
@@ -4836,6 +4840,7 @@ table#jardump { /* /jars */
 
 .main#jardump {
      padding: 0;
+     overflow: auto;
 }
 
 .main#jardump tt {
@@ -5312,11 +5317,11 @@ span#distance {
      width: 50px;
 }
 
-.netdbentry th:first-child  {
+.netdbentry th:first-child {
      white-space: nowrap;
 }
 
-.netdbentry td:first-child  {
+.netdbentry td:first-child {
      width: 80px;
 }
 
@@ -5433,10 +5438,11 @@ a.viewfullentry::after, a[href^="viewprofile"]::after {
      vertical-align: text-top;
 }
 
-#noleasesets {
+#noleasesets, #notinitialized, .netdbnotfound {
      background: #000 url(/themes/console/images/info/infohelp.png) 12px center no-repeat !important;
      padding: 15px 15px 15px 50px !important;
      border: 1px solid #443da0;
+     margin-top: -4px;
      margin-bottom: 10px;
      text-align: left;
 }
@@ -5567,6 +5573,10 @@ p.sybil_info, p.family, p.threatpoints, p.hashdist, p#sybil_totals, p.notfound {
      box-shadow: inset 0 0 0 1px #080077;
 }
 
+p#sybil_totals {
+     font-weight: normal;
+}
+
 p.sybil_info, p.hashdist, p.family {
      margin-top: -1px;
 }
@@ -5575,7 +5585,7 @@ p.sybil_info + p.sybil_info, p.family + p.family {
      margin-top: -4px;
 }
 
-p.sybil_info + a[name] + .sybil_routerinfo, p.hashdist + a[name] + .sybil_routerinfo  {
+p.sybil_info + a[name] + .sybil_routerinfo, p.hashdist + a[name] + .sybil_routerinfo {
      margin-top: 10px !important;
 }
 
@@ -5589,6 +5599,14 @@ p.sybil_info + a[name] + .sybil_routerinfo, p.hashdist + a[name] + .sybil_router
      margin-bottom: -5px;
 }
 
+.sybil_routerinfo + .threatpoints + ul + a[name] + table {
+     margin-top: -11px !important;
+}
+
+.sybil_routerinfo + .threatpoints + ul {
+     margin-bottom: 10px;
+}
+
 /* end netdb */
 
 /* /confignet, /configadvanced */
@@ -5704,6 +5722,10 @@ h3#pluginmanage {
      margin-bottom: -13px !important;
 }
 
+.sybils#samefamily {
+     margin-bottom: 10px !important;
+}
+
 h3.tabletitle a {
      text-transform: lowercase;
      letter-spacing: normal;
@@ -6153,6 +6175,548 @@ form[action="events"] {
      background-size: 28px 28px;
 }
 
+/* network status */
+
+.routersummary h4 a {
+     width: auto !important;
+     vertical-align: middle;
+     display: inline;
+}
+
+.routersummary .error, .routersummary .warn, .routersummary .testing, .routersummary .hidden,
+.routersummary .running, .routersummary .firewalled, .routersummary .vmcomm, .routersummary .clockskew, .tunnelBuildStatus {
+     display: inline-block;
+     vertical-align: middle;
+     border: 1px solid rgba(52, 47, 127, 0.6);
+     border-radius: 2px;
+     padding: 6px 3px;
+     width: 100%;
+     margin: -3px -1px;
+     box-shadow: inset 0 0 0 1px #000;
+     text-shadow: 0 1px 1px #000;
+     box-sizing: border-box;
+}
+
+.routersummary .firewalled {
+     border: 1px dotted #342f7f;
+}
+
+.routersummary .error {
+     border: 1px dotted #700;
+}
+
+.routersummary .warn, .routersummary .clockskew {
+     border: 1px solid #550;
+}
+
+.routersummary .testing {
+     border: 1px dotted #4F4B1D;
+}
+
+.routersummary .hidden, .routersummary .vmcomm {
+     border: 1px dotted #777;
+}
+
+.routersummary .running {
+     border: 1px solid #342f7f;
+     border: 1px solid rgba(52, 47, 127, 0.6);
+}
+
+.routersummary .error::before, .routersummary .warn::before, .routersummary .testing::before, .routersummary .hidden::before,
+.routersummary .running::before, .routersummary .firewalled::before, .routersummary .vmcomm::before, .routersummary .clockskew::before {
+     padding: 0 2px;
+     vertical-align: middle;
+     display: inline-block;
+     filter: drop-shadow(0 0 1px rgba(220,220,220,0.7));
+}
+
+.routersummary .error::before, .routersummary .clockskew::before {
+     content: url(/themes/console/images/info/network_status/network_error.png);
+}
+
+.routersummary .warn::before {
+     content: url(/themes/console/images/info/network_status/network_warning.png);
+}
+
+.routersummary .testing::before {
+     content: url(/themes/console/images/info/network_status/network_testing.png);
+}
+
+.routersummary .hidden::before {
+     content: url(/themes/console/images/info/network_status/network_hidden.png);
+     padding: 0 3px;
+}
+
+.routersummary .running::before {
+     content: url(/themes/console/images/info/network_status/network_ok.png);
+}
+
+.routersummary .firewalled::before {
+     content: url(/themes/console/images/info/network_status/network_firewalled.png);
+}
+
+.routersummary .vmcomm::before {
+     content: url(/themes/console/images/info/network_status/network_vm.png);
+}
+
+.routersummary .clockskew::before {
+     content: url(/themes/console/images/info/network_status/network_clockskew.png);
+}
+
+/* end network status */
+
+#sb_services, #sb_internals, #sb_advanced {
+     margin-top: -3px !important;
+     margin-bottom: -5px !important;
+}
+
+/* /tunnels */
+
+tt a {
+     letter-spacing: 0.07em;
+}
+
+.tunnel_cap {
+     background: rgba(0,0,140,0.4);
+     color: #c9ceff;
+     border: 1px solid rgba(0,0,64,0.2);
+     border-radius: 2px;
+     min-width: 12px;
+     padding: 0 2px;
+     display:inline-block;
+     margin: 1px 2px 1px 8px;
+     text-align: center !important;
+     text-shadow: 0 1px 1px #000;
+}
+
+.tunnel_cap:empty {
+     border: none;
+}
+
+.tunnel_id {
+     display: inline-block;
+     min-width: 78px;
+     text-align: right;
+}
+
+.tunnel_id:empty {
+     min-width: 0;
+}
+
+.tunnel_id:empty + .tunnel_cap {
+     margin-left: 12px !important;
+     display: inline-block;
+}
+
+.tunnel_peer {
+     display: inline-block;
+     min-width: 56px;
+     text-align: right;
+}
+
+.tunnel_local {
+     font-size: 8pt;
+     text-transform: lowercase;
+     background: rgba(0,0,96,0.3);
+     border-radius: 2px;
+     text-align: center;
+     padding: 2px 0;
+     margin-left: -4px;
+     margin-right: 4px;
+}
+
+.tunnel_peer:empty {
+     vertical-align: top;
+}
+
+#tunnel_defs {
+     margin-top: -1px;
+     margin-bottom: 10px;
+}
+
+#tunnel_defs td:first-child, #tunnel_defs td:nth-child(even) {
+     width: 1%;
+     white-space: nowrap;
+}
+
+@media screen and (max-width: 1100px) {
+.tunnel_id, .tunnel_peer {
+     min-width: 0 !important;
+     text-align: center !important;
+}
+
+.tunnel_local {
+     margin-right: 5px;
+     margin-left: 2px;
+     padding: 2px 4px;
+}
+
+.tunnel_peer:empty {
+     vertical-align: middle;
+}
+
+.tunnel_peer:empty::before {
+     margin: 1px 6px 1px 2px;
+}
+
+.tunnel_cap {
+     margin-left: 5px !important;
+}
+}
+
+@media screen and (min-width: 1500px) {
+.tunnel_cap {
+     margin-left: 10px;
+     padding: 0 1px;
+     min-width: 14px;
+}
+
+.tunnel_id:empty {
+     margin-right: -10px;
+}
+}
+
+/* end tunnels */
+
+/* /peers */
+
+#ntcpconnections th:nth-child(6), #ntcpconnections th:nth-child(7), #ntcpconnections th:nth-child(8), #ntcpconnections th:nth-child(9), #ntcpconnections th:nth-child(10),
+#ntcpconnections td:nth-child(6), #ntcpconnections td:nth-child(7), #ntcpconnections td:nth-child(8), #ntcpconnections td:nth-child(9), #ntcpconnections td:nth-child(10),
+#udpconnections td:nth-child(6), #udpconnections td:nth-child(7), #udpconnections td:nth-child(9), #udpconnections td:nth-child(10), #udpconnections td:nth-child(11),
+#udpconnections td:nth-child(13), #udpconnections td:nth-child(14), #udpconnections td:nth-child(15), #udpconnections td:nth-child(16) {
+     text-align: right;
+     white-space: nowrap;
+}
+
+#ntcpconnections .tablefooter td:nth-child(3), #ntcpconnections .tablefooter td:nth-child(4), #ntcpconnections .tablefooter td:nth-child(5), #ntcpconnections .tablefooter td:nth-child(6),
+#udpconnections .tablefooter td:nth-child(3), #udpconnections .tablefooter td:nth-child(4), #udpconnections .tablefooter td:nth-child(7), #udpconnections .tablefooter td:nth-child(8),
+#udpconnections .tablefooter td:nth-child(10), #udpconnections .tablefooter td:nth-child(11), #udpconnections .tablefooter td:nth-child(12), #udpconnections .tablefooter td:nth-child(13) {
+     text-align: right;
+}
+
+#udpconnections .tablefooter td:nth-child(9) {
+     text-align: center !important;
+}
+
+#ntcpconnections td:nth-child(4), #ntcpconnections td:nth-child(5), #udpconnections td:nth-child(4),
+#udpconnections td:nth-child(5), #udpconnections td:nth-child(8), #udpconnections td:nth-child(12) {
+     white-space: nowrap;
+}
+
+#udpconnections .tablefooter td, #ntcpconnections .tablefooter td {
+     padding-left: 5px;
+     padding-right: 5px;
+}
+
+#ntcpconnections th:nth-child(6), #ntcpconnections th:nth-child(7), #ntcpconnections th:nth-child(8), #ntcpconnections th:nth-child(9), #ntcpconnections th:nth-child(10) {
+     text-align: right;
+}
+
+#udpconnections th:nth-child(6), #udpconnections th:nth-child(7), #udpconnections th:nth-child(n+9) {
+     text-align: right;
+}
+
+#udpconnections th:nth-child(12) {
+     text-align: center;
+}
+
+.peersort {
+     text-align: center;
+     display: inline-block;
+}
+
+.right {
+     text-align: right;
+     margin: 0 1px;
+     display: inline-block;
+     width: 40%
+}
+
+.left {
+     text-align: left;
+     margin: 0 1px;
+     display: inline-block;
+     width: 40%
+}
+
+.peeripv6:empty {
+     padding: 0;
+     width: 0;
+}
+
+.cwnd .left, .cwnd .right {
+     width: auto;
+}
+
+#udpconnections th:nth-child(n+13), #udpconnections .tablefooter th:nth-child(n+10),
+#udpconnections td:nth-child(n+13), #udpconnections .tablefooter td:nth-child(n+10) {
+     padding-right: 1% !important;
+}
+
+#peerdefs {
+     line-height: 140%;
+}
+
+.peer_arrow {
+     display: inline-block;
+     width: 18px;
+     text-align: center;
+     margin-right: 3px;
+}
+
+/* end peers */
+
+/* netdb router address info */
+
+.leasesets_container {
+     -moz-columns: 680px 2;
+     -webkit-columns: 680px 2;
+     columns: 680px 2;
+     -moz-column-gap: 10px;
+     -webkit-column-gap: 10px;
+     column-gap: 10px;
+}
+
+th code {
+     -moz-user-select: all;
+     -webkit-user-select: all;
+     user-select: all;
+}
+
+@media screen and (min-width: 1634px) {
+.leasesets_container {
+     margin-bottom: 8px;
+}
+
+th code {
+     font-size: 9pt !important;
+}
+}
+
+.leasesets_container table:first-child {
+     margin-top: 0;
+}
+
+.leasesets_container table {
+     break-inside: avoid;
+     page-break-inside: avoid;
+     -webkit-column-break-inside: avoid;
+}
+
+.netdb_addresses br:first-child, .sybil_routerinfo tr:last-child td br:first-child {
+     display: none;
+}
+
+.netdbentry th:first-child::after {
+     content: "";
+     display: inline-block;
+     min-height: 20px;
+     vertical-align: middle;
+}
+
+.netdbentry th:last-child > *, .sybil_routerinfo th:nth-child(2) > * {
+     display: inline-block;
+     vertical-align: middle !important;
+}
+
+.netdbentry th a img {
+     display: inline-block;
+     vertical-align: middle;
+     margin-right: 1px;
+     margin-bottom: 2px;
+}
+
+.netdbentry a.viewfullentry::after {
+     display: inline-block;
+     vertical-align: middle !important;
+     margin-left: 3px;
+}
+
+.netdbentry td:first-child {
+     text-align: right;
+     min-width: 100px;
+     padding-right: 5px !important
+}
+
+b.netdb_transport {
+     display: inline-block;
+     width: 50px;
+     text-align: right;
+     margin-right: 5px;
+}
+
+#netdb code {
+    font-weight: normal !important;
+}
+
+.netdb_name {
+     color: #dfe2ff;
+     text-transform: capitalize;
+     font-weight: bold;
+}
+
+.netdb_info {
+     margin-right: 1px;
+}
+
+.netdb_expiry {
+     margin-left: 5px;
+}
+
+.sybil_routerinfo th img[src^="/flags"] {
+     height: 11px;
+     width: 16px;
+     margin-right: 5px;
+}
+
+.sybil_routerinfo b.netdb_transport {
+     margin-left: -13px;
+     margin-right: 0;
+}
+
+.sybil_routerinfo td:first-child, .netdbentry td:first-child {
+     text-align: right !important;
+     padding-right: 0;
+}
+
+.sybil_routerinfo td[colspan="3"] {
+     white-space: normal;
+}
+
+.sybil_container {
+     -moz-columns: 680px 2;
+     -webkit-columns: 680px 2;
+     columns: 680px 2;
+     margin: 10px 0;
+}
+
+.sybil_container p {
+     break-inside: avoid;
+     page-break-inside: avoid;
+     -webkit-column-break-inside: avoid;
+}
+
+.sybil_container p:first-child {
+     margin-top: 0;
+}
+
+.sybil_container p:last-child {
+     margin-bottom: 0;
+}
+
+/* end netdb router address */
+
+/* sybils */
+
+.leaseset th:last-child, .leaseset td:last-child, .sybil_routerinfo th:last-child, .sybil_routerinfo td:last-child {
+     border-right: 1px solid #443da0 !important;
+}
+
+.sybil_routerinfo table td:last-child {
+     border-right: none !important;
+}
+
+.sybilinfo_params {
+     padding: 0;
+     border-bottom: 1px solid #443da0;
+}
+
+.sybilinfo_container {
+     columns: 240px auto;
+     -moz-columns: 240px auto;
+     -webkit-columns: 240px auto;
+     -moz-column-gap: 0;
+     -webkit-column-gap: 0;
+     column-gap: 0;
+     background: #00001a;
+     padding: 4px 5px;
+}
+
+.sybilinfo_container b {
+     color: #bb3;
+}
+
+.sybil_routerinfo tr:last-child {
+     border-top: none;
+}
+
+.sybil_routerinfo p {
+     margin: 0;
+     padding: 0;
+     line-height: 120%;
+     break-inside: avoid;
+     page-break-inside: avoid;
+     -webkit-column-break-inside: avoid;
+}
+
+#sybils_summary {
+     line-height: 140%;
+}
+
+.sybilinfo_familyname {
+     display: inline-block;
+     vertical-align: top;
+     max-width: 150px;
+     white-space: nowrap;
+     overflow: hidden;
+     text-overflow: ellipsis;
+}
+
+.sybil_addresses td:first-child {
+     max-width: 155px;
+     font-weight: bold;
+     padding-right: 9px;
+}
+
+.sybil_addresses table {
+     width: 100%;
+     margin: 0;
+}
+
+.sybil_addresses {
+     padding: 0;
+     border-bottom: 1px solid #443da0
+}
+
+.sybil_addresses table, .sybil_addresses td {
+     border: none;
+}
+
+.threatpoints + ul {
+     -moz-columns: auto 600px;
+     -webkit-columns: auto 600px;
+     columns: auto 600px;
+     -moz-column-rule: 1px solid #443da0;
+     -webkit-column-rule: 1px solid #443da0;
+     column-rule: 1px solid #443da0;
+     padding-top: 3px;
+     padding-bottom: 3px;
+}
+
+.threatpoints + ul li:first-child {
+     margin-top: 0 !important;
+     padding-top: 0 !important;
+}
+
+.threatpoints + ul li:last-child {
+     padding-bottom: 0 !important;
+}
+
+.threatpoints + ul li {
+     list-style: none;
+     margin-left: 5px;
+     line-height: 120%;
+     break-inside: avoid !important;
+     page-break-inside: avoid !important;
+     -webkit-column-break-inside: avoid !important;
+}
+
+.threatpoints + ul li a {
+     white-space: nowrap;
+}
+
+/* end sybils */
+
 /* responsive layout */
 
 @media screen and (max-width: 900px) {
@@ -6590,286 +7154,3 @@ _:-ms-lang(x), table + .statusnotes {
 
 /* end IE/Edge tweaks */
 
-/* network status */
-
-.routersummary h4 a {
-     width: auto !important;
-     vertical-align: middle;
-     display: inline;
-}
-
-.routersummary .error, .routersummary .warn, .routersummary .testing, .routersummary .hidden,
-.routersummary .running, .routersummary .firewalled, .routersummary .vmcomm, .routersummary .clockskew, .tunnelBuildStatus {
-     display: inline-block;
-     vertical-align: middle;
-     border: 1px solid rgba(52, 47, 127, 0.6);
-     border-radius: 2px;
-     padding: 6px 3px;
-     width: 100%;
-     margin: -3px -1px;
-     box-shadow: inset 0 0 0 1px #000;
-     text-shadow: 0 1px 1px #000;
-     box-sizing: border-box;
-}
-
-.routersummary .firewalled {
-     border: 1px dotted #342f7f;
-}
-
-.routersummary .error {
-     border: 1px dotted #700;
-}
-
-.routersummary .warn, .routersummary .clockskew {
-     border: 1px solid #550;
-}
-
-.routersummary .testing {
-     border: 1px dotted #4F4B1D;
-}
-
-.routersummary .hidden, .routersummary .vmcomm {
-     border: 1px dotted #777;
-}
-
-.routersummary .running {
-     border: 1px solid #342f7f;
-     border: 1px solid rgba(52, 47, 127, 0.6);
-}
-
-.routersummary .error::before, .routersummary .warn::before, .routersummary .testing::before, .routersummary .hidden::before,
-.routersummary .running::before, .routersummary .firewalled::before, .routersummary .vmcomm::before, .routersummary .clockskew::before {
-     padding: 0 2px;
-     vertical-align: middle;
-     display: inline-block;
-     filter: drop-shadow(0 0 1px rgba(220,220,220,0.7));
-}
-
-.routersummary .error::before, .routersummary .clockskew::before {
-     content: url(/themes/console/images/info/network_status/network_error.png);
-}
-
-.routersummary .warn::before {
-     content: url(/themes/console/images/info/network_status/network_warning.png);
-}
-
-.routersummary .testing::before {
-     content: url(/themes/console/images/info/network_status/network_testing.png);
-}
-
-.routersummary .hidden::before {
-     content: url(/themes/console/images/info/network_status/network_hidden.png);
-     padding: 0 3px;
-}
-
-.routersummary .running::before {
-     content: url(/themes/console/images/info/network_status/network_ok.png);
-}
-
-.routersummary .firewalled::before {
-     content: url(/themes/console/images/info/network_status/network_firewalled.png);
-}
-
-.routersummary .vmcomm::before {
-     content: url(/themes/console/images/info/network_status/network_vm.png);
-}
-
-.routersummary .clockskew::before {
-     content: url(/themes/console/images/info/network_status/network_clockskew.png);
-}
-
-/* end network status */
-
-#sb_services, #sb_internals, #sb_advanced {
-     margin-top: -2px !important;
-}
-
-/* /tunnels */
-
-tt a {
-     letter-spacing: 0.07em;
-}
-
-.tunnel_cap {
-     background: rgba(0,0,140,0.4);
-     color: #c9ceff;
-     border: 1px solid rgba(0,0,64,0.2);
-     border-radius: 2px;
-     min-width: 12px;
-     padding: 0 2px;
-     display:inline-block;
-     margin: 1px 2px 1px 8px;
-     text-align: center !important;
-     text-shadow: 0 1px 1px #000;
-}
-
-.tunnel_cap:empty {
-     border: none;
-}
-
-.tunnel_id {
-     display: inline-block;
-     min-width: 78px;
-     text-align: right;
-}
-
-.tunnel_id:empty {
-     min-width: 0;
-}
-
-.tunnel_id:empty + .tunnel_cap {
-     margin-left: 12px !important;
-     display: inline-block;
-}
-
-.tunnel_peer {
-     display: inline-block;
-     min-width: 56px;
-     text-align: right;
-}
-
-.tunnel_local {
-     font-size: 8pt;
-     background: rgba(0,0,96,0.3);
-     border-radius: 2px;
-     text-align: center;
-     padding: 2px 0;
-     margin-left: -4px;
-     margin-right: 4px;
-}
-
-.tunnel_peer:empty {
-     vertical-align: top;
-}
-
-#tunnel_defs {
-     margin-top: -1px;
-     margin-bottom: 10px;
-}
-
-@media screen and (max-width: 1100px) {
-.tunnel_id, .tunnel_peer {
-     min-width: 0 !important;
-     text-align: center !important;
-}
-
-.tunnel_local {
-     margin-right: 5px;
-     margin-left: 2px;
-     padding: 2px 4px;
-}
-
-.tunnel_peer:empty {
-     vertical-align: middle;
-}
-
-.tunnel_peer:empty::before {
-     margin: 1px 6px 1px 2px;
-}
-
-.tunnel_cap {
-     margin-left: 5px !important;
-}
-}
-
-@media screen and (min-width: 1500px) {
-.tunnel_cap {
-     margin-left: 10px;
-     padding: 0 1px;
-     min-width: 14px;
-}
-
-.tunnel_id:empty {
-     margin-right: -10px;
-}
-}
-
-/* end tunnels */
-
-/* /peers */
-
-#ntcpconnections th:nth-child(6), #ntcpconnections th:nth-child(7), #ntcpconnections th:nth-child(8), #ntcpconnections th:nth-child(9), #ntcpconnections th:nth-child(10),
-#ntcpconnections td:nth-child(6), #ntcpconnections td:nth-child(7), #ntcpconnections td:nth-child(8), #ntcpconnections td:nth-child(9), #ntcpconnections td:nth-child(10),
-#udpconnections td:nth-child(6), #udpconnections td:nth-child(7), #udpconnections td:nth-child(9), #udpconnections td:nth-child(10), #udpconnections td:nth-child(11),
-#udpconnections td:nth-child(13), #udpconnections td:nth-child(14), #udpconnections td:nth-child(15), #udpconnections td:nth-child(16) {
-     text-align: right;
-     white-space: nowrap;
-}
-
-#ntcpconnections .tablefooter td:nth-child(3), #ntcpconnections .tablefooter td:nth-child(4), #ntcpconnections .tablefooter td:nth-child(5), #ntcpconnections .tablefooter td:nth-child(6),
-#udpconnections .tablefooter td:nth-child(3), #udpconnections .tablefooter td:nth-child(4), #udpconnections .tablefooter td:nth-child(7), #udpconnections .tablefooter td:nth-child(8),
-#udpconnections .tablefooter td:nth-child(10), #udpconnections .tablefooter td:nth-child(11), #udpconnections .tablefooter td:nth-child(12), #udpconnections .tablefooter td:nth-child(13) {
-     text-align: right;
-}
-
-#udpconnections .tablefooter td:nth-child(9) {
-     text-align: center !important;
-}
-
-#ntcpconnections td:nth-child(4), #ntcpconnections td:nth-child(5), #udpconnections td:nth-child(4),
-#udpconnections td:nth-child(5), #udpconnections td:nth-child(8), #udpconnections td:nth-child(12) {
-     white-space: nowrap;
-}
-
-#udpconnections .tablefooter td, #ntcpconnections .tablefooter td {
-     padding-left: 5px;
-     padding-right: 5px;
-}
-
-#ntcpconnections th:nth-child(6), #ntcpconnections th:nth-child(7), #ntcpconnections th:nth-child(8), #ntcpconnections th:nth-child(9), #ntcpconnections th:nth-child(10) {
-     text-align: right;
-}
-
-#udpconnections th:nth-child(6), #udpconnections th:nth-child(7), #udpconnections th:nth-child(n+9) {
-     text-align: right;
-}
-
-#udpconnections th:nth-child(12) {
-     text-align: center;
-}
-
-.peersort {
-     text-align: center;
-     display: inline-block;
-}
-
-.right {
-     text-align: right;
-     margin: 0 1px;
-     display: inline-block;
-     width: 40%
-}
-
-.left {
-     text-align: left;
-     margin: 0 1px;
-     display: inline-block;
-     width: 40%
-}
-
-.peeripv6:empty {
-     padding: 0;
-     width: 0;
-}
-
-.cwnd .left, .cwnd .right {
-     width: auto;
-}
-
-#udpconnections th:nth-child(n+13), #udpconnections .tablefooter th:nth-child(n+10),
-#udpconnections td:nth-child(n+13), #udpconnections .tablefooter td:nth-child(n+10) {
-     padding-right: 1% !important;
-}
-
-#peerdefs {
-     line-height: 140%;
-}
-
-.peer_arrow {
-     display: inline-block;
-     width: 18px;
-     text-align: center;
-     margin-right: 3px;
-}
-
-/* end peers */
diff --git a/installer/resources/themes/console/midnight/console_ar.css b/installer/resources/themes/console/midnight/console_ar.css
index bcf5f2e8ff..2df531f612 100644
--- a/installer/resources/themes/console/midnight/console_ar.css
+++ b/installer/resources/themes/console/midnight/console_ar.css
@@ -218,6 +218,10 @@ h3#iptransport a, th#upnpconfig a, h3#bwlimiter a, #config_stats h3 a, #config_l
      padding: 1px 3px 1px 1px !important;
 }
 
+.sybil_routerinfo th img[src^="/flags"], .netdbentry th a img {
+     margin-left: 5px;
+}
+
 table#leasesetdebug th:first-child, table#leasesetsummary th:first-child {
      text-align: right;
 }
@@ -242,6 +246,10 @@ table.leaseset th:last-child, table.leaseset td:nth-child(2) {
      text-align: left;
 }
 
+.leaseset th:last-child, .leaseset td:last-child, .sybil_routerinfo th:last-child, .sybil_routerinfo td:last-child {
+     border-right: none !important;
+}
+
 #netdboverview th, table.netdbentry th, table#leasesetdebug td:nth-child(2n) {
      text-align: right;
 }
@@ -449,6 +457,21 @@ h4.app, h4.app2 {
      text-align: right;
 }
 
+.netdbentry th a img {
+     margin-left: 6px;
+}
+
+.tunnel_local {
+     margin-right: -4px;
+     margin-left: 4px;
+}
+
+.tunnel_id:empty + .tunnel_cap {
+    display: inline-block;
+    margin-left: 0;
+    margin-right: 12px;
+}
+
 /* responsive layout */
 
 @media screen and (max-width: 1500px) {
diff --git a/installer/resources/themes/imagegen/imagegen.css b/installer/resources/themes/imagegen/imagegen.css
index 6dbf1bb817..bcfe5db75d 100644
--- a/installer/resources/themes/imagegen/imagegen.css
+++ b/installer/resources/themes/imagegen/imagegen.css
@@ -120,6 +120,12 @@ hr {
      margin-top: 10px;
 }
 
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+hr {
+     height: 1px;
+}
+}
+
 iframe {
      border: none;
      margin: 40px 20px 0 60px;