diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index f3463a6b..390b3b65 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -1,5 +1,35 @@
 CHANGE LOG
 
+2014-03-22 by alderaan
+Forum search: Rename "Username" to "Posted by" and add an HTML5 placeholder for the "posted by" text box
+
+2014-03-22 by alderaan
+"ask the staff" tool: improve display of page header
+
+2014-03-22 by alderaan
+Use HTML5 input type "search" for text boxes in search forms
+
+2014-03-22 by alderaan
+Use HTML5's placeholder attribute for the "search inbox" text box
+
+2014-03-22 by alderaan
+Add class="label" to the form labels on the "create a user" page
+
+2014-03-22 by alderaan
+Add missing header for the "invite pool" staff tool page
+
+2014-03-22 by alderaan
+Remove duplicated "economic stats" link on /tools.php
+
+2014-03-22 by alderaan
+Use HTML5 input type "email" for forms that require email address input
+
+2014-03-22 by alderaan
+Move the text box for entering the target torrent group ID into the same row as its label
+
+2014-03-22 by alderaan
+Add a "release type" label for the drop-down menu when editing torrent groups
+
 2014-03-20 by alderaan
 Use class="wide_input_text" for the "extra log message" and "extra staff notes" text boxes on the Reports v2 and torrent deletion forms
 
diff --git a/sections/better/transcode.php b/sections/better/transcode.php
index 664f6eb1..0b542ce3 100644
--- a/sections/better/transcode.php
+++ b/sections/better/transcode.php
@@ -90,7 +90,7 @@
 				<td>
 					<input type="hidden" name="method" value="transcode" />
 					<input type="hidden" name="type" value="<?=$_GET['type']?>" />
-					<input type="text" name="search" size="60" value="<?=(!empty($_GET['search']) ? display_str($_GET['search']) : '')?>" />
+					<input type="search" name="search" size="60" value="<?=(!empty($_GET['search']) ? display_str($_GET['search']) : '')?>" />
 					&nbsp;
 					<input type="submit" value="Search" />
 				</td>
diff --git a/sections/better/transcode_beta.php b/sections/better/transcode_beta.php
index b6842f7a..33fd985e 100644
--- a/sections/better/transcode_beta.php
+++ b/sections/better/transcode_beta.php
@@ -255,7 +255,7 @@ function transcode_parse_groups($Groups) {
 			<tr>
 				<td class="label"><strong>Search</strong></td>
 				<td>
-					<input type="text" name="search" size="60" value="<?=(!empty($_GET['search']) ? display_str($_GET['search']) : '')?>" />
+					<input type="search" name="search" size="60" value="<?=(!empty($_GET['search']) ? display_str($_GET['search']) : '')?>" />
 				</td>
 			</tr>
 			<tr><td>&nbsp;</td><td><input type="submit" value="Search" /></td></tr>
diff --git a/sections/collages/browse.php b/sections/collages/browse.php
index 777b526f..7a27d7fc 100644
--- a/sections/collages/browse.php
+++ b/sections/collages/browse.php
@@ -178,7 +178,7 @@
 				<tr id="search_terms">
 					<td class="label">Search terms:</td>
 					<td>
-						<input type="text" name="search" size="70" value="<?=(!empty($_GET['search']) ? display_str($_GET['search']) : '')?>" />
+						<input type="search" name="search" size="70" value="<?=(!empty($_GET['search']) ? display_str($_GET['search']) : '')?>" />
 					</td>
 				</tr>
 				<tr id="tagfilter">
diff --git a/sections/forums/forum.php b/sections/forums/forum.php
index bd0f281e..c88d2ddc 100644
--- a/sections/forums/forum.php
+++ b/sections/forums/forum.php
@@ -101,7 +101,7 @@
 								<strong>Search for:</strong>
 							</td>
 							<td>
-								<input type="text" id="searchbox" name="search" size="70" />
+								<input type="search" id="searchbox" name="search" size="70" />
 							</td>
 						</tr>
 						<tr>
@@ -114,11 +114,13 @@
 							</td>
 						</tr>
 						<tr>
-							<td><strong>Username:</strong></td>
-							<td><input type="text" id="username" name="user" size="70" /></td>
+							<td><strong>Posted by:</strong></td>
+							<td><input type="search" id="username" name="user" placeholder="Username" size="70" /></td>
 						</tr>
 						<tr>
-							<td colspan="2" style="text-align: center;"><input type="submit" name="submit" value="Search" /></td>
+							<td colspan="2" style="text-align: center;">
+								<input type="submit" name="submit" value="Search" />
+							</td>
 						</tr>
 					</table>
 				</form>
diff --git a/sections/forums/search.php b/sections/forums/search.php
index dcc3dc5f..f21f512d 100644
--- a/sections/forums/search.php
+++ b/sections/forums/search.php
@@ -97,13 +97,13 @@
 			<tr>
 				<td><strong>Search for:</strong></td>
 				<td>
-					<input type="text" name="search" size="70" value="<?=display_str($Search)?>" />
+					<input type="search" name="search" size="70" value="<?=display_str($Search)?>" />
 				</td>
 			</tr>
 			<tr>
-				<td><strong>Username:</strong></td>
+				<td><strong>Posted by:</strong></td>
 				<td>
-					<input type="text" name="user" size="70" value="<?=display_str($User)?>" />
+					<input type="search" name="user" placeholder="Username" size="70" value="<?=display_str($User)?>" />
 				</td>
 			</tr>
 			<tr>
@@ -224,8 +224,8 @@
 			p.Body,
 			t.CreatedTime
 		FROM forums_posts AS p
-			JOIN forums_topics AS t ON t.ID=p.TopicID
-			JOIN forums AS f ON f.ID=t.ForumID
+			JOIN forums_topics AS t ON t.ID = p.TopicID
+			JOIN forums AS f ON f.ID = t.ForumID
 		WHERE " . Forums::user_forums_sql() . ' AND ';
 
 	//In tests, this is significantly faster than LOCATE
@@ -238,13 +238,13 @@
 	//$SQL .= "', p.Body) ";
 
 	if (isset($SearchForums)) {
-		$SQL.=" AND f.ID IN ($SearchForums)";
+		$SQL .= " AND f.ID IN ($SearchForums)";
 	}
 	if (isset($AuthorID)) {
-		$SQL.=" AND p.AuthorID='$AuthorID' ";
+		$SQL .= " AND p.AuthorID = '$AuthorID' ";
 	}
 	if (!empty($ThreadID)) {
-		$SQL.=" AND t.ID='$ThreadID' ";
+		$SQL .= " AND t.ID = '$ThreadID' ";
 	}
 	if (!empty($ThreadAfterDate)) {
 		$SQL .= " AND t.CreatedTime >= '$ThreadAfterDate'";
@@ -276,7 +276,7 @@
 			'',
 			t.CreatedTime
 		FROM forums_topics AS t
-			JOIN forums AS f ON f.ID=t.ForumID
+			JOIN forums AS f ON f.ID = t.ForumID
 		WHERE " . Forums::user_forums_sql() . ' AND ';
 	$SQL .= "t.Title LIKE '%";
 	$SQL .= implode("%' AND t.Title LIKE '%", $Words);
diff --git a/sections/forums/thread.php b/sections/forums/thread.php
index 3939d1bf..6eaa9f36 100644
--- a/sections/forums/thread.php
+++ b/sections/forums/thread.php
@@ -192,11 +192,11 @@
 					<table cellpadding="6" cellspacing="1" border="0" class="layout border">
 						<tr>
 							<td><strong>Search for:</strong></td>
-							<td><input type="text" id="searchbox" name="search" size="70" /></td>
+							<td><input type="search" id="searchbox" name="search" size="70" /></td>
 						</tr>
 						<tr>
-							<td><strong>Username:</strong></td>
-							<td><input type="text" id="username" name="user" size="70" /></td>
+							<td><strong>Posted by:</strong></td>
+							<td><input type="search" id="username" name="user" placeholder="Username" size="70" /></td>
 						</tr>
 						<tr>
 							<td colspan="2" style="text-align: center;">
diff --git a/sections/inbox/inbox.php b/sections/inbox/inbox.php
index f1c6aa1a..ec481fbd 100644
--- a/sections/inbox/inbox.php
+++ b/sections/inbox/inbox.php
@@ -91,9 +91,9 @@
 		<form class="search_form" name="<?=($Section === 'sentbox' ? 'sentbox' : 'inbox')?>" action="inbox.php" method="get" id="searchbox">
 			<div>
 				<input type="hidden" name="action" value="<?=$Section?>" />
-				<input type="radio" name="searchtype" value="user"<?=(empty($_GET['searchtype']) || $_GET['searchtype'] == 'user' ? ' checked="checked"' : '')?> /> User
-				<input type="radio" name="searchtype" value="subject"<?=(!empty($_GET['searchtype']) && $_GET['searchtype'] == 'subject' ? ' checked="checked"' : '')?> /> Subject
-				<input type="radio" name="searchtype" value="message"<?=(!empty($_GET['searchtype']) && $_GET['searchtype'] == 'message' ? ' checked="checked"' : '')?> /> Message
+				<input type="radio" name="searchtype" value="user"<?=(empty($_GET['searchtype']) || $_GET['searchtype'] === 'user' ? ' checked="checked"' : '')?> /> User
+				<input type="radio" name="searchtype" value="subject"<?=(!empty($_GET['searchtype']) && $_GET['searchtype'] === 'subject' ? ' checked="checked"' : '')?> /> Subject
+				<input type="radio" name="searchtype" value="message"<?=(!empty($_GET['searchtype']) && $_GET['searchtype'] === 'message' ? ' checked="checked"' : '')?> /> Message
 				<span style="float: right;">
 <?			// provide a temporary toggle for sorting PMs
 		$ToggleTitle = 'Temporary toggle switch for sorting PMs. To permanently change the sorting behavior, edit the setting in your profile.';
@@ -106,10 +106,7 @@
 <?		} ?>
 				</span>
 				<br />
-				<input type="text" name="search" value="<?=(!empty($_GET['search']) ? display_str($_GET['search']) : 'Search '.($Section === 'sentbox' ? 'Sentbox' : 'Inbox'))?>" style="width: 98%;"
-						onfocus="if (this.value == 'Search <?=($Section === 'sentbox' ? 'Sentbox' : 'Inbox')?>') { this.value = ''; }"
-						onblur="if (this.value == '') { this.value = 'Search <?=($Section === 'sentbox' ? 'Sentbox' : 'Inbox')?>'; }"
-				/>
+				<input type="search" name="search" placeholder="<?=(!empty($_GET['search']) ? display_str($_GET['search']) : 'Search '.($Section === 'sentbox' ? 'sentbox' : 'inbox'))?>" style="width: 98%;" />
 			</div>
 		</form>
 		<form class="manage_form" name="messages" action="inbox.php" method="post" id="messageform">
diff --git a/sections/log/index.php b/sections/log/index.php
index 02e1b2a4..6ca4d382 100644
--- a/sections/log/index.php
+++ b/sections/log/index.php
@@ -17,7 +17,7 @@
 				<tr>
 					<td class="label"><strong>Search for:</strong></td>
 					<td>
-						<input type="text" name="search" size="60"<?=(!empty($_GET['search']) ? ' value="'.display_str($_GET['search']).'"' : '')?> />
+						<input type="search" name="search" size="60"<?=(!empty($_GET['search']) ? ' value="'.display_str($_GET['search']).'"' : '')?> />
 						&nbsp;
 						<input type="submit" value="Search log" />
 					</td>
diff --git a/sections/login/recover_step1.php b/sections/login/recover_step1.php
index 77e4b965..ed366de4 100644
--- a/sections/login/recover_step1.php
+++ b/sections/login/recover_step1.php
@@ -14,8 +14,8 @@
 		An email will be sent to your email address with information on how to reset your password.<br /><br />
 		<table class="layout" cellpadding="2" cellspacing="1" border="0" align="center">
 			<tr valign="top">
-				<td align="right">Email&nbsp;</td>
-				<td align="left"><input type="text" name="email" id="email" class="inputtext" /></td>
+				<td align="right">Email address:&nbsp;</td>
+				<td align="left"><input type="email" name="email" id="email" class="inputtext" /></td>
 			</tr>
 			<tr>
 				<td colspan="2" align="right"><input type="submit" name="reset" value="Reset!" class="submit" /></td>
diff --git a/sections/questions/questions.php b/sections/questions/questions.php
index b6902bac..24f772fb 100644
--- a/sections/questions/questions.php
+++ b/sections/questions/questions.php
@@ -41,12 +41,8 @@
 ?>
 <div class="thin">
 	<div class="header">
-		<h2>
-			User Questions
-			<span style="float: right;">
-				<?=$TotalQuestions?> questions asked, <?=count($Questions)?> left to answer
-			</span>
-		</h2>
+		<h2>User Questions</h2>
+		<h3><?=number_format($TotalQuestions)?> questions asked; <?=number_format(count($Questions))?> left to answer</h3>
 	</div>
 	<div class="linkbox">
 		<a class="brackets" href="questions.php?action=answers">View staff answers</a>
diff --git a/sections/register/step1.php b/sections/register/step1.php
index 6713635e..4c370f74 100644
--- a/sections/register/step1.php
+++ b/sections/register/step1.php
@@ -26,9 +26,9 @@
 			</td>
 		</tr>
 		<tr valign="top">
-			<td align="right">Email&nbsp;</td>
+			<td align="right">Email address&nbsp;</td>
 			<td align="left">
-				<input type="text" name="email" id="email" class="inputtext" placeholder="Email" value="<?=(!empty($_REQUEST['email']) ? display_str($_REQUEST['email']) : (!empty($InviteEmail) ? display_str($InviteEmail) : ''))?>" />
+				<input type="email" name="email" id="email" class="inputtext" placeholder="Email" value="<?=(!empty($_REQUEST['email']) ? display_str($_REQUEST['email']) : (!empty($InviteEmail) ? display_str($InviteEmail) : ''))?>" />
 			</td>
 		</tr>
 		<tr valign="top">
diff --git a/sections/requests/requests.php b/sections/requests/requests.php
index 4211b86c..34d107d0 100644
--- a/sections/requests/requests.php
+++ b/sections/requests/requests.php
@@ -376,13 +376,13 @@
 			<tr id="search_terms">
 				<td class="label">Search terms:</td>
 				<td>
-					<input type="text" name="search" size="75" value="<? if (isset($_GET['search'])) { echo display_str($_GET['search']); } ?>" />
+					<input type="search" name="search" size="75" value="<? if (isset($_GET['search'])) { echo display_str($_GET['search']); } ?>" />
 				</td>
 			</tr>
 			<tr id="tagfilter">
 				<td class="label">Tags (comma-separated):</td>
 				<td>
-					<input type="text" name="tags" id="tags" size="60" value="<?=(!empty($TagNames) ? display_str(implode(', ', $TagNames)) : '') ?>"<? Users::has_autocomplete_enabled('other'); ?> />&nbsp;
+					<input type="search" name="tags" id="tags" size="60" value="<?=(!empty($TagNames) ? display_str(implode(', ', $TagNames)) : '') ?>"<? Users::has_autocomplete_enabled('other'); ?> />&nbsp;
 					<input type="radio" name="tags_type" id="tags_type0" value="0"<? Format::selected('tags_type', 0, 'checked')?> /><label for="tags_type0"> Any</label>&nbsp;&nbsp;
 					<input type="radio" name="tags_type" id="tags_type1" value="1"<? Format::selected('tags_type', 1, 'checked')?> /><label for="tags_type1"> All</label>
 				</td>
@@ -403,7 +403,7 @@
 			<tr>
 				<td class="label">Requested by:</td>
 				<td>
-					<input type="text" name="requester" size="75" value="<?=display_str($_GET['requester'])?>" />
+					<input type="search" name="requester" size="75" value="<?=display_str($_GET['requester'])?>" />
 				</td>
 			</tr>
 <?		*/ ?>
diff --git a/sections/tools/data/invite_pool.php b/sections/tools/data/invite_pool.php
index 9413fe3d..a639277c 100644
--- a/sections/tools/data/invite_pool.php
+++ b/sections/tools/data/invite_pool.php
@@ -2,7 +2,8 @@
 if (!check_perms('users_view_invites')) {
 	error(403);
 }
-View::show_header('Invite Pool');
+$Title = 'Invite Pool';
+View::show_header($Title);
 define('INVITES_PER_PAGE', 50);
 list($Page, $Limit) = Format::page_limit(INVITES_PER_PAGE);
 
@@ -44,6 +45,9 @@
 
 $DB->set_query_id($RS);
 ?>
+	<div class="header">
+		<h2><?=$Title?></h2>
+	</div>
 	<div class="box pad">
 		<p><?=number_format($Results)?> unused invites have been sent.</p>
 	</div>
@@ -52,10 +56,10 @@
 		<form class="search_form" name="invites" action="" method="get">
 			<table cellpadding="6" cellspacing="1" border="0" class="layout border" width="100%">
 				<tr>
-					<td class="label"><strong>Email:</strong></td>
+					<td class="label"><strong>Email address:</strong></td>
 					<td>
 						<input type="hidden" name="action" value="invite_pool" />
-						<input type="text" name="search" size="60" value="<?=display_str($Search)?>" />
+						<input type="email" name="search" size="60" value="<?=display_str($Search)?>" />
 						&nbsp;
 						<input type="submit" value="Search log" />
 					</td>
@@ -72,8 +76,8 @@
 	<table width="100%">
 		<tr class="colhead">
 			<td>Inviter</td>
-			<td>Email</td>
-			<td>IP</td>
+			<td>Email address</td>
+			<td>IP address</td>
 			<td>InviteCode</td>
 			<td>Expires</td>
 <? if (check_perms('users_edit_invites')) { ?>
diff --git a/sections/tools/development/render_base.html b/sections/tools/development/render_base.html
index 95ee6f57..32d5fbf6 100644
--- a/sections/tools/development/render_base.html
+++ b/sections/tools/development/render_base.html
@@ -76,9 +76,7 @@ <h4 class="hidden">Site Menu</h4>
 									id="torrentssearch"
 									accesskey="t"
 									spellcheck="false"
-									onfocus="if (this.value == 'Torrents') this.value='';"
-									onblur="if (this.value == '') this.value='Torrents';"
-									value="Torrents" type="text" name="searchstr" size="17"
+									placeholder="Torrents" type="search" name="searchstr" size="17"
 									/>
 							</form>
 						</li>
@@ -86,39 +84,38 @@ <h4 class="hidden">Site Menu</h4>
 							<span class="hidden">Artist: </span>
 							<form class="search_form" name="artists" action="" method="get">
 								<script type="text/javascript" src="static/functions/autocomplete.js?v=1362029969"></script>
-								<input id="artistsearch" value="Artists" type="text" name="artistname" size="17"/>
+								<input id="artistsearch" placeholder="Artists" type="search" name="artistname" size="17" />
 								<ul id="artistcomplete" style="visibility: hidden;"><li /></ul>
 							</form>
 						</li>
 						<li id="searchbar_requests">
 							<span class="hidden">Requests: </span>
 							<form class="search_form" name="requests" action="" method="get">
-								<input id="requestssearch" value="Requests" type="text" name="search" size="17"/>
+								<input id="requestssearch" placeholder="Requests" type="search" name="search" size="17" />
 							</form>
 						</li>
 						<li id="searchbar_forums">
 							<span class="hidden">Forums: </span>
 							<form class="search_form" name="forums" action="" method="get">
 								<input value="search" type="hidden" name="action" />
-								<input id="forumssearch" value="Forums" type="text" name="search" size="17"/>
+								<input id="forumssearch" placeholder="Forums" type="search" name="search" size="17" />
 							</form>
 						</li>
 						<li id="searchbar_log">
 							<span class="hidden">Log: </span>
 							<form class="search_form" name="log" action="" method="get">
-								<input id="logsearch" value="Log" type="text" name="search" size="17"/>
+								<input id="logsearch" placeholder="Log" type="search" name="search" size="17" />
 							</form>
 						</li>
 						<li id="searchbar_users">
 							<span class="hidden">Users: </span>
 							<form class="search_form" name="users" action="" method="get">
 								<input type="hidden" name="action" value="search" />
-								<input id="userssearch" value="Users" type="text" name="search" size="20"/>
+								<input id="userssearch" placeholder="Users" type="search" name="search" size="20" />
 							</form>
 						</li>
 					</ul>
 				</div>
-
 			</div>
 			<div id="content">
 				<div class="thin">
diff --git a/sections/tools/finances/donation_log.php b/sections/tools/finances/donation_log.php
index a14743f8..ad407f6e 100644
--- a/sections/tools/finances/donation_log.php
+++ b/sections/tools/finances/donation_log.php
@@ -106,19 +106,19 @@
 			<tr>
 				<td class="label"><strong>Username:</strong></td>
 				<td>
-					<input type="text" name="username" size="60" value="<? if (!empty($_GET['username'])) { echo display_str($_GET['username']); } ?>" />
+					<input type="search" name="username" size="60" value="<? if (!empty($_GET['username'])) { echo display_str($_GET['username']); } ?>" />
 				</td>
 			</tr>
 			<tr>
 				<td class="label"><strong>Email:</strong></td>
 				<td>
-					<input type="text" name="email" size="60" value="<? if (!empty($_GET['email'])) { echo display_str($_GET['email']); } ?>" />
+					<input type="search" name="email" size="60" value="<? if (!empty($_GET['email'])) { echo display_str($_GET['email']); } ?>" />
 				</td>
 			</tr>
 			<tr>
 				<td class="label"><strong>Source:</strong></td>
 				<td>
-					<input type="text" name="source" size="60" value="<? if (!empty($_GET['source'])) { echo display_str($_GET['source']); } ?>" />
+					<input type="search" name="source" size="60" value="<? if (!empty($_GET['source'])) { echo display_str($_GET['source']); } ?>" />
 				</td>
 			</tr>
 			<tr>
diff --git a/sections/tools/finances/donor_rewards.php b/sections/tools/finances/donor_rewards.php
index 031b0779..fbafe52f 100644
--- a/sections/tools/finances/donor_rewards.php
+++ b/sections/tools/finances/donor_rewards.php
@@ -50,7 +50,8 @@
 
 <form action="" method="get">
 	<input type="hidden" name="action" value="donor_rewards" />
-	<strong>Username Search: </strong><input type="text" name="username" />
+	<strong>Username Search: </strong>
+	<input type="search" name="username" />
 </form>
 	<table style="table-layout: fixed; width: 100%;">
 		<tr class="colhead">
diff --git a/sections/tools/managers/bans.php b/sections/tools/managers/bans.php
index 24b1aca8..efb44f85 100644
--- a/sections/tools/managers/bans.php
+++ b/sections/tools/managers/bans.php
@@ -95,12 +95,12 @@
 				<td class="label"><label for="ip">IP address:</label></td>
 				<td>
 					<input type="hidden" name="action" value="ip_ban" />
-					<input type="text" id="ip" name="ip" size="20" value="<?=(!empty($_GET['ip']) ? display_str($_GET['ip']) : '')?>" />
+					<input type="search" id="ip" name="ip" size="20" value="<?=(!empty($_GET['ip']) ? display_str($_GET['ip']) : '')?>" />
 				</td>
 				<td class="label"><label for="notes">Notes:</label></td>
 				<td>
 					<input type="hidden" name="action" value="ip_ban" />
-					<input type="text" id="notes" name="notes" size="60" value="<?=(!empty($_GET['notes']) ? display_str($_GET['notes']) : '')?>" />
+					<input type="search" id="notes" name="notes" size="60" value="<?=(!empty($_GET['notes']) ? display_str($_GET['notes']) : '')?>" />
 				</td>
 				<td>
 					<input type="submit" value="Search" />
diff --git a/sections/tools/managers/email_blacklist.php b/sections/tools/managers/email_blacklist.php
index 2a4e68d9..ae0f4eac 100644
--- a/sections/tools/managers/email_blacklist.php
+++ b/sections/tools/managers/email_blacklist.php
@@ -42,8 +42,8 @@
 <br />
 <form action="tools.php" method="post">
 	<input type="hidden" name="action" value="email_blacklist" />
-	<input type="text" name="email" size="30" placeholder="Email" />
-	<input type="text" name="comment" size="60" placeholder="Comment" />
+	<input type="email" name="email" size="30" placeholder="Email" />
+	<input type="search" name="comment" size="60" placeholder="Comment" />
 	<input type="submit" value="Search" />
 </form>
 <div class="linkbox pager">
@@ -55,9 +55,9 @@
 </div>
 <table>
 	<tr class="colhead">
-		<td>Email</td>
+		<td>Email address</td>
 		<td>Comment</td>
-		<td>Added</td>
+		<td>Date added</td>
 		<td>Submit</td>
 	</tr>
 	<tr class="colhead">
@@ -81,7 +81,7 @@
 				<input type="hidden" name="action" value="email_blacklist_alter" />
 				<input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
 				<input type="hidden" name="id" value="<?=$Result['ID']?>" />
-				<input type="text" name="email" value="<?=display_str($Result['Email'])?>" size="30" />
+				<input type="email" name="email" value="<?=display_str($Result['Email'])?>" size="30" />
 			</td>
 			<td><input type="text" name="comment" value="<?=display_str($Result['Comment'])?>" size="60" /></td>
 			<td><?=Users::format_username($Result ['UserID'], false, false, false)?><br /><?=time_diff($Result ['Time'], 1)?></td>
diff --git a/sections/tools/managers/email_blacklist_alter.php b/sections/tools/managers/email_blacklist_alter.php
index 626f87fe..1637474b 100644
--- a/sections/tools/managers/email_blacklist_alter.php
+++ b/sections/tools/managers/email_blacklist_alter.php
@@ -5,15 +5,17 @@
 
 authorize();
 
-if ($_POST['submit'] == 'Delete') { // Delete
-	if (!is_number($_POST['id']) || $_POST['id'] == '') {
+if ($_POST['submit'] === 'Delete') { // Delete
+	if (!is_number($_POST['id']) || $_POST['id'] === '') {
 		error(0);
 	}
-	$DB->query('DELETE FROM email_blacklist WHERE ID='.$_POST['id']);
+	$DB->query("
+		DELETE FROM email_blacklist
+		WHERE ID = $_POST[id]");
 } else { // Edit & Create, Shared Validation
-	$Val->SetFields('email', '1','string','The email must be set', array('minlength'=>1));
-	$Val->SetFields('comment', '0','string','The description has a max length of 255 characters', array('maxlength'=>255));
-	$Err = $Val->ValidateForm($_POST); // Validate the form
+	$Val->SetFields('email', '1', 'string', 'The email must be set', array('minlength'=>1));
+	$Val->SetFields('comment', '0', 'string', 'The description has a max length of 255 characters', array('maxlength'=>255));
+	$Err = $Val->ValidateForm($_POST);
 	if ($Err) {
 		error($Err);
 	}
@@ -21,22 +23,22 @@
 	$P = array();
 	$P = db_array($_POST); // Sanitize the form
 
-	if ($_POST['submit'] == 'Edit') { // Edit
-		if (!is_number($_POST['id']) || $_POST['id'] == '') {
+	if ($_POST['submit'] === 'Edit') { // Edit
+		if (!is_number($_POST['id']) || $_POST['id'] === '') {
 			error(0);
 		}
 		$DB->query("
 			UPDATE email_blacklist
 			SET
-				Email='$P[email]',
-				Comment='$P[comment]',
-				UserID='$LoggedUser[ID]',
-				Time='".sqltime()."'
-			WHERE ID='$P[id]'");
+				Email = '$P[email]',
+				Comment = '$P[comment]',
+				UserID = '$LoggedUser[ID]',
+				Time = '".sqltime()."'
+			WHERE ID = '$P[id]'");
 	} else { // Create
 		$DB->query("
 			INSERT INTO email_blacklist (Email, Comment, UserID, Time)
-			VALUES ('$P[email]','$P[comment]','$LoggedUser[ID]','".sqltime()."')");
+			VALUES ('$P[email]', '$P[comment]', '$LoggedUser[ID]', '".sqltime()."')");
 	}
 }
 
diff --git a/sections/tools/misc/create_user.php b/sections/tools/misc/create_user.php
index f84a7d44..81dc2dc6 100644
--- a/sections/tools/misc/create_user.php
+++ b/sections/tools/misc/create_user.php
@@ -98,19 +98,21 @@
 		<input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
 		<table class="layout" cellpadding="2" cellspacing="1" border="0" align="center">
 			<tr valign="top">
-				<td align="right">Username&nbsp;</td>
+				<td align="right" class="label">Username:</td>
 				<td align="left"><input type="text" name="Username" id="username" class="inputtext" /></td>
 			</tr>
 			<tr valign="top">
-				<td align="right">Email&nbsp;</td>
-				<td align="left"><input type="text" name="Email" id="email" class="inputtext" /></td>
+				<td align="right" class="label">Email address:</td>
+				<td align="left"><input type="email" name="Email" id="email" class="inputtext" /></td>
 			</tr>
 			<tr valign="top">
-				<td align="right">Password&nbsp;</td>
+				<td align="right" class="label">Password:</td>
 				<td align="left"><input type="password" name="Password" id="password" class="inputtext" /></td>
 			</tr>
 			<tr>
-				<td colspan="2" align="right"><input type="submit" name="submit" value="Create User" class="submit" /></td>
+				<td colspan="2" align="right">
+					<input type="submit" name="submit" value="Create User" class="submit" />
+				</td>
 			</tr>
 		</table>
 	</form>
diff --git a/sections/tools/misc/dupe_ip.php b/sections/tools/misc/dupe_ip.php
index 26b620dd..22a36b0f 100644
--- a/sections/tools/misc/dupe_ip.php
+++ b/sections/tools/misc/dupe_ip.php
@@ -71,10 +71,11 @@
 <?	} ?>
 	</table>
 	<div class="linkbox">
-<? echo $Pages; ?>
+<?	echo $Pages; ?>
 	</div>
-<? } else { ?>
+<?	} else { ?>
 	<h2 align="center">There are currently no users with more than <?=IP_OVERLAPS?> IP overlaps.</h2>
-<? }
+<?
+	}
 View::show_footer();
 ?>
diff --git a/sections/tools/misc/manipulate_tree.php b/sections/tools/misc/manipulate_tree.php
index 61d9c388..e3038588 100644
--- a/sections/tools/misc/manipulate_tree.php
+++ b/sections/tools/misc/manipulate_tree.php
@@ -92,9 +92,9 @@
 		<table class="layout">
 			<tr>
 				<td class="label"><strong>UserID</strong></td>
-				<td><input type="text" size="10" name="id" id="id" /></td>
+				<td><input type="search" size="10" name="id" id="id" /></td>
 				<td class="label"><strong>Mandatory comment!</strong></td>
-				<td><input type="text" size="40" name="comment" id="comment" /></td>
+				<td><input type="search" size="40" name="comment" id="comment" /></td>
 			</tr>
 			<tr>
 				<td class="label"><strong>Action: </strong></td>
diff --git a/sections/tools/tools.php b/sections/tools/tools.php
index 9604a379..afdcdc68 100644
--- a/sections/tools/tools.php
+++ b/sections/tools/tools.php
@@ -178,7 +178,6 @@ function create_row($Title, $URL, $HasPermission = false, $Tooltip = false) {
 	// begin Site Information category
 	$ToolsHTML = "";
 	create_row("Economic stats", "tools.php?action=economic_stats", check_perms("site_view_flow"));
-	create_row("Economic stats", "tools.php?action=economic_stats", check_perms("site_view_flow"));
 
 	create_row("Invite pool", "tools.php?action=invite_pool", check_perms("users_view_invites"));
 	create_row("Registration log", "tools.php?action=registration_log", check_perms("users_view_ips") && check_perms("users_view_email"));
diff --git a/sections/torrents/browse.php b/sections/torrents/browse.php
index 33ba545e..8aeac711 100644
--- a/sections/torrents/browse.php
+++ b/sections/torrents/browse.php
@@ -642,29 +642,29 @@ function header_link($SortKey, $DefaultWay = 'desc') {
 			<tr id="artist_name" class="ftr_advanced<?=$HideAdvanced?>">
 				<td class="label">Artist name:</td>
 				<td colspan="3" class="ft_artistname">
-					<input type="text" spellcheck="false" size="40" name="artistname" class="inputtext smaller fti_advanced" value="<?Format::form('artistname')?>" />
+					<input type="search" spellcheck="false" size="40" name="artistname" class="inputtext smaller fti_advanced" value="<?Format::form('artistname')?>" />
 				</td>
 			</tr>
 			<tr id="album_torrent_name" class="ftr_advanced<?=$HideAdvanced?>">
 				<td class="label">Album/Torrent name:</td>
 				<td colspan="3" class="ft_groupname">
-					<input type="text" spellcheck="false" size="40" name="groupname" class="inputtext smaller fti_advanced" value="<?Format::form('groupname')?>" />
+					<input type="search" spellcheck="false" size="40" name="groupname" class="inputtext smaller fti_advanced" value="<?Format::form('groupname')?>" />
 				</td>
 			</tr>
 			<tr id="record_label" class="ftr_advanced<?=$HideAdvanced?>">
 				<td class="label">Record label:</td>
 				<td colspan="3" class="ft_recordlabel">
-					<input type="text" spellcheck="false" size="40" name="recordlabel" class="inputtext smaller fti_advanced" value="<?Format::form('recordlabel')?>" />
+					<input type="search" spellcheck="false" size="40" name="recordlabel" class="inputtext smaller fti_advanced" value="<?Format::form('recordlabel')?>" />
 				</td>
 			</tr>
 			<tr id="catalogue_number_year" class="ftr_advanced<?=$HideAdvanced?>">
 				<td class="label">Catalogue number:</td>
 				<td class="ft_cataloguenumber">
-					<input type="text" size="40" name="cataloguenumber" class="inputtext smallest fti_advanced" value="<?Format::form('cataloguenumber')?>" />
+					<input type="search" size="40" name="cataloguenumber" class="inputtext smallest fti_advanced" value="<?Format::form('cataloguenumber')?>" />
 				</td>
 				<td class="label">Year:</td>
 				<td class="ft_year">
-					<input type="text" name="year" class="inputtext smallest fti_advanced" value="<?Format::form('year')?>" size="4" />
+					<input type="search" name="year" class="inputtext smallest fti_advanced" value="<?Format::form('year')?>" size="4" />
 				</td>
 			</tr>
 			<tr id="edition_expand" class="ftr_advanced<?=$HideAdvanced?>">
@@ -684,35 +684,35 @@ function header_link($SortKey, $DefaultWay = 'desc') {
 			<tr id="edition_title" class="ftr_advanced<?=$HideAdvanced . $Hidden?>">
 				<td class="label">Edition title:</td>
 				<td class="ft_remastertitle">
-					<input type="text" spellcheck="false" size="40" name="remastertitle" class="inputtext smaller fti_advanced" value="<?Format::form('remastertitle')?>" />
+					<input type="search" spellcheck="false" size="40" name="remastertitle" class="inputtext smaller fti_advanced" value="<?Format::form('remastertitle')?>" />
 				</td>
 				<td class="label">Edition year:</td>
 				<td class="ft_remasteryear">
-					<input type="text" name="remasteryear" class="inputtext smallest fti_advanced" value="<?Format::form('remasteryear')?>" size="4" />
+					<input type="search" name="remasteryear" class="inputtext smallest fti_advanced" value="<?Format::form('remasteryear')?>" size="4" />
 				</td>
 			</tr>
 			<tr id="edition_label" class="ftr_advanced<?=$HideAdvanced . $Hidden?>">
 				<td class="label">Edition release label:</td>
 				<td colspan="3" class="ft_remasterrecordlabel">
-					<input type="text" spellcheck="false" size="40" name="remasterrecordlabel" class="inputtext smaller fti_advanced" value="<?Format::form('remasterrecordlabel')?>" />
+					<input type="search" spellcheck="false" size="40" name="remasterrecordlabel" class="inputtext smaller fti_advanced" value="<?Format::form('remasterrecordlabel')?>" />
 				</td>
 			</tr>
 			<tr id="edition_catalogue" class="ftr_advanced<?=$HideAdvanced . $Hidden?>">
 				<td class="label">Edition catalogue number:</td>
 				<td colspan="3" class="ft_remastercataloguenumber">
-					<input type="text" size="40" name="remastercataloguenumber" class="inputtext smallest fti_advanced" value="<?Format::form('remastercataloguenumber')?>" />
+					<input type="search" size="40" name="remastercataloguenumber" class="inputtext smallest fti_advanced" value="<?Format::form('remastercataloguenumber')?>" />
 				</td>
 			</tr>
 			<tr id="file_list" class="ftr_advanced<?=$HideAdvanced?>">
 				<td class="label">File list:</td>
 				<td colspan="3" class="ft_filelist">
-					<input type="text" spellcheck="false" size="40" name="filelist" class="inputtext fti_advanced" value="<?Format::form('filelist')?>" />
+					<input type="search" spellcheck="false" size="40" name="filelist" class="inputtext fti_advanced" value="<?Format::form('filelist')?>" />
 				</td>
 			</tr>
 			<tr id="torrent_description" class="ftr_advanced<?=$HideAdvanced?>">
 				<td class="label"><span title="Search torrent descriptions (not group information)" class="tooltip">Torrent description:</span></td>
 				<td colspan="3" class="ft_description">
-					<input type="text" spellcheck="false" size="40" name="description" class="inputtext fti_advanced" value="<?Format::form('description')?>" />
+					<input type="search" spellcheck="false" size="40" name="description" class="inputtext fti_advanced" value="<?Format::form('description')?>" />
 				</td>
 			</tr>
 			<tr id="rip_specifics" class="ftr_advanced<?=$HideAdvanced?>">
@@ -780,13 +780,13 @@ function header_link($SortKey, $DefaultWay = 'desc') {
 			<tr id="search_terms" class="ftr_basic<?=$HideBasic?>">
 				<td class="label">Search terms:</td>
 				<td colspan="3" class="ftb_searchstr">
-					<input type="text" spellcheck="false" size="40" name="searchstr" class="inputtext fti_basic" value="<?Format::form('searchstr')?>" />
+					<input type="search" spellcheck="false" size="40" name="searchstr" class="inputtext fti_basic" value="<?Format::form('searchstr')?>" />
 				</td>
 			</tr>
 			<tr id="tagfilter">
 				<td class="label"><span title="Use !tag to exclude tag" class="tooltip">Tags (comma-separated):</span></td>
 				<td colspan="3" class="ft_taglist">
-					<input type="text" size="40" id="tags" name="taglist" class="inputtext smaller" value="<?=str_replace('_', '.', display_str($TagListString)) /* Use aliased tags, not actual query string. */ ?>" />&nbsp;
+					<input type="search" size="40" id="tags" name="taglist" class="inputtext smaller" value="<?=str_replace('_', '.', display_str($TagListString)) /* Use aliased tags, not actual query string. */ ?>" />&nbsp;
 					<input type="radio" name="tags_type" id="tags_type0" value="0"<?Format::selected('tags_type', 0, 'checked')?> /><label for="tags_type0"> Any</label>&nbsp;&nbsp;
 					<input type="radio" name="tags_type" id="tags_type1" value="1"<?Format::selected('tags_type', 1, 'checked')?> /><label for="tags_type1"> All</label>
 				</td>
diff --git a/sections/torrents/editgroup.php b/sections/torrents/editgroup.php
index 37c4b512..d59d89fa 100644
--- a/sections/torrents/editgroup.php
+++ b/sections/torrents/editgroup.php
@@ -64,13 +64,14 @@
 				<h3>Torrent group description:</h3>
 				<textarea name="body" cols="91" rows="20"><?=$Body?></textarea><br />
 <?	if ($CategoryID == 1) { ?>
-				<select id="releasetype" name="releasetype">
+				<h3>Release type:
+					<select id="releasetype" name="releasetype">
 <?		foreach ($ReleaseTypes as $Key => $Val) { ?>
-					<option value="<?=$Key?>"<?=($Key == $ReleaseType ? ' selected="selected"' : '')?>><?=$Val?></option>
+						<option value="<?=$Key?>"<?=($Key == $ReleaseType ? ' selected="selected"' : '')?>><?=$Val?></option>
 <?		} ?>
-				</select>
+					</select>
+				</h3>
 <?		if (check_perms('torrents_edit_vanityhouse')) { ?>
-				<br />
 				<h3>
 					<label>Vanity House: <input type="checkbox" name="vanity_house" value="1" <?=($VanityHouse ? 'checked="checked" ' : '')?>/></label>
 				</h3>
@@ -167,8 +168,9 @@
 				<input type="hidden" name="action" value="merge" />
 				<input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
 				<input type="hidden" name="groupid" value="<?=$GroupID?>" />
-				<h3>Target torrent group ID</h3>
-				<input type="text" name="targetgroupid" size="10" />
+				<h3>Target torrent group ID:
+					<input type="text" name="targetgroupid" size="10" />
+				</h3>
 				<div style="text-align: center;">
 					<input type="submit" value="Merge" />
 				</div>
diff --git a/sections/torrents/user.php b/sections/torrents/user.php
index a95cfc99..f6c32626 100644
--- a/sections/torrents/user.php
+++ b/sections/torrents/user.php
@@ -346,7 +346,7 @@ function header_link($SortKey, $DefaultWay = 'DESC') {
 					<td>
 						<input type="hidden" name="type" value="<?=$_GET['type']?>" />
 						<input type="hidden" name="userid" value="<?=$UserID?>" />
-						<input type="text" name="search" size="60" value="<?Format::form('search')?>" />
+						<input type="search" name="search" size="60" value="<?Format::form('search')?>" />
 					</td>
 				</tr>
 				<tr>
@@ -409,7 +409,7 @@ function header_link($SortKey, $DefaultWay = 'DESC') {
 				<tr>
 					<td class="label"><strong>Tags:</strong></td>
 					<td>
-						<input type="text" name="tags" size="60" class="tooltip" title="Use !tag to exclude tag" value="<?Format::form('tags')?>" />&nbsp;
+						<input type="search" name="tags" size="60" class="tooltip" title="Use !tag to exclude tag" value="<?Format::form('tags')?>" />&nbsp;
 						<input type="radio" name="tags_type" id="tags_type0" value="0"<?Format::selected('tags_type', 0, 'checked')?> /><label for="tags_type0"> Any</label>&nbsp;&nbsp;
 						<input type="radio" name="tags_type" id="tags_type1" value="1"<?Format::selected('tags_type', 1, 'checked')?> /><label for="tags_type1"> All</label>
 					</td>
diff --git a/sections/user/advancedsearch.php b/sections/user/advancedsearch.php
index ce6a1ac1..e6ff785c 100644
--- a/sections/user/advancedsearch.php
+++ b/sections/user/advancedsearch.php
@@ -482,7 +482,7 @@ function num_compare($Field, $Operand, $Num1, $Num2 = '') {
 				</td>
 			</tr>
 			<tr>
-				<td class="label nobr">Email:</td>
+				<td class="label nobr">Email address:</td>
 				<td>
 					<input type="text" name="email" size="20" value="<?=display_str($_GET['email'])?>" />
 				</td>
diff --git a/sections/user/edit.php b/sections/user/edit.php
index bb44932f..3be8dc49 100644
--- a/sections/user/edit.php
+++ b/sections/user/edit.php
@@ -787,7 +787,7 @@ function checked($Checked) {
 				<td class="label tooltip" title="This is the email address you want associated with your <?=SITE_NAME?> account. It will be used if you forget your password or if an alert needs to be sent to you."><strong>Email address</strong></td>
 				<td>
 					<div class="field_div">
-						<input type="text" size="50" name="email" id="email" value="<?=display_str($Email)?>" />
+						<input type="email" size="50" name="email" id="email" value="<?=display_str($Email)?>" />
 					</div>
 					<p class="min_padding">When changing your email address, you must enter your current password in the "Current password" field before saving your changes.</p>
 				</td>
diff --git a/sections/user/invite.php b/sections/user/invite.php
index 380ed980..22f94d7c 100644
--- a/sections/user/invite.php
+++ b/sections/user/invite.php
@@ -151,7 +151,7 @@
 				<tr>
 					<td class="label">Email address:</td>
 					<td>
-						<input type="text" name="email" size="60" />
+						<input type="email" name="email" size="60" />
 						<input type="submit" value="Invite" />
 					</td>
 				</tr>
@@ -179,7 +179,7 @@
 	<div class="box pad">
 		<table width="100%">
 			<tr class="colhead">
-				<td>Email</td>
+				<td>Email address</td>
 				<td>Expires in</td>
 				<td>Delete invite</td>
 			</tr>
diff --git a/sections/wiki/article.php b/sections/wiki/article.php
index fef9f03d..0c0dbb8a 100644
--- a/sections/wiki/article.php
+++ b/sections/wiki/article.php
@@ -63,11 +63,7 @@
 			<div class="pad">
 			<form class="search_form" name="articles" action="wiki.php" method="get">
 				<input type="hidden" name="action" value="search" />
-				<input
-					onfocus="if (this.value == 'Search articles') { this.value = ''; }"
-					onblur="if (this.value == '') { this.value = 'Search articles'; }"
-					value="Search articles" type="text" name="search" size="20"
-				/>
+				<input type="search" placeholder="Search articles" name="search" size="20" />
 				<input value="Search" type="submit" class="hidden" />
 			</form>
 			<br style="line-height: 10px;" />
diff --git a/sections/wiki/search.php b/sections/wiki/search.php
index 333693f0..93efdcaa 100644
--- a/sections/wiki/search.php
+++ b/sections/wiki/search.php
@@ -85,7 +85,7 @@
 				<tr>
 					<td class="label"><label for="search"><strong>Search for:</strong></label></td>
 					<td colspan="3">
-						<input type="text" name="search" id="search" size="70" value="<?=display_str($_GET['search'])?>" />
+						<input type="search" name="search" id="search" size="70" value="<?=display_str($_GET['search'])?>" />
 					</td>
 				</tr>
 				<tr>
diff --git a/sections/wiki/splash.php b/sections/wiki/splash.php
index e8193343..120b931f 100644
--- a/sections/wiki/splash.php
+++ b/sections/wiki/splash.php
@@ -7,7 +7,7 @@
 		<p>Search the wiki for user created tutorials and information.</p>
 		<form class="search_form" name="wiki" action="wiki.php" method="get">
 			<input type="hidden" name="action" value="search" />
-			<input type="text" name="search" size="80" />
+			<input type="search" name="search" size="80" />
 			<input value="Search" type="submit" class="hidden" />
 		</form>
 		<br />
@@ -42,4 +42,4 @@
 		</span>
 	</div>
 </div>
-<? View::show_footer(); ?>
\ No newline at end of file
+<? View::show_footer(); ?>
diff --git a/sections/wiki/wiki_browse.php b/sections/wiki/wiki_browse.php
index 41c557d4..90281ab1 100644
--- a/sections/wiki/wiki_browse.php
+++ b/sections/wiki/wiki_browse.php
@@ -53,7 +53,7 @@
 		<form class="search_form" name="wiki" action="wiki.php" method="get">
 			<input type="hidden" name="action" value="search" />
 			<input type="hidden" name="nojump" value="1" />
-			<input type="text" name="search" size="80" />
+			<input type="search" name="search" size="80" />
 			<input value="Search" type="submit" class="hidden" />
 		</form>
 		<br />