diff --git a/public_html/css/hpr.css b/public_html/css/hpr.css
index f11441c..bc923e3 100644
--- a/public_html/css/hpr.css
+++ b/public_html/css/hpr.css
@@ -474,20 +474,35 @@ fieldset > table td input[type="radio"] {
 #search form {
 	flex: 1 1 auto
 }
+#search fieldset {
+	padding-top: 1rem;
+}
+#search fieldset > legend {
+	font-weight: var(--default-header-x-font-weight);
+}
 #search fieldset > input {
-	width: initial;
+	width: 94%;
 }
 #search fieldset > input[type="submit"] {
 	background-color: var(--background-secondary);
 	color: var(--text-secondary);
+	width: 100%;
 }
 #search fieldset > input[type="submit"]:hover {
-	background-color: var(--link-secondary);
-	color: var(--background-secondary);
+	background-color: var(--link-primary-hover);
+	color: var(--background-primary);
+}
+#search fieldset > p {
+	margin-top: 0.5rem;
+	margin-bottom: 0.5rem;
 }
 .no-css {
 	display: none;
 }
+#tags .date {
+	margin:0;
+	font-size: 1rem;
+}
 #tags #tag_initial_letter_index {
 	columns: 3 auto;
 }
@@ -586,6 +601,12 @@ fieldset > table td input[type="radio"] {
 		margin-bottom: 1.0rem;
 		width: 100%;
 	}
+	#search fieldset > input {
+		width: 55%;
+	}
+	#search fieldset > input[type="submit"] {
+		width: 40%;
+	}
 	body > main {
 		padding: 0.25rem 2rem;
 	}
diff --git a/templates/content-search.tpl.html b/templates/content-search.tpl.html
index ba8fab1..d79205c 100644
--- a/templates/content-search.tpl.html
+++ b/templates/content-search.tpl.html
@@ -75,8 +75,8 @@ END %-->
 <!--% all_first = ['#','&#x0002E;','/','0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z'] %-->
 <header>
 	<hgroup>
-	<h1 class="title"><a id="TOP">Search by Tag</a></h1>
-	<p class="date">Page generated on <!--% date.format(date.now, format => '%Y-%m-%d at %H:%M:%S UTC', gmt => 1) %--></p>
+	<h1 id="TOP" class="title">Search by Tag</h1>
+	<p class="date">Generated on <!--% date.format(date.now, format => '%Y-%m-%d at %H:%M:%S UTC', gmt => 1) %--></p>
 	</hgroup>
 </header>
 	<p>This section summarises all of the tags currently used throughout the