diff --git a/history.txt b/history.txt
index e50e75d28..2fd710c64 100644
--- a/history.txt
+++ b/history.txt
@@ -2,7 +2,8 @@
     * Better support for Internet Explorer/classic theme.
     * Incremental improvements to classic theme.
     * More UI tweaks and fiddles. 
-
+    * Fixes for I2PSnark UI; more to come.
+    
 2009-07-31 dr|z3d
     * Resolve anomalous buttons and text fields in console ui. 
     * Enhance presentation of data in /peers.jsp.
diff --git a/installer/resources/themes/console/classic/console.css b/installer/resources/themes/console/classic/console.css
index b63795545..80c00304f 100644
--- a/installer/resources/themes/console/classic/console.css
+++ b/installer/resources/themes/console/classic/console.css
@@ -26,12 +26,11 @@ pre {
 
 div.logo {
      float: left;
-     width: 200px;
-     left: 1em;
-     top: 1em;
-     margin: 0em;
-     padding: .5em;
+     width: 175px;
+     margin: 0 0 0 20px;
+     padding: 10px;
      text-align: center;
+     border: 5px solid #dedeff;
 }
 
 div.toolbar {
@@ -75,12 +74,15 @@ div.routersummary p {
 }     
 
 div.warning {
-     margin: 0 10px 10px 205px;
-     padding: 5px 10px;
+     margin: 20px 20px 10px 240px;
+     padding: 10px 20px 20px 75px;
      background: #ffefef;
-     border: medium solid #ffafaf;
+     border: 5px solid #ffafaf;
      text-align: left;
      color: inherit;
+     background-image:url("../images/errortriangle.png");
+     background-position:15px center;
+     background-repeat:no-repeat;
 }
 
 div.main {
diff --git a/installer/resources/themes/console/images/errortriangle.png b/installer/resources/themes/console/images/errortriangle.png
new file mode 100644
index 000000000..f1730ccbf
Binary files /dev/null and b/installer/resources/themes/console/images/errortriangle.png differ
diff --git a/installer/resources/themes/console/images/i2psnark.png b/installer/resources/themes/console/images/i2psnark.png
index 31722ab9d..63fddb107 100644
Binary files a/installer/resources/themes/console/images/i2psnark.png and b/installer/resources/themes/console/images/i2psnark.png differ
diff --git a/installer/resources/themes/console/snark.css b/installer/resources/themes/console/snark.css
index 501312743..4b6fbb2c3 100644
--- a/installer/resources/themes/console/snark.css
+++ b/installer/resources/themes/console/snark.css
@@ -63,11 +63,12 @@ body {
   -khtml-border-radius: 4px;
   border-radius: 4px;
   border: 2px solid #930;
-  text-align: center; 
-  overflow-x: scroll;            
-  background: #ddf url('../console/images/orangetile.png');
+  text-align: left; 
+  overflow: auto;            
+  background: #f40 url('../console/images/orangetile.png');
   color: #531;
   height: 64px;
+  width: 100%;
 }
 
 pre {
@@ -85,6 +86,7 @@ table {
 	padding: 0px;
 	border-width: 0px;
 	border-spacing: 0px;
+  border-collapse: collapse;
 }
 
 th {
@@ -92,8 +94,9 @@ th {
   font-size: 8pt;
   border-top: 1px outset #001;
   border-bottom: 1px inset #001;  
-  background: #f91 url('/themes/console/images/tabletitleorange.png') repeat-x;
+  background: #f60 url('/themes/console/images/tabletitleorange.png') repeat-x;
   text-align: left;
+  whitespace: nowrap;
 }
 
 .SnarkTorrents {
@@ -134,7 +137,7 @@ td {
 .page {
 	background-color: #fff;
 	color:#310;
-  min-width: 700px !important;
+  min-width: 800px !important;
 /*  max-width: 800px !important; */
   margin: 20px;
   padding: 10px 20px 5px 20px;
@@ -186,7 +189,7 @@ a:visited{
 }
 
 a:hover{
-  color: #f60;
+  color: #f40;
   font-weight: bold;
 }
 
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index f23327089..266c93290 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 05;
+    public final static long BUILD = 06;
     /** for example "-test" */
     public final static String EXTRA = "";
     public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java
index 7ffbac578..7b86ba83b 100644
--- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java
+++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java
@@ -583,8 +583,8 @@ public class TunnelPoolManager implements TunnelManagerFacade {
             live += pending.size();
         }
         if (live <= 0)
-            out.write("<div class=\"statusnotes\"><center>N<b>No tunnels; waiting for the grace period to end.</center></b></div>\n");
-        out.write("<div class=\"statusnotes\"><center><b>Lifetime bandwidth usage: " + DataHelper.formatSize(processedIn*1024) + "<B in, " +
+            out.write("<div class=\"statusnotes\"><center><b>No tunnels; waiting for the grace period to end.</center></b></div>\n");
+        out.write("<div class=\"statusnotes\"><center><b>Lifetime bandwidth usage: " + DataHelper.formatSize(processedIn*1024) + "B in, " +
                   DataHelper.formatSize(processedOut*1024) + "B out</b></center></div>");
     }