Merge pull request #2616 from k-paulius/captions

92 files changed, 158 insertions, 158 deletions

diff --git a/src/etc/inc/auth.inc b/src/etc/inc/auth.inc
index a5f0ff4..95c630b 100644
--- a/src/etc/inc/auth.inc
+++ b/src/etc/inc/auth.inc
@@ -1386,7 +1386,7 @@ function radius_backed($username, $passwd, $authcfg, &$attributes = array()) {
 		$retvalue['auth_val'] = 1;
 		$retvalue['error'] = $rauth->getError();
 		if ($debug) {
-			printf(gettext("Radius start: %s<br />\n"), $retvalue['error']);
+			printf(gettext("RADIUS start: %s<br />\n"), $retvalue['error']);
 		}
 	}
 
@@ -1398,7 +1398,7 @@ function radius_backed($username, $passwd, $authcfg, &$attributes = array()) {
 		$retvalue['auth_val'] = 1;
 		$retvalue['error'] = $result->getMessage();
 		if ($debug) {
-			printf(gettext("Radius send failed: %s<br />\n"), $retvalue['error']);
+			printf(gettext("RADIUS send failed: %s<br />\n"), $retvalue['error']);
 		}
 	} else if ($result === true) {
 		if ($rauth->getAttributes()) {
@@ -1406,13 +1406,13 @@ function radius_backed($username, $passwd, $authcfg, &$attributes = array()) {
 		}
 		$retvalue['auth_val'] = 2;
 		if ($debug) {
-			printf(gettext("Radius Auth succeeded")."<br />\n");
+			printf(gettext("RADIUS Auth succeeded")."<br />\n");
 		}
 		$ret = true;
 	} else {
 		$retvalue['auth_val'] = 3;
 		if ($debug) {
-			printf(gettext("Radius Auth rejected")."<br />\n");
+			printf(gettext("RADIUS Auth rejected")."<br />\n");
 		}
 	}
 
diff --git a/src/etc/inc/captiveportal.inc b/src/etc/inc/captiveportal.inc
index 1714a40..2921af2 100644
--- a/src/etc/inc/captiveportal.inc
+++ b/src/etc/inc/captiveportal.inc
@@ -1300,7 +1300,7 @@ function captiveportal_init_radius_servers() {
 		$cprdsrvlck = lock("captiveportalradius{$cpzone}", LOCK_EX);
 		$fd = @fopen("{$g['vardb_path']}/captiveportal_radius_{$cpzone}.db", "w");
 		if (!$fd) {
-			captiveportal_syslog("Error: cannot open radius DB file in captiveportal_configure().\n");
+			captiveportal_syslog("Error: cannot open RADIUS DB file in captiveportal_configure().\n");
 			unlock($cprdsrvlck);
 			return 1;
 		}
diff --git a/src/etc/inc/shaper.inc b/src/etc/inc/shaper.inc
index 2f9eadc..4637250 100644
--- a/src/etc/inc/shaper.inc
+++ b/src/etc/inc/shaper.inc
@@ -3965,7 +3965,7 @@ EOD;
 
 		$sform->add($section);
 
-		$section = new Form_Section('Advanced options');
+		$section = new Form_Section('Advanced Options');
 
 		$section->addInput(new Form_Input(
 			'delay',
@@ -4269,7 +4269,7 @@ class dnqueue_class extends dummynet_class {
 
 		$sform->add($section);
 
-		$section = new Form_Section('Advanced options');
+		$section = new Form_Section('Advanced Options');
 
 		$section->addInput(new Form_Input(
 			'weight',
diff --git a/src/usr/local/www/crash_reporter.php b/src/usr/local/www/crash_reporter.php
index 07ae915..d24e1b5 100644
--- a/src/usr/local/www/crash_reporter.php
+++ b/src/usr/local/www/crash_reporter.php
@@ -150,7 +150,7 @@ exec("/usr/bin/grep -vi warning /tmp/PHP_errors.log", $php_errors);
 		}
 ?>
 	<div class="panel panel-default">
-		<div class="panel-heading"><h2 class="panel-title"><?=gettext("Unfortunately we have detected a programming bug.")?></h2></div>
+		<div class="panel-heading"><h2 class="panel-title"><?=gettext("Unfortunately We Have Detected a Programming Bug")?></h2></div>
 		<div class="panel-body">
 			<div class="content">
 				<p>
diff --git a/src/usr/local/www/diag_backup.php b/src/usr/local/www/diag_backup.php
index 3a06df3..6021346 100644
--- a/src/usr/local/www/diag_backup.php
+++ b/src/usr/local/www/diag_backup.php
@@ -623,7 +623,7 @@ display_top_tabs($tab_array);
 $form = new Form(false);
 $form->setMultipartEncoding();	// Allow file uploads
 
-$section = new Form_Section('Backup configuration');
+$section = new Form_Section('Backup Configuration');
 
 $section->addInput(new Form_Select(
 	'backuparea',
@@ -670,7 +670,7 @@ $group->add(new Form_Button(
 $section->add($group);
 $form->add($section);
 
-$section = new Form_Section('Restore backup');
+$section = new Form_Section('Restore Backup');
 
 $section->addInput(new Form_StaticText(
 	null,
@@ -718,7 +718,7 @@ $section->add($group);
 $form->add($section);
 
 if (($config['installedpackages']['package'] != "") || (is_subsystem_dirty("packagelock"))) {
-	$section = new Form_Section('Package functions');
+	$section = new Form_Section('Package Functions');
 
 	if ($config['installedpackages']['package'] != "") {
 		$group = new Form_Group('');
diff --git a/src/usr/local/www/diag_confbak.php b/src/usr/local/www/diag_confbak.php
index 5f8e9bb..495f9f7 100644
--- a/src/usr/local/www/diag_confbak.php
+++ b/src/usr/local/www/diag_confbak.php
@@ -149,7 +149,7 @@ if ($diff) {
 <div class="panel panel-default">
 	<div class="panel-heading">
 		<h2 class="panel-title">
-			<?=sprintf(gettext('Configuration diff from %1$s to %2$s'), date(gettext("n/j/y H:i:s"), $oldtime), date(gettext("n/j/y H:i:s"), $newtime))?>
+			<?=sprintf(gettext('Configuration Diff from %1$s to %2$s'), date(gettext("n/j/y H:i:s"), $oldtime), date(gettext("n/j/y H:i:s"), $newtime))?>
 		</h2>
 	</div>
 	<div class="panel-body table-responsive">
diff --git a/src/usr/local/www/diag_dns.php b/src/usr/local/www/diag_dns.php
index c9d5ba6..367d166 100755
--- a/src/usr/local/www/diag_dns.php
+++ b/src/usr/local/www/diag_dns.php
@@ -287,7 +287,7 @@ if (!$input_errors && $type) {
 
 <!-- Third table displays "More information" -->
 <div class="panel panel-default">
-	<div class="panel-heading"><h2 class="panel-title"><?=gettext('More information')?></h2></div>
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext('More Information')?></h2></div>
 	<div class="panel-body">
 		<ul class="list-group">
 			<li class="list-group-item"><a href="/diag_ping.php?host=<?=htmlspecialchars($host)?>&amp;count=3"><?=gettext("Ping")?></a></li>
diff --git a/src/usr/local/www/diag_dump_states.php b/src/usr/local/www/diag_dump_states.php
index c4821cb..d6e6fe1 100755
--- a/src/usr/local/www/diag_dump_states.php
+++ b/src/usr/local/www/diag_dump_states.php
@@ -148,7 +148,7 @@ $current_statecount=`pfctl -si | grep "current entries" | awk '{ print $3 }'`;
 
 $form = new Form(false);
 
-$section = new Form_Section('State filter', 'secfilter', COLLAPSIBLE|SEC_OPEN);
+$section = new Form_Section('State Filter', 'secfilter', COLLAPSIBLE|SEC_OPEN);
 
 $section->addInput(new Form_Input(
 	'filter',
diff --git a/src/usr/local/www/diag_dump_states_sources.php b/src/usr/local/www/diag_dump_states_sources.php
index 6f8f5d7..23877e8 100644
--- a/src/usr/local/www/diag_dump_states_sources.php
+++ b/src/usr/local/www/diag_dump_states_sources.php
@@ -137,7 +137,7 @@ print $form;
 
 ?>
 <div class="panel panel-default">
-	<div class="panel-heading"><h2 class="panel-title"><?=gettext("Current source tracking entries")?></h2></div>
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext("Current Source Tracking Entries")?></h2></div>
 	<div class="panel-body">
 		<table class="table table-striped">
 			<thead>
diff --git a/src/usr/local/www/diag_gmirror.php b/src/usr/local/www/diag_gmirror.php
index 41ddff0..c8a3d2d 100644
--- a/src/usr/local/www/diag_gmirror.php
+++ b/src/usr/local/www/diag_gmirror.php
@@ -239,7 +239,7 @@ else:
 
 	<!-- GEOM mirror table -->
 	<div class="panel panel-default">
-		<div class="panel-heading"><h2 class="panel-title"><?=gettext('GEOM Mirror information - Mirror Status')?></h2></div>
+		<div class="panel-heading"><h2 class="panel-title"><?=gettext('GEOM Mirror Information - Mirror Status')?></h2></div>
 		<div class="panel-body table-responsive">
 
 <?php
@@ -321,7 +321,7 @@ else:
 
 	<!-- Consumer information table -->
 	<div class="panel panel-default">
-		<div class="panel-heading"><h2 class="panel-title"><?=gettext('Consumer information - Available consumers')?></h2></div>
+		<div class="panel-heading"><h2 class="panel-title"><?=gettext('Consumer Information - Available Consumers')?></h2></div>
 		<div class="panel-body table-responsive">
 <?php
 	if (count($unused_consumers) > 0): ?>
diff --git a/src/usr/local/www/diag_nanobsd.php b/src/usr/local/www/diag_nanobsd.php
index 26ab828..0183325 100644
--- a/src/usr/local/www/diag_nanobsd.php
+++ b/src/usr/local/www/diag_nanobsd.php
@@ -243,7 +243,7 @@ print($form);
 if (file_exists("/conf/upgrade_log.txt") && $_POST['viewupgradelog']) {
 ?>
 	<div class="panel panel-default">
-		<div class="panel-heading"><h2 class="panel-title"><?=gettext("Previous upgrade log")?></h2></div>
+		<div class="panel-heading"><h2 class="panel-title"><?=gettext("Previous Upgrade Log")?></h2></div>
 			<!-- No white space between the <pre> and the first output or it will appear on the page! -->
 			<pre><?=str_ireplace("pfsense", $g['product_name'], file_get_contents("/conf/upgrade_log.txt"))?>
 				<br /><?=gettext("File list:")?>
diff --git a/src/usr/local/www/diag_pf_info.php b/src/usr/local/www/diag_pf_info.php
index 27a78ae..3de6ee5 100644
--- a/src/usr/local/www/diag_pf_info.php
+++ b/src/usr/local/www/diag_pf_info.php
@@ -94,7 +94,7 @@ $form->addGlobal(new Form_Input(
 	'hidden',
 	'yes'
 ));
-$section = new Form_Section('Auto update page');
+$section = new Form_Section('Auto Update Page');
 
 $section->addInput(new Form_Checkbox(
 	'refresh',
diff --git a/src/usr/local/www/diag_resetstate.php b/src/usr/local/www/diag_resetstate.php
index 45589eb..4206d91 100644
--- a/src/usr/local/www/diag_resetstate.php
+++ b/src/usr/local/www/diag_resetstate.php
@@ -128,7 +128,7 @@ $resetbtn->removeClass('btn-primary')->addClass('btn-danger');
 
 $form = new Form($resetbtn);
 
-$section = new Form_Section('Select states to reset');
+$section = new Form_Section('Select States to Reset');
 
 $section->addInput(new Form_Checkbox(
 	'statetable',
diff --git a/src/usr/local/www/diag_smart.php b/src/usr/local/www/diag_smart.php
index 10c12ec..57fe59b 100644
--- a/src/usr/local/www/diag_smart.php
+++ b/src/usr/local/www/diag_smart.php
@@ -133,7 +133,7 @@ switch ($action) {
 		$output = add_colors(shell_exec($smartctl . " -t " . escapeshellarg($test) . " /dev/" . escapeshellarg($targetdev)));
 ?>
 		<div class="panel  panel-default">
-			<div class="panel-heading"><h2 class="panel-title"><?=gettext('Test results')?></h2></div>
+			<div class="panel-heading"><h2 class="panel-title"><?=gettext('Test Results')?></h2></div>
 			<div class="panel-body">
 				<pre><?=$output?></pre>
 			</div>
@@ -442,7 +442,7 @@ switch ($action) {
 			'View'
 		);
 
-		$section = new Form_Section('View logs');
+		$section = new Form_Section('View Logs');
 
 		$section->addInput(new Form_Input(
 			'action',
diff --git a/src/usr/local/www/diag_sockets.php b/src/usr/local/www/diag_sockets.php
index 55c1b17..b03aff2 100644
--- a/src/usr/local/www/diag_sockets.php
+++ b/src/usr/local/www/diag_sockets.php
@@ -90,7 +90,7 @@ $showAllOption = $showAll ? "" : "?showAll";
 		$name = ($tabindex == 0 ? 'IPv4' : 'IPv6');
 ?>
 <div class="panel panel-default">
-	<div class="panel-heading"><h2 class="panel-title"><?=$name?> <?=gettext("system socket information")?></h2></div>
+	<div class="panel-heading"><h2 class="panel-title"><?=$name?> <?=gettext("System Socket Information")?></h2></div>
 	<div class="panel-body">
 		<div class="table table-responsive">
 			<table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable>
diff --git a/src/usr/local/www/diag_tables.php b/src/usr/local/www/diag_tables.php
index b2f100d..769fab4 100644
--- a/src/usr/local/www/diag_tables.php
+++ b/src/usr/local/www/diag_tables.php
@@ -127,14 +127,14 @@ if ($savemsg) {
 }
 
 if ($tablename == "webConfiguratorlockout") {
-	$displayname = gettext("Web configurator lockout table");
+	$displayname = gettext("Web Configurator Lockout Table");
 } else {
-	$displayname = sprintf(gettext("%s table"), ucfirst($tablename));
+	$displayname = sprintf(gettext("%s Table"), ucfirst($tablename));
 }
 
 $form = new Form(false);
 
-$section = new Form_Section('Table to display');
+$section = new Form_Section('Table to Display');
 $group = new Form_Group("Table");
 
 $group->add(new Form_Select(
diff --git a/src/usr/local/www/edit.php b/src/usr/local/www/edit.php
index 1b6a43d..a9b8637 100644
--- a/src/usr/local/www/edit.php
+++ b/src/usr/local/www/edit.php
@@ -123,7 +123,7 @@ require("head.inc");
 </div>
 
 <div class="panel panel-default">
-	<div class="panel-heading"><h2 class="panel-title"><?=gettext("Save / Load a file from the filesystem")?></h2></div>
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext("Save / Load a File from the Filesystem")?></h2></div>
 	<div class="panel-body">
 		<div class="content">
 			<form>
diff --git a/src/usr/local/www/exec.php b/src/usr/local/www/exec.php
index 618eb23..39d5a33 100644
--- a/src/usr/local/www/exec.php
+++ b/src/usr/local/www/exec.php
@@ -257,7 +257,7 @@ if (!isBlank($_POST['txtCommand'])):?>
 	</div>
 
 	<div class="panel panel-default">
-		<div class="panel-heading"><h2 class="panel-title"><?=gettext('Download file')?></h2></div>
+		<div class="panel-heading"><h2 class="panel-title"><?=gettext('Download File')?></h2></div>
 		<div class="panel-body">
 			<div class="content">
 				<input name="dlPath" type="text" id="dlPath" placeholder="File to download" class="col-sm-4" value="<?=htmlspecialchars($_GET['dlPath']);?>"/>
@@ -273,7 +273,7 @@ if (!isBlank($_POST['txtCommand'])):?>
 	}
 ?>
 	<div class="panel panel-default">
-		<div class="panel-heading"><h2 class="panel-title"><?=gettext('Upload file')?></h2></div>
+		<div class="panel-heading"><h2 class="panel-title"><?=gettext('Upload File')?></h2></div>
 		<div class="panel-body">
 			<div class="content">
 				<input name="ulfile" type="file" class="btn btn-default btn-sm btn-file" id="ulfile" />
@@ -286,7 +286,7 @@ if (!isBlank($_POST['txtCommand'])):?>
 	// Experimental version. Writes the user's php code to a file and executes it via a new instance of PHP
 	// This is intended to prevent bad code from breaking the GUI
 	if (!isBlank($_POST['txtPHPCommand'])) {
-		puts("<div class=\"panel panel-success responsive\"><div class=\"panel-heading\"><h2 class=\"panel-title\">PHP response</h2></div>");
+		puts("<div class=\"panel panel-success responsive\"><div class=\"panel-heading\"><h2 class=\"panel-title\">PHP Response</h2></div>");
 
 		$tmpname = tempnam("/tmp", "");
 		$phpfile = fopen($tmpname, "w");
diff --git a/src/usr/local/www/firewall_aliases_import.php b/src/usr/local/www/firewall_aliases_import.php
index 094211a..acfe63d 100755
--- a/src/usr/local/www/firewall_aliases_import.php
+++ b/src/usr/local/www/firewall_aliases_import.php
@@ -193,7 +193,7 @@ if ($input_errors) {
 }
 
 $form = new Form;
-$section = new Form_Section('Alias details');
+$section = new Form_Section('Alias Details');
 
 $section->addInput(new Form_Input(
 	'name',
diff --git a/src/usr/local/www/firewall_nat_1to1.php b/src/usr/local/www/firewall_nat_1to1.php
index 4661e70..50c48ff 100644
--- a/src/usr/local/www/firewall_nat_1to1.php
+++ b/src/usr/local/www/firewall_nat_1to1.php
@@ -144,7 +144,7 @@ if (isset($_POST['del_x'])) {
 		} else {
 			$a_1to1[$_GET['id']]['disabled'] = true;
 		}
-		if (write_config(gettext("Firewall: NAT: 1 to 1, enable/disable NAT rule"))) {
+		if (write_config(gettext("Firewall: NAT: 1:1, enable/disable NAT rule"))) {
 			mark_subsystem_dirty('natconf');
 		}
 		header("Location: firewall_nat_1to1.php");
@@ -173,7 +173,7 @@ display_top_tabs($tab_array);
 ?>
 <form action="firewall_nat_1to1.php" method="post">
 	<div class="panel panel-default">
-		<div class="panel-heading"><h2 class="panel-title"><?=gettext("NAT 1 to 1 mappings")?></h2></div>
+		<div class="panel-heading"><h2 class="panel-title"><?=gettext("NAT 1:1 Mappings")?></h2></div>
 		<div id="mainarea" class="table-responsive panel-body">
 			<table class="table table-striped table-hover table-condensed">
 				<thead>
diff --git a/src/usr/local/www/firewall_nat_1to1_edit.php b/src/usr/local/www/firewall_nat_1to1_edit.php
index 4b6178f..b6dfce8 100644
--- a/src/usr/local/www/firewall_nat_1to1_edit.php
+++ b/src/usr/local/www/firewall_nat_1to1_edit.php
@@ -397,7 +397,7 @@ $form = new Form(new Form_Button(
 	gettext("Save")
 ));
 
-$section = new Form_Section('Edit NAT 1 to 1 entry');
+$section = new Form_Section('Edit NAT 1:1 Entry');
 
 $section->addInput(new Form_Checkbox(
 	'nobinat',
diff --git a/src/usr/local/www/firewall_nat_edit.php b/src/usr/local/www/firewall_nat_edit.php
index 2165a32..af7f637 100644
--- a/src/usr/local/www/firewall_nat_edit.php
+++ b/src/usr/local/www/firewall_nat_edit.php
@@ -668,7 +668,7 @@ $form = new Form(new Form_Button(
 	gettext("Save")
 ));
 
-$section = new Form_Section('Edit Redirect entry');
+$section = new Form_Section('Edit Redirect Entry');
 
 $section->addInput(new Form_Checkbox(
 	'disabled',
diff --git a/src/usr/local/www/firewall_nat_npt_edit.php b/src/usr/local/www/firewall_nat_npt_edit.php
index 249159e..cd061be 100644
--- a/src/usr/local/www/firewall_nat_npt_edit.php
+++ b/src/usr/local/www/firewall_nat_npt_edit.php
@@ -218,7 +218,7 @@ if ($input_errors) {
 
 $form = new Form();
 
-$section = new Form_Section('Edit NAT NPt entry');
+$section = new Form_Section('Edit NAT NPt Entry');
 
 $section->addInput(new Form_Checkbox(
 	'disabled',
diff --git a/src/usr/local/www/firewall_nat_out.php b/src/usr/local/www/firewall_nat_out.php
index fea779e..0ea354e 100644
--- a/src/usr/local/www/firewall_nat_out.php
+++ b/src/usr/local/www/firewall_nat_out.php
@@ -553,7 +553,7 @@ if ($mode == "automatic" || $mode == "hybrid"):
 	unset($FilterIflist, $GatewaysList);
 ?>
 	<div class="panel panel-default">
-		<div class="panel-heading"><h2 class="panel-title"><?=gettext("Automatic rules:")?></h2></div>
+		<div class="panel-heading"><h2 class="panel-title"><?=gettext("Automatic Rules:")?></h2></div>
 		<div class="panel-body table-responsive">
 			<table class="table table-hover table-striped table-condensed">
 				<thead>
diff --git a/src/usr/local/www/firewall_nat_out_edit.php b/src/usr/local/www/firewall_nat_out_edit.php
index 4983331..829b0d0 100644
--- a/src/usr/local/www/firewall_nat_out_edit.php
+++ b/src/usr/local/www/firewall_nat_out_edit.php
@@ -444,7 +444,7 @@ $form = new Form(new Form_Button(
 	gettext("Save")
 ));
 
-$section = new Form_Section('Edit Advanced Outbound NAT entry');
+$section = new Form_Section('Edit Advanced Outbound NAT Entry');
 
 $section->addInput(new Form_Checkbox(
 	'disabled',
diff --git a/src/usr/local/www/firewall_rules.php b/src/usr/local/www/firewall_rules.php
index a65fab5..e2917ca 100644
--- a/src/usr/local/www/firewall_rules.php
+++ b/src/usr/local/www/firewall_rules.php
@@ -396,7 +396,7 @@ $columns_in_table = 13;
 ?>
 <form method="post">
 	<div class="panel panel-default">
-		<div class="panel-heading"><h2 class="panel-title"><?=gettext("Rules (Drag to change order)")?></h2></div>
+		<div class="panel-heading"><h2 class="panel-title"><?=gettext("Rules (Drag to Change Order)")?></h2></div>
 		<div id="mainarea" class="table-responsive panel-body">
 			<table id="ruletable" class="table table-hover table-striped table-condensed">
 				<thead>
diff --git a/src/usr/local/www/firewall_rules_edit.php b/src/usr/local/www/firewall_rules_edit.php
index 17bf822..94374ca 100644
--- a/src/usr/local/www/firewall_rules_edit.php
+++ b/src/usr/local/www/firewall_rules_edit.php
@@ -1048,7 +1048,7 @@ if ($input_errors) {
 }
 
 $form = new Form;
-$section = new Form_Section('Edit Firewall rule');
+$section = new Form_Section('Edit Firewall Rule');
 
 if (isset($id)) {
 	$form->addGlobal(new Form_Input(
@@ -1380,7 +1380,7 @@ foreach (['src' => 'Source', 'dst' => 'Destination'] as $type => $name) {
 	$form->add($section);
 }
 
-$section = new Form_Section('Extra options');
+$section = new Form_Section('Extra Options');
 $section->addInput(new Form_Checkbox(
 	'log',
 	'Log',
@@ -1416,7 +1416,7 @@ if (!$adv_open) {
 
 $form->add($section);
 
-$section = new Form_Section('Advanced options');
+$section = new Form_Section('Advanced Options');
 $section->addClass('advanced-options');
 
 $section->addInput(new Form_Select(
diff --git a/src/usr/local/www/firewall_schedule_edit.php b/src/usr/local/www/firewall_schedule_edit.php
index 93c7f91..72090ab 100644
--- a/src/usr/local/www/firewall_schedule_edit.php
+++ b/src/usr/local/www/firewall_schedule_edit.php
@@ -386,7 +386,7 @@ if ($input_errors) {
 
 $form = new Form();
 
-$section = new Form_Section('Schedule information');
+$section = new Form_Section('Schedule Information');
 
 $input = new Form_Input(
 	'name',
@@ -489,7 +489,7 @@ if (isset($id) && $a_schedules[$id]) {
 
 $form->add($section);
 
-$section = new Form_Section('Configured ranges');
+$section = new Form_Section('Configured Ranges');
 $counter = 0;
 
 if ($getSchedule) {
diff --git a/src/usr/local/www/firewall_shaper_queues.php b/src/usr/local/www/firewall_shaper_queues.php
index 9e751c9..501ee53 100644
--- a/src/usr/local/www/firewall_shaper_queues.php
+++ b/src/usr/local/www/firewall_shaper_queues.php
@@ -71,7 +71,7 @@ if ($_GET['reset'] != "") {
 	exit;
 }
 
-$qname = gettext("No queue configured/selected");
+$qname = gettext("No Queue Configured/Selected");
 
 $shaperIFlist = get_configured_interface_with_descr();
 read_altq_config();
diff --git a/src/usr/local/www/guiconfig.inc b/src/usr/local/www/guiconfig.inc
index 175f540..9117b08 100644
--- a/src/usr/local/www/guiconfig.inc
+++ b/src/usr/local/www/guiconfig.inc
@@ -150,7 +150,7 @@ $firewall_rules_dscp_types = array(
 
 $auth_server_types = array(
 	'ldap' => "LDAP",
-	'radius' => "Radius");
+	'radius' => "RADIUS");
 
 $ldap_urltypes = array(
 	'TCP - Standard' => 389,
diff --git a/src/usr/local/www/interfaces.php b/src/usr/local/www/interfaces.php
index 68c4435..637492b 100644
--- a/src/usr/local/www/interfaces.php
+++ b/src/usr/local/www/interfaces.php
@@ -1704,7 +1704,7 @@ $form = new Form(new Form_Button(
 	gettext("Save")
 ));
 
-$section = new Form_Section('General configuration');
+$section = new Form_Section('General Configuration');
 
 $section->addInput(new Form_Checkbox(
 	'enable',
@@ -1785,7 +1785,7 @@ if (count($mediaopts_list) > 0) {
 
 $form->add($section);
 
-$section = new Form_Section('Static IPv4 configuration');
+$section = new Form_Section('Static IPv4 Configuration');
 $section->addClass('staticv4');
 
 $section->addInput(new Form_IpAddress(
@@ -1816,7 +1816,7 @@ $section->add($group);
 
 $form->add($section);
 
-$section = new Form_Section('Static IPv6 configuration');
+$section = new Form_Section('Static IPv6 Configuration');
 $section->addClass('staticv6');
 
 $section->addInput(new Form_IpAddress(
@@ -1846,7 +1846,7 @@ $section->add($group);
 $form->add($section);
 
 // Add new gateway modal pop-up for IPv6
-$modal = new Modal('New IPv6 gateway', 'newgateway6', 'large');
+$modal = new Modal('New IPv6 Gateway', 'newgateway6', 'large');
 
 $modal->addInput(new Form_Checkbox(
 	'defaultgw6',
@@ -1897,7 +1897,7 @@ $form->add($modal);
 
 // ==== DHCP client configuration =============================
 
-$section = new Form_Section('DHCP client configuration');
+$section = new Form_Section('DHCP Client Configuration');
 $section->addClass('dhcp');
 
 $group = new Form_Group('Options');
@@ -2079,7 +2079,7 @@ $form->add($section);
 
 // DHCP6 client config
 
-$section = new Form_Section('DHCP6 client configuration');
+$section = new Form_Section('DHCP6 Client Configuration');
 $section->addClass('dhcp6');
 
 $section->addInput(new Form_Checkbox(
@@ -2147,7 +2147,7 @@ $form->add($section);
 
 // DHCP6 client config - Advanced
 
-$section = new Form_Section('Advanced DHCP6 client configuration');
+$section = new Form_Section('Advanced DHCP6 Client Configuration');
 $section->addClass('dhcp6advanced');
 
 $section->addInput(new Form_Checkbox(
@@ -2742,7 +2742,7 @@ $form->add($section);
 // Wireless interface
 if (isset($wancfg['wireless'])) {
 
-	$section = new Form_Section('Common wireless configuration - Settings apply to all wireless networks on ' . $wlanbaseif . '.');
+	$section = new Form_Section('Common Wireless Configuration - Settings apply to all wireless networks on ' . $wlanbaseif . '.');
 
 	$section->addInput(new Form_Checkbox(
 		'persistcommonwireless',
@@ -2866,7 +2866,7 @@ if (isset($wancfg['wireless'])) {
 	$form->add($section);
 
 	// Regulatory settings
-	$section = new Form_Section('Regulatory settings');
+	$section = new Form_Section('Regulatory Settings');
 
 	$domain_list = array("" => 'Default');
 
@@ -2911,7 +2911,7 @@ if (isset($wancfg['wireless'])) {
 
 	$form->add($section);
 
-	$section = new Form_Section('Network-specific wireless configuration');
+	$section = new Form_Section('Network-Specific Wireless Configuration');
 
 	$section->addInput(new Form_Select(
 		'mode',
@@ -3035,7 +3035,7 @@ if (isset($wancfg['wireless'])) {
 
 	$form->add($section);
 
-	$section = new Form_Section('802.1x RADIUS options');
+	$section = new Form_Section('802.1x RADIUS Options');
 
 	$section->addInput(new Form_Checkbox(
 		'ieee8021x',
@@ -3104,7 +3104,7 @@ if (isset($wancfg['wireless'])) {
 	$form->add($section);
 }
 
-$section = new Form_Section('Private networks');
+$section = new Form_Section('Private Networks');
 
 $section->addInput(new Form_Checkbox(
 	'blockpriv',
@@ -3153,7 +3153,7 @@ $form->addGlobal(new Form_Input(
 
 
 // Add new gateway modal pop-up
-$modal = new Modal('New gateway', 'newgateway', 'large');
+$modal = new Modal('New Gateway', 'newgateway', 'large');
 
 $modal->addInput(new Form_Checkbox(
 	'defaultgw',
diff --git a/src/usr/local/www/load_balancer_monitor_edit.php b/src/usr/local/www/load_balancer_monitor_edit.php
index 6ba0907..be02833 100644
--- a/src/usr/local/www/load_balancer_monitor_edit.php
+++ b/src/usr/local/www/load_balancer_monitor_edit.php
@@ -299,7 +299,7 @@ $form = new Form(new Form_Button(
 	gettext("Save")
 ));
 
-$section = new Form_Section('Edit Load Balancer - Monitor entry');
+$section = new Form_Section('Edit Load Balancer - Monitor Entry');
 
 $section->addInput(new Form_Input(
 	'name',
diff --git a/src/usr/local/www/load_balancer_pool_edit.php b/src/usr/local/www/load_balancer_pool_edit.php
index b19cbe3..fa76681 100644
--- a/src/usr/local/www/load_balancer_pool_edit.php
+++ b/src/usr/local/www/load_balancer_pool_edit.php
@@ -340,7 +340,7 @@ $form = new Form(new Form_Button(
 	gettext("Save")
 ));
 
-$section = new Form_Section('Add/edit Load Balancer - Pool entry');
+$section = new Form_Section('Add/Edit Load Balancer - Pool Entry');
 
 $section->addInput(new Form_Input(
 	'name',
@@ -383,7 +383,7 @@ $section->addInput(new Form_Input(
 
 $form->add($section);
 
-$section = new Form_Section('Add item to the pool');
+$section = new Form_Section('Add Item to the Pool');
 
 $monitorlist = array();
 
@@ -422,7 +422,7 @@ $section->add($group);
 
 $form->add($section);
 
-$section = new Form_Section('Current pool members');
+$section = new Form_Section('Current Pool Members');
 
 $group = new Form_Group('Members');
 
diff --git a/src/usr/local/www/load_balancer_virtual_server_edit.php b/src/usr/local/www/load_balancer_virtual_server_edit.php
index 31bf0ce..d9b155f 100644
--- a/src/usr/local/www/load_balancer_virtual_server_edit.php
+++ b/src/usr/local/www/load_balancer_virtual_server_edit.php
@@ -201,7 +201,7 @@ if ($input_errors) {
 
 $form = new Form();
 
-$section = new Form_Section('Edit Load Balancer - Virtual Server entry');
+$section = new Form_Section('Edit Load Balancer - Virtual Server Entry');
 
 $section->addInput(new Form_Input(
 	'name',
diff --git a/src/usr/local/www/pkg_edit.php b/src/usr/local/www/pkg_edit.php
index 2db6b6e..4694eea 100644
--- a/src/usr/local/www/pkg_edit.php
+++ b/src/usr/local/www/pkg_edit.php
@@ -657,7 +657,7 @@ $form->addGlobal(new Form_Input(
 
 if ($pkg['advanced_options'] == "enabled") {
 	$advfield_count = 0;
-	$advanced = new Form_Section(gettext("Advanced features"));
+	$advanced = new Form_Section("Advanced Features");
 	$advanced->addClass('advancedoptions');
 }
 
@@ -735,7 +735,7 @@ foreach ($pkg['fields']['field'] as $pkga) {
 	// If we get here but have no $section, the package config file probably had no listtopic field
 	// We can create a section with a generic name to fix that
 	if (!$section) {
-		$section = new Form_Section(gettext('General options'));
+		$section = new Form_Section('General Options');
 	}
 
 	switch ($pkga['type']) {
diff --git a/src/usr/local/www/pkg_mgr_install.php b/src/usr/local/www/pkg_mgr_install.php
index 1518ec0..c4d217d 100644
--- a/src/usr/local/www/pkg_mgr_install.php
+++ b/src/usr/local/www/pkg_mgr_install.php
@@ -292,14 +292,14 @@ if ($input_errors) {
 
 	switch ($pkgmode) {
 		case 'reinstallpkg':
-			$pkgtxt = sprintf(gettext('Package <b>%s</b> will be reinstalled'), $pkgname);
+			$pkgtxt = sprintf(gettext('Package <b>%s</b> will be Reinstalled'), $pkgname);
 			break;
 		case 'delete':
-			$pkgtxt = sprintf(gettext('Package <b>%s</b> will be removed'), $pkgname);
+			$pkgtxt = sprintf(gettext('Package <b>%s</b> will be Removed'), $pkgname);
 			break;
 		case 'installed':
 		default:
-			$pkgtxt = sprintf(gettext('Package <b>%s</b> will be installed'), $pkgname);
+			$pkgtxt = sprintf(gettext('Package <b>%s</b> will be Installed'), $pkgname);
 			break;
 	}
 ?>
@@ -310,11 +310,11 @@ if ($input_errors) {
 <?php
 			if ($pkgmode == 'reinstallall') {
 ?>
-				<?=gettext("All packages will be reinstalled.");?>
+				<?=gettext("All Packages will be Reinstalled.");?>
 <?php
 			} else if ($_GET['from'] && $_GET['to']) {
 ?>
-				<?=sprintf(gettext('Package: %1$s will be upgraded from %2$s to %3$s.'), '<b>' . $pkgname . '</b>', '<b>' . $_GET['from'] . '</b>', '<b>' . $_GET['to'] . '</b>')?>
+				<?=sprintf(gettext('Package: %1$s will be Upgraded from %2$s to %3$s.'), '<b>' . $pkgname . '</b>', '<b>' . $_GET['from'] . '</b>', '<b>' . $_GET['to'] . '</b>')?>
 <?php
 			} else if ($firmwareupdate) {
 ?>
@@ -400,17 +400,17 @@ if ($_POST) {
 }
 
 if ($_POST['mode'] == 'delete') {
-	$panel_heading_txt = gettext("Package removal");
+	$panel_heading_txt = gettext("Package Removal");
 	$pkg_success_txt = sprintf(gettext('<b>%1$s</b> removal successfully completed'), $pkgid);
 	$pkg_fail_txt = sprintf(gettext('<b>%1$s</b> removal failed!'), $pkgid);
 	$pkg_wait_txt = sprintf(gettext('Please wait while the removal of <b>%1$s</b> completes.'), $pkgid);
 } else if (($_POST['mode'] == 'reinstallpkg') || ($_POST['mode'] == 'reinstallall')) {
-	$panel_heading_txt = gettext("Package reinstallation");
+	$panel_heading_txt = gettext("Package Reinstallation");
 	$pkg_success_txt = sprintf(gettext('<b>%1$s</b> reinstallation successfully completed'), $pkgid);
 	$pkg_fail_txt = sprintf(gettext('<b>%1$s</b> reinstallation failed!'), $pkgid);
 	$pkg_wait_txt = sprintf(gettext('Please wait while the reinstallation of <b>%1$s</b> completes.'), $pkgid);
 } else {
-	$panel_heading_txt = gettext("Package installation");
+	$panel_heading_txt = gettext("Package Installation");
 	$pkg_success_txt = sprintf(gettext('<b>%1$s</b> installation successfully completed'), $pkgid);
 	$pkg_fail_txt = sprintf(gettext('<b>%1$s</b> installation failed!'), $pkgid);
 	$pkg_wait_txt = sprintf(gettext('Please wait while the installation of <b>%1$s</b> completes.'), $pkgid);
@@ -439,7 +439,7 @@ if (!empty($_POST['id']) || $_POST['mode'] == "reinstallall"):
 		<div class="panel-heading">
 <?php if ($firmwareupdate) {
 ?>
-			<h2 class="panel-title" id="status"><?=gettext("Updating system")?></h2>
+			<h2 class="panel-title" id="status"><?=gettext("Updating System")?></h2>
 <?php } else {
 ?>
 			<h2 class="panel-title" id="status"><?=$panel_heading_txt?></h2>
diff --git a/src/usr/local/www/services_captiveportal.php b/src/usr/local/www/services_captiveportal.php
index d46b985..68ade85 100644
--- a/src/usr/local/www/services_captiveportal.php
+++ b/src/usr/local/www/services_captiveportal.php
@@ -953,7 +953,7 @@ $section->add($group);
 
 $form->add($section);
 
-$section = new Form_Section('RADIUS options');
+$section = new Form_Section('RADIUS Options');
 $section->addClass('Radius');
 
 $section->addInput(new Form_Checkbox(
@@ -1032,7 +1032,7 @@ $section->addInput(new Form_Select(
 
 $form->add($section);
 
-$section = new Form_Section('HTTPS options');
+$section = new Form_Section('HTTPS Options');
 $section->addClass('HTTPS');
 
 $section->addInput(new Form_Checkbox(
@@ -1071,7 +1071,7 @@ $section->addInput(new Form_Checkbox(
 
 $form->add($section);
 
-$section = new Form_Section('HTML page contents');
+$section = new Form_Section('HTML Page Contents');
 $section->addClass('HTML');
 
 $section->addInput(new Form_Input(
diff --git a/src/usr/local/www/services_captiveportal_filemanager.php b/src/usr/local/www/services_captiveportal_filemanager.php
index cbe5896..8827239 100644
--- a/src/usr/local/www/services_captiveportal_filemanager.php
+++ b/src/usr/local/www/services_captiveportal_filemanager.php
@@ -186,7 +186,7 @@ if ($_GET['act'] == 'add') {
 
 	$form->setMultipartEncoding();
 
-	$section = new Form_Section('Upload a new file');
+	$section = new Form_Section('Upload a New File');
 
 	$section->addInput(new Form_Input(
 		'zone',
diff --git a/src/usr/local/www/services_captiveportal_hostname_edit.php b/src/usr/local/www/services_captiveportal_hostname_edit.php
index d36fc80..71fef4f 100644
--- a/src/usr/local/www/services_captiveportal_hostname_edit.php
+++ b/src/usr/local/www/services_captiveportal_hostname_edit.php
@@ -204,7 +204,7 @@ $form = new Form(new Form_Button(
 	gettext("Save")
 ));
 
-$section = new Form_Section('Captive Portal Hostname settings');
+$section = new Form_Section('Captive Portal Hostname Settings');
 
 $section->addInput(new Form_Select(
 	'dir',
diff --git a/src/usr/local/www/services_captiveportal_ip_edit.php b/src/usr/local/www/services_captiveportal_ip_edit.php
index 379711a..5daffa4 100644
--- a/src/usr/local/www/services_captiveportal_ip_edit.php
+++ b/src/usr/local/www/services_captiveportal_ip_edit.php
@@ -244,7 +244,7 @@ if ($input_errors) {
 
 $form = new Form();
 
-$section = new Form_Section('Edit Captive Portal IP rule');
+$section = new Form_Section('Edit Captive Portal IP Rule');
 
 $section->addInput(new Form_IpAddress(
 	'ip',
diff --git a/src/usr/local/www/services_captiveportal_mac_edit.php b/src/usr/local/www/services_captiveportal_mac_edit.php
index 35d796e..22bb4c5 100644
--- a/src/usr/local/www/services_captiveportal_mac_edit.php
+++ b/src/usr/local/www/services_captiveportal_mac_edit.php
@@ -227,7 +227,7 @@ if ($input_errors) {
 
 $form = new Form();
 
-$section = new Form_Section('Edit MAC address rules');
+$section = new Form_Section('Edit MAC Address Rules');
 
 $section->addInput(new Form_Select(
 	'action',
diff --git a/src/usr/local/www/services_captiveportal_vouchers.php b/src/usr/local/www/services_captiveportal_vouchers.php
index 46588a6..392fbf4 100644
--- a/src/usr/local/www/services_captiveportal_vouchers.php
+++ b/src/usr/local/www/services_captiveportal_vouchers.php
@@ -507,7 +507,7 @@ endif;
 
 $form = new Form();
 
-$section = new Form_Section('Create, generate and activate Rolls with Vouchers');
+$section = new Form_Section('Create, Generate and Activate Rolls with Vouchers');
 
 $section->addInput(new Form_Checkbox(
 	'enable',
@@ -518,7 +518,7 @@ $section->addInput(new Form_Checkbox(
 
 $form->add($section);
 
-$section = new Form_Section('Create, generate and activate Rolls with Vouchers');
+$section = new Form_Section('Create, Generate and Activate Rolls with Vouchers');
 $section->addClass('rolledit');
 
 $section->addInput(new Form_Textarea(
@@ -588,7 +588,7 @@ $section->addInput(new Form_Input(
 
 $form->add($section);
 
-$section = new Form_Section('Voucher database synchronization');
+$section = new Form_Section('Voucher Database Synchronization');
 $section->addClass('rolledit');
 
 $section->addInput(new Form_IpAddress(
diff --git a/src/usr/local/www/services_captiveportal_vouchers_edit.php b/src/usr/local/www/services_captiveportal_vouchers_edit.php
index 1508b5d..2290806 100644
--- a/src/usr/local/www/services_captiveportal_vouchers_edit.php
+++ b/src/usr/local/www/services_captiveportal_vouchers_edit.php
@@ -214,7 +214,7 @@ if ($savemsg) {
 
 $form = new Form();
 
-$section = new Form_Section('Voucher rolls');
+$section = new Form_Section('Voucher Rolls');
 
 $section->addInput(new Form_Input(
 	'number',
diff --git a/src/usr/local/www/services_dhcp.php b/src/usr/local/www/services_dhcp.php
index 0c03469..7306e68 100644
--- a/src/usr/local/www/services_dhcp.php
+++ b/src/usr/local/www/services_dhcp.php
@@ -879,7 +879,7 @@ $section->add($group);
 $form->add($section);
 
 if (!is_numeric($pool) && !($act == "newpool")) {
-	$section = new Form_Section('Additional pools');
+	$section = new Form_Section('Additional Pools');
 
 	$btnaddpool = new Form_Button(
 		'btnaddpool',
@@ -926,7 +926,7 @@ for ($idx=1; $idx<=4; $idx++) {
 
 $form->add($section);
 
-$section = new Form_Section('Other options');
+$section = new Form_Section('Other Options');
 
 $section->addInput(new Form_IpAddress(
 	'gateway',
@@ -1225,7 +1225,7 @@ if ($pconfig['netboot']) {
 } else {
 	$sectate = COLLAPSIBLE|SEC_CLOSED;
 }
-$section = new Form_Section("Network booting", nwkbootsec, $sectate);
+$section = new Form_Section("Network Booting", nwkbootsec, $sectate);
 
 $section->addInput(new Form_Checkbox(
 	'netboot',
@@ -1304,7 +1304,7 @@ if (!is_numeric($pool) && !($act == "newpool")) {
 ?>
 
 <div class="panel panel-default">
-	<div class="panel-heading"><h2 class="panel-title"><?=gettext("DHCP Static Mappings for this interface")?></h2></div>
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext("DHCP Static Mappings for this Interface")?></h2></div>
 	<div class="table-responsive">
 			<table class="table table-striped table-hover table-condensed">
 				<thead>
diff --git a/src/usr/local/www/services_dhcp_relay.php b/src/usr/local/www/services_dhcp_relay.php
index 2f71de0..ecb7186 100644
--- a/src/usr/local/www/services_dhcp_relay.php
+++ b/src/usr/local/www/services_dhcp_relay.php
@@ -171,7 +171,7 @@ if ($savemsg) {
 
 $form = new Form;
 
-$section = new Form_Section('DHCP Relay configuration');
+$section = new Form_Section('DHCP Relay Configuration');
 
 $section->addInput(new Form_Checkbox(
 	'enable',
diff --git a/src/usr/local/www/services_dhcpv6.php b/src/usr/local/www/services_dhcpv6.php
index 6d2a2c88..5a00c7a 100644
--- a/src/usr/local/www/services_dhcpv6.php
+++ b/src/usr/local/www/services_dhcpv6.php
@@ -894,7 +894,7 @@ print_info_box(
 ?>
 </div>
 <div class="panel panel-default">
-	<div class="panel-heading"><h2 class="panel-title"><?=gettext("DHCPv6 Static Mappings for this interface.");?></h2></div>
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext("DHCPv6 Static Mappings for this Interface.");?></h2></div>
 	<div class="panel-body table-responsive">
 		<table class="table table-striped table-hover table-condensed">
 			<thead>
diff --git a/src/usr/local/www/services_dhcpv6_relay.php b/src/usr/local/www/services_dhcpv6_relay.php
index c95b0df..974644a 100644
--- a/src/usr/local/www/services_dhcpv6_relay.php
+++ b/src/usr/local/www/services_dhcpv6_relay.php
@@ -169,7 +169,7 @@ if ($savemsg) {
 
 $form = new Form;
 
-$section = new Form_Section('DHCPv6 Relay configuration');
+$section = new Form_Section('DHCPv6 Relay Configuration');
 
 $section->addInput(new Form_Checkbox(
 	'enable',
diff --git a/src/usr/local/www/services_dnsmasq_domainoverride_edit.php b/src/usr/local/www/services_dnsmasq_domainoverride_edit.php
index f0ffd9c..5354e3c 100644
--- a/src/usr/local/www/services_dnsmasq_domainoverride_edit.php
+++ b/src/usr/local/www/services_dnsmasq_domainoverride_edit.php
@@ -160,7 +160,7 @@ if ($input_errors) {
 
 $form = new Form();
 
-$section = new Form_Section('Domain override options');
+$section = new Form_Section('Domain Override Options');
 
 $section->addInput(new Form_Input(
 	'domain',
diff --git a/src/usr/local/www/services_dnsmasq_edit.php b/src/usr/local/www/services_dnsmasq_edit.php
index 8bc1ac4..17c892c 100644
--- a/src/usr/local/www/services_dnsmasq_edit.php
+++ b/src/usr/local/www/services_dnsmasq_edit.php
@@ -239,7 +239,7 @@ if ($input_errors) {
 
 $form = new Form();
 
-$section = new Form_Section('Host override options');
+$section = new Form_Section('Host Override Options');
 
 $section->addInput(new Form_Input(
 	'host',
@@ -282,7 +282,7 @@ if (isset($id) && $a_hosts[$id]) {
 
 $form->add($section);
 
-$section = new Form_Section('Additional names for this host');
+$section = new Form_Section('Additional Names for this Host');
 
 if (!$pconfig['aliases']['item']) {
 	$pconfig['aliases']['item'] = array('host' => "");
diff --git a/src/usr/local/www/services_pppoe_edit.php b/src/usr/local/www/services_pppoe_edit.php
index 63d87e6..e7b6053 100644
--- a/src/usr/local/www/services_pppoe_edit.php
+++ b/src/usr/local/www/services_pppoe_edit.php
@@ -435,7 +435,7 @@ $section->addInput(new Form_Input(
 
 $section->addInput(new Form_Checkbox(
 	'radiusissueips',
-	'Radius Issued IP Addresses',
+	'RADIUS Issued IP Addresses',
 	'Assign IP Addresses to users via RADIUS server reply attributes',
 	$pconfig['radiusissueips']
 ));
diff --git a/src/usr/local/www/services_rfc2136_edit.php b/src/usr/local/www/services_rfc2136_edit.php
index 891e8b1..a529d41 100644
--- a/src/usr/local/www/services_rfc2136_edit.php
+++ b/src/usr/local/www/services_rfc2136_edit.php
@@ -192,7 +192,7 @@ if ($savemsg) {
 
 $form = new Form;
 
-$section = new Form_Section('RFC 2136 client');
+$section = new Form_Section('RFC 2136 Client');
 
 $section->addInput(new Form_Checkbox(
 	'enable',
diff --git a/src/usr/local/www/services_snmp.php b/src/usr/local/www/services_snmp.php
index 16ef69f..3cd949f 100644
--- a/src/usr/local/www/services_snmp.php
+++ b/src/usr/local/www/services_snmp.php
@@ -233,7 +233,7 @@ $section->addInput(new Form_Checkbox(
 
 $form->add($section);
 
-$section = new Form_Section('SNMP Daemon settings');
+$section = new Form_Section('SNMP Daemon Settings');
 
 $section->addInput(new Form_Input(
 	'pollport',
@@ -276,7 +276,7 @@ $section->addInput(new Form_Checkbox(
 
 $form->add($section);
 
-$section = new Form_Section('SNMP Trap settings');
+$section = new Form_Section('SNMP Trap Settings');
 
 if ($pconfig['trapenable']) {
 	$section->addClass('toggle-traps', 'in');
diff --git a/src/usr/local/www/services_unbound_acls.php b/src/usr/local/www/services_unbound_acls.php
index 1c94824..4702bab 100644
--- a/src/usr/local/www/services_unbound_acls.php
+++ b/src/usr/local/www/services_unbound_acls.php
@@ -313,7 +313,7 @@ if ($act == "new" || $act == "edit") {
 	// NOT 'edit' or 'add'
 ?>
 <div class="panel panel-default">
-	<div class="panel-heading"><h2 class="panel-title"><?=gettext('Access Lists to control access to the DNS Resolver')?></h2></div>
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext('Access Lists to Control Access to the DNS Resolver')?></h2></div>
 	<div class="panel-body">
 		<div class="table-responsive">
 			<table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable>
diff --git a/src/usr/local/www/services_unbound_host_edit.php b/src/usr/local/www/services_unbound_host_edit.php
index 6f87318..88f50b1 100644
--- a/src/usr/local/www/services_unbound_host_edit.php
+++ b/src/usr/local/www/services_unbound_host_edit.php
@@ -240,7 +240,7 @@ if ($input_errors) {
 
 $form = new Form();
 
-$section = new Form_Section('Host override options');
+$section = new Form_Section('Host Override Options');
 
 $section->addInput(new Form_Input(
 	'host',
@@ -283,7 +283,7 @@ if (isset($id) && $a_hosts[$id]) {
 
 $form->add($section);
 
-$section = new Form_Section('Additional names for this host');
+$section = new Form_Section('Additional Names for this Host');
 
 if (!$pconfig['aliases']['item']) {
 	$pconfig['aliases']['item'] = array('host' => "");
diff --git a/src/usr/local/www/services_wol.php b/src/usr/local/www/services_wol.php
index b23b81b..8e27cb8 100644
--- a/src/usr/local/www/services_wol.php
+++ b/src/usr/local/www/services_wol.php
@@ -188,7 +188,7 @@ print $form;
 
 <div class="panel panel-default">
 	<div class="panel-heading">
-		<h2 class="panel-title"><?=gettext("Wake on LAN devices");?></h2>
+		<h2 class="panel-title"><?=gettext("Wake on LAN Devices");?></h2>
 	</div>
 
 	<div class="panel-body">
diff --git a/src/usr/local/www/services_wol_edit.php b/src/usr/local/www/services_wol_edit.php
index 0bbcda3..53fde8f 100644
--- a/src/usr/local/www/services_wol_edit.php
+++ b/src/usr/local/www/services_wol_edit.php
@@ -152,7 +152,7 @@ if (isset($id) && $a_wol[$id]) {
 	));
 }
 
-$section = new Form_Section('Edit WOL entry');
+$section = new Form_Section('Edit WOL Entry');
 
 $section->addInput(new Form_Select(
 	'interface',
diff --git a/src/usr/local/www/status_carp.php b/src/usr/local/www/status_carp.php
index 1ccc7cb..224ef6f 100644
--- a/src/usr/local/www/status_carp.php
+++ b/src/usr/local/www/status_carp.php
@@ -266,7 +266,7 @@ if ($carpcount == 0) {
 </form>
 
 <div class="panel panel-default">
-	<div class="panel-heading"><h2 class="panel-title"><?=gettext('pfSync nodes')?></h2></div>
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext('pfSync Nodes')?></h2></div>
 	<div class="panel-body">
 		<ul>
 <?php
diff --git a/src/usr/local/www/status_dhcp_leases.php b/src/usr/local/www/status_dhcp_leases.php
index 41bce34..b787257 100644
--- a/src/usr/local/www/status_dhcp_leases.php
+++ b/src/usr/local/www/status_dhcp_leases.php
@@ -339,7 +339,7 @@ if ($_GET['order']) {
 if (count($pools) > 0) {
 ?>
 <div class="panel panel-default">
-	<div class="panel-heading"><h2 class="panel-title"><?=gettext('Pool status')?></h2></div>
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext('Pool Status')?></h2></div>
 	<div class="panel-body table-responsive">
 		<table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable>
 		<thead>
@@ -466,7 +466,7 @@ foreach ($leases as $data):
 </div>
 
 <div class="panel panel-default">
-	<div class="panel-heading"><h2 class="panel-title"><?=gettext('Leases in use')?></h2></div>
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext('Leases in Use')?></h2></div>
 	<div class="panel-body table-responsive">
 		<table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable>
 			<thead>
diff --git a/src/usr/local/www/status_dhcpv6_leases.php b/src/usr/local/www/status_dhcpv6_leases.php
index 541ba8f..0cbd14c 100644
--- a/src/usr/local/www/status_dhcpv6_leases.php
+++ b/src/usr/local/www/status_dhcpv6_leases.php
@@ -408,7 +408,7 @@ if ($_GET['order']) {
 if (count($pools) > 0) {
 ?>
 <div class="panel panel-default">
-	<div class="panel-heading"><h2 class="panel-title"><?=gettext('Pool status')?></h2></div>
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext('Pool Status')?></h2></div>
 	<div class="panel-body">
 		<table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable>
 		<thead>
diff --git a/src/usr/local/www/status_graph.php b/src/usr/local/www/status_graph.php
index 8a366f3..0ce5c0c 100644
--- a/src/usr/local/www/status_graph.php
+++ b/src/usr/local/www/status_graph.php
@@ -154,7 +154,7 @@ include("head.inc");
 $form = new Form(false);
 $form->addClass('auto-submit');
 
-$section = new Form_Section('Graph settings');
+$section = new Form_Section('Graph Settings');
 
 $group = new Form_Group('');
 
@@ -255,7 +255,7 @@ if (ipsec_enabled()) {
 ?>
 <div class="panel panel-default">
 	<div class="panel-heading">
-		<h2 class="panel-title"><?=gettext("Traffic graph");?></h2>
+		<h2 class="panel-title"><?=gettext("Traffic Graph");?></h2>
 	</div>
 	<div class="panel-body">
 		<div class="col-sm-6">
diff --git a/src/usr/local/www/status_interfaces.php b/src/usr/local/www/status_interfaces.php
index ad1042c..3d19bac 100644
--- a/src/usr/local/www/status_interfaces.php
+++ b/src/usr/local/www/status_interfaces.php
@@ -117,7 +117,7 @@ foreach ($ifdescrs as $ifdescr => $ifname):
 ?>
 
 <div class="panel panel-default">
-	<div class="panel-heading"><h2 class="panel-title"><?=htmlspecialchars($ifname)?><?=gettext(" interface "); ?>(<?=htmlspecialchars($ifdescr)?>, <?=htmlspecialchars($ifinfo['hwif'])?>)</h2></div>
+	<div class="panel-heading"><h2 class="panel-title"><?=htmlspecialchars($ifname)?><?=gettext(" Interface "); ?>(<?=htmlspecialchars($ifdescr)?>, <?=htmlspecialchars($ifinfo['hwif'])?>)</h2></div>
 	<div class="panel-body">
 		<dl class="dl-horizontal">
 <?php
diff --git a/src/usr/local/www/status_ipsec.php b/src/usr/local/www/status_ipsec.php
index 09caa2a..a85c873 100644
--- a/src/usr/local/www/status_ipsec.php
+++ b/src/usr/local/www/status_ipsec.php
@@ -124,7 +124,7 @@ display_top_tabs($tab_array);
 ?>
 
 <div class="panel panel-default">
-	<div class="panel-heading"><h2 class="panel-title"><?=gettext("IPsec status");?></h2></div>
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext("IPsec Status");?></h2></div>
 	<div class="panel-body table responsive">
 		<table class="table table-striped table-condensed table-hover sortable-theme-bootstrap" data-sortable>
 			<thead>
diff --git a/src/usr/local/www/status_logs_common.inc b/src/usr/local/www/status_logs_common.inc
index b608817..90d1574 100644
--- a/src/usr/local/www/status_logs_common.inc
+++ b/src/usr/local/www/status_logs_common.inc
@@ -162,15 +162,15 @@ function system_log_table_panel_title() {
 
 	if ($rawfilter) {
 		if (($filtersubmit) || ($filterlogentries_submit)) {
-			$rtnstr .= sprintf(gettext("%s matched %s log entries."), "<span id='count'>_ _</span>", gettext($allowed_logs[$logfile]["name"]));
+			$rtnstr .= sprintf(gettext("%s Matched %s Log Entries."), "<span id='count'>_ _</span>", gettext($allowed_logs[$logfile]["name"]));
 		} else {
-			$rtnstr .= sprintf(gettext("Last %s %s log entries."), "<span id='count'>_ _</span>", gettext($allowed_logs[$logfile]["name"]));
+			$rtnstr .= sprintf(gettext("Last %s %s Log Entries."), "<span id='count'>_ _</span>", gettext($allowed_logs[$logfile]["name"]));
 		}
 	} else {
 		if (($filtersubmit) || ($filterlogentries_submit)) {
-			$rtnstr .= sprintf(gettext("%d matched %s log entries."), count($filterlog), gettext($allowed_logs[$logfile]["name"]));
+			$rtnstr .= sprintf(gettext("%d Matched %s Log Entries."), count($filterlog), gettext($allowed_logs[$logfile]["name"]));
 		} else {
-			$rtnstr .= sprintf(gettext("Last %d %s log entries."), count($filterlog), gettext($allowed_logs[$logfile]["name"]));
+			$rtnstr .= sprintf(gettext("Last %d %s Log Entries."), count($filterlog), gettext($allowed_logs[$logfile]["name"]));
 		}
 	}
 
diff --git a/src/usr/local/www/status_ntpd.php b/src/usr/local/www/status_ntpd.php
index e1fe2b9..8b6b121 100644
--- a/src/usr/local/www/status_ntpd.php
+++ b/src/usr/local/www/status_ntpd.php
@@ -263,7 +263,7 @@ if (($gps_ok) && ($gps_lat) && ($gps_lon)):
 ?>
 
 <div class="panel panel-default">
-	<div class="panel-heading"><h2 class="panel-title"><?=gettext("GPS information");?></h2></div>
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext("GPS Information");?></h2></div>
 	<div class="panel-body">
 		<table class="table table-striped table-hover table-condensed">
 			<thead>
diff --git a/src/usr/local/www/status_openvpn.php b/src/usr/local/www/status_openvpn.php
index 46601e7..58e6d55 100644
--- a/src/usr/local/www/status_openvpn.php
+++ b/src/usr/local/www/status_openvpn.php
@@ -129,7 +129,7 @@ include("head.inc"); ?>
 ?>
 
 <div class="panel panel-default">
-		<div class="panel-heading"><h2 class="panel-title"><?=htmlspecialchars($server['name']);?> <?=gettext('Client connections')?></h2></div>
+		<div class="panel-heading"><h2 class="panel-title"><?=htmlspecialchars($server['name']);?> <?=gettext('Client Connections')?></h2></div>
 		<div class="panel-body table-responsive">
 			<table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable>
 				<thead>
diff --git a/src/usr/local/www/status_pkglogs.php b/src/usr/local/www/status_pkglogs.php
index b387fd3..0be83ee 100755
--- a/src/usr/local/www/status_pkglogs.php
+++ b/src/usr/local/www/status_pkglogs.php
@@ -126,7 +126,7 @@ if ($pkgwithlogging == false) {
 ?>
 
 	<div class="panel panel-default">
-		<div class="panel-heading"><h2 class="panel-title"><?=printf(gettext('Last %1$s %2$s log entries'), $nentries, $curtab)?></h2></div>
+		<div class="panel-heading"><h2 class="panel-title"><?=printf(gettext('Last %1$s %2$s Log Entries'), $nentries, $curtab)?></h2></div>
 		<div class="panel-body">
 			<pre>
 <?php
diff --git a/src/usr/local/www/status_rrd_graph.php b/src/usr/local/www/status_rrd_graph.php
index 15fbcfb..8a051b6 100644
--- a/src/usr/local/www/status_rrd_graph.php
+++ b/src/usr/local/www/status_rrd_graph.php
@@ -534,7 +534,7 @@ if ($input_errors && count($input_errors)) {
 
 $form = new Form(false);
 
-$section = new Form_Section('Graph settings');
+$section = new Form_Section('Graph Settings');
 
 $group = new Form_Group('Options');
 
diff --git a/src/usr/local/www/status_rrd_graph_settings.php b/src/usr/local/www/status_rrd_graph_settings.php
index ecb0490..4e6161e 100644
--- a/src/usr/local/www/status_rrd_graph_settings.php
+++ b/src/usr/local/www/status_rrd_graph_settings.php
@@ -192,7 +192,7 @@ if ($savemsg) {
 
 $form = new Form;
 
-$section = new Form_Section('Graph settings');
+$section = new Form_Section('Graph Settings');
 
 $section->addInput(new Form_Checkbox(
 	'enable',
diff --git a/src/usr/local/www/status_wireless.php b/src/usr/local/www/status_wireless.php
index 4211a4e..4bcae6c 100644
--- a/src/usr/local/www/status_wireless.php
+++ b/src/usr/local/www/status_wireless.php
@@ -112,7 +112,7 @@ display_top_tabs($tab_array);
 ?>
 
 <div class="panel panel-default">
-	<div class="panel-heading"><h2 class="panel-title"><?=gettext("Nearby access points or ad-hoc peers")?></h2></div>
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext("Nearby Access Points or Ad-Hoc Peers")?></h2></div>
 	<div class="panel-body">
 		<div class="table-responsive">
 			<table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable>
@@ -181,7 +181,7 @@ display_top_tabs($tab_array);
 </div>
 
 <div class="panel panel-default">
-	<div class="panel-heading"><h2 class="panel-title"><?=gettext("Associated or ad-hoc peers")?></h2></div>
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext("Associated or Ad-Hoc Peers")?></h2></div>
 	<div class="panel-body">
 		<div class="table-responsive">
 			<table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable>
diff --git a/src/usr/local/www/system.php b/src/usr/local/www/system.php
index 69d3069..0cd77e7 100644
--- a/src/usr/local/www/system.php
+++ b/src/usr/local/www/system.php
@@ -501,7 +501,7 @@ $section->addInput(new Form_Select(
 	'Theme',
 	$pconfig['webguicss'],
 	$csslist
-))->setHelp('Choose an alternative css file (if installed) to change the appearance of the Web configurator. css files are located in /usr/local/www/bootstrap/css');
+))->setHelp('Choose an alternative css file (if installed) to change the appearance of the WebConfigurator. css files are located in /usr/local/www/bootstrap/css');
 
 $section->addInput(new Form_Select(
 	'webguifixedmenu',
diff --git a/src/usr/local/www/system_advanced_firewall.php b/src/usr/local/www/system_advanced_firewall.php
index f831959..c3a3fd2 100644
--- a/src/usr/local/www/system_advanced_firewall.php
+++ b/src/usr/local/www/system_advanced_firewall.php
@@ -679,7 +679,7 @@ if (count($config['interfaces']) > 1) {
 	$form->add($section);
 }
 
-$section = new Form_Section('State Timeouts in seconds. (Leave blank for default)');
+$section = new Form_Section('State Timeouts in Seconds. (Leave blank for default)');
 
 $tcpTimeouts = array('First', 'Opening', 'Established', 'Closing', 'FIN Wait', 'Closed');
 foreach ($tcpTimeouts as $name) {
diff --git a/src/usr/local/www/system_advanced_misc.php b/src/usr/local/www/system_advanced_misc.php
index 5c937f7..f93d735 100644
--- a/src/usr/local/www/system_advanced_misc.php
+++ b/src/usr/local/www/system_advanced_misc.php
@@ -322,7 +322,7 @@ $tab_array[] = array(gettext("Notifications"), false, "system_advanced_notificat
 display_top_tabs($tab_array);
 
 $form = new Form;
-$section = new Form_Section('Proxy support');
+$section = new Form_Section('Proxy Support');
 
 $section->addInput(new Form_Input(
 	'proxyurl',
@@ -395,7 +395,7 @@ $section->addInput(new Form_Checkbox(
 	'most all scenarios, which instead use gateway groups.');
 
 $form->add($section);
-$section = new Form_Section('Power savings');
+$section = new Form_Section('Power Savings');
 
 $section->addInput(new Form_Checkbox(
 	'powerd_enable',
@@ -561,7 +561,7 @@ $section->addInput(new Form_Input(
 $form->add($section);
 
 if ($g['platform'] == "pfSense") {
-	$section = new Form_Section('Hardware settings');
+	$section = new Form_Section('Hardware Settings');
 
 	$opts = array(0.5,  1, 2,  3,  4,  5,  7.5,  10,  15,  20,  30,  60);
 	$vals = array(  6, 12, 24, 36, 48, 60,  90, 120, 180, 240, 241, 242);
diff --git a/src/usr/local/www/system_authservers.php b/src/usr/local/www/system_authservers.php
index 1171c7e..8f22868 100644
--- a/src/usr/local/www/system_authservers.php
+++ b/src/usr/local/www/system_authservers.php
@@ -450,7 +450,7 @@ $form->addGlobal(new Form_Input(
 	$id
 ));
 
-$section = new Form_Section('Server settings');
+$section = new Form_Section('Server Settings');
 
 $section->addInput($input = new Form_Input(
 	'name',
@@ -689,7 +689,7 @@ $section->addInput(new Form_Checkbox(
 $form->add($section);
 
 // ==== RADIUS section ========================================================
-$section = new Form_Section('Radius Server Settings');
+$section = new Form_Section('RADIUS Server Settings');
 $section->addClass('toggle-radius collapse');
 
 $section->addInput(new Form_Input(
diff --git a/src/usr/local/www/system_camanager.php b/src/usr/local/www/system_camanager.php
index d81ce00..e184779 100644
--- a/src/usr/local/www/system_camanager.php
+++ b/src/usr/local/www/system_camanager.php
@@ -489,7 +489,7 @@ if ($act == "edit") {
 	));
 }
 
-$section = new Form_Section('Create / edit CA');
+$section = new Form_Section('Create / Edit CA');
 
 $section->addInput(new Form_Input(
 	'descr',
diff --git a/src/usr/local/www/system_certmanager.php b/src/usr/local/www/system_certmanager.php
index d9cd26b..2544407 100644
--- a/src/usr/local/www/system_certmanager.php
+++ b/src/usr/local/www/system_certmanager.php
@@ -650,7 +650,7 @@ if (isset($id) && $a_cert[$id]) {
 	));
 }
 
-$section = new Form_Section('Add a new certificate');
+$section = new Form_Section('Add a New Certificate');
 
 if (!isset($id)) {
 	$section->addInput(new Form_Select(
@@ -950,7 +950,7 @@ print $form;
 		'Update'
 	));
 
-	$section = new Form_Section("Complete signing request for " . $pconfig['descr']);
+	$section = new Form_Section("Complete Signing Request for " . $pconfig['descr']);
 
 	$section->addInput(new Form_Input(
 		'descr',
diff --git a/src/usr/local/www/system_crlmanager.php b/src/usr/local/www/system_crlmanager.php
index 650ea20..040e7f5 100644
--- a/src/usr/local/www/system_crlmanager.php
+++ b/src/usr/local/www/system_crlmanager.php
@@ -377,7 +377,7 @@ if ($act == "new" || $act == gettext("Save") || $input_errors) {
 	if (!isset($id)) {
 		$form = new Form();
 
-		$section = new Form_Section('Create new revocation list');
+		$section = new Form_Section('Create new Revocation List');
 
 		$section->addInput(new Form_Select(
 			'method',
@@ -550,7 +550,7 @@ if ($act == "new" || $act == gettext("Save") || $input_errors) {
 	if (count($ca_certs) == 0) {
 		print_info_box(gettext("No Certificates Found for this CA."), 'danger');
 	} else {
-		$section = new Form_Section('Choose a certificate to revoke');
+		$section = new Form_Section('Choose a Certificate to Revoke');
 		$group = new Form_Group(null);
 
 		$group->add(new Form_Select(
diff --git a/src/usr/local/www/system_gateway_groups_edit.php b/src/usr/local/www/system_gateway_groups_edit.php
index 8da6bc5..63a7f6e 100644
--- a/src/usr/local/www/system_gateway_groups_edit.php
+++ b/src/usr/local/www/system_gateway_groups_edit.php
@@ -220,7 +220,7 @@ if ($input_errors) {
 
 $form = new Form();
 
-$section = new Form_Section('Edit gateway group entry');
+$section = new Form_Section('Edit Gateway Group Entry');
 
 $section->addInput(new Form_Input(
 	'name',
diff --git a/src/usr/local/www/system_gateways_edit.php b/src/usr/local/www/system_gateways_edit.php
index f6b3c2a..9889019 100644
--- a/src/usr/local/www/system_gateways_edit.php
+++ b/src/usr/local/www/system_gateways_edit.php
@@ -672,7 +672,7 @@ $form->addGlobal(new Form_Input(
 	$pconfig['friendlyiface']
 ));
 
-$section = new Form_Section('Edit gateway');
+$section = new Form_Section('Edit Gateway');
 
 $section->addInput(new Form_Checkbox(
 	'disabled',
diff --git a/src/usr/local/www/system_groupmanager.php b/src/usr/local/www/system_groupmanager.php
index cf60b3d..4ae3170 100644
--- a/src/usr/local/www/system_groupmanager.php
+++ b/src/usr/local/www/system_groupmanager.php
@@ -359,7 +359,7 @@ if (isset($id) && $a_group[$id]){
 	));
 }
 
-$section = new Form_Section('Group properties');
+$section = new Form_Section('Group Properties');
 
 if ($_GET['act'] != "new") {
 	$section->addInput(new Form_StaticText(
diff --git a/src/usr/local/www/system_groupmanager_addprivs.php b/src/usr/local/www/system_groupmanager_addprivs.php
index 2c49e26..a9daa47 100644
--- a/src/usr/local/www/system_groupmanager_addprivs.php
+++ b/src/usr/local/www/system_groupmanager_addprivs.php
@@ -200,7 +200,7 @@ if (isset($groupid)) {
 	));
 }
 
-$section = new Form_Section('Add privileges for '. $a_group['name']);
+$section = new Form_Section('Add Privileges for '. $a_group['name']);
 
 $section->addInput(new Form_Select(
 	'sysprivs',
diff --git a/src/usr/local/www/system_routes_edit.php b/src/usr/local/www/system_routes_edit.php
index d9ac2c6..aacf260 100644
--- a/src/usr/local/www/system_routes_edit.php
+++ b/src/usr/local/www/system_routes_edit.php
@@ -273,7 +273,7 @@ if (isset($id) && $a_routes[$id]) {
 	));
 }
 
-$section = new Form_Section('Edit route entry');
+$section = new Form_Section('Edit Route Entry');
 
 $section->addInput(new Form_IpAddress(
 	'network',
diff --git a/src/usr/local/www/system_usermanager.php b/src/usr/local/www/system_usermanager.php
index 03daafa..91cc4f6 100644
--- a/src/usr/local/www/system_usermanager.php
+++ b/src/usr/local/www/system_usermanager.php
@@ -753,7 +753,7 @@ if ($act == "new" || $act == "edit" || $input_errors):
 		$form->add($section);
 
 		// ==== Certificate table section =====================================
-		$section = new Form_Section('User certificates');
+		$section = new Form_Section('User Certificates');
 
 		$section->addInput(new Form_StaticText(
 			null,
@@ -765,7 +765,7 @@ if ($act == "new" || $act == "edit" || $input_errors):
 
 	// ==== Add user certificate for a new user
 	if (is_array($config['ca']) && count($config['ca']) > 0) {
-		$section = new Form_Section('Create certificate for user');
+		$section = new Form_Section('Create Certificate for User');
 		$section->addClass('cert-options');
 
 		$nonPrvCas = array();
diff --git a/src/usr/local/www/system_usermanager_addprivs.php b/src/usr/local/www/system_usermanager_addprivs.php
index 6e377d5..5811673 100644
--- a/src/usr/local/www/system_usermanager_addprivs.php
+++ b/src/usr/local/www/system_usermanager_addprivs.php
@@ -177,7 +177,7 @@ display_top_tabs($tab_array);
 
 $form = new Form();
 
-$section = new Form_Section('User privileges');
+$section = new Form_Section('User Privileges');
 
 $section->addInput(new Form_Select(
 	'sysprivs',
diff --git a/src/usr/local/www/vpn_ipsec.php b/src/usr/local/www/vpn_ipsec.php
index ad61821..1d8d5c1 100644
--- a/src/usr/local/www/vpn_ipsec.php
+++ b/src/usr/local/www/vpn_ipsec.php
@@ -272,7 +272,7 @@ display_top_tabs($tab_array);
 
 <form name="mainform" method="post">
 	<div class="panel panel-default">
-		<div class="panel-heading"><h2 class="panel-title"><?=gettext('IPsec tunnels')?></h2></div>
+		<div class="panel-heading"><h2 class="panel-title"><?=gettext('IPsec Tunnels')?></h2></div>
 		<div class="panel-body table-responsive">
 			<table class="table table-striped table-hover">
 				<thead>
diff --git a/src/usr/local/www/vpn_ipsec_keys_edit.php b/src/usr/local/www/vpn_ipsec_keys_edit.php
index b07a0a8..33a8faa 100644
--- a/src/usr/local/www/vpn_ipsec_keys_edit.php
+++ b/src/usr/local/www/vpn_ipsec_keys_edit.php
@@ -165,7 +165,7 @@ include("head.inc");
 
 $form = new Form;
 
-$section = new Form_Section('Edit pre-shared-secret');
+$section = new Form_Section('Edit Pre-Shared-Secret');
 
 $section->addInput(new Form_Input(
 	'ident',
diff --git a/src/usr/local/www/vpn_ipsec_phase1.php b/src/usr/local/www/vpn_ipsec_phase1.php
index 85d50b0..f94587a 100644
--- a/src/usr/local/www/vpn_ipsec_phase1.php
+++ b/src/usr/local/www/vpn_ipsec_phase1.php
@@ -723,7 +723,7 @@ $section->addInput(new Form_Input(
 
 $form->add($section);
 
-$section = new Form_Section('Phase 1 proposal (Authentication)');
+$section = new Form_Section('Phase 1 Proposal (Authentication)');
 
 $section->addInput(new Form_Select(
 	'authentication_method',
@@ -803,7 +803,7 @@ $section->addInput(new Form_Select(
 
 $form->add($section);
 
-$section = new Form_Section('Phase 1 proposal (Algorithms)');
+$section = new Form_Section('Phase 1 Proposal (Algorithms)');
 
 $group = new Form_Group('Encryption Algorithm');
 
diff --git a/src/usr/local/www/vpn_ipsec_phase2.php b/src/usr/local/www/vpn_ipsec_phase2.php
index e214e11..20e033e 100644
--- a/src/usr/local/www/vpn_ipsec_phase2.php
+++ b/src/usr/local/www/vpn_ipsec_phase2.php
@@ -623,7 +623,7 @@ $section->addInput(new Form_Input(
 
 $form->add($section);
 
-$section = new Form_Section('Phase 2 proposal (SA/Key Exchange)');
+$section = new Form_Section('Phase 2 Proposal (SA/Key Exchange)');
 
 $section->addInput(new Form_Select(
 	'proto',
diff --git a/src/usr/local/www/vpn_ipsec_settings.php b/src/usr/local/www/vpn_ipsec_settings.php
index 03c44d5..768e7c9 100644
--- a/src/usr/local/www/vpn_ipsec_settings.php
+++ b/src/usr/local/www/vpn_ipsec_settings.php
@@ -271,7 +271,7 @@ display_top_tabs($tab_array);
 
 $form = new Form;
 
-$section = new Form_Section('Start IPsec in debug mode based on sections selected');
+$section = new Form_Section('Start IPsec in Debug Mode Based on Sections Selected');
 
 foreach ($ipsec_log_cats as $cat => $desc) {
 	$section->addInput(new Form_Select(
diff --git a/src/usr/local/www/vpn_openvpn_client.php b/src/usr/local/www/vpn_openvpn_client.php
index abd52fb..3b9ae7e 100644
--- a/src/usr/local/www/vpn_openvpn_client.php
+++ b/src/usr/local/www/vpn_openvpn_client.php
@@ -553,7 +553,7 @@ if ($act=="new" || $act=="edit"):
 	))->setHelp('You may enter a description here for your reference (not parsed).');
 
 	$form->add($section);
-	$section = new Form_Section('User Authentication settings');
+	$section = new Form_Section('User Authentication Settings');
 	$section->addClass('authentication');
 
 	$section->addInput(new Form_Input(
@@ -572,7 +572,7 @@ if ($act=="new" || $act=="edit"):
 
 	$form->add($section);
 
-	$section = new Form_Section('Cryptographic settings');
+	$section = new Form_Section('Cryptographic Settings');
 
 	$section->addInput(new Form_Checkbox(
 		'tlsauth_enable',
@@ -674,7 +674,7 @@ if ($act=="new" || $act=="edit"):
 
 	$form->add($section);
 
-	$section = new Form_Section('Tunnel settings');
+	$section = new Form_Section('Tunnel Settings');
 
 	$section->addInput(new Form_Input(
 		'tunnel_network',
diff --git a/src/usr/local/www/vpn_openvpn_csc.php b/src/usr/local/www/vpn_openvpn_csc.php
index 46639c0..10d7ade 100644
--- a/src/usr/local/www/vpn_openvpn_csc.php
+++ b/src/usr/local/www/vpn_openvpn_csc.php
@@ -379,7 +379,7 @@ if ($act == "new" || $act == "edit"):
 
 	$form->add($section);
 
-	$section = new Form_Section('Tunnel settings');
+	$section = new Form_Section('Tunnel Settings');
 
 	$section->addInput(new Form_Input(
 		'tunnel_network',
@@ -432,7 +432,7 @@ if ($act == "new" || $act == "edit"):
 
 	$form->add($section);
 
-	$section = new Form_Section('Client settings');
+	$section = new Form_Section('Client Settings');
 
 	// Default domain name
 	$section->addInput(new Form_Checkbox(
diff --git a/src/usr/local/www/vpn_openvpn_server.php b/src/usr/local/www/vpn_openvpn_server.php
index 26fbe2a..da65de9 100644
--- a/src/usr/local/www/vpn_openvpn_server.php
+++ b/src/usr/local/www/vpn_openvpn_server.php
@@ -694,7 +694,7 @@ if ($act=="new" || $act=="edit"):
 
 	$form->add($section);
 
-	$section = new Form_Section('Cryptographic settings');
+	$section = new Form_Section('Cryptographic Settings');
 
 	$section->addInput(new Form_Checkbox(
 		'tlsauth_enable',
@@ -837,7 +837,7 @@ if ($act=="new" || $act=="edit"):
 
 	$form->add($section);
 
-	$section = new Form_Section('Tunnel settings');
+	$section = new Form_Section('Tunnel Settings');
 
 	$section->addInput(new Form_Input(
 		'tunnel_network',
diff --git a/src/usr/local/www/wizards/openvpn_wizard.xml b/src/usr/local/www/wizards/openvpn_wizard.xml
index 8eee453..21220d8 100644
--- a/src/usr/local/www/wizards/openvpn_wizard.xml
+++ b/src/usr/local/www/wizards/openvpn_wizard.xml
@@ -56,7 +56,7 @@
 					<value>ldap</value>
 				</option>
 				<option>
-					<name>Radius</name>
+					<name>RADIUS</name>
 					<value>radius</value>
 				</option>
 			</options>