diff --git a/sections/artist/artist.php b/sections/artist/artist.php
index 183db10c..200346f0 100644
--- a/sections/artist/artist.php
+++ b/sections/artist/artist.php
@@ -230,12 +230,12 @@ function compare($X, $Y){
 			$ToggleStr = '';
 		}
 ?>
-		<a href="#torrents_<?=str_replace(" ", "_", strtolower($ReleaseTypes[$ReleaseID]))?>"<?=$ToggleStr?>>[<?=$DisplayName?>]</a>
+		[<a href="#torrents_<?=str_replace(" ", "_", strtolower($ReleaseTypes[$ReleaseID]))?>"<?=$ToggleStr?>><?=$DisplayName?></a>]
 <?
 	}
 	if ($NumRequests > 0) {
 ?>
-	<a href="#requests">[Requests]</a>
+	[<a href="#requests">Requests</a>]
 <? } ?>
 	</div>
 <? }
@@ -496,7 +496,7 @@ function compare($X, $Y){
 		<h2><?=display_str($Name)?><? if ($RevisionID) { ?> (Revision #<?=$RevisionID?>)<? } if ($VanityHouseArtist) { ?> [Vanity House] <? } ?></h2>
 		<div class="linkbox">
 <? if (check_perms('site_submit_requests')) { ?>
-			<a href="requests.php?action=new&amp;artistid=<?=$ArtistID?>">[Add Request]</a>
+			[<a href="requests.php?action=new&amp;artistid=<?=$ArtistID?>">Add request</a>]
 <? }
 
 if (check_perms('site_torrents_notify')) {
@@ -507,45 +507,45 @@ function compare($X, $Y){
 	}
 	if (stripos($Notify['Artists'], '|'.$Name.'|') === false) {
 ?>
-			<a href="artist.php?action=notify&amp;artistid=<?=$ArtistID?>&amp;auth=<?=$LoggedUser['AuthKey']?>">[Notify of new uploads]</a>
+			[<a href="artist.php?action=notify&amp;artistid=<?=$ArtistID?>&amp;auth=<?=$LoggedUser['AuthKey']?>">Notify of new uploads</a>]
 <?
 	} else {
 ?>
-			<a href="artist.php?action=notifyremove&amp;artistid=<?=$ArtistID?>&amp;auth=<?=$LoggedUser['AuthKey']?>">[Do not notify of new uploads]</a>
+			[<a href="artist.php?action=notifyremove&amp;artistid=<?=$ArtistID?>&amp;auth=<?=$LoggedUser['AuthKey']?>">Do not notify of new uploads</a>]
 <?
 	}
 }
 
 if (has_bookmarked('artist', $ArtistID)) {
 ?>
-			<a href="#" id="bookmarklink_artist_<?=$ArtistID?>" onclick="Unbookmark('artist', <?=$ArtistID?>,'[Bookmark]');return false;">[Remove bookmark]</a>
+			[<a href="#" id="bookmarklink_artist_<?=$ArtistID?>" onclick="Unbookmark('artist', <?=$ArtistID?>,'[Bookmark]');return false;">Remove bookmark</a>]
 
 <?
 	} else {
 ?>
-			<a href="#" id="bookmarklink_artist_<?=$ArtistID?>" onclick="Bookmark('artist', <?=$ArtistID?>,'[Remove bookmark]');return false;">[Bookmark]</a>
+			[<a href="#" id="bookmarklink_artist_<?=$ArtistID?>" onclick="Bookmark('artist', <?=$ArtistID?>,'[Remove bookmark]');return false;">Bookmark</a>]
 <?
 }
 
 if (check_perms('site_edit_wiki')) {
 ?>
-			<a href="artist.php?action=edit&amp;artistid=<?=$ArtistID?>">[Edit]</a>
+			[<a href="artist.php?action=edit&amp;artistid=<?=$ArtistID?>">Edit</a>]
 <? } ?>
-			<a href="artist.php?action=history&amp;artistid=<?=$ArtistID?>">[View history]</a>
-			<a href="artist.php?id=<?=$ArtistID?>#info">[Info]</a>
+			[<a href="artist.php?action=history&amp;artistid=<?=$ArtistID?>">View history</a>]
+			[<a href="artist.php?id=<?=$ArtistID?>#info">Info</a>]
 <!--		<strip>-->
-			<a href="artist.php?id=<?=$ArtistID?>#concerts">[Concerts]</a>
+			[<a href="artist.php?id=<?=$ArtistID?>#concerts">Concerts</a>]
 <!--		</strip>-->
-			<a href="artist.php?id=<?=$ArtistID?>#artistcomments">[Comments]</a>
+			[<a href="artist.php?id=<?=$ArtistID?>#artistcomments">Comments</a>]
 <? if (check_perms('site_delete_artist') && check_perms('torrents_delete')) { ?>
-			<a href="artist.php?action=delete&amp;artistid=<?=$ArtistID?>&amp;auth=<?=$LoggedUser['AuthKey']?>">[Delete]</a>
+			[<a href="artist.php?action=delete&amp;artistid=<?=$ArtistID?>&amp;auth=<?=$LoggedUser['AuthKey']?>">Delete</a>]
 <? }
 
 if ($RevisionID && check_perms('site_edit_wiki')) {
 ?>
-			<a href="artist.php?action=revert&amp;artistid=<?=$ArtistID?>&amp;revisionid=<?=$RevisionID?>&amp;auth=<?=$LoggedUser['AuthKey']?>">
-				[Revert to this revision]
-			</a>
+			[<a href="artist.php?action=revert&amp;artistid=<?=$ArtistID?>&amp;revisionid=<?=$RevisionID?>&amp;auth=<?=$LoggedUser['AuthKey']?>">
+				Revert to this revision
+			</a>]
 <? } ?>
 		</div>
 	</div>
@@ -560,7 +560,7 @@ function compare($X, $Y){
 <?	} ?>
 
 		<div class="box box_search">
-			<div class="head"><strong>Search File Lists</strong></div>
+			<div class="head"><strong>Search file lists</strong></div>
 			<ul class="nobullet">
 				<li>
 					<form class="search_form" name="filelists" action="torrents.php">
@@ -705,10 +705,10 @@ function compare($X, $Y){
 				<li>
 					<span title="<?=$Score?>"><a href="artist.php?id=<?=$Artist2ID?>" style="float:left; display:block;"><?=$Artist2Name?></a></span>
 					<div style="float:right; display:block; letter-spacing: -1px;">
-						<a href="artist.php?action=vote_similar&amp;artistid=<?=$ArtistID?>&amp;similarid=<?=$SimilarID?>&amp;way=down" style="font-family: monospace;" title="Vote down this similar artist. Use this when you feel that the two artists are not all that similar.">[-]</a>
-						<a href="artist.php?action=vote_similar&amp;artistid=<?=$ArtistID?>&amp;similarid=<?=$SimilarID?>&amp;way=up" style="font-family: monospace;" title="Vote up this similar artist. Use this when you feel that the two artists are quite similar.">[+]</a>
+						[<a href="artist.php?action=vote_similar&amp;artistid=<?=$ArtistID?>&amp;similarid=<?=$SimilarID?>&amp;way=down" style="font-family: monospace;" title="Vote down this similar artist. Use this when you feel that the two artists are not all that similar.">-</a>]
+						[<a href="artist.php?action=vote_similar&amp;artistid=<?=$ArtistID?>&amp;similarid=<?=$SimilarID?>&amp;way=up" style="font-family: monospace;" title="Vote up this similar artist. Use this when you feel that the two artists are quite similar.">+</a>]
 <?		if(check_perms('site_delete_tag')) { ?>
-						<span class="remove remove_artist"><a href="artist.php?action=delete_similar&amp;similarid=<?=$SimilarID?>&amp;auth=<?=$LoggedUser['AuthKey']?>" title="Remove this similar artist">[X]</a></span>
+						[<span class="remove remove_artist"><a href="artist.php?action=delete_similar&amp;similarid=<?=$SimilarID?>&amp;auth=<?=$LoggedUser['AuthKey']?>" title="Remove this similar artist">X</a>]</span>
 <?		} ?>
 					</div>
 					<br style="clear:both" />
@@ -743,7 +743,7 @@ function compare($X, $Y){
 		<tr class="colhead_dark">
 			<td style="width:48%;">
 				<a href="#">&uarr;</a>&nbsp;
-				<strong>Request Name</strong>
+				<strong>Request name</strong>
 			</td>
 			<td>
 				<strong>Vote</strong>
@@ -839,7 +839,7 @@ function compare($X, $Y){
 			<div id="flipper_head" class="head">
 				<a href="#">&uarr;</a>&nbsp;
 				<strong id="flipper_title">Similar Artist Map</strong>
-				<a id="flip_to" href="#null" onclick="flipView();"> [Switch to Cloud]</a>
+				[<a id="flip_to" href="#null" onclick="flipView();">Switch to cloud</a>]
 			</div>
 			<div id="flip_view_1" style="display:block;width:<?=WIDTH?>px;height:<?=HEIGHT?>px;position:relative;background-image:url(static/similar/<?=$ArtistID?>.png?t=<?=time()?>)">
 <?
@@ -918,7 +918,7 @@ function require(file, callback) {
 			<div id="info" class="head">
 				<a href="#">&uarr;</a>&nbsp;
 				<strong>Artist info</strong>
-				<a href="#" onclick="$('#body').toggle(); return false;">[Toggle]</a>
+				[<a href="#" onclick="$('#body').toggle(); return false;">Toggle</a>]
 			</div>
 			<div id="body" class="body"><?=$Text->full_format($Body)?></div>
 		</div>
@@ -999,16 +999,16 @@ function require(file, callback) {
 		<td colspan="<?=Users::has_avatars_enabled() ? 2 : 1?>">
 			<div style="float:left;"><a class="post_id" href='artist.php?id=<?=$ArtistID?>&amp;postid=<?=$PostID?>#post<?=$PostID?>'>#<?=$PostID?></a>
 				<strong><?=Users::format_username($AuthorID, true, true, true, true)?></strong> <?=time_diff($AddedTime)?>
-				- <a href="#quickpost" onclick="Quote('<?=$PostID?>','<?=$Username?>');">[Quote]</a>
+				- [<a href="#quickpost" onclick="Quote('<?=$PostID?>','<?=$Username?>');">Quote</a>]
 <?	if ($AuthorID == $LoggedUser['ID'] || check_perms('site_moderate_forums')) { ?>
-				- <a href="#post<?=$PostID?>" onclick="Edit_Form('<?=$PostID?>','<?=$Key?>');">[Edit]</a>
+				- [<a href="#post<?=$PostID?>" onclick="Edit_Form('<?=$PostID?>','<?=$Key?>');">Edit</a>]
 <?	}
 	if (check_perms('site_moderate_forums')) { ?>
-				- <a href="#post<?=$PostID?>" onclick="Delete('<?=$PostID?>');">[Delete]</a>
+				- [<a href="#post<?=$PostID?>" onclick="Delete('<?=$PostID?>');">Delete</a>]
 <?	} ?>
 			</div>
 			<div id="bar<?=$PostID?>" style="float:right;">
-				<a href="reports.php?action=report&amp;type=artist_comment&amp;id=<?=$PostID?>">[Report]</a>
+				[<a href="reports.php?action=report&amp;type=artist_comment&amp;id=<?=$PostID?>">Report</a>]
 <?	if (check_perms('users_warn') && $AuthorID != $LoggedUser['ID']) {
 		$AuthorInfo = Users::user_info($AuthorID);
 		if ($LoggedUser['Class'] >= $AuthorInfo['Class']) {
@@ -1020,7 +1020,7 @@ function require(file, callback) {
 					<input type="hidden" name="userid" value="<?=$AuthorID?>" />
 					<input type="hidden" name="key" value="<?=$Key?>" />
 				</form>
-				- <a href="#" onclick="$('#warn<?=$PostID?>').raw().submit(); return false;">[Warn]</a>
+				- [<a href="#" onclick="$('#warn<?=$PostID?>').raw().submit(); return false;">Warn</a>]
 <?		}
 	}
 ?>
@@ -1073,7 +1073,7 @@ function require(file, callback) {
 								by <strong><?=Users::format_username($LoggedUser['ID'], true, true, true, true)?></strong>	Just now
 							</div>
 							<div id="barpreview" style="float:right;">
-								<a href="#quickreplypreview">[Report]</a>
+								[<a href="#quickreplypreview">Report</a>]
 								&nbsp;
 								<a href="#">&uarr;</a>
 							</div>
diff --git a/sections/artist/artist_rearrange.php b/sections/artist/artist_rearrange.php
index c4cd40a0..f2514f3b 100644
--- a/sections/artist/artist_rearrange.php
+++ b/sections/artist/artist_rearrange.php
@@ -173,16 +173,16 @@ function compare($X, $Y){
 		}
 
 ?>
-		<a href="#torrents_<?=str_replace(" ", "_", strtolower($ReleaseTypes[$ReleaseID]))?>" id="torrents_<?=$ReleaseID?>_anchorlink">[<?=$DisplayName?>]</a>
+		[<a href="#torrents_<?=str_replace(" ", "_", strtolower($ReleaseTypes[$ReleaseID]))?>" id="torrents_<?=$ReleaseID?>_anchorlink"><?=$DisplayName?></a>]
 <?
 	}
 	if ($NumRequests > 0) {
 ?>
-	<a href="#requests" id="requests_anchorlink">[Requests]</a>
+	[<a href="#requests" id="requests_anchorlink">Requests</a>]
 	</span>
 	<span style="position:right" id="torrents_allopenclose" class="hidden">
-		<a href="#" onclick="setDefaultShow('all', true);return false;">[All default open]</a>
-		<a href="#" onclick="setDefaultShow('all', false);return false;">[All default closed]</a>
+		[<a href="#" onclick="setDefaultShow('all', true);return false;">All default open</a>]
+		[<a href="#" onclick="setDefaultShow('all', false);return false;">All default closed</a>]
 	</span>
 <? } ?>
 	</div>
@@ -250,8 +250,8 @@ function display_name($ReleaseType) {
 			<td class="artist_normalcol sign"><img src="static/styles/<?=$LoggedUser['StyleName'] ?>/images/seeders.png" alt="Seeders" title="Seeders" /></td>
 			<td class="artist_normalcol sign"><img src="static/styles/<?=$LoggedUser['StyleName'] ?>/images/leechers.png" alt="Leechers" title="Leechers" /></td>
 			<td class="artist_editcol hidden" align="right">
-				<a href="#"<?=!$HideDiscogDefault?'class="hidden"':''?> id="releases_<?=$ReleaseType?>_openlink" onclick="setDefaultShow('<?=$ReleaseType?>',true);return false;">[default closed]</a>
-				<a href="#"<?=$HideDiscogDefault?'class="hidden"':''?> id="releases_<?=$ReleaseType?>_closedlink" onclick="setDefaultShow('<?=$ReleaseType?>',false);return false;">[default open]</a>
+				[<a href="#"<?=!$HideDiscogDefault?'class="hidden"':''?> id="releases_<?=$ReleaseType?>_openlink" onclick="setDefaultShow('<?=$ReleaseType?>',true);return false;">default closed</a>]
+				[<a href="#"<?=$HideDiscogDefault?'class="hidden"':''?> id="releases_<?=$ReleaseType?>_closedlink" onclick="setDefaultShow('<?=$ReleaseType?>',false);return false;">default open</a>]
 				<input class="hidden" id="releases_<?=$ReleaseType?>_defaultopen"<?=!$HideDiscogDefault?' checked="checked"':''?> type="checkbox" title="Show" />
 				&nbsp;
 				<span style="cursor:move;" id="torrents_<?=$ReleaseTypeLabel?>_handle">&#9776;</span>
@@ -392,15 +392,15 @@ function display_name($ReleaseType) {
 	<div class="header">
 		<h2><?=$Name?><? if ($RevisionID) { ?> (Revision #<?=$RevisionID?>)<? } if ($VanityHouseArtist) { ?> [Vanity House] <? } ?></h2>
 			<span style="font-size: 0.7em;float:right;">
-				<a href="#" onclick="editOrdering();return false;" class="" id="editlayout">[Edit ordering]</a>
+				[<a href="#" onclick="editOrdering();return false;" class="" id="editlayout">Edit ordering</a>]
 				<span class="hidden" id="savinglayout">Saving ordering...</span>
-				<a href="#" onclick="saveOrdering();return false;" class="hidden" id="savelayout">[Save ordering]</a>
+				[<a href="#" onclick="saveOrdering();return false;" class="hidden" id="savelayout">Save ordering</a>]
 			</span>
 		</h2>
 		<div id="emptylinkbox" class="linkbox hidden"></div>
 		<div id="linkbox" class="linkbox">
 <? if (check_perms('site_submit_requests')) { ?>
-			<a href="requests.php?action=new&amp;artistid=<?=$ArtistID?>">[Add Request]</a>
+			[<a href="requests.php?action=new&amp;artistid=<?=$ArtistID?>">Add request</a>]
 <? }
 
 if (check_perms('site_torrents_notify')) {
@@ -411,40 +411,40 @@ function display_name($ReleaseType) {
 	}
 	if (stripos($Notify['Artists'], '|'.$Name.'|') === FALSE) {
 ?>
-			<a href="artist.php?action=notify&amp;artistid=<?=$ArtistID?>&amp;auth=<?=$LoggedUser['AuthKey']?>">[Notify of new uploads]</a>
+			[<a href="artist.php?action=notify&amp;artistid=<?=$ArtistID?>&amp;auth=<?=$LoggedUser['AuthKey']?>">Notify of new uploads</a>]
 <?
 	} else {
 ?>
-			<a href="artist.php?action=notifyremove&amp;artistid=<?=$ArtistID?>&amp;auth=<?=$LoggedUser['AuthKey']?>">[Do not notify of new uploads]</a>
+			[<a href="artist.php?action=notifyremove&amp;artistid=<?=$ArtistID?>&amp;auth=<?=$LoggedUser['AuthKey']?>">Do not notify of new uploads</a>]
 <?
 	}
 }
 
 if (has_bookmarked('artist', $ArtistID)) {
 ?>
-			<a href="#" id="bookmarklink_artist_<?=$ArtistID?>" onclick="Unbookmark('artist', <?=$ArtistID?>,'[Bookmark]');return false;">[Remove bookmark]</a>
+			[<a href="#" id="bookmarklink_artist_<?=$ArtistID?>" onclick="Unbookmark('artist', <?=$ArtistID?>,'[Bookmark]');return false;">Remove bookmark</a>]
 
 <?
 	} else {
 ?>
-			<a href="#" id="bookmarklink_artist_<?=$ArtistID?>" onclick="Bookmark('artist', <?=$ArtistID?>,'[Remove bookmark]');return false;">[Bookmark]</a>
+			[<a href="#" id="bookmarklink_artist_<?=$ArtistID?>" onclick="Bookmark('artist', <?=$ArtistID?>,'[Remove bookmark]');return false;">Bookmark</a>]
 <?
 }
 
 if (check_perms('site_edit_wiki')) {
 ?>
-			<a href="artist.php?action=edit&amp;artistid=<?=$ArtistID?>">[Edit]</a>
+			[<a href="artist.php?action=edit&amp;artistid=<?=$ArtistID?>">Edit</a>]
 <? } ?>
-			<a href="artist.php?action=history&amp;artistid=<?=$ArtistID?>">[View history]</a>
+			[<a href="artist.php?action=history&amp;artistid=<?=$ArtistID?>">View history</a>]
 <? if (check_perms('site_delete_artist') && check_perms('torrents_delete')) { ?>
-			<a href="artist.php?action=delete&amp;artistid=<?=$ArtistID?>&amp;auth=<?=$LoggedUser['AuthKey']?>">[Delete]</a>
+			[<a href="artist.php?action=delete&amp;artistid=<?=$ArtistID?>&amp;auth=<?=$LoggedUser['AuthKey']?>">Delete</a>]
 <? }
 
 if ($RevisionID && check_perms('site_edit_wiki')) {
 ?>
-			<a href="artist.php?action=revert&amp;artistid=<?=$ArtistID?>&amp;revisionid=<?=$RevisionID?>&amp;auth=<?=$LoggedUser['AuthKey']?>">
-				[Revert to this revision]
-			</a>
+			[<a href="artist.php?action=revert&amp;artistid=<?=$ArtistID?>&amp;revisionid=<?=$RevisionID?>&amp;auth=<?=$LoggedUser['AuthKey']?>">
+				Revert to this revision
+			</a>]
 <? } ?>
 		</div>
 	</div>
@@ -479,11 +479,11 @@ function display_name($ReleaseType) {
 			<div class="box box_info box_statistics_artist">
 			<div class="head"><strong>Statistics</strong></div>
 			<ul class="stats nobullet">
-				<li>Number of groups: <?=$NumGroups?></li>
-				<li>Number of torrents: <?=$NumTorrents?></li>
-				<li>Number of seeders: <?=$NumSeeders?></li>
-				<li>Number of leechers: <?=$NumLeechers?></li>
-				<li>Number of snatches: <?=$NumSnatches?></li>
+				<li>Number of groups: <?=number_format($NumGroups)?></li>
+				<li>Number of torrents: <?=number_format($NumTorrents)?></li>
+				<li>Number of seeders: <?=number_format($NumSeeders)?></li>
+				<li>Number of leechers: <?=number_format($NumLeechers)?></li>
+				<li>Number of snatches: <?=number_format($NumSnatches)?></li>
 			</ul>
 		</div>
 <?
@@ -529,10 +529,10 @@ function display_name($ReleaseType) {
 ?>
 				<li>
 					<span title=<?=$Score?>><a href="artist.php?id=<?=$Artist2ID?>" style="float:left; display:block;"><?=$Artist2Name?></a></span>										<div style="float:right; display:block; letter-spacing: -1px;">
-					<a href="artist.php?action=vote_similar&amp;artistid=<?=$ArtistID?>&amp;similarid=<?=$SimilarID?>&amp;way=down" style="font-family: monospace;">[&minus;]</a>
-					<a href="artist.php?action=vote_similar&amp;artistid=<?=$ArtistID?>&amp;similarid=<?=$SimilarID?>&amp;way=up" style="font-family: monospace;">[+]</a>
+					[<a href="artist.php?action=vote_similar&amp;artistid=<?=$ArtistID?>&amp;similarid=<?=$SimilarID?>&amp;way=down" style="font-family: monospace;">&minus;</a>]
+					[<a href="artist.php?action=vote_similar&amp;artistid=<?=$ArtistID?>&amp;similarid=<?=$SimilarID?>&amp;way=up" style="font-family: monospace;">+</a>]
 <?		if(check_perms('site_delete_tag')) { ?>
-					<a href="artist.php?action=delete_similar&amp;similarid=<?=$SimilarID?>&amp;auth=<?=$LoggedUser['AuthKey']?>">[X]</a>
+					[<a href="artist.php?action=delete_similar&amp;similarid=<?=$SimilarID?>&amp;auth=<?=$LoggedUser['AuthKey']?>">X</a>]
 <?		} ?>
 					</div>
 					<br style="clear:both" />
@@ -567,7 +567,7 @@ function display_name($ReleaseType) {
 		<tr class="colhead_dark">
 			<td style="width:48%;">
 				<a href="#">&uarr;</a>&nbsp;
-				<strong>Request Name</strong>
+				<strong>Request name</strong>
 			</td>
 			<td>
 				<strong>Vote</strong>
diff --git a/sections/artist/concerts.php b/sections/artist/concerts.php
index 569218bc..6ff8bc8b 100644
--- a/sections/artist/concerts.php
+++ b/sections/artist/concerts.php
@@ -1,16 +1,16 @@
 <div class="box">
-    <div id="concerts" class="head">
-        <a href="#">&uarr;</a>&nbsp;<strong>Upcoming Concerts</strong>
-        <a href="#" onclick="$('#concertsbody').toggle(); return false;">[Toggle]</a>
-    </div>
+	<div id="concerts" class="head">
+		<a href="#">&uarr;</a>&nbsp;<strong>Upcoming concerts</strong>
+		[<a href="#" onclick="$('#concertsbody').toggle(); return false;">Toggle</a>]
+	</div>
     <div id="concertsbody">
 <?
 			$ArtistEvents = LastFM::get_artist_events($ArtistID, $Name);
 			$Debug->log_var($ArtistEvents);
 			if ($ArtistEvents === false) { // Something went wrong
-				echo 'An error occurred when retrieving concert info.';
+				echo '<br />An error occurred when retrieving concert info.<br />';
 			} elseif (!isset($ArtistEvents['events']['event'])) { // No upcoming events
-				echo 'This artist has no upcoming concerts.';
+				echo '<br />This artist has no upcoming concerts.<br />';
 			} else {
 				echo '<ul>';
 				if (isset($ArtistEvents['events']['event'][0])) { // Multiple events
@@ -44,7 +44,7 @@ function make_concert_link($Event)
 		<input type="hidden" name="concert_id" value="<?=$Event['id']?>"/>
 		<input type="hidden" name="concert_template" value="<?=get_concert_post_template($Name, $Event)?>"/>
 	</form>
-	<li><?=$Concert?> - <a href="#" onclick="$('#concert<?=$Event['id']?>').raw().submit(); return false;">[Go to Thread]</a></li>
+	<li><?=$Concert?> - [<a href="#" onclick="$('#concert<?=$Event['id']?>').raw().submit(); return false;">Go to thread</a>]</li>
 <?
 }
 ?>
@@ -77,7 +77,7 @@ function get_concert_post_template($Artist, $Event)
 		if (strpos ($Url, '://') === false) {
 			$Url = 'http://' . $Url;
 		}
-		$Website = "[b]Website:[/b] " . $Url;
+		$Website = "[b]Web site:[/b] " . $Url;
 	}
 	if (isset($Event['artists']['artist']) && (count($Event['artists']['artist']) == 1 && strtolower($Event['artists']['artist'][1]) == strtolower($Artist))) {
 		$i = 0;
diff --git a/sections/artist/edit.php b/sections/artist/edit.php
index 80a8c048..5227c2b8 100644
--- a/sections/artist/edit.php
+++ b/sections/artist/edit.php
@@ -101,9 +101,9 @@
 		if($AliasName == $Name) { $DefaultRedirectID = $AliasID; }
 ?>
 			<li><?=$AliasID?>. <?=$AliasName?>
-<?		if($User) { ?> <a href="user.php?id=<?=$User?>">User</a>. <?}
+<?		if($User) { ?> [<a href="user.php?id=<?=$User?>">User</a>] <?}
 		if($Redirect) { ?> (writes redirect to <?=$Redirect?>)<? } ?>
-			<a href="artist.php?action=delete_alias&amp;aliasid=<?=$AliasID?>&amp;auth=<?=$LoggedUser['AuthKey']?>">[X]</a>
+			[<a href="artist.php?action=delete_alias&amp;aliasid=<?=$AliasID?>&amp;auth=<?=$LoggedUser['AuthKey']?>">X</a>]
 			</li>
 <?	}
 ?>
@@ -116,10 +116,10 @@
 			<input type="text" name="name" size="40" value="<?=$Name?>" /><br />
 			<h3>Writes redirect to (Alias ID, blank for no redirect):</h3>
 			<input type="text" name="redirect" size="40" value="<?=$DefaultRedirectID?>" /><br />
-			<em>This redirects artist names as they are written, eg. new torrents and added artists. All uses of this new alias will be redirected to the alias ID you enter here. Use for common misspellings, etc.</em><br />
+			<em>This redirects artist names as they are written (e.g. when new torrents are uploaded or artists added). All uses of this new alias will be redirected to the alias ID you enter here. Use for common misspellings, etc.</em><br />
 			<input type="submit" value="Add alias" />
 		</form>
 	</div>
 <? } ?> 
 </div>
-<? View::show_footer() ?>
\ No newline at end of file
+<? View::show_footer() ?>
diff --git a/sections/bookmarks/torrents.php b/sections/bookmarks/torrents.php
index a8f4ebf0..14b285ba 100644
--- a/sections/bookmarks/torrents.php
+++ b/sections/bookmarks/torrents.php
@@ -101,7 +101,7 @@ function compare($X, $Y){
 					<span style="float:left;"><strong><?=$DisplayName?></strong></span>
 					<span style="float:right;text-align:right">
 <? if(!$Sneaky){ ?>
-						<a href="#group_<?=$GroupID?>" onclick="Unbookmark('torrent', <?=$GroupID?>, '');return false;">Remove Bookmark</a>
+						<a href="#group_<?=$GroupID?>" class="remove_bookmark" title="Remove bookmark" onclick="Unbookmark('torrent', <?=$GroupID?>, '');return false;">Unbookmark</a>
 						<br />
 <? } ?>
 						<?=time_diff($AddedTime);?>
@@ -220,7 +220,7 @@ function compare($X, $Y){
 			<strong><?=$DisplayName?></strong>
 			<?=$TorrentTags?>
 <? if(!$Sneaky){ ?>
-			<span style="float:left;"><a href="#group_<?=$GroupID?>" onclick="Unbookmark('torrent', <?=$GroupID?>, '');return false;">Remove Bookmark</a></span>
+			<span style="float:left;"><a href="#group_<?=$GroupID?>" class="remove_bookmark" title="Remove bookmark" onclick="Unbookmark('torrent', <?=$GroupID?>, '');return false;">Unbookmark</a></span>
 <? } ?>
 			<span style="float:right;"><?=time_diff($AddedTime);?></span>
 
diff --git a/sections/collages/all_comments.php b/sections/collages/all_comments.php
index 9a10cd21..1227cd40 100644
--- a/sections/collages/all_comments.php
+++ b/sections/collages/all_comments.php
@@ -82,10 +82,10 @@
 	<tr class="colhead_dark">
 		<td colspan="<?=Users::has_avatars_enabled() ? 2 : 1?>">
 			<span style="float:left;"><a href='#post<?=$PostID?>'>#<?=$PostID?></a>
-				by <?=Users::format_username($AuthorID, true, true, true, true, true)?> <?=time_diff($AddedTime)?> <a href="reports.php?action=report&amp;type=collages_comment&amp;id=<?=$PostID?>">[Report Comment]</a>
-<? if (!$ThreadInfo['IsLocked']){ ?>				- <a href="#quickpost" onclick="Quote('<?=$PostID?>','<?=$Username?>');">[Quote]</a><? }
-if ($AuthorID == $LoggedUser['ID'] || check_perms('site_moderate_forums')){ ?>				- <a href="#post<?=$PostID?>" onclick="Edit_Form('<?=$PostID?>');">[Edit]</a><? }
-if (check_perms('site_moderate_forums')){ ?>				- <a href="#post<?=$PostID?>" onclick="Delete('<?=$PostID?>');">[Delete]</a> <? } ?>
+				by <?=Users::format_username($AuthorID, true, true, true, true, true)?> <?=time_diff($AddedTime)?> [<a href="reports.php?action=report&amp;type=collages_comment&amp;id=<?=$PostID?>">Report Comment</a>]
+<? if (!$ThreadInfo['IsLocked']){ ?>				- [<a href="#quickpost" onclick="Quote('<?=$PostID?>','<?=$Username?>');">Quote</a>]<? }
+if ($AuthorID == $LoggedUser['ID'] || check_perms('site_moderate_forums')){ ?>				- [<a href="#post<?=$PostID?>" onclick="Edit_Form('<?=$PostID?>');">Edit</a>]<? }
+if (check_perms('site_moderate_forums')){ ?>				- [<a href="#post<?=$PostID?>" onclick="Delete('<?=$PostID?>');">Delete</a>] <? } ?>
 			</span>
 			<span id="bar<?=$PostID?>" style="float:right;">
 				<a href="#">&uarr;</a>
@@ -113,7 +113,7 @@
 		<div id="reply_box">
 			<h3>Post reply</h3>
 			<div class="box pad" style="padding:20px 10px 10px 10px;">
-			<form class="send_form center" name="comment" id="quickpostform" action="" method="post">
+				<form class="send_form center" name="comment" id="quickpostform" action="" method="post">
 					<input type="hidden" name="action" value="add_comment" />
 					<input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
 					<input type="hidden" name="collageid" value="<?=$CollageID?>" />
diff --git a/sections/collages/collage.php b/sections/collages/collage.php
index 829a8772..58a2e7e2 100644
--- a/sections/collages/collage.php
+++ b/sections/collages/collage.php
@@ -367,32 +367,32 @@ function compare($X, $Y){
 	<div class="header">
 		<h2><?=$Name?></h2>
 		<div class="linkbox">
-			<a href="collages.php">[List of collages]</a>
+			[<a href="collages.php">List of collages</a>]
 <? if (check_perms('site_collages_create')) { ?>
-			<a href="collages.php?action=new">[New collage]</a>
+			[<a href="collages.php?action=new">New collage</a>]
 <? } ?>
 			<br /><br />
 <? if(check_perms('site_collages_subscribe')) { ?>
-			<a href="#" onclick="CollageSubscribe(<?=$CollageID?>);return false;" id="subscribelink<?=$CollageID?>">[<?=(in_array($CollageID, $CollageSubscriptions) ? 'Unsubscribe' : 'Subscribe')?>]</a>
+			[<a href="#" onclick="CollageSubscribe(<?=$CollageID?>);return false;" id="subscribelink<?=$CollageID?>"><?=(in_array($CollageID, $CollageSubscriptions) ? 'Unsubscribe' : 'Subscribe')?></a>]
 <? }
    if (check_perms('site_collages_delete') || (check_perms('site_edit_wiki') && !$Locked)) { ?>
-			<a href="collages.php?action=edit&amp;collageid=<?=$CollageID?>">[Edit description]</a>
+			[<a href="collages.php?action=edit&amp;collageid=<?=$CollageID?>">Edit description</a>]
 <? } else { ?>
 			[Locked]
 <? }
 	if(has_bookmarked('collage', $CollageID)) {
 ?>
-			<a href="#" id="bookmarklink_collage_<?=$CollageID?>" onclick="Unbookmark('collage', <?=$CollageID?>,'[Bookmark]');return false;">[Remove bookmark]</a>
+			[<a href="#" id="bookmarklink_collage_<?=$CollageID?>" onclick="Unbookmark('collage', <?=$CollageID?>,'[Bookmark]');return false;">Remove bookmark</a>]
 <?	} else { ?>
-			<a href="#" id="bookmarklink_collage_<?=$CollageID?>" onclick="Bookmark('collage', <?=$CollageID?>,'[Remove bookmark]');return false;">[Bookmark]</a>
+			[<a href="#" id="bookmarklink_collage_<?=$CollageID?>" onclick="Bookmark('collage', <?=$CollageID?>,'[Remove bookmark]');return false;">Bookmark</a>]
 <?	}
 
 if (check_perms('site_collages_manage') && !$Locked) { ?>
-			<a href="collages.php?action=manage&amp;collageid=<?=$CollageID?>">[Manage torrents]</a>
+			[<a href="collages.php?action=manage&amp;collageid=<?=$CollageID?>">Manage torrents</a>]
 <? } ?>
-			<a href="reports.php?action=report&amp;type=collage&amp;id=<?=$CollageID?>">[Report Collage]</a>
+			[<a href="reports.php?action=report&amp;type=collage&amp;id=<?=$CollageID?>">Report collage</a>]
 <? if (check_perms('site_collages_delete') || $CreatorID == $LoggedUser['ID']) { ?>
-			<a href="collages.php?action=delete&amp;collageid=<?=$CollageID?>&amp;auth=<?=$LoggedUser['AuthKey']?>" onclick="return confirm('Are you sure you want to delete this collage?.');">[Delete]</a>
+			[<a href="collages.php?action=delete&amp;collageid=<?=$CollageID?>&amp;auth=<?=$LoggedUser['AuthKey']?>" onclick="return confirm('Are you sure you want to delete this collage?');">Delete</a>]
 <? } ?>
 		</div>
 	</div>
@@ -427,7 +427,7 @@ function compare($X, $Y){
 					<li id="list<?=$ListItem?>">
 						<input type="hidden" name="list[]" value="<?=$ListItem?>" /> 
 						<span style="float:left;"><?=$ZIPOptions[$ListItem]['2']?></span>
-						<span class="remove remove_collector"><a href="#" onclick="remove_selection('<?=$ListItem?>');return false;" style="float:right;">[X]</a></span>
+						<span class="remove remove_collector">[<a href="#" onclick="remove_selection('<?=$ListItem?>');return false;" style="float:right;">X</a>]</span>
 						<br style="clear:all;" />
 					</li>
 <? } ?>
@@ -494,7 +494,7 @@ function compare($X, $Y){
 				</ol>
 			</div>
 		</div>
-<? if(!empty($Artists)) { ?>		
+<? if(!empty($Artists)) { ?>
 		<div class="box box_artists">
 			<div class="head"><strong>Top artists</strong></div>
 			<div class="pad">
@@ -535,7 +535,7 @@ function compare($X, $Y){
 		</div>
 <? if(check_perms('site_collages_manage') && !$PreventAdditions) { ?>
 		<div class="box box_addtorrent">
-			<div class="head"><strong>Add torrent</strong><span style="float: right"><a href="#" onclick="$('.add_torrent_container').toggle_class('hidden'); this.innerHTML = (this.innerHTML == '[Batch Add]'?'[Individual Add]':'[Batch Add]'); return false;">[Batch Add]</a></span></div>
+			<div class="head"><strong>Add torrent</strong><span style="float: right">[<a href="#" onclick="$('.add_torrent_container').toggle_class('hidden'); this.innerHTML = (this.innerHTML == 'Batch Add'?'Individual Add':'Batch Add'); return false;">Batch Add</a>]</span></div>
 			<div class="pad add_torrent_container">
 				<form class="add_form" name="torrent" action="collages.php" method="post">
 					<input type="hidden" name="action" value="add_torrent" />
@@ -579,7 +579,7 @@ function compare($X, $Y){
 	list($CommentID, $Body, $UserID, $Username, $CommentTime) = $Comment;
 ?>
 		<div class="box comment">
-			<div class="head">By <?=Users::format_username($UserID, false, false, false) ?> <?=time_diff($CommentTime) ?> <a href="reports.php?action=report&amp;type=collages_comment&amp;id=<?=$CommentID?>">[Report Comment]</a></div>
+			<div class="head">By <?=Users::format_username($UserID, false, false, false) ?> <?=time_diff($CommentTime) ?> [<a href="reports.php?action=report&amp;type=collages_comment&amp;id=<?=$CommentID?>">Report Comment</a>]</div>
 			<div class="pad"><?=$Text->full_format($Body)?></div>
 		</div>
 <?
diff --git a/sections/forums/forum.php b/sections/forums/forum.php
index 4254071d..56e7164d 100644
--- a/sections/forums/forum.php
+++ b/sections/forums/forum.php
@@ -82,7 +82,10 @@
 							<td>
 								<input type="hidden" name="action" value="search" />
 								<input type="hidden" name="forums[]" value="<?=$ForumID?>" />
-								<strong>Search for:</strong></td><td><input type="text" id="searchbox" name="search" size="70" />
+								<strong>Search for:</strong>
+							</td>
+							<td>
+								<input type="text" id="searchbox" name="search" size="70" />
 							</td>
 						</tr>
 						<tr>
@@ -95,7 +98,8 @@
 							</td>
 						</tr>
 						<tr>
-							<td><strong>Username:</strong></td><td><input type="text" id="username" name="user" size="70" /></td>
+							<td><strong>Username:</strong></td>
+							<td><input type="text" id="username" name="user" size="70" /></td>
 						</tr>
 						<tr>
 							<td colspan="2" style="text-align: center"><input type="submit" name="submit" value="Search" /></td>
@@ -121,7 +125,7 @@
 	</div>
 <? if(check_perms('site_moderate_forums')) { ?>
 	<div class="linkbox">
-		<a href="forums.php?action=edit_rules&amp;forumid=<?=$ForumID?>">Change specific rules</a>
+		[<a href="forums.php?action=edit_rules&amp;forumid=<?=$ForumID?>">Change specific rules</a>]
 	</div>
 <? } ?>
 <? if(!empty($Forums[$ForumID]['SpecificRules'])) { ?>
diff --git a/sections/forums/newthread.php b/sections/forums/newthread.php
index c4944990..693c3adb 100644
--- a/sections/forums/newthread.php
+++ b/sections/forums/newthread.php
@@ -27,8 +27,8 @@
 	<div class="hidden" id="newthreadpreview">
 		<div class="linkbox">
 			<div class="center">
-				<a href="#" onclick="return false;">[Report Thread]</a>
-				<a href="#" onclick="return false;"><?=!empty($HeavyInfo['AutoSubscribe']) ? '[Unsubscribe]' : '[Subscribe]'?></a>
+				[<a href="#" onclick="return false;">Report Thread</a>]
+				[<a href="#" onclick="return false;"><?=!empty($HeavyInfo['AutoSubscribe']) ? 'Unsubscribe' : 'Subscribe'?></a>]
 			</div>
 		</div>
 <? if (check_perms('forums_polls_create')) { ?>
@@ -56,7 +56,7 @@
 					Just now
 					</span>
 					<span id="barpreview" style="float:right;">
-						<a href="#newthreadpreview">[Report Post]</a>
+						[<a href="#newthreadpreview">Report Post</a>]
 						&nbsp;
 						<a href="#">&uarr;</a>
 					</span>
@@ -101,7 +101,7 @@
 
 if (check_perms('forums_polls_create')) {
 ?>
-				<script type="text/javascript">
+				<script type="text/javascript">//<![CDATA[
 				var AnswerCount = 1;
 
 				function AddAnswerField() {
@@ -124,6 +124,7 @@ function RemoveAnswerField() {
 						for (i=0; i<2; i++) { x.removeChild(x.lastChild); }
 						AnswerCount--;
 				}
+				//]]>
 				</script>
 				<tr>
 					<td colspan="2" class="center">
diff --git a/sections/forums/search.php b/sections/forums/search.php
index 2dcef219..66eb1b48 100644
--- a/sections/forums/search.php
+++ b/sections/forums/search.php
@@ -142,19 +142,19 @@
 <?		} ?>
 				<td>
 					<input type="checkbox" name="forums[]" value="<?=$Forum['ID']?>" id="forum_<?=$Forum['ID']?>"<? if(isset($_GET['forums']) && in_array($Forum['ID'], $_GET['forums'])) { echo ' checked="checked"';} ?> />
-					<label for="forum_<?=$Forum['ID']?>"><?=$Forum['Name']?></label>
+					<label for="forum_<?=$Forum['ID']?>"><?=htmlspecialchars($Forum['Name'])?></label>
 				</td>
-<? 	} 
+<? 	}
 	if ($Columns%5) { ?>
 				<td colspan="<?=(5-($Columns%5))?>"></td>
 <?	} ?>
 			</tr>
 		</table>
+<? } else { ?>
+						<input type="hidden" name="threadid" value="<?=$ThreadID?>" />
+<? } ?>
 					</td>
 				</tr>
-<? } else { ?>
-				<input type="hidden" name="threadid" value="<?=$ThreadID?>" />
-<? } ?>
 				<tr>
 					<td><strong>Username:</strong></td>
 					<td>
diff --git a/sections/forums/thread.php b/sections/forums/thread.php
index f4755bbb..e883eeeb 100644
--- a/sections/forums/thread.php
+++ b/sections/forums/thread.php
@@ -143,13 +143,15 @@
 
 
 $DB->query("UPDATE users_notify_quoted SET UnRead = '0' WHERE UserID = '$LoggedUser[ID]' AND TopicID = '$ThreadID'");
-
+$Cache->delete_value('forums_quotes_' . $LoggedUser['ID']);
+/*
 $QuoteNotificationsCount = $Cache->get_value('forums_quotes_' . $LoggedUser['ID']);
 if ($QuoteNotificationsCount > 0) {
 	$Cache->cache_value('forums_quotes_' . $LoggedUser['ID'], $QuoteNotificationsCount - 1, 0);
 } else {
 	$Cache->delete_value('forums_quotes_' . $LoggedUser['ID']);
 }
+*/
 
 // Start printing
 View::show_header($ThreadInfo['Title'] . ' < '.$Forums[$ForumID]['Name'].' < '. 'Forums','comments,subscriptions,bbcode,jquery');
@@ -162,9 +164,9 @@
 	</h2>
 	<div class="linkbox">
 		<div class="center">
-			<a href="reports.php?action=report&amp;type=thread&amp;id=<?=$ThreadID?>">[Report Thread]</a>
-			<a href="#" onclick="Subscribe(<?=$ThreadID?>);return false;" id="subscribelink<?=$ThreadID?>">[<?=(in_array($ThreadID, $UserSubscriptions) ? 'Unsubscribe' : 'Subscribe')?>]</a>
-			<a href="#" onclick="$('#searchthread').toggle(); this.innerHTML = (this.innerHTML == '[Search this Thread]'?'[Hide Search]':'[Search this Thread]'); return false;">[Search this Thread]</a>
+			[<a href="reports.php?action=report&amp;type=thread&amp;id=<?=$ThreadID?>">Report Thread</a>]
+			[<a href="#" onclick="Subscribe(<?=$ThreadID?>);return false;" id="subscribelink<?=$ThreadID?>"><?=(in_array($ThreadID, $UserSubscriptions) ? 'Unsubscribe' : 'Subscribe')?></a>]
+			[<a href="#" onclick="$('#searchthread').toggle(); this.innerHTML = (this.innerHTML == 'Search this Thread'?'Hide Search':'Search this Thread'); return false;">Search this Thread</a>]
 		</div>
 		<div id="searchthread" class="hidden center">
 			<div style="display: inline-block;">
@@ -172,10 +174,12 @@
 				<form class="search_form" name="forum_thread" action="forums.php" method="get">
 					<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><strong>Search for:</strong></td>
+							<td><input type="text" 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>Username:</strong></td>
+							<td><input type="text" id="username" name="user" size="70" /></td>
 						</tr>
 						<tr>
 							<td colspan="2" style="text-align: center">
@@ -310,7 +314,7 @@
 				<li>
 					<a href="forums.php?action=change_vote&amp;threadid=<?=$ThreadID?>&amp;auth=<?=$LoggedUser['AuthKey']?>&amp;vote=<?=(int) $i?>"><?=display_str($Answer == '' ? "Blank" : $Answer)?></a>
 					 - <?=$StaffVotes[$i]?>&nbsp;(<?=number_format(((float) $Votes[$i]/$TotalVotes)*100, 2)?>%)
-					 <a href="forums.php?action=delete_poll_option&amp;threadid=<?=$ThreadID?>&amp;auth=<?=$LoggedUser['AuthKey']?>&amp;vote=<?=(int) $i?>">[X]</a>
+					 [<a href="forums.php?action=delete_poll_option&amp;threadid=<?=$ThreadID?>&amp;auth=<?=$LoggedUser['AuthKey']?>&amp;vote=<?=(int) $i?>">X</a>]
 </li>
 <?			} ?>
 				<li><a href="forums.php?action=change_vote&amp;threadid=<?=$ThreadID?>&amp;auth=<?=$LoggedUser['AuthKey']?>&amp;vote=0">Blank</a> - <?=$StaffVotes[0]?>&nbsp;(<?=number_format(((float) $Votes[0]/$TotalVotes)*100, 2)?>%)</li>
@@ -326,7 +330,7 @@
 <?
 			}
 ?>
-			<a href="#" onclick="AddPollOption(<?=$ThreadID?>); return false;">[+]</a>
+			[<a href="#" onclick="AddPollOption(<?=$ThreadID?>); return false;">+</a>]
 <?
 		}
 
@@ -352,7 +356,7 @@
 						</li>
 					</ul>
 <?		if($ForumID == STAFF_FORUM) { ?>
-					<a href="#" onclick="AddPollOption(<?=$ThreadID?>); return false;">[+]</a>
+					[<a href="#" onclick="AddPollOption(<?=$ThreadID?>); return false;">+</a>]
 					<br />
 					<br />
 <?		} ?>
@@ -421,30 +425,30 @@
 		<td colspan="<?=Users::has_avatars_enabled() ? 2 : 1?>">
 			<div style="float:left;"><a class="post_id" href="forums.php?action=viewthread&amp;threadid=<?=$ThreadID?>&amp;postid=<?=$PostID?>#post<?=$PostID?>">#<?=$PostID?></a>
 				<?=Users::format_username($AuthorID, true, true, true, true, true)?>
-				<?=time_diff($AddedTime,2)?> 
+				<?=time_diff($AddedTime,2)?>
 <?	if (!$ThreadInfo['IsLocked'] || check_perms('site_moderate_forums')) { ?>
-				- <a href="#quickpost" onclick="Quote('<?=$PostID?>','<?=$Username?>', true);">[Quote]</a> 
+				- [<a href="#quickpost" onclick="Quote('<?=$PostID?>','<?=$Username?>', true);">Quote</a>]
 <?	}
 	if ((!$ThreadInfo['IsLocked'] && check_forumperm($ForumID, 'Write') && $AuthorID == $LoggedUser['ID']) || check_perms('site_moderate_forums')) { ?>
-				- <a href="#post<?=$PostID?>" onclick="Edit_Form('<?=$PostID?>','<?=$Key?>');">[Edit]</a> 
+				- [<a href="#post<?=$PostID?>" onclick="Edit_Form('<?=$PostID?>','<?=$Key?>');">Edit</a>]
 <?	}
-	if(check_perms('site_admin_forums') && $ThreadInfo['Posts'] > 1) { ?> 
-				- <a href="#post<?=$PostID?>" onclick="Delete('<?=$PostID?>');">[Delete]</a> 
+	if(check_perms('site_admin_forums') && $ThreadInfo['Posts'] > 1) { ?>
+				- [<a href="#post<?=$PostID?>" onclick="Delete('<?=$PostID?>');">Delete</a>]
 <?	}
 	if($PostID == $ThreadInfo['StickyPostID']) { ?>
 				<strong><span class="sticky_post_label">[Sticky]</span></strong>
 <?		if(check_perms('site_moderate_forums')) { ?>
-				- <a href="forums.php?action=sticky_post&amp;threadid=<?=$ThreadID?>&amp;postid=<?=$PostID?>&amp;remove=true&amp;auth=<?=$LoggedUser['AuthKey']?>" >[X]</a>
+				- [<a href="forums.php?action=sticky_post&amp;threadid=<?=$ThreadID?>&amp;postid=<?=$PostID?>&amp;remove=true&amp;auth=<?=$LoggedUser['AuthKey']?>" >X</a>]
 <?		}
 	} else {
 		if(check_perms('site_moderate_forums')) { ?>
-				- <a href="forums.php?action=sticky_post&amp;threadid=<?=$ThreadID?>&amp;postid=<?=$PostID?>&amp;auth=<?=$LoggedUser['AuthKey']?>" >[&#x21d5;]</a>
+				- [<a href="forums.php?action=sticky_post&amp;threadid=<?=$ThreadID?>&amp;postid=<?=$PostID?>&amp;auth=<?=$LoggedUser['AuthKey']?>" >&#x21d5;</a>]
 <? 		}
 	}
 ?>
 			</div>
 			<div id="bar<?=$PostID?>" style="float:right;">
-				<a href="reports.php?action=report&amp;type=post&amp;id=<?=$PostID?>">[Report]</a>
+				[<a href="reports.php?action=report&amp;type=post&amp;id=<?=$PostID?>">Report</a>]
 <?	if (check_perms('users_warn') && $AuthorID != $LoggedUser['ID']) {
 		$AuthorInfo = Users::user_info($AuthorID);
 		if($LoggedUser['Class'] >= $AuthorInfo['Class']) {
@@ -455,7 +459,7 @@
 					<input type="hidden" name="userid" value="<?=$AuthorID?>" />
 					<input type="hidden" name="key" value="<?=$Key?>" />
 				</form>
-				- <a href="#" onclick="$('#warn<?=$PostID?>').raw().submit(); return false;">[Warn]</a>
+				- [<a href="#" onclick="$('#warn<?=$PostID?>').raw().submit(); return false;">Warn</a>]
 <?		}
 	}
 ?>
@@ -517,7 +521,7 @@
 								by <?=Users::format_username($LoggedUser['ID'], true, true, true, true, true)?> Just now
 								</span>
 								<span id="barpreview" style="float:right;">
-									<a href="#quickreplypreview">[Report Post]</a>
+									[<a href="#quickreplypreview">Report</a>]
 									&nbsp;
 									<a href="#">&uarr;</a>
 								</span>
diff --git a/sections/inbox/conversation.php b/sections/inbox/conversation.php
index ec112c17..6937a7d2 100644
--- a/sections/inbox/conversation.php
+++ b/sections/inbox/conversation.php
@@ -63,14 +63,14 @@
 <div class="thin">
 	<h2><?=$Subject.($ForwardedID > 0 ? ' (Forwarded to '.$ForwardedName.')':'')?></h2>
 	<div class="linkbox">
-		<a href="inbox.php">[Back to inbox]</a>
+		[<a href="inbox.php">Back to inbox</a>]
 	</div>
 <?
 
 while(list($SentDate, $SenderID, $Body, $MessageID) = $DB->next_record()) { ?>
 	<div class="box vertical_space">
 		<div class="head">
-			<strong><?=$Users[(int)$SenderID]['UserStr']?></strong> <?=time_diff($SentDate)?> - <a href="#quickpost" onclick="Quote('<?=$MessageID?>','<?=$Users[(int)$SenderID]['Username']?>');">[Quote]</a>	
+			<strong><?=$Users[(int)$SenderID]['UserStr']?></strong> <?=time_diff($SentDate)?> - [<a href="#quickpost" onclick="Quote('<?=$MessageID?>','<?=$Users[(int)$SenderID]['Username']?>');">Quote</a>]
 		</div>
 		<div class="body" id="message<?=$MessageID?>">
 			<?=$Text->full_format($Body)?>
diff --git a/sections/inbox/inbox.php b/sections/inbox/inbox.php
index 027184ba..e361e458 100644
--- a/sections/inbox/inbox.php
+++ b/sections/inbox/inbox.php
@@ -20,9 +20,9 @@
 <?
 
 if($Section == 'inbox') { ?>
-		<a href="inbox.php?action=sentbox">[Sentbox]</a>
+		[<a href="inbox.php?action=sentbox">Sentbox</a>]
 <? } elseif($Section == 'sentbox') { ?>
-		<a href="inbox.php">[Inbox]</a>
+		[<a href="inbox.php">Inbox</a>]
 <? }
 
 ?>
@@ -76,7 +76,7 @@
 if(empty($CurURL)) {
 	$CurURL = "inbox.php?";
 } else {
-	$CurURL = "inbox.php?".$CurURL."&";
+	$CurURL = "inbox.php?".$CurURL."&amp;";
 }
 
 $Pages=Format::get_pages($Page,$NumResults,MESSAGES_PER_PAGE,9);
@@ -88,7 +88,7 @@
 <? if($DB->record_count()==0) { ?>
 	<h2>Your <?= ($Section == 'sentbox') ? 'sentbox' : 'inbox' ?> is currently empty</h2>
 <? } else { ?>
-		<form class="search_form" name="<?= ($Section == 'sentbox')?'sentbox':'inbox'?>" name="" action="inbox.php" method="get" id="searchbox">
+		<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" checked="checked" /> User
@@ -96,9 +96,9 @@
 				<input type="radio" name="searchtype" value="message" /> Message
 				<span style="float: right;">
 <?			if(empty($_GET['sort']) || $_GET['sort'] != "unread") { ?>
-					<a href="<?=$CurURL?>sort=unread">List unread first</a>
+					[<a href="<?=$CurURL?>sort=unread">List unread first</a>]
 <?			} else { ?>
-					<a href="<?=$CurURL?>">List latest first</a>
+					[<a href="<?=$CurURL?>">List latest first</a>]
 <?			} ?>
 				</span>
 				<br />
diff --git a/sections/reports/compose.php b/sections/reports/compose.php
index 6767e2f5..1e475721 100644
--- a/sections/reports/compose.php
+++ b/sections/reports/compose.php
@@ -34,6 +34,7 @@
 }
 View::show_header('Compose', 'inbox,bbcode');
 
+// $TypeLink is placed directly in the <textarea> when composing a PM
 switch($Type) {
 	case "user" :
 		$DB->query("SELECT Username FROM users_main WHERE ID=".$ThingID);
@@ -41,8 +42,8 @@
 			$Error = "No user with the reported ID found";
 		} else {
 			list($Username) = $DB->next_record();
-			$TypeLink = "[user]".$Username."[/user]";
-			$Subject = "User Report: ". display_str($Username);
+			$TypeLink = "the user [user]".$Username."[/user]";
+			$Subject = "User Report: ".display_str($Username);
 		}
 		break;
 	case "request" :
@@ -52,9 +53,8 @@
 			$Error = "No request with the reported ID found";
 		} else {
 			list($Name) = $DB->next_record();
-			$TypeLink = "[url=https://".SSL_SITE_URL."/requests.php?action=view&amp;id=".$ThingID."]".display_str($Name)."[/url]";
-			$Subject = "Request Report: ". display_str($Name);
-
+			$TypeLink = "the request [url=https://".SSL_SITE_URL."/requests.php?action=view&amp;id=".$ThingID."]".display_str($Name)."[/url]";
+			$Subject = "Request Report: ".display_str($Name);
 		}
 		break;
 	case "collage" :
@@ -63,9 +63,8 @@
 			$Error = "No collage with the reported ID found";
 		} else {
 			list($Name) = $DB->next_record();
-			$TypeLink = "[url=https://".SSL_SITE_URL."/collage.php?id=".$ThingID."]".display_str($Name)."[/url]";
-			$Subject = "Collage Report: ". display_str($Name);
-
+			$TypeLink = "the collage [url=https://".SSL_SITE_URL."/collage.php?id=".$ThingID."]".display_str($Name)."[/url]";
+			$Subject = "Collage Report: ".display_str($Name);
 		}
 		break;
 	case "thread" :
@@ -74,9 +73,8 @@
 			$Error = "No forum thread with the reported ID found";
 		} else {
 			list($Title) = $DB->next_record();
-			$TypeLink = "[url=https://".SSL_SITE_URL."/forums.php?action=viewthread&amp;threadid=".$ThingID."]".display_str($Title)."[/url]";
-			$Subject = "Thread Report: ". display_str($Title);
-
+			$TypeLink = "the forum thread [url=https://".SSL_SITE_URL."/forums.php?action=viewthread&amp;threadid=".$ThingID."]".display_str($Title)."[/url]";
+			$Subject = "Forum Thread Report: ".display_str($Title);
 		}
 		break;
 	case "post" :
@@ -90,9 +88,8 @@
 			$Error =  "No forum post with the reported ID found";
 		} else {
 			list($PostID,$Body,$TopicID,$PostNum) = $DB->next_record();
-			$TypeLink = "[url=https://".SSL_SITE_URL."/forums.php?action=viewthread&amp;threadid=".$TopicID."&amp;post=".$PostNum."#post".$PostID."]FORUM POST[/url]";
-			$Subject = "Post Report";
-
+			$TypeLink = "this [url=https://".SSL_SITE_URL."/forums.php?action=viewthread&amp;threadid=".$TopicID."&amp;post=".$PostNum."#post".$PostID."]forum post[/url]";
+			$Subject = "Forum Post Report: Post ID #".display_str($PostID);
 		}
 		break;
 	case "requests_comment" :
@@ -102,9 +99,8 @@
 		} else {
 			list($RequestID, $Body, $PostNum) = $DB->next_record();
 			$PageNum = ceil($PostNum / TORRENT_COMMENTS_PER_PAGE);
-			$TypeLink = "[url=https://".SSL_SITE_URL."/requests.php?action=view&amp;id=".$RequestID."&amp;page=".$PageNum."#post".$ThingID."]REQUEST COMMENT[/url]";
-			$Subject = "Request Comment Report";
-
+			$TypeLink = "this [url=https://".SSL_SITE_URL."/requests.php?action=view&amp;id=".$RequestID."&amp;page=".$PageNum."#post".$ThingID."]request comment[/url]";
+			$Subject = "Request Comment Report: ID #".display_str($ThingID);
 		}
 		break;
 	case "torrents_comment" :
@@ -114,9 +110,8 @@
 		} else {
 			list($GroupID, $Body, $PostNum) = $DB->next_record();
 			$PageNum = ceil($PostNum / TORRENT_COMMENTS_PER_PAGE);
-			$TypeLink = "[url=https://".SSL_SITE_URL."/torrents.php?id=".$GroupID."&amp;page=".$PageNum."#post".$ThingID."]TORRENT COMMENT[/url]";
-			$Subject = "Torrent Comment Report";
-
+			$TypeLink = "this [url=https://".SSL_SITE_URL."/torrents.php?id=".$GroupID."&amp;page=".$PageNum."#post".$ThingID."]torrent comment[/url]";
+			$Subject = "Torrent Comment Report: ID #".display_str($ThingID);
 		}
 		break;
 	case "collages_comment" :
@@ -127,8 +122,8 @@
 			list($CollageID, $Body, $PostNum) = $DB->next_record();
 			$PerPage = POSTS_PER_PAGE;
 			$PageNum = ceil($PostNum / $PerPage);
-			$TypeLink = "[url=https://".SSL_SITE_URL."/collage.php?action=comments&amp;collageid=".$CollageID."&amp;page=".$PageNum."#post".$ThingID."]COLLAGE COMMENT[/url]";
-			$Subject = "Collage Comment Report";
+			$TypeLink = "this [url=https://".SSL_SITE_URL."/collage.php?action=comments&amp;collageid=".$CollageID."&amp;page=".$PageNum."#post".$ThingID."]collage comment[/url]";
+			$Subject = "Collage Comment Report: ID #".display_str($ThingID);
 		}
 		break;
 	default:
@@ -142,7 +137,7 @@
 $DB->query("SELECT r.Reason FROM reports AS r WHERE r.ID = $ReportID");
 list($Reason) = $DB->next_record();
 
-$Body = "You reported this $TypeLink for the reason:\n[quote]".$Reason."[/quote]";
+$Body = "You reported $TypeLink for the reason:\n[quote]".$Reason."[/quote]";
 
 ?>
 <div class="thin">
@@ -153,20 +148,20 @@
 	</div>
 	<form class="send_form" name="message" action="reports.php" method="post" id="messageform">
 		<div class="box pad">
-			<input type="hidden" name="action" value="takecompose" /> <input
-				type="hidden" name="toid" value="<?=$ToID?>" /> <input type="hidden"
-				name="auth" value="<?=$LoggedUser['AuthKey']?>" />
+			<input type="hidden" name="action" value="takecompose" />
+			<input type="hidden" name="toid" value="<?=$ToID?>" />
+			<input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
 			<div id="quickpost">
 				<h3>Subject</h3>
-				<input type="text" name="subject" size="95"
-					value="<?=(!empty($Subject) ? $Subject : '')?>" /><br />
+				<input type="text" name="subject" size="95" value="<?=(!empty($Subject) ? $Subject : '')?>" />
+				<br />
 				<h3>Body</h3>
 				<textarea id="body" name="body" cols="95" rows="10"><?=(!empty($Body) ? $Body : '')?></textarea>
 			</div>
 			<div id="preview" class="hidden"></div>
 			<div id="buttons" class="center">
-				<input type="button" value="Preview" onclick="Quick_Preview();" /> <input
-					type="submit" value="Send message" />
+				<input type="button" value="Preview" onclick="Quick_Preview();" />
+				<input type="submit" value="Send message" />
 			</div>
 		</div>
 	</form>
diff --git a/sections/reports/reports.php b/sections/reports/reports.php
index 1c1e9f3a..997aa96b 100644
--- a/sections/reports/reports.php
+++ b/sections/reports/reports.php
@@ -72,38 +72,39 @@
 // Start printing stuff
 ?>
 <div class="thin">
-    <div class="header">
-        <h2>Active Reports</h2>
+	<div class="header">
+		<h2>Active Reports</h2>
 
-        <div class="linkbox">
-            <a href="reports.php">New</a> |
-            <a href="reports.php?view=old">Old</a> |
-            <a href="reports.php?action=stats">Stats</a>
-        </div>
-    </div>
-    <div class="linkbox">
+		<div class="linkbox">
+			<a href="reports.php">New</a> |
+			<a href="reports.php?view=old">Old</a> |
+			<a href="reports.php?action=stats">Stats</a>
+		</div>
+	</div>
+	<div class="linkbox">
 		<?
 // pagination
 		$Pages = Format::get_pages($Page, $Results, REPORTS_PER_PAGE, 11);
 		echo $Pages;
 		?>
-    </div>
+	</div>
 	<?
 	while (list($ReportID, $SnitchID, $SnitchName, $ThingID, $Short, $ReportedTime, $Reason, $Status, $ClaimerID, $Notes) = $DB->next_record()) {
 		$Type = $Types[$Short];
 		$Reference = "reports.php?id=" . $ReportID . "#report" . $ReportID;
 		?>
-        <div id="report<?=$ReportID?>">
-            <table cellpadding="5" id="report_<?=$ReportID?>">
-                <tr>
-                    <td><strong><a href="<?=$Reference?>">Report #<?=$ReportID?></a></strong></td>
-                    <td><strong><?=$Type['title']?></strong> was reported by <a href="user.php?id=<?=$SnitchID?>"><?=$SnitchName?></a> <?=time_diff($ReportedTime)?> <a
-                            href="reports.php?action=compose&amp;to=<?=$SnitchID?>&amp;reportid=<?=$ReportID?>&amp;type=<?=$Short?>&amp;thingid=<?=$ThingID?>">[Contact]</a></td>
-                </tr>
-                <tr>
-
-                    <td class="center" colspan="2">
-                        <strong>
+		<div id="report<?=$ReportID?>">
+			<table cellpadding="5" id="report_<?=$ReportID?>">
+				<tr>
+					<td><strong><a href="<?=$Reference?>">Report #<?=$ReportID?></a></strong></td>
+					<td>
+						<strong><?=$Type['title']?></strong> was reported by <a href="user.php?id=<?=$SnitchID?>"><?=$SnitchName?></a> <?=time_diff($ReportedTime)?>
+						[<a href="reports.php?action=compose&amp;to=<?=$SnitchID?>&amp;reportid=<?=$ReportID?>&amp;type=<?=$Short?>&amp;thingid=<?=$ThingID?>">Contact</a>]
+					</td>
+				</tr>
+				<tr>
+					<td class="center" colspan="2">
+						<strong>
 							<?
 							switch ($Short) {
 								case "user" :
@@ -184,7 +185,7 @@
 									} else {
 										list($ArtistID, $Body, $PostNum) = $DB->next_record();
 										$PageNum = ceil($PostNum / TORRENT_COMMENTS_PER_PAGE);
-										echo "<a href='artist.php?id=" . $ArtistID . "&page=" . $PageNum . "#post" . $ThingID . "'>COMMENT</a>";
+										echo "<a href='artist.php?id=" . $ArtistID . "&amp;page=" . $PageNum . "#post" . $ThingID . "'>ARTIST COMMENT</a>";
 									}
 									break;
 
diff --git a/sections/top10/torrents.php b/sections/top10/torrents.php
index d4cffdfa..866697c0 100644
--- a/sections/top10/torrents.php
+++ b/sections/top10/torrents.php
@@ -491,12 +491,10 @@ function generate_torrent_table($Caption, $Tag, $Details, $Limit) {
 <?
 		if($IsBookmarked) {
 ?>
-				<a href="#" class="bookmarklink_torrent_<?=$GroupID?>" onclick="Unbookmark('torrent', <?=$GroupID?>,'Bookmark');return false;">Remove Bookmark</a>
-<?
-		} else {
-?>
-				<a href="#" class="bookmarklink_torrent_<?=$GroupID?>" onclick="Bookmark('torrent', <?=$GroupID?>,'Remove Bookmark');return false;">Bookmark</a>
-<? }?>
+				<a href="#" id="bookmarklink_torrent_<?=$GroupID?>" class="remove_bookmark" title="Remove bookmark" onclick="Unbookmark('torrent',<?=$GroupID?>,'Bookmark');return false;">Unbookmark</a>
+<?	} else {  ?>
+				<a href="#" id="bookmarklink_torrent_<?=$GroupID?>" class="add_bookmark" title="Add bookmark" onclick="Bookmark('torrent',<?=$GroupID?>,'Unbookmark');return false;">Bookmark</a>
+<?  }  ?>
 			</span>
 			
 			<?=$TorrentTags?>
diff --git a/sections/top10/votes.php b/sections/top10/votes.php
index ee76c6a8..316782ae 100644
--- a/sections/top10/votes.php
+++ b/sections/top10/votes.php
@@ -221,9 +221,9 @@
 					<td>
 						<strong><?=$DisplayName?></strong> <!--<?Votes::vote_link($GroupID,$UserVotes[$GroupID]['Type']);?>-->
 		<?	if($IsBookmarked) { ?>
-						<span class="bookmark" style="float:right;">[ <a href="#" class="bookmarklink_torrent_<?=$GroupID?>" title="Remove bookmark" onclick="Unbookmark('torrent',<?=$GroupID?>,'Bookmark');return false;">Unbookmark</a> ]</span>
+						<span class="bookmark" style="float:right;">[ <a href="#" id="bookmarklink_torrent_<?=$GroupID?>" class="remove_bookmark" title="Remove bookmark" onclick="Unbookmark('torrent',<?=$GroupID?>,'Bookmark');return false;">Unbookmark</a> ]</span>
 		<?	} else { ?>
-						<span class="bookmark" style="float:right;">[ <a href="#" class="bookmarklink_torrent_<?=$GroupID?>" title="Add bookmark" onclick="Bookmark('torrent',<?=$GroupID?>,'Unbookmark');return false;">Bookmark</a> ]</span>
+						<span class="bookmark" style="float:right;">[ <a href="#" id="bookmarklink_torrent_<?=$GroupID?>" class="add_bookmark" title="Add bookmark" onclick="Bookmark('torrent',<?=$GroupID?>,'Unbookmark');return false;">Bookmark</a> ]</span>
 		<?	} ?>
 					<?=$TorrentTags?>
 					</td>
@@ -335,9 +335,9 @@
 <?		} ?>
 					| <a href="reportsv2.php?action=report&amp;id=<?=$TorrentID?>" title="Report">RP</a>
 <?		if($IsBookmarked) { ?>
-					| <a href="#" id="bookmarklink_torrent_<?=$GroupID?>" title="Remove bookmark" onclick="Unbookmark('torrent',<?=$GroupID?>,'Bookmark');return false;">Unbookmark</a>
+					| <a href="#" id="bookmarklink_torrent_<?=$GroupID?>" class="remove_bookmark" title="Remove bookmark" onclick="Unbookmark('torrent',<?=$GroupID?>,'Bookmark');return false;">Unbookmark</a>
 <?		} else { ?>
-					| <a href="#" id="bookmarklink_torrent_<?=$GroupID?>" title="Add bookmark" onclick="Bookmark('torrent',<?=$GroupID?>,'Unbookmark');return false;">Bookmark</a>
+					| <a href="#" id="bookmarklink_torrent_<?=$GroupID?>" class="add_bookmark" title="Add bookmark" onclick="Bookmark('torrent',<?=$GroupID?>,'Unbookmark');return false;">Bookmark</a>
 <?		} ?>
 					]
 				</span>
diff --git a/sections/torrents/browse2.php b/sections/torrents/browse2.php
index 02222bf4..081c8f35 100644
--- a/sections/torrents/browse2.php
+++ b/sections/torrents/browse2.php
@@ -962,9 +962,9 @@ function header_link($SortKey,$DefaultWay="desc") {
 		<td colspan="2">
 			<?=$DisplayName?>
 <?	if (in_array($GroupID, $Bookmarks)) { ?>
-			<span class="bookmark" style="float:right;"><a href="#" id="bookmarklink_torrent_<?=$GroupID?>" title="Remove bookmark" onclick="Unbookmark('torrent',<?=$GroupID?>,'Bookmark');return false;">Unbookmark</a></span>
+			<span class="remove_bookmark" style="float:right;"><a href="#" id="bookmarklink_torrent_<?=$GroupID?>" title="Remove bookmark" onclick="Unbookmark('torrent',<?=$GroupID?>,'Bookmark');return false;">Unbookmark</a></span>
 <?	} else { ?>
-			<span class="bookmark" style="float:right;"><a href="#" id="bookmarklink_torrent_<?=$GroupID?>" title="Add bookmark" onclick="Bookmark('torrent',<?=$GroupID?>,'Unbookmark');return false;">Bookmark</a></span>
+			<span class="add_bookmark" style="float:right;"><a href="#" id="bookmarklink_torrent_<?=$GroupID?>" title="Add bookmark" onclick="Bookmark('torrent',<?=$GroupID?>,'Unbookmark');return false;">Bookmark</a></span>
 <?	} ?>
 			<br />
 			<div class="tags">
diff --git a/sections/torrents/details.php b/sections/torrents/details.php
index 8b841251..8295bc71 100644
--- a/sections/torrents/details.php
+++ b/sections/torrents/details.php
@@ -96,9 +96,9 @@ function compare($X, $Y){
 <?	}
 	if(has_bookmarked('torrent', $GroupID)) {
 ?>
-			<a href="#" id="bookmarklink_torrent_<?=$GroupID?>" onclick="Unbookmark('torrent', <?=$GroupID?>,'[Bookmark]');return false;">[Remove bookmark]</a>
-<?	} else { ?>
-			<a href="#" id="bookmarklink_torrent_<?=$GroupID?>" onclick="Bookmark('torrent', <?=$GroupID?>,'[Remove bookmark]');return false;">[Bookmark]</a>
+			<a href="#" id="bookmarklink_torrent_<?=$GroupID?>" class="remove_bookmark" title="Remove bookmark" onclick="Unbookmark('torrent',<?=$GroupID?>,'Bookmark');return false;">Unbookmark</a>
+<?	} else {  ?>
+			<a href="#" id="bookmarklink_torrent_<?=$GroupID?>" class="add_bookmark" title="Add bookmark" onclick="Bookmark('torrent',<?=$GroupID?>,'Unbookmark');return false;">Bookmark</a>
 <?	}
 	if($Categories[$GroupCategoryID-1] == 'Music') { ?>
 			<a href="upload.php?groupid=<?=$GroupID?>">[Add format]</a>
diff --git a/sections/user/lastfm.php b/sections/user/lastfm.php
index e77e726a..48b1365e 100644
--- a/sections/user/lastfm.php
+++ b/sections/user/lastfm.php
@@ -9,8 +9,8 @@
     <div class="box box_info box_lastfm">
         <div class="head colhead_dark">Last.fm</div>
         <ul class="stats nobullet">
-            <li class="lastfm_username">
-                Username: <a id="lastfm_username" href="<?= $LastFMInfo['user']['url'] ?>" title="<?= $LastFMInfo['user']['name'] ?> on Last.fm: <?= $LastFMInfo['user']['playcount'] ?> plays, <?= $LastFMInfo['user']['playlists'] ?> playlists."><?= $LastFMInfo['user']['name'] ?></a>
+            <li>
+                Username: <a id="lastfm_username" href="<?= $LastFMInfo['user']['url'] ?>" target="_blank" title="<?= $LastFMInfo['user']['name'] ?> on Last.fm: <?= $LastFMInfo['user']['playcount'] ?> plays, <?= $LastFMInfo['user']['playlists'] ?> playlists."><?= $LastFMInfo['user']['name'] ?></a>
             </li>
             <div id="lastfm_stats" <? if ($OwnProfile == true): ?>data-uid="<?= $OwnProfile ?>"<? endif; ?>>
             </div>
diff --git a/sections/userhistory/post_history.php b/sections/userhistory/post_history.php
index 5f6c56b9..bfc1461b 100644
--- a/sections/userhistory/post_history.php
+++ b/sections/userhistory/post_history.php
@@ -212,24 +212,24 @@
 	if(!$ShowUnread){ ?>
 		<br /><br />
 		<? if($ShowGrouped) { ?>
-			<a href="userhistory.php?action=posts&amp;userid=<?=$UserID?>&amp;showunread=0&amp;group=0">Show all posts</a>&nbsp;&nbsp;&nbsp;
+			[<a href="userhistory.php?action=posts&amp;userid=<?=$UserID?>&amp;showunread=0&amp;group=0">Show all posts</a>]&nbsp;&nbsp;&nbsp;
 		<? } else { ?>
-			<a href="userhistory.php?action=posts&amp;userid=<?=$UserID?>&amp;showunread=0&amp;group=1">Show all posts (grouped)</a>&nbsp;&nbsp;&nbsp;
+			[<a href="userhistory.php?action=posts&amp;userid=<?=$UserID?>&amp;showunread=0&amp;group=1">Show all posts (grouped)</a>]&nbsp;&nbsp;&nbsp;
 		<? } ?>
-		<a href="userhistory.php?action=posts&amp;userid=<?=$UserID?>&amp;showunread=1&amp;group=1">Only display posts with unread replies (grouped)</a>&nbsp;&nbsp;&nbsp;
+		[<a href="userhistory.php?action=posts&amp;userid=<?=$UserID?>&amp;showunread=1&amp;group=1">Only display posts with unread replies (grouped)</a>]&nbsp;&nbsp;&nbsp;
 <?	} else { ?>
 		<br /><br />
-		<a href="userhistory.php?action=posts&amp;userid=<?=$UserID?>&amp;showunread=0&amp;group=0">Show all posts</a>&nbsp;&nbsp;&nbsp;
+		[<a href="userhistory.php?action=posts&amp;userid=<?=$UserID?>&amp;showunread=0&amp;group=0">Show all posts</a>]&nbsp;&nbsp;&nbsp;
 <?	
 		if(!$ShowGrouped) {
-			?><a href="userhistory.php?action=posts&amp;userid=<?=$UserID?>&amp;showunread=1&amp;group=1">Only display posts with unread replies (grouped)</a>&nbsp;&nbsp;&nbsp;<?
+			?>[<a href="userhistory.php?action=posts&amp;userid=<?=$UserID?>&amp;showunread=1&amp;group=1">Only display posts with unread replies (grouped)</a>]&nbsp;&nbsp;&nbsp;<?
 		}
 		else {
-			?><a href="userhistory.php?action=posts&amp;userid=<?=$UserID?>&amp;showunread=1&amp;group=0">Only display posts with unread replies</a>&nbsp;&nbsp;&nbsp;<?
+			?>[<a href="userhistory.php?action=posts&amp;userid=<?=$UserID?>&amp;showunread=1&amp;group=0">Only display posts with unread replies</a>]&nbsp;&nbsp;&nbsp;<?
 		}
 	}
 ?>
-			<a href="userhistory.php?action=subscriptions">Go to subscriptions</a>
+			[<a href="userhistory.php?action=subscriptions">Go to subscriptions</a>]
 <?
 }
 ?>
@@ -285,7 +285,7 @@
 ?>
 				<span id="bar<?=$PostID ?>" style="float:right;">
 <? 		if($ViewingOwn && !in_array($TopicID, $UserSubscriptions)) { ?>
-					<a href="#" onclick="Subscribe(<?=$TopicID?>);$('.subscribelink<?=$TopicID?>').remove();return false;" class="subscribelink<?=$TopicID?>">[Subscribe]</a>
+					[<a href="#" onclick="Subscribe(<?=$TopicID?>);$('.subscribelink<?=$TopicID?>').remove();return false;" class="subscribelink<?=$TopicID?>">Subscribe</a>]
 					&nbsp;
 <? 		} ?>
 					<a href="#">&uarr;</a>
diff --git a/sections/userhistory/quote_notifications.php b/sections/userhistory/quote_notifications.php
index f61c1de6..45019f9a 100644
--- a/sections/userhistory/quote_notifications.php
+++ b/sections/userhistory/quote_notifications.php
@@ -49,12 +49,12 @@
 		<div class="linkbox pager">
 			<br />
 			<? if ($UnreadSQL) { ?>
-			<a href="userhistory.php?action=quote_notifications&amp;showall=1">Show all quotes</a>&nbsp;&nbsp;&nbsp;
+			[<a href="userhistory.php?action=quote_notifications&amp;showall=1">Show all quotes</a>]&nbsp;&nbsp;&nbsp;
 			<? } else { ?>
-			<a href="userhistory.php?action=quote_notifications">Show unread quotes</a>&nbsp;&nbsp;&nbsp;
+			[<a href="userhistory.php?action=quote_notifications">Show unread quotes</a>]&nbsp;&nbsp;&nbsp;
 			<? } ?>
-			<a href="userhistory.php?action=subscriptions">Show subscriptions</a>&nbsp;&nbsp;&nbsp;
-			<a href="userhistory.php?action=quote_notifications&amp;catchup=1">Catch up</a>&nbsp;&nbsp;&nbsp;
+			[<a href="userhistory.php?action=subscriptions">Show subscriptions</a>]&nbsp;&nbsp;&nbsp;
+			[<a href="userhistory.php?action=quote_notifications&amp;catchup=1">Catch up</a>]&nbsp;&nbsp;&nbsp;
 			<br /> <br />
 			<?
 			$Pages = Format::get_pages($Page, $NumResults, TOPICS_PER_PAGE, 9);
diff --git a/sections/userhistory/subscriptions.php b/sections/userhistory/subscriptions.php
index cefab662..9b8b9b3e 100644
--- a/sections/userhistory/subscriptions.php
+++ b/sections/userhistory/subscriptions.php
@@ -102,23 +102,23 @@
 if(!$ShowUnread) {
 ?>
 			<br /><br />
-			<a href="userhistory.php?action=subscriptions&amp;showunread=1">Only display topics with unread replies</a>&nbsp;&nbsp;&nbsp;
+			[<a href="userhistory.php?action=subscriptions&amp;showunread=1">Only display topics with unread replies</a>]&nbsp;&nbsp;&nbsp;
 <?
 } else {
 ?>
 			<br /><br />
-			<a href="userhistory.php?action=subscriptions&amp;showunread=0">Show all subscribed topics</a>&nbsp;&nbsp;&nbsp;
+			[<a href="userhistory.php?action=subscriptions&amp;showunread=0">Show all subscribed topics</a>]&nbsp;&nbsp;&nbsp;
 <?
 }
 if($NumResults) {
 ?>
-			<a href="#" onclick="Collapse();return false;" id="collapselink"><?=$ShowCollapsed?'Show':'Hide'?> post bodies</a>&nbsp;&nbsp;&nbsp;
+			[<a href="#" onclick="Collapse();return false;" id="collapselink"><?=$ShowCollapsed?'Show':'Hide'?> post bodies</a>]&nbsp;&nbsp;&nbsp;
 <?
 }
 ?>
-			<a href="userhistory.php?action=catchup&amp;auth=<?=$LoggedUser['AuthKey']?>">Catch up</a>&nbsp;&nbsp;&nbsp;
-			<a href="userhistory.php?action=posts&amp;userid=<?=$LoggedUser['ID']?>">Go to post history</a>&nbsp;&nbsp;&nbsp;
-			<a href="userhistory.php?action=quote_notifications">Quote notifications</a>&nbsp;&nbsp;&nbsp;
+			[<a href="userhistory.php?action=catchup&amp;auth=<?=$LoggedUser['AuthKey']?>">Catch up</a>]&nbsp;&nbsp;&nbsp;
+			[<a href="userhistory.php?action=posts&amp;userid=<?=$LoggedUser['ID']?>">Go to post history</a>]&nbsp;&nbsp;&nbsp;
+			[<a href="userhistory.php?action=quote_notifications">Quote notifications</a>]&nbsp;&nbsp;&nbsp;
 		</div>
 	</div>
 <?
diff --git a/static/styles/postmod/style.css b/static/styles/postmod/style.css
index f32629a5..d3755502 100644
--- a/static/styles/postmod/style.css
+++ b/static/styles/postmod/style.css
@@ -1053,3 +1053,7 @@ tr.torrent .bookmark > a:before {
 tr.torrent .bookmark > a:after {
     color:#646054;
 }
+
+#requests .forum_post textarea { /* overriding the inline 80-character monospace */
+	max-width: 409px;
+}