diff --git a/webui/src/main/css/muwire.css b/webui/src/main/css/muwire.css
index ccf11a8d..fb81c2fe 100644
--- a/webui/src/main/css/muwire.css
+++ b/webui/src/main/css/muwire.css
@@ -2,7 +2,7 @@
   position:relative;
 }
 #table-scroll {
-  max-height: 300px;
+  max-height: 500px;
   overflow:auto;
   margin-top:20px;
 }
@@ -27,16 +27,8 @@
   border:1px solid red;
 }
 
-div#activeSearches table thead th:nth-child(2) {
-  width: 55px;
-}
-div#activeSearches table thead th:nth-child(3) {
-  width: 55px;
-}
 div#activeSearches table td:nth-child(2) {
-  text-align: right;
-}
-div#activeSearches table tbody td:nth-child(3) {
+  width: 30px;
   text-align: right;
 }
 
@@ -44,11 +36,17 @@ div#topTable table thead th:nth-child(2) {
   width: 100px;
 }
 div#topTable table thead th:nth-child(3) {
+  width: 100px;
+}
+div#topTable table thead th:nth-child(4) {
   width: 300px;
 }
 div#topTable table tbody td:nth-child(2) {
   text-align: center;
 }
+div#topTable table tbody td:nth-child(3) {
+  text-align: right;
+}
 
 div#bottomTable table thead th:nth-child(2) {
   width: 100px;
@@ -67,21 +65,21 @@ div#activeBrowses table thead th:nth-child(2) {
   width: 100px;
 }
 div#activeBrowses table thead th:nth-child(3) {
-  width: 200px;
+  width: 100px;
+}
+div#activeBrowses table tbody td:nth-child(2) {
+  text-align: center;
+}
+div#activeBrowses table tbody td:nth-child(3) {
+  text-align: right;
 }
 
 div#filesTable table thead th:nth-child(2) {
   width: 100px;
 }
-div#filesTable table thead th:nth-child(3) {
-  width: 100px;
-}
 div#filesTable table tbody td:nth-child(2) {
   text-align: right;
 }
-div#filesTable table tbody td:nth-child(3) {
-  text-align: center;
-}
 
 div#resultsTable table thead th:nth-child(2) {
   width: 100px;
@@ -97,7 +95,7 @@ div#resultsTable table tbody td:nth-child(3) {
 }
 
 div#downloads table thead th:nth-child(2) {
-  width: 80px;
+  width: 120px;
 }
 div#downloads table thead th:nth-child(3) {
   width: 80px;
@@ -108,9 +106,6 @@ div#downloads table thead th:nth-child(4) {
 div#downloads table thead th:nth-child(5) {
   width: 120px;
 }
-div#downloads table thead th:nth-child(6) {
-  width: 80px;
-}
 div#downloads table tbody td:nth-child(2) {
   text-align: center;
 }
@@ -123,9 +118,6 @@ div#downloads table tbody td:nth-child(4) {
 div#downloads table tbody td:nth-child(5) {
   text-align: right;
 }
-div#downloads table tbody td:nth-child(6) {
-  text-align: center;
-}
 
 div#trustedUsers table thead th:nth-child(2) {
   width: 100px;
@@ -133,18 +125,13 @@ div#trustedUsers table thead th:nth-child(2) {
 div#trustedUsers table thead th:nth-child(3) {
   width: 100px;
 }
-div#trustedUsers table thead th:nth-child(4) {
-  width: 100px;
+div#trustedUsers table tbody td:nth-child(3) {
+  text-align: center;
 }
 div#distrustedUsers table thead th:nth-child(2) {
   width: 100px;
 }
-div#distrustedUsers table thead th:nth-child(3) {
-  width: 100px;
-}
-div#distrustedUsers table thead th:nth-child(4) {
-  width: 100px;
-}
+
 div#trustLists table thead th:nth-child(2) {
   width: 100px;
 }
@@ -152,14 +139,33 @@ div#trustLists table thead th:nth-child(3) {
   width: 100px;
 }
 div#trustLists table thead th:nth-child(4) {
-  width: 100px;
+  width: 120px;
 }
 div#trustLists table thead th:nth-child(5) {
+  width: 180px;
+}
+div#trustLists table tbody td:nth-child(2) {
+  text-align: right;
+}
+div#trustLists table tbody td:nth-child(3) {
+  text-align: right;
+}
+div#trustLists table tbody td:nth-child(4) {
+  text-align: center;
+}
+
+div#trusted table thead th:nth-child(2) {
   width: 100px;
 }
-div#trustLists table thead th:nth-child(6) {
+div#trusted table thead th:nth-child(3) {
+  width: 300px;
+}
+div#distrusted table thead th:nth-child(2) {
   width: 100px;
 }
+div#distrusted table thead th:nth-child(3) {
+  width: 300px;
+}
 
 pre {
   background: #a7d5d5;
@@ -167,6 +173,16 @@ pre {
   margin: 10px 20px 10px 5px;
 }
 
+div.right {
+  display: inline-block;
+  float: right;
+}
+
+span.right {
+  display: inline-block;
+  float: right;
+}
+
 /* File tree CSS */
 
  /* Remove default bullets */
diff --git a/webui/src/main/js/filesTable.js b/webui/src/main/js/filesTable.js
index 38a13f82..d7b82273 100644
--- a/webui/src/main/js/filesTable.js
+++ b/webui/src/main/js/filesTable.js
@@ -22,7 +22,7 @@ class SharedFile {
 		var commentDiv = "<div id='comment-" + this.path + "'></div>"
 		var fetchLink = "<a href='/MuWire/DownloadedContent/" + this.infoHash + "'>" + _t("Fetch") + "</a>"
 		
-		var html = this.name + "<div>" + unshareLink.render() + " " + fetchLink + " " + showCommentHtml + "  " + certifyHtml + "</div>"
+		var html = this.name + "<div class=\"right\">" + unshareLink.render() + " " + fetchLink + " " + showCommentHtml + "  " + certifyHtml + "</div>"
 		html += commentDiv
 		
 		mapping.set("File", html)
@@ -193,4 +193,4 @@ function certify(path) {
 	xmlhttp.open("POST", "/MuWire/Certificate", true)
 	xmlhttp.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
 	xmlhttp.send("action=certify&file=" + path)
-}
\ No newline at end of file
+}
diff --git a/webui/src/main/webapp/BrowseHost.jsp b/webui/src/main/webapp/BrowseHost.jsp
index c5fc40ce..cd35fb7b 100644
--- a/webui/src/main/webapp/BrowseHost.jsp
+++ b/webui/src/main/webapp/BrowseHost.jsp
@@ -1,10 +1,11 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8"
     pageEncoding="UTF-8"%>
+<%@ page import="com.muwire.webui.*" %>
 <%@include file="initcode.jsi"%>
 
 <% 
 
-String pagetitle="Browse Host"; 
+String pagetitle=Util._t("Browse Host"); 
 
 %>
 
@@ -26,7 +27,7 @@ String pagetitle="Browse Host";
 			<form action="/MuWire/Browse" method="post">
 				<input type="text" name="host">
 				<input type="hidden" name="action" value="browse">
-				<input type="submit" value="Browse">
+				<input type="submit" value=<%=Util._t("Browse")%>>
 			</form>
 		</div>
 		<div class="menubox-divider"></div>
diff --git a/webui/src/main/webapp/searchbox.jsi b/webui/src/main/webapp/searchbox.jsi
index ccd79700..8018976a 100644
--- a/webui/src/main/webapp/searchbox.jsi
+++ b/webui/src/main/webapp/searchbox.jsi
@@ -2,11 +2,13 @@
             <div class="menubox">
               <div class="searchbox">
                 <h2><%=Util._t("Search")%></h2>
-                <div class="menu-icon"></div>
                   <form action="/MuWire/Search" method="post">
                      <input type="text" name="search" />
                      <input type="hidden" name="action" value="start" />
-                     <input type="submit" value="<%=Util._t("Search")%>" />
+                     <div class="menuitem search">
+                       <div class="menu-icon"></div>
+                       <input type="submit" value="<%=Util._t("Search")%>" />
+                     </div>
                   </form>
               </div>
             </div>
diff --git a/webui/src/main/webapp/sidebar.jsi b/webui/src/main/webapp/sidebar.jsi
index b0a1300a..470fcad0 100644
--- a/webui/src/main/webapp/sidebar.jsi
+++ b/webui/src/main/webapp/sidebar.jsi
@@ -44,6 +44,7 @@
                   </div>
                 </a>
             </div>
+            <div class="menubox-divider"></div>
             <div class="menubox">
                 <h2><%=Util._t("Trust")%></h2>
                 <a class="menuitem identities" href="TrustUsers">
@@ -75,4 +76,4 @@
                 <a class="menuitem" href="faq"><%=Util._t("FAQ")%></a>
                 <a class="menuitem" href="about"><%=Util._t("About")%></a>
             </div>
-			-->
\ No newline at end of file
+			-->