diff --git a/classes/class_torrents.php b/classes/class_torrents.php
index 30cccaf5..59aca00c 100644
--- a/classes/class_torrents.php
+++ b/classes/class_torrents.php
@@ -583,7 +583,7 @@ public static function has_snatched($TorrentID) {
 
 		// Torrent was not found in the previously inspected snatch lists
 		$CurSnatchedTorrents =& $SnatchedTorrents[$BucketID];
-		if (empty($CurSnatchedTorrents)) {
+		if ($CurSnatchedTorrents === false) {
 			$CurTime = time();
 			// This bucket hasn't been checked before
 			$CurSnatchedTorrents = $Cache->get_value('users_snatched_'.$UserID.'_'.$BucketID, true);
diff --git a/sections/artist/artist.php b/sections/artist/artist.php
index 07ccfbf8..8d1994d6 100644
--- a/sections/artist/artist.php
+++ b/sections/artist/artist.php
@@ -828,7 +828,6 @@ function compare($X, $Y){
 	$Similar->write_artists();
 ?>
 			</div>
-		</div>
 		<div id="flip_view_2" style="display:none;width:<?=WIDTH?>px;height:<?=HEIGHT?>px;">
 			<canvas width="<?=WIDTH?>px" height="<?=HEIGHT-20?>px" id="similarArtistsCanvas"></canvas>
 			<div id="artistTags" style="display:none;">
@@ -836,6 +835,7 @@ function compare($X, $Y){
 			</div>
 			<strong style="margin-left:10px;"><a id="currentArtist" href="#null">Loading...</a></strong>
 		</div>
+		</div>
 
 <script>
 var cloudLoaded = false;
diff --git a/sections/better/snatch.php b/sections/better/snatch.php
index 17a72a8c..fcf35f78 100644
--- a/sections/better/snatch.php
+++ b/sections/better/snatch.php
@@ -1,6 +1,5 @@
 <?
-
-if(!empty($_GET['userid']) && is_number($_GET['userid'])) {
+if (!empty($_GET['userid']) && is_number($_GET['userid'])) {
 	if (check_perms('users_override_paranoia')) {
 		$UserID = $_GET['userid'];
 	} else {
@@ -10,7 +9,10 @@
 	$UserID = $LoggedUser['ID'];
 }
 
-if(!empty($_GET['filter']) && $_GET['filter'] == 'seeding') {
+$Encodings = array('V0 (VBR)', 'V2 (VBR)', '320');
+$EncodingKeys = array_fill_keys($Encodings, true);
+
+if (!empty($_GET['filter']) && $_GET['filter'] == 'seeding') {
 	$SeedingOnly = true;
 } else {
 	$SeedingOnly = false;
@@ -25,18 +27,26 @@
 			OR t.Media = 'Vinyl')
 		AND x.uid='$UserID'");
 
-$SnatchedGroupIDs = $DB->collect('GroupID');
-$Snatches = $DB->to_array('GroupID');
+$SnatchedTorrentIDs = array_fill_keys($DB->collect('fid'), true);
+$SnatchedGroupIDs = array_unique($DB->collect('GroupID'));
+if (count($SnatchedGroupIDs) > 1000) {
+	shuffle($SnatchedGroupIDs);
+	$SnatchedGroupIDs = array_slice($SnatchedGroupIDs, 0, 1000);
+}
 
-if(count($SnatchedGroupIDs) == 0) { error(($SeedingOnly ? "You aren't seeding any 100% FLACs!" : "You haven't snatched any 100% FLACs!")); }
+if (count($SnatchedGroupIDs) == 0) {
+	error(($SeedingOnly ? "You aren't seeding any 100% FLACs!" : "You haven't snatched any 100% FLACs!"));
+}
 // Create hash table
 
 $DB->query("CREATE TEMPORARY TABLE temp_sections_better_snatch
 	SELECT t.GroupID,
-	GROUP_CONCAT(t.Encoding SEPARATOR ' ') AS EncodingList
+	GROUP_CONCAT(t.Encoding SEPARATOR ' ') AS EncodingList,
+	CRC32(CONCAT_WS(' ', Media, Remasteryear, Remastertitle,
+		Remasterrecordlabel, Remastercataloguenumber)) AS RemIdent
 	FROM torrents AS t
 	WHERE t.GroupID IN(".implode(',',$SnatchedGroupIDs).")
-	GROUP BY t.GroupID");
+	GROUP BY t.GroupID, RemIdent");
 
 //$DB->query('SELECT * FROM t');
 
@@ -45,16 +55,58 @@
 		OR EncodingList NOT LIKE '%V2 (VBR)%' 
 		OR EncodingList NOT LIKE '%320%'");
 
-$GroupIDs = $DB->collect('GroupID');
+$GroupIDs = array_fill_keys($DB->collect('GroupID'), true);
 
-if(count($GroupIDs) == 0) { error('No results found'); }
+if (count($GroupIDs) == 0) {
+	error('No results found');
+}
 
-$Results = Torrents::get_groups($GroupIDs);
+$Groups = Torrents::get_groups(array_keys($GroupIDs));
+$Groups = $Groups['matches'];
+
+$TorrentGroups = array();
+foreach ($Groups as $GroupID => $Group) {
+	if (empty($Group['Torrents'])) {
+		unset($Groups[$GroupID]);
+		continue;
+	}
+	foreach ($Group['Torrents'] as $Torrent) {
+		$TorRemIdent = "$Torrent[Media] $Torrent[RemasterYear] $Torrent[RemasterTitle] $Torrent[RemasterRecordLabel] $Torrent[RemasterCatalogueNumber]";
+		if (!isset($TorrentGroups[$Group['ID']])) {
+			$TorrentGroups[$Group['ID']] = array(
+				$TorRemIdent => array(
+					'FlacID' => 0,
+					'Formats' => array(),
+					'Medium' => $Torrent['Media'],
+					'RemasterTitle' => $Torrent['RemasterTitle'],
+					'RemasterYear' => $Torrent['RemasterYear'],
+					'RemasterRecordLabel' => $Torrent['RemasterRecordLabel'],
+					'RemasterCatalogueNumber' => $Torrent['RemasterCatalogueNumber']
+				)
+			);
+		} elseif (!isset($TorrentGroups[$Group['ID']][$TorRemIdent])) {
+			$TorrentGroups[$Group['ID']][$TorRemIdent] = array(
+				'FlacID' => 0,
+				'Formats' => array(),
+				'Medium' => $Torrent['Media'],
+				'RemasterTitle' => $Torrent['RemasterTitle'],
+				'RemasterYear' => $Torrent['RemasterYear'],
+				'RemasterRecordLabel' => $Torrent['RemasterRecordLabel'],
+				'RemasterCatalogueNumber' => $Torrent['RemasterCatalogueNumber']
+			);
+		}
+		if (isset($EncodingKeys[$Torrent['Encoding']])) {
+			$TorrentGroups[$Group['ID']][$TorRemIdent]['Formats'][$Torrent['Encoding']] = true;
+		} elseif (isset($SnatchedTorrentIDs[$Torrent['ID']])) {
+			$TorrentGroups[$Group['ID']][$TorRemIdent]['FlacID'] = $Torrent['ID'];
+		}
+	}
+}
 
 View::show_header('Transcode Snatches');
 ?>
 <div class="linkbox">
-<? if($SeedingOnly) { ?>
+<? if ($SeedingOnly) { ?>
 	<a href="better.php?method=snatch">Show all</a>
 <? } else { ?>
 	<a href="better.php?method=snatch&amp;filter=seeding">Just those currently seeding</a>
@@ -69,50 +121,80 @@
 			<td>320</td>
 		</tr>
 <?
-$Results = $Results['matches'];
-foreach ($Results as $GroupID=>$Group) {
-	list($GroupID, $GroupName, $GroupYear, $GroupRecordLabel, $GroupCatalogueNumber, $TorrentTags, $ReleaseType, $GroupVanityHouse, $Torrents, $Artists) = array_values($Group);
-	$FlacID = $Snatches[$GroupID]['fid'];
-	
-	$DisplayName = '';
-	if(count($Artists)>0) {
-		$DisplayName = Artists::display_artists(array('1'=>$Artists));
+foreach ($TorrentGroups as $GroupID => $Editions) {
+	$GroupInfo = $Groups[$GroupID];
+	$GroupYear = $GroupInfo['Year'];
+	$ExtendedArtists = $GroupInfo['ExtendedArtists'];
+	$GroupCatalogueNumber = $GroupInfo['CatalogueNumber'];
+	$GroupName = $GroupInfo['Name'];
+	$GroupRecordLabel = $GroupInfo['RecordLabel'];
+	$ReleaseType = $GroupInfo['ReleaseType'];
+
+	if (!empty($ExtendedArtists[1]) || !empty($ExtendedArtists[4]) || !empty($ExtendedArtists[5]) || !empty($ExtendedArtists[6])) {
+		unset($ExtendedArtists[2]);
+		unset($ExtendedArtists[3]);
+		$ArtistNames = Artists::display_artists($ExtendedArtists);
+	} else {
+		$ArtistNames = '';
 	}
-	$DisplayName.='<a href="torrents.php?id='.$GroupID.'&amp;torrentid='.$FlacID.'" title="View Torrent">'.$GroupName.'</a>';
-	if($GroupYear>0) { $DisplayName.=" [".$GroupYear."]"; }
-	if($ReleaseType>0) { $DisplayName.=" [".$ReleaseTypes[$ReleaseType]."]"; }
-	
-	$MissingEncodings = array('V0 (VBR)'=>1, 'V2 (VBR)'=>1, '320'=>1);
-	
-	foreach($Torrents as $Torrent) {
-		if(!empty($MissingEncodings[$Torrent['Encoding']])) {
-			$MissingEncodings[$Torrent['Encoding']] = 0;
+
+	$TagList = array();
+	$TagList = explode(' ', str_replace('_', '.', $GroupInfo['TagList']));
+	$TorrentTags = array();
+	foreach ($TagList as $Tag) {
+		$TorrentTags[] = '<a href="torrents.php?taglist='.$Tag.'">'.$Tag.'</a>';
+	}
+	$TorrentTags = implode(', ', $TorrentTags);
+	foreach ($Editions as $RemIdent => $Edition) {
+		if (!$Edition['FlacID'] || count($Edition['Formats']) == 3) {
+			continue;
 		}
-	}
-	
-	$TagList=array();
-	if($TorrentTags!='') {
-		$TorrentTags=explode(' ',$TorrentTags);
-		foreach ($TorrentTags as $TagKey => $TagName) {
-			$TagName = str_replace('_','.',$TagName);
-			$TagList[]='<a href="torrents.php?searchtags='.$TagName.'">'.$TagName.'</a>';
+		$DisplayName = $ArtistNames . '<a href="torrents.php?id='.$GroupID.'&amp;torrentid='.$Edition['FlacID'].'#torrent'.$Edition['FlacID'].'" title="View Torrent">'.$GroupName.'</a>';
+		if($GroupYear > 0) {
+			$DisplayName .= " [".$GroupYear."]";
 		}
-		$PrimaryTag = $TorrentTags[0];
-		$TagList = implode(', ', $TagList);
-		$TorrentTags='<br /><div class="tags">'.$TagList.'</div>';
-	}
+		if ($ReleaseType > 0) {
+			$DisplayName .= " [".$ReleaseTypes[$ReleaseType]."]";
+		}
+		$DisplayName .= ' ['.$Edition['Medium'].']';
+
+		$EditionInfo = array();
+		if (!empty($Edition['RemasterYear'])) {
+			$ExtraInfo = $Edition['RemasterYear'];
+		} else {
+			$ExtraInfo = '';
+		}
+		if (!empty($Edition['RemasterRecordLabel'])) {
+			$EditionInfo[] = $Edition['RemasterRecordLabel'];
+		}
+		if (!empty($Edition['RemasterTitle'])) {
+			$EditionInfo[] = $Edition['RemasterTitle'];
+		}
+		if (!empty($Edition['RemasterCatalogueNumber'])) {
+			$EditionInfo[] = $Edition['RemasterCatalogueNumber'];
+		}
+		if (!empty($Edition['RemasterYear'])) {
+			$ExtraInfo .= ' - ';
+		}
+		$ExtraInfo .= implode(' / ', $EditionInfo);
 ?>
-		<tr>
+		<tr<?=$Edition['IsSnatched'] ? ' class="snatched_torrent"' : ''?>>
 			<td>
-				<?=$DisplayName?>	
-				[ <a href="torrents.php?action=download&amp;id=<?=$FlacID?>&amp;authkey=<?=$LoggedUser['AuthKey']?>&torrent_pass=<?=$LoggedUser['torrent_pass']?>">DL</a> ]
-				<?=$TorrentTags?>
+				<span class="torrent_links_block">
+					[ <a href="torrents.php?action=download&amp;id=<?=$Edition['FlacID']?>&amp;authkey=<?=$LoggedUser['AuthKey']?>&amp;torrent_pass=<?=$LoggedUser['torrent_pass']?>" title="Download">DL</a> ]
+				</span>
+				<?=$DisplayName?>
+				<div class="torrent_info"><?=$ExtraInfo?></div>
+				<div class="tags"><?=$TorrentTags?></div>
 			</td>
-			<td><strong><?=($MissingEncodings['V2 (VBR)'] == 0)?'<span style="color: green;">YES</span>':'<span style="color: red;">NO</span>'?></strong></td>
-			<td><strong><?=($MissingEncodings['V0 (VBR)'] == 0)?'<span style="color: green;">YES</span>':'<span style="color: red;">NO</span>'?></strong></td>
-			<td><strong><?=($MissingEncodings['320'] == 0)?'<span style="color: green;">YES</span>':'<span style="color: red;">NO</span>'?></strong></td>
+			<td><?=isset($Edition['Formats']['V2 (VBR)'])?'<strong class="important_text_alt">YES</strong>':'<strong class="important_text">NO</strong>'?></td>
+			<td><?=isset($Edition['Formats']['V0 (VBR)'])?'<strong class="important_text_alt">YES</strong>':'<strong class="important_text">NO</strong>'?></td>
+			<td><?=isset($Edition['Formats']['320'])?'<strong class="important_text_alt">YES</strong>':'<strong class="important_text">NO</strong>'?></td>
 		</tr>
-<?	} ?>
+<?
+	}
+}
+?>
 	</table>
 </div>
 <?
diff --git a/sections/better/transcode.php b/sections/better/transcode.php
index 9cbd911e..605a2021 100644
--- a/sections/better/transcode.php
+++ b/sections/better/transcode.php
@@ -129,7 +129,7 @@
 	$TagList = explode(' ',str_replace('_','.',$GroupInfo['TagList']));
 	$TorrentTags = array();
 	foreach ($TagList as $Tag) {
-		$TorrentTags[] = '<a href="torrents.php?'.$Action.'&amp;taglist='.$Tag.'">'.$Tag.'</a>';
+		$TorrentTags[] = '<a href="torrents.php?taglist='.$Tag.'">'.$Tag.'</a>';
 	}
 	$TorrentTags = implode(', ', $TorrentTags);
 	foreach ($Editions as $RemIdent => $Edition) {
@@ -179,9 +179,9 @@
 				<div class="torrent_info"><?=$ExtraInfo?></div>
 				<div class="tags"><?=$TorrentTags?></div>
 			</td>
-			<td><strong><?=isset($Edition['Formats']['V2 (VBR)'])?'<span style="color: green;">YES</span>':'<span style="color: red;">NO</span>'?></strong></td>
-			<td><strong><?=isset($Edition['Formats']['V0 (VBR)'])?'<span style="color: green;">YES</span>':'<span style="color: red;">NO</span>'?></strong></td>
-			<td><strong><?=isset($Edition['Formats']['320'])?'<span style="color: green;">YES</span>':'<span style="color: red;">NO</span>'?></strong></td>
+			<td><strong><?=isset($Edition['Formats']['V2 (VBR)'])?'<span class="important_text_alt">YES</span>':'<span class="important_text">NO</span>'?></strong></td>
+			<td><strong><?=isset($Edition['Formats']['V0 (VBR)'])?'<span class="important_text_alt">YES</span>':'<span class="important_text">NO</span>'?></strong></td>
+			<td><strong><?=isset($Edition['Formats']['320'])?'<span class="important_text_alt">YES</span>':'<span class="important_text">NO</span>'?></strong></td>
 		</tr>
 <?
 		}
diff --git a/sections/bookmarks/torrents.php b/sections/bookmarks/torrents.php
index 350c78bb..324ce2de 100644
--- a/sections/bookmarks/torrents.php
+++ b/sections/bookmarks/torrents.php
@@ -375,7 +375,6 @@ function compare($X, $Y){
 		</script>
 <?		}
 } ?>
-		<br />
 		<table class="torrent_table grouping cats" id="torrent_table">
 			<tr class="colhead_dark">
 				<td><!-- expand/collapse --></td>
diff --git a/sections/collages/browse.php b/sections/collages/browse.php
index c834ad6c..cf1c4735 100644
--- a/sections/collages/browse.php
+++ b/sections/collages/browse.php
@@ -47,14 +47,14 @@
 }
 
 // Ordering
-if(!empty($_GET['order']) && !empty($OrderTable[$_GET['order']])) {
-	$Order = $OrderTable[$_GET['order']];
+if(!empty($_GET['order_by']) && !empty($OrderTable[$_GET['order_by']])) {
+	$Order = $OrderTable[$_GET['order_by']];
 } else {
 	$Order = 'ID';
 }
 
-if(!empty($_GET['way']) && !empty($WayTable[$_GET['way']])) {
-	$Way = $WayTable[$_GET['way']];
+if(!empty($_GET['order_way']) && !empty($WayTable[$_GET['order_way']])) {
+	$Way = $WayTable[$_GET['order_way']];
 } else {
 	$Way = 'DESC';
 }
@@ -91,10 +91,20 @@
 	$SQL .= "%'";
 }
 
+if (isset($_GET['tags_type']) && $_GET['tags_type'] == 0) { // Any
+	$_GET['tags_type'] = 0;
+} else { // All
+	$_GET['tags_type'] = 1;
+}
+
 if(!empty($Tags)) {
-	$SQL.= " AND TagList LIKE '%";
-	$SQL .= implode("%' AND TagList LIKE '%", $Tags);
-	$SQL .= "%'";
+	$SQL.= " AND (TagList LIKE '%";
+	if ($_GET['tags_type'] == 0) {
+		$SQL .= implode("%' OR TagList LIKE '%", $Tags);
+	} else {
+		$SQL .= implode("%' AND TagList LIKE '%", $Tags);
+	}
+	$SQL .= "%')";
 }
 
 if(!empty($_GET['userid'])) {
@@ -153,50 +163,54 @@
 		<form class="search_form" name="collages" action="" method="get">
 			<div><input type="hidden" name="action" value="search" /></div>
 			<table cellpadding="6" cellspacing="1" border="0" class="layout border" width="100%">
-				<tr>
-					<td class="label"><strong>Search for:</strong></td>
-					<td colspan="3">
+				<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']) : '')?>" />
 					</td>
 				</tr>
-				<tr>
-					<td class="label"><strong>Tags:</strong></td>
-					<td colspan="3">
-						<input type="text" name="tags" size="70" value="<?=(!empty($_GET['tags']) ? display_str($_GET['tags']) : '')?>" />
+				<tr id="tagfilter">
+					<td class="label">Tags (comma-separated):</td>
+					<td>
+						<input type="text" name="tags" size="70" value="<?=(!empty($_GET['tags']) ? display_str($_GET['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>
 				</tr>
-				<tr>
-					<td class="label"><strong>Categories:</strong></td>
-					<td colspan="3">
+				<tr id="categories">
+					<td class="label">Categories:</td>
+					<td>
 <? foreach($CollageCats as $ID=>$Cat) { ?>
 						<input type="checkbox" value="1" name="cats[<?=$ID?>]" id="cats_<?=$ID?>" <?if(in_array($ID, $Categories)) { echo ' checked="checked"'; }?>>
-						<label for="cats_<?=$ID?>"><?=$Cat?></label>
+						<label for="cats_<?=$ID?>"><?=$Cat?></label>&nbsp;&nbsp;
 <? } ?>
 					</td>
 				</tr>
-				<tr>
-					<td class="label"><strong>Search in:</strong></td>
+				<tr id="search_name_description">
+					<td class="label">Search in:</td>
 					<td>
-						<input type="radio" name="type" value="c.name" <? if($Type == 'c.name') { echo 'checked="checked" '; }?>/> Names
+						<input type="radio" name="type" value="c.name" <? if($Type == 'c.name') { echo 'checked="checked" '; }?>/> Names&nbsp;&nbsp;
 						<input type="radio" name="type" value="description" <? if($Type == 'description') { echo 'checked="checked" '; }?>/> Descriptions
 					</td>
-					<td class="label"><strong>Order by:</strong></td>
+				</tr>
+				<tr id="order_by">
+					<td class="label">Order by:</td>
 					<td>
-						<select name="order">
+						<select name="order_by" class="ft_order_by">
 						<?
 							foreach($OrderVals as $Cur){ ?>
-							<option value="<?=$Cur?>"<? if(isset($_GET['order']) && $_GET['order'] == $Cur || (!isset($_GET['order']) && $Cur == 'Time')) { echo ' selected="selected"'; } ?>><?=$Cur?></option>
+							<option value="<?=$Cur?>"<? if(isset($_GET['order_by']) && $_GET['order_by'] == $Cur || (!isset($_GET['order_by']) && $Cur == 'Time')) { echo ' selected="selected"'; } ?>><?=$Cur?></option>
 						<?	}?>
 						</select>
-						<select name="way">
+						<select name="order_way" class="ft_order_way">
 						<?	foreach($WayVals as $Cur){ ?>
-							<option value="<?=$Cur?>"<? if(isset($_GET['way']) && $_GET['way'] == $Cur || (!isset($_GET['way']) && $Cur == 'Descending')) { echo ' selected="selected"'; } ?>><?=$Cur?></option>
+							<option value="<?=$Cur?>"<? if(isset($_GET['order_way']) && $_GET['order_way'] == $Cur || (!isset($_GET['order_way']) && $Cur == 'Descending')) { echo ' selected="selected"'; } ?>><?=$Cur?></option>
 						<?	}?>
 						</select>
 					</td>
 				</tr>
 				<tr>
-					<td colspan="4" class="center">
+					<td colspan="2" class="center">
 						<input type="submit" value="Search" />
 					</td>
 				</tr>
@@ -217,15 +231,15 @@
 	if ($CollageCount == 1) {
 		list($CollageID) = $DB->next_record();
 ?>
-		<a href="collages.php?id=<?=$CollageID?>">[My personal collage]</a>
+		<a href="collages.php?id=<?=$CollageID?>">[Personal collage]</a>
 <?	} elseif ($CollageCount > 1) { ?>
-		<a href="collages.php?action=mine">[My personal collages]</a>
+		<a href="collages.php?action=mine">[Personal collages]</a>
 <?	}
 } 
 if (check_perms('site_collages_subscribe')) { ?>
-		<a href="userhistory.php?action=subscribed_collages">[My Subscribed Collages]</a>
+		<a href="userhistory.php?action=subscribed_collages">[Subscribed collages]</a>
 <? } ?>
-		<a href="bookmarks.php?type=collages">[Bookmarked Collages]</a>
+		<a href="bookmarks.php?type=collages">[Bookmarked collages]</a>
 <?
 if (check_perms('site_collages_recover')) { ?>
 		<a href="collages.php?action=recover">[Recover collage]</a>
@@ -238,7 +252,7 @@
 }
 ?>
 		<a href="collages.php?userid=<?=$LoggedUser['ID']?>">[Collages you started]</a>
-		<a href="collages.php?userid=<?=$LoggedUser['ID']?>&amp;contrib=1">[Collages you've contributed to]</a>
+		<a href="collages.php?userid=<?=$LoggedUser['ID']?>&amp;contrib=1">[Collages you contributed to]</a>
 <? } else { ?>
 		<a href="bookmarks.php?type=torrents">[Torrents]</a>
 		<a href="bookmarks.php?type=artists">[Artists]</a>
diff --git a/sections/collages/new.php b/sections/collages/new.php
index f3c0b2c2..101e3344 100644
--- a/sections/collages/new.php
+++ b/sections/collages/new.php
@@ -50,15 +50,15 @@
 					</select>
 					<br />
 					<ul>
-						<li><strong>Theme</strong> - A collage containing releases that all relate to a certain theme (Searching for the perfect beat, for instance)</li>	
-						<li><strong>Genre introduction</strong> - A subjective introduction to a Genre composed by our own users</li>
-						<li><strong>Discography</strong> - A collage containing all the releases of an artist, when that artist has a multitude of side projects</li>
-						<li><strong>Label</strong> - A collage containing all the releases of a particular record label</li>
-						<li><strong>Staff picks</strong> - A list of recommendations picked by the staff on special occasions</li>
-						<li><strong>Charts</strong> - A collage containing all the releases that comprise a certain chart (Billboard Top 100, Pitchfork Top 100, What.cd Top 10 for a certain week)</li>
+						<li><strong>Theme</strong> - A collage containing releases that all relate to a certain theme (e.g. "Searching for the Perfect Beat", "Concept Albums", "Funky Groove", etc.).</li>	
+						<li><strong>Genre introduction</strong> - A subjective introduction to a genre composed by our own users.</li>
+						<li><strong>Discography</strong> - A collage containing all the releases of an artist. Useful for keeping track of side-projects.</li>
+						<li><strong>Label</strong> - A collage containing all the releases of a particular record label.</li>
+						<li><strong>Staff picks</strong> - A listing of recommendations picked by the staff on special occasions.</li>
+						<li><strong>Charts</strong> - Contains all the releases that comprise a certain type of chart (e.g. Billboard Top 100, Pitchfork Top 100, What.cd Top 10, etc.).</li>
 <?
    if(($CollageCount < $LoggedUser['Permissions']['MaxCollages']) && check_perms('site_collages_personal')) { ?>
-						<li><strong>Personal</strong> - You can put whatever you want here.  It's your personal collage.</li>	
+						<li><strong>Personal</strong> - You can put whatever you want here.  It's your own personal collage.</li>	
 <? } ?>					
 					</ul>
 				</td>
@@ -77,7 +77,7 @@
 			</tr>
 			<tr>
 				<td colspan="2" class="center">
-					<strong>Please ensure your collage will be allowed under the <a href="rules.php?p=collages">rules</a></strong>
+					<strong>Please ensure your collage will be allowed under the <a href="rules.php?p=collages">Collage Rules</a>.</strong>
 				</td>
 			</tr>
 			<tr>
diff --git a/sections/forums/forum.php b/sections/forums/forum.php
index fa951f83..4254071d 100644
--- a/sections/forums/forum.php
+++ b/sections/forums/forum.php
@@ -141,7 +141,7 @@
 echo $Pages;
 ?>
 	</div>
-	<table class="forum_list" width="100%">
+	<table class="forum_index" width="100%">
 		<tr class="colhead">
 			<td style="width:2%;"></td>
 			<td>Latest</td>
diff --git a/sections/forums/newthread.php b/sections/forums/newthread.php
index 9f103ec8..b251893b 100644
--- a/sections/forums/newthread.php
+++ b/sections/forums/newthread.php
@@ -83,11 +83,11 @@
 			<input type="hidden" name="forum" value="<?=$ForumID?>" />
 			<table id="newthreadtext" class="layout">
 				<tr>
-					<td class="label">Title</td>
+                    <td class="label">Title:</td> 
 					<td><input id="title" type="text" name="title" style="width: 98%;" /></td>
 				</tr>
 				<tr>
-					<td class="label">Body</td>
+					<td class="label">Body:</td>
 					<td><textarea id="posttext" style="width: 98%;" onkeyup="resize('posttext');" name="body" cols="90" rows="8"></textarea></td>
 				</tr>
 				<tr>
@@ -132,26 +132,30 @@ function RemoveAnswerField() {
 					</td>
 				</tr>
 				<tr id="poll_question" class="hidden">
-					<td class="label">Question</td>
+					<td class="label">Question:</td>
 					<td><input type="text" name="question" id="pollquestionfield" style="width: 98%;" /></td>
 				</tr>
 				<tr id="poll_answers" class="hidden">
-					<td class="label">Answers</td>
+					<td class="label">Answers:</td>
 					<td id="answer_block">
 						<input type="text" name="answers[]" style="width: 90%;" />
 						[<a href="#" onclick="AddAnswerField();return false;">+</a>]
 						[<a href="#" onclick="RemoveAnswerField();return false;">-</a>]
 					</td>
 				</tr>
+				<tr>
+					<td colspan="2" class="center">
+						<input type="button" value="Preview" onclick="Newthread_Preview(1);" id="newthreadpreviewbutton" />
+						<input type="button" value="Editor" onclick="Newthread_Preview(0);" id="newthreadeditbutton" class="hidden" />
+						<input type="submit" id="submit_button" value="Create thread" />
+					</td>
+				</tr>
 <? } ?>
 			</table>
 			<div id="subscribediv" class="hidden">
 				<input id="subscribeboxpreview" type="checkbox" name="subscribe"<?=!empty($HeavyInfo['AutoSubscribe'])?' checked="checked"':''?> />
 				<label for="subscribebox">Subscribe to topic</label>
 			</div>
-			<input type="button" value="Preview" onclick="Newthread_Preview(1);" id="newthreadpreviewbutton" />
-			<input type="button" value="Editor" onclick="Newthread_Preview(0);" id="newthreadeditbutton" class="hidden" />
-			<input type="submit" id="submit_button" value="Create thread" />
 		</form>
 	</div>
 </div>
diff --git a/sections/requests/requests.php b/sections/requests/requests.php
index 0f128022..00fc35f4 100644
--- a/sections/requests/requests.php
+++ b/sections/requests/requests.php
@@ -360,13 +360,13 @@
 		<input type="hidden" name="userid" value="<?=$_GET['userid']?>" />
 <?	} ?>
 		<table cellpadding="6" cellspacing="1" border="0" class="layout border" width="100%">
-			<tr>
+			<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']); } ?>" />
 				</td>
 			</tr>
-			<tr>
+			<tr id="tagfilter">
 				<td class="label">Tags (comma-separated):</td>
 				<td>
 					<input type="text" name="tags" size="60" value="<?= (!empty($TagNames) ? display_str(implode(', ', $TagNames)) : '') ?>" />&nbsp;
@@ -374,14 +374,14 @@
 					<input type="radio" name="tags_type" id="tags_type1" value="1"  <?Format::selected('tags_type',1,'checked')?> /><label for="tags_type1"> All</label>
 				</td>
 			</tr>
-			<tr>
+			<tr id="include_filled">
 				<td class="label">Include filled:</td>
 				<td>
 					<input type="checkbox" name="show_filled" <? if(!$Submitted || !empty($_GET['show_filled']) || (!$Submitted && !empty($_GET['type']) && $_GET['type'] == "filled")) { ?>checked="checked"<? } ?> />
 				</td>
 			</tr>
 <?	if(check_perms('site_see_old_requests')){ ?> 
-			<tr>
+			<tr id="include_old">
 				<td class="label">Include old:</td>
 				<td>
 					<input type="checkbox" name="showall" <? if(!empty($_GET['showall'])) {?>checked="checked"<? } ?> />
diff --git a/sections/top10/torrents.php b/sections/top10/torrents.php
index 5c16f858..e799db59 100644
--- a/sections/top10/torrents.php
+++ b/sections/top10/torrents.php
@@ -59,23 +59,18 @@
 	<form class="search_form" name="torrents" action="" method="get">
 		<input type="hidden" name="advanced" value="1" />
 		<table cellpadding="6" cellspacing="1" border="0" class="layout border" width="100%">
-			<tr>
+			<tr id="tagfilter">
 				<td class="label">Tags (comma-separated):</td>
-				<td>
-					<input type="text" name="tags" size="75" value="<? if(!empty($_GET['tags'])) { echo display_str($_GET['tags']);} ?>" />
-				</td>
-			</tr>
-			<tr>
-				<td></td>
-				<td>
-					<input type="radio" id="rdoAll" name="anyall" value="all"<?=($_GET['anyall']!='any'?' checked':'')?>><label for="rdoAll"> All</label>&nbsp;
+				<td class="ft_taglist">
+					<input type="text" name="tags" size="75" value="<? if(!empty($_GET['tags'])) { echo display_str($_GET['tags']);} ?>" />&nbsp;
+					<input type="radio" id="rdoAll" name="anyall" value="all"<?=($_GET['anyall']!='any'?' checked':'')?>><label for="rdoAll"> All</label>&nbsp;&nbsp;
 					<input type="radio" id="rdoAny" name="anyall" value="any"<?=($_GET['anyall']=='any'?' checked':'')?>><label for="rdoAny"> Any</label>
 				</td>
 			</tr>
 			<tr>
-				<td class="label">Format</td>
+				<td class="label">Format:</td>
 				<td>
-					<select name="format" style="width:auto;">
+					<select name="format" style="width:auto;" class="ft_format">
 						<option value="">Any</option>
 <?	foreach ($Formats as $FormatName) { ?>
 						<option value="<?=display_str($FormatName)?>" <? if(isset($_GET['format']) && $FormatName==$_GET['format']) { ?>selected="selected"<? } ?>><?=display_str($FormatName)?></option>
diff --git a/sections/top10/votes.php b/sections/top10/votes.php
index 46458dde..b52d0abf 100644
--- a/sections/top10/votes.php
+++ b/sections/top10/votes.php
@@ -105,22 +105,17 @@
 		<input type="hidden" name="advanced" value="1" />
 		<input type="hidden" name="type" value="votes" />
 		<table cellpadding="6" cellspacing="1" border="0" class="layout border" width="100%">
-			<tr>
+			<tr id="tagfilter">
 				<td class="label">Tags (comma-separated):</td>
-				<td>
-					<input type="text" name="tags" size="75" value="<? if(!empty($_GET['tags'])) { echo display_str($_GET['tags']);} ?>" />
-				</td>
-			</tr>
-			<tr>
-				<td></td>
-				<td>
-					<input type="radio" id="rdoAll" name="anyall" value="all"<?=($_GET['anyall']!='any'?' checked':'')?>><label for="rdoAll"> All</label>&nbsp;
+				<td class="ft_taglist">
+					<input type="text" name="tags" size="75" value="<? if(!empty($_GET['tags'])) { echo display_str($_GET['tags']);} ?>" />&nbsp;
+					<input type="radio" id="rdoAll" name="anyall" value="all"<?=($_GET['anyall']!='any'?' checked':'')?>><label for="rdoAll"> All</label>&nbsp;&nbsp;
 					<input type="radio" id="rdoAny" name="anyall" value="any"<?=($_GET['anyall']=='any'?' checked':'')?>><label for="rdoAny"> Any</label>
 				</td>
 			</tr>
-			<tr>
+			<tr id="yearfilter">
 				<td class="label">Year:</td>
-				<td>
+				<td class="ft_year">
 					<input type="text" name="year1" size="4" value="<? if(!empty($_GET['year1'])) { echo display_str($_GET['year1']);} ?>" />
 					to
 					<input type="text" name="year2" size="4" value="<? if(!empty($_GET['year2'])) { echo display_str($_GET['year2']);} ?>" />
diff --git a/sections/torrents/browse2.php b/sections/torrents/browse2.php
index 85924bac..fd59bec5 100644
--- a/sections/torrents/browse2.php
+++ b/sections/torrents/browse2.php
@@ -553,37 +553,37 @@ function header_link($SortKey,$DefaultWay="desc") {
 	<div class="box pad">
 		<table class="layout">
 <? if ($AdvancedSearch) { ?>
-			<tr>
-				<td class="label">Artist Name:</td>
-				<td colspan="3" class="fta_artistname">
+			<tr id="artist_name">
+				<td class="label">Artist name:</td>
+				<td colspan="3" class="ft_artistname">
 					<input type="text" spellcheck="false" size="40" name="artistname" class="inputtext smaller" value="<?Format::form('artistname')?>" />
 					<input type="hidden" name="action" value="advanced" />
 				</td>
 			</tr>
-			<tr>
-				<td class="label">Album/Torrent Name:</td>
-				<td colspan="3" class="fta_groupname">
+			<tr id="album_torrent_name">
+				<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" value="<?Format::form('groupname')?>" />
 				</td>
 			</tr>
-			<tr>
-				<td class="label">Record Label:</td>
-				<td colspan="3" class="fta_recordlabel">
+			<tr id="record_label">
+				<td class="label">Record label:</td>
+				<td colspan="3" class="ft_recordlabel">
 					<input type="text" spellcheck="false" size="40" name="recordlabel" class="inputtext smaller" value="<?Format::form('recordlabel')?>" />
 				</td>
 			</tr>
-			<tr>
-				<td class="label">Catalogue Number:</td>
-				<td class="fta_cataloguenumber">
+			<tr id="catalogue_number_year">
+				<td class="label">Catalogue number:</td>
+				<td class="ft_cataloguenumber">
 					<input type="text" size="40" name="cataloguenumber" class="inputtext smallest" value="<?Format::form('cataloguenumber')?>"  />
 				</td>
 				<td class="label">Year:</td>
-				<td class="fta_year">
+				<td class="ft_year">
 					<input type="text" name="year" class="inputtext smallest" value="<?Format::form('year')?>" size="4" />
 				</td>
 			</tr>
 			<tr id="edition_expand">
-				<td colspan="4" class="center fta_edition_expand">[<a href="#" onclick="ToggleEditionRows();return false;">Click here to toggle searching for specific remaster information</a>]</td>
+				<td colspan="4" class="center ft_edition_expand">[<a href="#" onclick="ToggleEditionRows();return false;">Click here to toggle searching for specific remaster information</a>]</td>
 			</tr>
 <?
 if (Format::form('remastertitle', true) == "" && Format::form('remasteryear', true) == "" && 
@@ -594,54 +594,54 @@ function header_link($SortKey,$DefaultWay="desc") {
 }
 ?>
 			<tr id="edition_title" class="<?=$Hidden?>">
-				<td class="label">Edition Title:</td>
-				<td class="fta_remastertitle">
+				<td class="label">Edition title:</td>
+				<td class="ft_remastertitle">
 					<input type="text" spellcheck="false" size="40" name="remastertitle" class="inputtext smaller" value="<?Format::form('remastertitle')?>" />
 				</td>
-				<td class="label">Edition Year:</td>
-				<td class="fta_remasteryear">
+				<td class="label">Edition year:</td>
+				<td class="ft_remasteryear">
 					<input type="text" name="remasteryear" class="inputtext smallest" value="<?Format::form('remasteryear')?>" size="4" />
 				</td>
 			</tr>
 			<tr id="edition_label" class="<?=$Hidden?>">
-				<td class="label">Edition Release Label:</td>
-				<td colspan="3" class="fta_remasterrecordlabel">
+				<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" value="<?Format::form('remasterrecordlabel')?>" />
 				</td>
 			</tr>
 			<tr id="edition_catalogue" class="<?=$Hidden?>">
-				<td class="label">Edition Catalogue Number:</td>
-				<td colspan="3" class="fta_remastercataloguenumber">
+				<td class="label">Edition catalogue number:</td>
+				<td colspan="3" class="ft_remastercataloguenumber">
 					<input type="text" size="40" name="remastercataloguenumber" class="inputtext smallest" value="<?Format::form('remastercataloguenumber')?>" />
 				</td>
 			</tr>
-			<tr>
-				<td class="label">File List:</td>
-				<td colspan="3" class="fta_filelist">
+			<tr id="file_list">
+				<td class="label">File list:</td>
+				<td colspan="3" class="ft_filelist">
 					<input type="text" spellcheck="false" size="40" name="filelist" class="inputtext" value="<?Format::form('filelist')?>" />
 				</td>
 			</tr>
-			<tr>
-				<td class="label">Rip Specifics:</td>
-				<td class="nobr" colspan="3" class="fta_encoding">
-					<select id="bitrate" name="encoding">
+			<tr id="rip_specifics">
+				<td class="label">Rip specifics:</td>
+				<td class="nobr" colspan="3" class="ft_ripspecifics">
+					<select id="bitrate" name="encoding" class="ft_bitrate">
 						<option value="">Bitrate</option>
 <?	foreach ($Bitrates as $BitrateName) { ?>
 						<option value="<?=display_str($BitrateName); ?>" <?Format::selected('encoding', $BitrateName)?>><?=display_str($BitrateName); ?></option>
 <?	} ?>			</select>
 
-					<select name="format">
+					<select name="format" class="ft_format">
 						<option value="">Format</option>
 <?	foreach ($Formats as $FormatName) { ?>
 						<option value="<?=display_str($FormatName); ?>" <?Format::selected('format', $FormatName)?>><?=display_str($FormatName); ?></option>
 <?	} ?>			</select>
-					<select name="media">
+					<select name="media" class="ft_media">
 						<option value="">Media</option>
 <?	foreach ($Media as $MediaName) { ?>
 						<option value="<?=display_str($MediaName); ?>" <?Format::selected('media',$MediaName)?>><?=display_str($MediaName); ?></option>
 <?	} ?>
 					</select>
-					<select name="releasetype">
+					<select name="releasetype" class="ft_releasetype">
 						<option value="">Release type</option>
 <?	foreach ($ReleaseTypes as $ID=>$Type) { ?>
 						<option value="<?=display_str($ID); ?>" <?Format::selected('releasetype',$ID)?>><?=display_str($Type); ?></option>
@@ -649,32 +649,32 @@ function header_link($SortKey,$DefaultWay="desc") {
 					</select>
 				</td>
 			</tr>
-			<tr>
+			<tr id="misc">
 				<td class="label">Misc:</td>
-				<td class="nobr" colspan="3" class="fta_misc">
-					<select name="haslog" class="fta_haslog">
+				<td class="nobr" colspan="3" class="ft_misc">
+					<select name="haslog" class="ft_haslog">
 						<option value="">Has Log</option>
 						<option value="1" <?Format::selected('haslog','1')?>>Yes</option>
 						<option value="0" <?Format::selected('haslog','0')?>>No</option>
 						<option value="100" <?Format::selected('haslog','100')?>>100% only</option>
 						<option value="-1" <?Format::selected('haslog','-1')?>>&lt;100%/Unscored</option>
 					</select>
-					<select name="hascue" class="fta_hascue">
+					<select name="hascue" class="ft_hascue">
 						<option value="">Has Cue</option>
 						<option value="1" <?Format::selected('hascue',1)?>>Yes</option>
 						<option value="0" <?Format::selected('hascue',0)?>>No</option>
 					</select>
-					<select name="scene" class="fta_scene">
+					<select name="scene" class="ft_scene">
 						<option value="">Scene</option>
 						<option value="1" <?Format::selected('scene',1)?>>Yes</option>
 						<option value="0" <?Format::selected('scene',0)?>>No</option>
 					</select>
-					<select name="vanityhouse" class="fta_vanityhouse">
+					<select name="vanityhouse" class="ft_vanityhouse">
 						<option value="">Vanity House</option>
 						<option value="1" <?Format::selected('vanityhouse',1)?>>Yes</option>
 						<option value="0" <?Format::selected('vanityhouse',0)?>>No</option>
 					</select>
-					<select name="freetorrent" class="fta_freetorrent">
+					<select name="freetorrent" class="ft_freetorrent">
 						<option value="">Leech Status</option>
 						<option value="1" <?Format::selected('freetorrent',1)?>>Freeleech</option>
 						<option value="2" <?Format::selected('freetorrent',2)?>>Neutral Leech</option>
@@ -684,7 +684,7 @@ function header_link($SortKey,$DefaultWay="desc") {
 				</td>
 			</tr>
 <? } else { // BASIC SEARCH ?>
-			<tr>
+			<tr id="search_terms">
 				<td class="label">Search terms:</td>
 				<td colspan="3" class="ftb_searchstr">
 					<input type="text" spellcheck="false" size="40" name="searchstr" class="inputtext" value="<?Format::form('searchstr')?>" />
@@ -694,7 +694,7 @@ function header_link($SortKey,$DefaultWay="desc") {
 				</td>
 			</tr>
 <? } ?>
-			<tr>
+			<tr id="tagfilter">
 				<td class="label">Tags (comma-separated):</td>
 				<td colspan="3" class="ft_taglist">
 					<input type="text" size="40" id="tags" name="taglist" class="inputtext smaller" title="Use !tag to exclude tag" value="<?=str_replace('_','.',Format::form('taglist', true))?>" />&nbsp;
@@ -702,7 +702,7 @@ function header_link($SortKey,$DefaultWay="desc") {
 					<input type="radio" name="tags_type" id="tags_type1" value="1"  <?Format::selected('tags_type',1,'checked')?> /><label for="tags_type1"> All</label>
 				</td>
 			</tr>
-			<tr>
+			<tr id="order">
 				<td class="label">Order by:</td>
 				<td colspan="<?=($AdvancedSearch)?'3':'1'?>" class="ft_order">
 					<select name="order_by" style="width:auto;" class="ft_order_by">
@@ -720,7 +720,7 @@ function header_link($SortKey,$DefaultWay="desc") {
 					</select>
 				</td>
 			</tr>
-			<tr>
+			<tr id="group_results">
 				<td class="label">
 					<label for="group_results">Group by release:</label>
 				</td>
diff --git a/static/styles/mono/style.css b/static/styles/mono/style.css
index effe0d9f..95fb4da7 100644
--- a/static/styles/mono/style.css
+++ b/static/styles/mono/style.css
@@ -879,7 +879,7 @@ div.thin .header+.linkbox+div td {
 	padding-left: 10px !important;
 }
 
-div.thin .header+.linkbox+div table td:first-child,.filter_torrents table:nth-child(1) td:first-child {
+td.label {
 	font-size: 10pt;
 }
 
@@ -910,10 +910,6 @@ div.thin form.search_form table td.label,.filter_torrents table td:first-child {
 	text-align: right;
 }
 
-div.thin form.search_form table td.label {
-	width: 12%;
-}
-
 .filter_torrents .submit {
 	position: relative;
 	padding-top: 15px;