diff --git a/webui/src/main/java/com/muwire/webui/Util.java b/webui/src/main/java/com/muwire/webui/Util.java
index ce4e4b74..a7248f3c 100644
--- a/webui/src/main/java/com/muwire/webui/Util.java
+++ b/webui/src/main/java/com/muwire/webui/Util.java
@@ -36,11 +36,13 @@ public class Util {
         _x("Clear Finished"),
         _x("Comment"),
         _x("Details for {0}"),
+        _x("Directory for downloaded files"),
+        _x("Directory for incomplete files"),
         _x("Done Pieces"),
         _x("Down"),
         _x("Download"),
-        _x("Download Settings"),
         _x("Download Location"),
+        _x("Download retry frequency (seconds)"),
         _x("Downloader"),
         _x("Downloading"),
         _x("Enter Reason (Optional)"),
@@ -50,7 +52,7 @@ public class Util {
         _x("Hide Certificates"),
         _x("Hide Comment"),
         _x("Host"),
-        _x("I2P Tunnel Settings - Changes Require Plugin Restart"),
+        _x("I2P Tunnels - Changes Require Plugin Restart"),
         _x("Import"),
         _x("Imported"),
         _x("Inbound tunnel length"),
@@ -75,19 +77,16 @@ public class Util {
         _x("Results from {0}"),
         _x("Resume"),
         _x("Retry"),
-        _x("Retry failed downloads every (seconds)"),
         _x("Save"),
-        _x("Save downloaded files to"),
         _x("Search"),
         _x("Search extra hop"),
         _x("Search in comments"),
-        _x("Search Settings"),
         _x("Sender"),
         _x("Senders"),
         _x("Share downloaded files"),
         _x("Share hidden files"),
         _x("Shared Files"),
-        _x("Sharing Settings"),
+        _x("Sharing"),
         _x("Show Comment"),
         _x("Size"),
         _x("Speed"),
@@ -99,11 +98,10 @@ public class Util {
         _x("Total Pieces"),
         _x("Total upload slots (-1 means unlimited)"),
         _x("Trust"),
-        _x("Trust Settings"),
+        _x("Trust list update frequency (hours)"),
         _x("Unshare"),
         _x("Unsubscribe"),
-        _x("Update trust lists every (hours)"),
-        _x("Upload Settings"),
+        _x("Upload"),
         _x("Upload slots per user (-1 means unlimited)"),
         _x("Uploads"),
         _x("User"),
diff --git a/webui/src/main/webapp/ConfigurationPage.jsp b/webui/src/main/webapp/ConfigurationPage.jsp
index 9de5516e..b132bdbb 100644
--- a/webui/src/main/webapp/ConfigurationPage.jsp
+++ b/webui/src/main/webapp/ConfigurationPage.jsp
@@ -33,7 +33,7 @@ String outboundQuantity = core.getI2pOptions().getProperty("outbound.quantity");
 	<section class="main foldermain">
 		<form action="/MuWire/Configuration" method="post">
 			<div class="configuration-section">
-				<h3><%=Util._t("Search Settings")%></h3>
+				<h3><%=Util._t("Search")%></h3>
 				<table>
 					<tr>
 						<td><%=Util._t("Search in comments")%></td>
@@ -46,24 +46,24 @@ String outboundQuantity = core.getI2pOptions().getProperty("outbound.quantity");
 				</table>
 			</div>
 			<div class="configuration-section">
-				<h3><%=Util._t("Download Settings")%></h3>
+				<h3><%=Util._t("Downloads")%></h3>
 				<table>
 					<tr>
-						<td><%=Util._t("Retry failed downloads every (seconds)")%></td>
+						<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>
 					</tr>
 					<tr>
-						<td><%=Util._t("Save downloaded files to")%></td>
+						<td><%=Util._t("Directory for downloaded files")%></td>
 						<td><p align="right"><input type="text" size="30" name="downloadLocation" value="<%= core.getMuOptions().getDownloadLocation().getAbsoluteFile()%>"></p></td>
 					</tr>
 					<tr> 
-						<td><%=Util._t("Store incomplete files in")%></td>
+						<td><%=Util._t("Directory for incomplete files")%></td>
 						<td><p align="right"><input type="text" size="30" name="incompleteLocation" value="<%= core.getMuOptions().getIncompleteLocation().getAbsoluteFile()%>"></p></td>
 					</tr>
 				</table>
 			</div>
 			<div class="configuration-section">
-				<h3><%=Util._t("Upload Settings")%></h3>
+				<h3><%=Util._t("Upload")%></h3>
 				<table>
 					<tr>
 						<td><%=Util._t("Total upload slots (-1 means unlimited)")%></td>
@@ -76,7 +76,7 @@ String outboundQuantity = core.getI2pOptions().getProperty("outbound.quantity");
 				</table>
 			</div>
 			<div class="configuration-section">
-				<h3><%=Util._t("Sharing Settings")%></h3>
+				<h3><%=Util._t("Sharing")%></h3>
 				<table>
 					<tr>
 						<td><%=Util._t("Share downloaded files")%></td>
@@ -89,7 +89,7 @@ String outboundQuantity = core.getI2pOptions().getProperty("outbound.quantity");
 				</table>
 			</div>
 			<div class="configuration-section">
-				<h3><%=Util._t("Trust Settings")%></h3>
+				<h3><%=Util._t("Trust")%></h3>
 				<table>
 					<tr>
 						<td><%=Util._t("Allow only trusted connections")%></td>
@@ -104,13 +104,13 @@ String outboundQuantity = core.getI2pOptions().getProperty("outbound.quantity");
 						<td><p align="right"><input type="checkbox" <% if (core.getMuOptions().getAllowTrustLists()) out.write("checked"); %> name="allowTrustLists" value="true"></p></td>
 					</tr>
 					<tr>
-						<td><%=Util._t("Update trust lists every (hours)")%></td>
+						<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>
 					</tr>
 				</table>
 			</div>
 			<div class="configuration-section">
-				<h3><%=Util._t("I2P Tunnel Settings - Changes Require Plugin Restart")%></h3>
+				<h3><%=Util._t("I2P Tunnels - Changes Require Plugin Restart")%></h3>
 				<table>
 					<tr>
 						<td><%=Util._t("Inbound tunnel length")%></td>