diff --git a/webui/src/main/java/com/muwire/webui/Util.java b/webui/src/main/java/com/muwire/webui/Util.java
index 94d684a2..5b05917d 100644
--- a/webui/src/main/java/com/muwire/webui/Util.java
+++ b/webui/src/main/java/com/muwire/webui/Util.java
@@ -36,6 +36,7 @@ public class Util {
         _x("Details for {0}"),
         _x("Down"),
         _x("Download"),
+        _x("Download Settings"),
         _x("Downloading"),
         _x("Enter Reason (Optional)"),
         _x("ETA"),
@@ -44,6 +45,7 @@ public class Util {
         _x("Hide Certificates"),
         _x("Hide Comment"),
         _x("Host"),
+        _x("I2P Tunnel Settings - Changes Require Plugin Restart"),
         _x("Import"),
         _x("Imported"),
         _x("Inbound tunnel length"),
@@ -71,11 +73,13 @@ public class Util {
         _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("Show Comment"),
         _x("Size"),
         _x("Speed"),
@@ -86,9 +90,11 @@ public class Util {
         _x("Subscribed"),
         _x("Total upload slots (-1 means unlimited)"),
         _x("Trust"),
+        _x("Trust Settings"),
         _x("Unshare"),
         _x("Unsubscribe"),
         _x("Update trust lists every (hours)"),
+        _x("Upload Settings"),
         _x("Upload slots per user (-1 means unlimited)"),
         _x("User"),
         _x("View {0} Certificates"),
diff --git a/webui/src/main/webapp/ConfigurationPage.jsp b/webui/src/main/webapp/ConfigurationPage.jsp
index 53917b4c..9de5516e 100644
--- a/webui/src/main/webapp/ConfigurationPage.jsp
+++ b/webui/src/main/webapp/ConfigurationPage.jsp
@@ -33,6 +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>
 				<table>
 					<tr>
 						<td><%=Util._t("Search in comments")%></td>
@@ -45,6 +46,7 @@ String outboundQuantity = core.getI2pOptions().getProperty("outbound.quantity");
 				</table>
 			</div>
 			<div class="configuration-section">
+				<h3><%=Util._t("Download Settings")%></h3>
 				<table>
 					<tr>
 						<td><%=Util._t("Retry failed downloads every (seconds)")%></td>
@@ -61,6 +63,7 @@ String outboundQuantity = core.getI2pOptions().getProperty("outbound.quantity");
 				</table>
 			</div>
 			<div class="configuration-section">
+				<h3><%=Util._t("Upload Settings")%></h3>
 				<table>
 					<tr>
 						<td><%=Util._t("Total upload slots (-1 means unlimited)")%></td>
@@ -73,6 +76,7 @@ String outboundQuantity = core.getI2pOptions().getProperty("outbound.quantity");
 				</table>
 			</div>
 			<div class="configuration-section">
+				<h3><%=Util._t("Sharing Settings")%></h3>
 				<table>
 					<tr>
 						<td><%=Util._t("Share downloaded files")%></td>
@@ -85,6 +89,7 @@ String outboundQuantity = core.getI2pOptions().getProperty("outbound.quantity");
 				</table>
 			</div>
 			<div class="configuration-section">
+				<h3><%=Util._t("Trust Settings")%></h3>
 				<table>
 					<tr>
 						<td><%=Util._t("Allow only trusted connections")%></td>
@@ -105,6 +110,7 @@ String outboundQuantity = core.getI2pOptions().getProperty("outbound.quantity");
 				</table>
 			</div>
 			<div class="configuration-section">
+				<h3><%=Util._t("I2P Tunnel Settings - Changes Require Plugin Restart")%></h3>
 				<table>
 					<tr>
 						<td><%=Util._t("Inbound tunnel length")%></td>