5 files changed, 7 insertions, 13 deletions
diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php
index 102694cd..6764bbf7 100644
--- a/web/template/pkg_details.php
+++ b/web/template/pkg_details.php
@@ -70,7 +70,7 @@ $out_of_date_time = ($row["OutOfDateTS"] == 0) ? $msg : gmdate("Y-m-d", intval($
 
 ?>
 <div class="pgbox">
-	<div class="pgboxtitle"><span class="f3"><?php echo __("Package Details") ?></span></div>
+	<h2><?php echo __("Package Details") . ': ' . htmlspecialchars($row['Name']) . ' ' . htmlspecialchars($row['Version']) ?></h2>
 	<div class="pgboxbody">
 
 	<p>
diff --git a/web/template/pkg_search_form.php b/web/template/pkg_search_form.php
index 53d34fe3..3e291e13 100644
--- a/web/template/pkg_search_form.php
+++ b/web/template/pkg_search_form.php
@@ -2,8 +2,8 @@
 
 <div class='pgbox'>
 <form action='packages.php' method='get'>
-<div class='pgboxtitle'>
-	<span class='f3'><?php print __("Search Criteria"); ?></span>
+<h2><?php print __("Search Criteria"); ?></h2>
+<div>
 	<input type='hidden' name='O' value='0' />
 	<input type='text' name='K' size='30' value="<?php if (isset($_REQUEST["K"])) { print stripslashes(trim(htmlspecialchars($_REQUEST["K"], ENT_QUOTES))); } ?>" maxlength='35' />
 	<input type='submit' style='min-width:80px' class='button' name='do_Search' value='<?php print __("Go"); ?>' />
diff --git a/web/template/pkg_search_results.php b/web/template/pkg_search_results.php
index 8ef352b0..209a80d4 100644
--- a/web/template/pkg_search_results.php
+++ b/web/template/pkg_search_results.php
@@ -5,9 +5,7 @@
 <?php } else { ?>
 	<form action='packages.php?<?php echo htmlentities($_SERVER['QUERY_STRING']) ?>' method='post'>
 		<div class="pgbox">
-			<div class="pgboxtitle">
-				<span class='f3'><?php print __("Package Listing") ?></span>
-			</div>
+			<h2><?php print __("Package Listing") ?></h2>
 
 
 
diff --git a/web/template/tu_details.php b/web/template/tu_details.php
index 52a86561..45c7f9a9 100644
--- a/web/template/tu_details.php
+++ b/web/template/tu_details.php
@@ -1,5 +1,5 @@
 <div class="pgbox">
-<div class="pgboxtitle"><span class="f3"><?php print __("Proposal Details") ?></span></div>
+<h2><?php print __("Proposal Details") ?></h2>
 <div class="pgboxbody">
 <?php
 if ($isrunning == 1) { ?>
@@ -51,9 +51,7 @@ N/A
 <?php
 if (!$isrunning) { ?>
 <div class="pgbox">
-	<div class="pgboxtitle">
-	<span class="f3"><?php echo __('Voters'); ?></span>
-	</div>
+	<h2><?php echo __('Voters'); ?></h2>
 	<div class="pgboxbody">
 	<?php echo $whovoted; ?>
 	</div>
diff --git a/web/template/tu_list.php b/web/template/tu_list.php
index 16dd6901..7eb6f323 100644
--- a/web/template/tu_list.php
+++ b/web/template/tu_list.php
@@ -1,7 +1,5 @@
 <div class="pgbox">
-		<div class="pgboxtitle" style="text-align:right;">
-			<span class='f3'><?php print $type ?></span>
-		</div>
+	<h2><?php print $type ?></h2>
 			<table class='results'>
 				<tr>
 					<th class='header'><span class='f2'><?php print __("Proposal") ?></span></th>