diff --git a/webui/src/main/webapp/Downloads.jsp b/webui/src/main/webapp/Downloads.jsp
index abbe543c..5a4c8c05 100644
--- a/webui/src/main/webapp/Downloads.jsp
+++ b/webui/src/main/webapp/Downloads.jsp
@@ -15,7 +15,7 @@
 <html>
     <head>
 <%@include file="css.jsi"%>
-    <script src="js/download.js" type="text/javascript"></script>
+    <script src="js/download.js?<%=version%>" type="text/javascript"></script>
     </head>
     <body onload="initConnectionsCount(); initDownloads();">
 <%@include file="header.jsi"%>    	
@@ -23,9 +23,7 @@
 
 		<div id="table-wrapper">
 				<div id="downloads"></div>
-			</div>
 		</div>		
-		</table>
 		<hr/>
 		<p>Download Details</p>
 		<div id="downloadDetails"><p>Click on a download to view details</p></div>
diff --git a/webui/src/main/webapp/Home.jsp b/webui/src/main/webapp/Home.jsp
index 188a7c7c..f99ea464 100644
--- a/webui/src/main/webapp/Home.jsp
+++ b/webui/src/main/webapp/Home.jsp
@@ -19,14 +19,17 @@
 <html>
 	<head>
 <%@include file="css.jsi"%>
-	<script src="js/search.js" type="text/javascript"></script>
+	<script src="js/search.js?<%=version%>" type="text/javascript"></script>
 	</head>
-<%@include file="header.jsi"%>
 <% if (groupBy.equals("sender")) { %>
 		<body onload="initConnectionsCount();initGroupBySender();">
-		<center><a href="/MuWire/Home.jsp?groupBy=file">Group By File</a></center>
 <% } else { %>
 		<body onload="initConnectionsCount();initGroupByFile();">
+<% } %>
+<%@include file="header.jsi"%>
+<% if (groupBy.equals("sender")) { %>
+		<center><a href="/MuWire/Home.jsp?groupBy=file">Group By File</a></center>
+<% } else { %>
 		<center><a href="/MuWire/Home.jsp?groupBy=sender">Group By Sender</a></center>
 <% } %>
 		<table width="100%">
@@ -90,6 +93,7 @@
 													<div id="table-wrapper">
 														<div id="table-scroll">
 															<div id="bottomTable">
+															</div>
 														</div>
 													</div>
 												</td>
diff --git a/webui/src/main/webapp/css.jsi b/webui/src/main/webapp/css.jsi
index 031f4c26..e7e92ae3 100644
--- a/webui/src/main/webapp/css.jsi
+++ b/webui/src/main/webapp/css.jsi
@@ -1,4 +1,4 @@
 <title>MuWire ${version}</title>
 <link href="i2pbote.css?${version}" rel="stylesheet" type="text/css">
 <link href="muwire.css?${version}" rel="stylesheet" type="text/css">
-<script src="js/conncount.js" type="text/javascript"></script>
+<script src="js/conncount.js?${version}" type="text/javascript"></script>
