diff --git a/webui/src/main/css/muwire.css b/webui/src/main/css/muwire.css
index 3aa2e0ca..78ce8927 100644
--- a/webui/src/main/css/muwire.css
+++ b/webui/src/main/css/muwire.css
@@ -32,32 +32,73 @@ div#activeSearches table td:nth-child(2) {
   text-align: right;
 }
 
-div#topTable table thead th:nth-child(2) {
+div#topTableSender table thead th:nth-child(2) {
   width: 100px;
 }
-div#topTable table thead th:nth-child(3) {
+div#topTableSender table thead th:nth-child(3) {
   width: 100px;
 }
-div#topTable table thead th:nth-child(4) {
+div#topTableSender table thead th:nth-child(4) {
   width: 300px;
 }
-div#topTable table tbody td:nth-child(2) {
+div#topTableSender table tbody td:nth-child(1) {
+  text-overflow: ellipsis;
+}
+div#topTableSender table tbody td:nth-child(2) {
   text-align: center;
 }
-div#topTable table tbody td:nth-child(3) {
+div#topTableSender table tbody td:nth-child(3) {
   text-align: right;
 }
 
-div#bottomTable table thead th:nth-child(2) {
+div#bottomTableSender table thead th:nth-child(2) {
   width: 100px;
 }
-div#bottomTable table thead th:nth-child(3) {
+div#bottomTableSender table thead th:nth-child(3) {
   width: 100px;
 }
-div#bottomTable table tbody td:nth-child(2) {
+div#bottomTableSender table tbody td:nth-child(1) {
+  text-overflow: ellipsis;
+}
+div#bottomTableSender table tbody td:nth-child(2) {
   text-align: right;
 }
-div#bottomTable table tbody td:nth-child(3) {
+div#bottomTableSender table tbody td:nth-child(3) {
+  text-align: center;
+}
+
+div#topTableFile table thead th:nth-child(2) {
+  width: 100px;
+}
+div#topTableFile table thead th:nth-child(3) {
+  width: 100px;
+}
+div#topTableFile table thead th:nth-child(4) {
+  width: 100px;
+}
+div#topTableFile table tbody td:nth-child(1) {
+  text-overflow: ellipsis;
+}
+div#topTableFile table tbody td:nth-child(2) {
+  text-align: right;
+}
+div#topTableFile table tbody td:nth-child(3) {
+  text-align: right;
+}
+div#topTableFile table tbody td:nth-child(4) {
+  text-align: center;
+}
+
+div#bottomTableFile table thead th:nth-child(2) {
+  width: 100px;
+}
+div#bottomTableFile table thead th:nth-child(3) {
+  width: 300px;
+}
+div#bottomTableFile table tbody td:nth-child(1) {
+  text-overflow: ellipsis;
+}
+div#bottomTableFile table tbody td:nth-child(2) {
   text-align: center;
 }
 
@@ -67,6 +108,9 @@ div#activeBrowses table thead th:nth-child(2) {
 div#activeBrowses table thead th:nth-child(3) {
   width: 100px;
 }
+div#activeBrowses table tbody td:nth-child(1) {
+  text-overflow: ellipsis;
+}
 div#activeBrowses table tbody td:nth-child(2) {
   text-align: center;
 }
@@ -77,6 +121,9 @@ div#activeBrowses table tbody td:nth-child(3) {
 div#filesTable table thead th:nth-child(2) {
   width: 100px;
 }
+div#filesTable table tbody td:nth-child(1) {
+  text-overflow: ellipsis;
+}
 div#filesTable table tbody td:nth-child(2) {
   text-align: right;
 }
@@ -87,6 +134,9 @@ div#resultsTable table thead th:nth-child(2) {
 div#resultsTable table thead th:nth-child(3) {
   width: 100px;
 }
+div#resultsTable table tbody td:nth-child(1) {
+  text-overflow: ellipsis;
+}
 div#resultsTable table tbody td:nth-child(2) {
   text-align: right;
 }
@@ -106,6 +156,9 @@ div#downloads table thead th:nth-child(4) {
 div#downloads table thead th:nth-child(5) {
   width: 120px;
 }
+div#downloads table tbody td:nth-child(1) {
+  text-overflow: ellipsis;
+}
 div#downloads table tbody td:nth-child(2) {
   text-align: center;
 }
@@ -119,6 +172,31 @@ div#downloads table tbody td:nth-child(5) {
   text-align: right;
 }
 
+div#uploads table thead th:nth-child(2) {
+  width: 120px;
+}
+div#uploads table thead th:nth-child(3) {
+  width: 120px;
+}
+div#uploads table thead th:nth-child(4) {
+  width: 100px;
+}
+div#uploads table thead th:nth-child(5) {
+  width: 100px;
+}
+div#uploads table tbody td:nth-child(1) {
+  text-overflow: ellipsis;
+}
+div#uploads table tbody td:nth-child(3) {
+  text-overflow: ellipsis;
+}
+div#uploads table tbody td:nth-child(4) {
+  text-align: right;
+}
+div#uploads table tbody td:nth-child(5) {
+  text-align: right;
+}
+
 div#trustedUsers table thead th:nth-child(2) {
   width: 100px;
 }
@@ -128,6 +206,16 @@ div#trustedUsers table thead th:nth-child(3) {
 div#trustedUsers table tbody td:nth-child(3) {
   text-align: center;
 }
+div#trustedUsers table tbody td:nth-child(1) {
+  text-overflow: ellipsis;
+}
+div#trustedUsers table tbody td:nth-child(3) {
+  text-align: center;
+}
+
+div#distrustedUsers table tbody td:nth-child(1) {
+  text-overflow: ellipsis;
+}
 div#distrustedUsers table thead th:nth-child(2) {
   width: 100px;
 }
@@ -144,6 +232,9 @@ div#trustLists table thead th:nth-child(4) {
 div#trustLists table thead th:nth-child(5) {
   width: 180px;
 }
+div#trustLists table tbody td:nth-child(1) {
+  text-overflow: ellipsis;
+}
 div#trustLists table tbody td:nth-child(2) {
   text-align: right;
 }
@@ -160,12 +251,18 @@ div#trusted table thead th:nth-child(2) {
 div#trusted table thead th:nth-child(3) {
   width: 300px;
 }
+div#trusted table tbody td:nth-child(1) {
+  text-overflow: ellipsis;
+}
 div#distrusted table thead th:nth-child(2) {
   width: 100px;
 }
 div#distrusted table thead th:nth-child(3) {
   width: 300px;
 }
+div#distrusted table tbody td:nth-child(1) {
+  text-overflow: ellipsis;
+}
 
 pre {
   background: #a7d5d5;
@@ -190,6 +287,10 @@ span.right {
   float: right;
 }
 
+input.right {
+  text-align: right;
+}
+
 /* File tree CSS */
 
  /* Remove default bullets */
diff --git a/webui/src/main/webapp/ConfigurationPage.jsp b/webui/src/main/webapp/ConfigurationPage.jsp
index ee6058d3..5734bdd9 100644
--- a/webui/src/main/webapp/ConfigurationPage.jsp
+++ b/webui/src/main/webapp/ConfigurationPage.jsp
@@ -56,7 +56,7 @@ Exception error = (Exception) application.getAttribute("MWConfigError");
 				<table>
 					<tr>
 						<td><%=Util._t("Download retry frequency (seconds)")%></td>
-						<td><p align="right"><input type="text" size="1" name="downloadRetryInterval" value="<%= core.getMuOptions().getDownloadRetryInterval()%>"></p></td>
+						<td><p align="right"><input type="text" size="1" name="downloadRetryInterval" class="right" value="<%= core.getMuOptions().getDownloadRetryInterval()%>"></p></td>
 					</tr>
 					<tr>
 						<td><%=Util._t("Directory for downloaded files")%></td>
@@ -73,11 +73,11 @@ Exception error = (Exception) application.getAttribute("MWConfigError");
 				<table>
 					<tr>
 						<td><%=Util._t("Total upload slots (-1 means unlimited)")%></td>
-						<td><p align="right"><input type="text" size="1" name="totalUploadSlots" value="<%= core.getMuOptions().getTotalUploadSlots() %>"></p></td>
+						<td><p align="right"><input type="text" size="1" name="totalUploadSlots" class="right" value="<%= core.getMuOptions().getTotalUploadSlots() %>"></p></td>
 					</tr>
 					<tr>
 						<td><%=Util._t("Upload slots per user (-1 means unlimited)")%></td>
-						<td><p align="right"><input type="text" size="1" name="uploadSlotsPerUser" value="<%= core.getMuOptions().getUploadSlotsPerUser() %>"></p></td>
+						<td><p align="right"><input type="text" size="1" name="uploadSlotsPerUser" class="right" value="<%= core.getMuOptions().getUploadSlotsPerUser() %>"></p></td>
 					</tr>
 				</table>
 			</div>
@@ -111,7 +111,7 @@ Exception error = (Exception) application.getAttribute("MWConfigError");
 					</tr>
 					<tr>
 						<td><%=Util._t("Trust list update frequency (hours)")%></td>
-						<td><p align="right"><input type="text" size="1" name="trustListInterval" value="<%= core.getMuOptions().getTrustListInterval() %>"></p></td>
+						<td><p align="right"><input type="text" size="1" name="trustListInterval" class="right" value="<%= core.getMuOptions().getTrustListInterval() %>"></p></td>
 					</tr>
 				</table>
 			</div>
@@ -120,19 +120,19 @@ Exception error = (Exception) application.getAttribute("MWConfigError");
 				<table>
 					<tr>
 						<td><%=Util._t("Inbound tunnel length")%></td>
-						<td><p align="right"><input type="text" size="1" name="inbound.length" value="<%=inboundLength%>"></p></td>
+						<td><p align="right"><input type="text" size="1" name="inbound.length" class="right" value="<%=inboundLength%>"></p></td>
 					</tr>
 					<tr>
 						<td><%=Util._t("Inbound tunnel quantity")%></td>
-						<td><p align="right"><input type="text" size="1" name="inbound.quantity" value="<%=inboundQuantity%>"></p></td>
+						<td><p align="right"><input type="text" size="1" name="inbound.quantity" class="right" value="<%=inboundQuantity%>"></p></td>
 					</tr>
 					<tr>
 						<td><%=Util._t("Outbound tunnel length")%></td>
-						<td><p align="right"><input type="text" size="1" name="outbound.length" value="<%=outboundLength%>"></p></td>
+						<td><p align="right"><input type="text" size="1" name="outbound.length" class="right" value="<%=outboundLength%>"></p></td>
 					</tr>
 					<tr>
 						<td><%=Util._t("Outbound tunnel quantity")%></td>
-						<td><p align="right"><input type="text" size="1" name="outbound.quantity" value="<%=outboundQuantity%>"></p></td>
+						<td><p align="right"><input type="text" size="1" name="outbound.quantity" class="right" value="<%=outboundQuantity%>"></p></td>
 					</tr>
 				</table>
 			</div>
diff --git a/webui/src/main/webapp/Downloads.jsp b/webui/src/main/webapp/Downloads.jsp
index cd793b4c..4f4ae4ce 100644
--- a/webui/src/main/webapp/Downloads.jsp
+++ b/webui/src/main/webapp/Downloads.jsp
@@ -22,9 +22,6 @@
 <%@include file="header.jsi"%>    	
 	<aside>
 <%@include file="searchbox.jsi"%>    	
-            <div class="menubox">
-                <h2><%=Util._t("Downloads")%></h2>
-            </div>
 <%@include file="sidebar.jsi"%>    	
 	</aside>
 	<section class="main foldermain">
diff --git a/webui/src/main/webapp/Uploads.jsp b/webui/src/main/webapp/Uploads.jsp
index aa8cae8c..e43d15f4 100644
--- a/webui/src/main/webapp/Uploads.jsp
+++ b/webui/src/main/webapp/Uploads.jsp
@@ -22,9 +22,6 @@
 <%@include file="header.jsi"%>    	
 	<aside>
 <%@include file="searchbox.jsi"%>    	
-            <div class="menubox">
-                <h2><%=Util._t("Uploads")%></h2>
-            </div>
 <%@include file="sidebar.jsi"%>    	
 	</aside>
 	<section class="main foldermain">