diff --git a/design/privateheader.php b/design/privateheader.php
index b3c0e8d4..022d4638 100644
--- a/design/privateheader.php
+++ b/design/privateheader.php
@@ -95,20 +95,12 @@
 	<div id="logo"><a href="index.php"></a></div>
 	<div id="userinfo">
 		<ul id="userinfo_username">
-			<li id="nav_userinfo"<?=Format::add_class($PageID, array('user',false,false), 'active', true, 'id')?>>
-				<a href="user.php?id=<?=$LoggedUser['ID']?>" class="username"><?=$LoggedUser['Username']?></a>
-			</li>
-			<li id="nav_useredit" class="brackets<?=Format::add_class($PageID, array('user','edit'), 'active', false)?>">
-				<a href="user.php?action=edit&amp;userid=<?=$LoggedUser['ID']?>">Edit</a>
-			</li>
-			<li id="nav_logout" class="brackets">
-				<a href="logout.php?auth=<?=$LoggedUser['AuthKey']?>">Logout</a>
-			</li>
+			<li id="nav_userinfo"<?=Format::add_class($PageID, array('user',false,false), 'active', true, 'id')?>><a href="user.php?id=<?=$LoggedUser['ID']?>" class="username"><?=$LoggedUser['Username']?></a></li>
+			<li id="nav_useredit" class="brackets<?=Format::add_class($PageID, array('user','edit'), 'active', false)?>"><a href="user.php?action=edit&amp;userid=<?=$LoggedUser['ID']?>">Edit</a></li>
+			<li id="nav_logout" class="brackets"><a href="logout.php?auth=<?=$LoggedUser['AuthKey']?>">Logout</a></li>
 		</ul>
 		<ul id="userinfo_major">
-			<li id="nav_upload" class="brackets<?=Format::add_class($PageID, array('upload'), 'active', false)?>">
-				<a href="upload.php">Upload</a>
-			</li>
+			<li id="nav_upload" class="brackets<?=Format::add_class($PageID, array('upload'), 'active', false)?>"><a href="upload.php">Upload</a></li>
 <?
 if(check_perms('site_send_unlimited_invites')) {
 	$Invites = ' (∞)';
@@ -118,33 +110,19 @@
 	$Invites = '';
 }
 ?>
-			<li id="nav_invite" class="brackets<?=Format::add_class($PageID, array('user','invite'), 'active', false)?>">
-				<a href="user.php?action=invite">Invite<?=$Invites?></a>
-			</li>
-			<li id="nav_donate" class="brackets<?=Format::add_class($PageID, array('donate'), 'active', false)?>">
-				<a href="donate.php">Donate</a>
-			</li>
+			<li id="nav_invite" class="brackets<?=Format::add_class($PageID, array('user','invite'), 'active', false)?>"><a href="user.php?action=invite">Invite<?=$Invites?></a></li>
+			<li id="nav_donate" class="brackets<?=Format::add_class($PageID, array('donate'), 'active', false)?>"><a href="donate.php">Donate</a></li>
 			
 </ul>
 		<ul id="userinfo_stats">
-			<li id="stats_seeding">
-				<a href="torrents.php?type=seeding&amp;userid=<?=$LoggedUser['ID']?>">Up</a>: <span class="stat" title="<?=Format::get_size($LoggedUser['BytesUploaded'], 5)?>"><?=Format::get_size($LoggedUser['BytesUploaded'])?></span>
-			</li>
-			<li id="stats_leeching">
-				<a href="torrents.php?type=leeching&amp;userid=<?=$LoggedUser['ID']?>">Down</a>: <span class="stat" title="<?=Format::get_size($LoggedUser['BytesDownloaded'], 5)?>"><?=Format::get_size($LoggedUser['BytesDownloaded'])?></span>
-			</li>
-			<li id="stats_ratio">
-				Ratio: <span class="stat"><?=Format::get_ratio_html($LoggedUser['BytesUploaded'], $LoggedUser['BytesDownloaded'])?></span>
-			</li>
+			<li id="stats_seeding"><a href="torrents.php?type=seeding&amp;userid=<?=$LoggedUser['ID']?>">Up</a>: <span class="stat" title="<?=Format::get_size($LoggedUser['BytesUploaded'], 5)?>"><?=Format::get_size($LoggedUser['BytesUploaded'])?></span></li>
+			<li id="stats_leeching"><a href="torrents.php?type=leeching&amp;userid=<?=$LoggedUser['ID']?>">Down</a>: <span class="stat" title="<?=Format::get_size($LoggedUser['BytesDownloaded'], 5)?>"><?=Format::get_size($LoggedUser['BytesDownloaded'])?></span></li>
+			<li id="stats_ratio">Ratio: <span class="stat"><?=Format::get_ratio_html($LoggedUser['BytesUploaded'], $LoggedUser['BytesDownloaded'])?></span></li>
 <?	if(!empty($LoggedUser['RequiredRatio'])) {?>
-			<li id="stats_required">
-				<a href="rules.php?p=ratio">Required</a>: <span class="stat" title="<?=number_format($LoggedUser['RequiredRatio'], 5)?>"><?=number_format($LoggedUser['RequiredRatio'], 2)?></span>
-			</li>
+			<li id="stats_required"><a href="rules.php?p=ratio">Required</a>: <span class="stat" title="<?=number_format($LoggedUser['RequiredRatio'], 5)?>"><?=number_format($LoggedUser['RequiredRatio'], 2)?></span></li>
 <?	}
     if($LoggedUser['FLTokens'] > 0) { ?>
-			<li id="fl_tokens">
-				<a href="wiki.php?action=article&amp;id=754">Tokens: </a><span class="stat"><a href="userhistory.php?action=token_history&amp;userid=<?=$LoggedUser['ID']?>"><?=$LoggedUser['FLTokens']?></a></span>
-			</li>
+			<li id="fl_tokens"><a href="wiki.php?action=article&amp;id=754">Tokens: </a><span class="stat"><a href="userhistory.php?action=token_history&amp;userid=<?=$LoggedUser['ID']?>"><?=$LoggedUser['FLTokens']?></a></span></li>
 <?	} ?>
 		</ul>
 <?
@@ -170,67 +148,31 @@
 } ?>
 
 		<ul id="userinfo_minor"<?=$NewSubscriptions ? ' class="highlite"' : ''?>>
-			<li id="nav_inbox"<?=Format::add_class($PageID, array('inbox'), 'active', true)?>>
-				<a onmousedown="Stats('inbox');" href="inbox.php">Inbox</a>
-			</li>
-			<li id="nav_staffinbox"<?=Format::add_class($PageID, array('staffpm'), 'active', true)?>>
-				<a onmousedown="Stats('staffpm');" href="staffpm.php">Staff Inbox</a>
-			</li>
-			<li id="nav_uploaded"<?=Format::add_class($PageID, array('torrents',false,'uploaded'), 'active', true, 'userid')?>>
-				<a onmousedown="Stats('uploads');" href="torrents.php?type=uploaded&amp;userid=<?=$LoggedUser['ID']?>">Uploads</a>
-			</li>
-			<li id="nav_bookmarks"<?=Format::add_class($PageID, array('bookmarks'), 'active', true)?>>
-				<a onmousedown="Stats('bookmarks');" href="bookmarks.php?type=torrents">Bookmarks</a>
-			</li>
+			<li id="nav_inbox"<?=Format::add_class($PageID, array('inbox'), 'active', true)?>><a onmousedown="Stats('inbox');" href="inbox.php">Inbox</a></li>
+			<li id="nav_staffinbox"<?=Format::add_class($PageID, array('staffpm'), 'active', true)?>><a onmousedown="Stats('staffpm');" href="staffpm.php">Staff Inbox</a></li>
+			<li id="nav_uploaded"<?=Format::add_class($PageID, array('torrents',false,'uploaded'), 'active', true, 'userid')?>><a onmousedown="Stats('uploads');" href="torrents.php?type=uploaded&amp;userid=<?=$LoggedUser['ID']?>">Uploads</a></li>
+			<li id="nav_bookmarks"<?=Format::add_class($PageID, array('bookmarks'), 'active', true)?>><a onmousedown="Stats('bookmarks');" href="bookmarks.php?type=torrents">Bookmarks</a></li>
 <? if (check_perms('site_torrents_notify')) { ?>
-			<li id="nav_notifications" <?=Format::add_class($PageID, array(array('torrents','notify'),array('user','notify')), 'active', true, 'userid')?>>
-				<a onmousedown="Stats('notifications');" href="user.php?action=notify">Notifications</a>
-			</li>
+			<li id="nav_notifications" <?=Format::add_class($PageID, array(array('torrents','notify'),array('user','notify')), 'active', true, 'userid')?>><a onmousedown="Stats('notifications');" href="user.php?action=notify">Notifications</a></li>
 <? } ?>
-			<li id="nav_subscriptions"<?=Format::add_class($PageID, array('userhistory','subscriptions'), 'active', true)?>>
-				<a onmousedown="Stats('subscriptions');" href="userhistory.php?action=subscriptions"<?=($NewSubscriptions ? ' class="new-subscriptions"' : '')?>>Subscriptions</a>
-			</li>
-			<li id="nav_comments"<?=Format::add_class($PageID, array('comments'), 'active', true, 'userid')?>>
-				<a onmousedown="Stats('comments');" href="comments.php">Comments</a>
-			</li>
-			<li id="nav_friends"<?=Format::add_class($PageID, array('friends'), 'active', true)?>>
-				<a onmousedown="Stats('friends');" href="friends.php">Friends</a>
-			</li>
+			<li id="nav_subscriptions"<?=Format::add_class($PageID, array('userhistory','subscriptions'), 'active', true)?>><a onmousedown="Stats('subscriptions');" href="userhistory.php?action=subscriptions"<?=($NewSubscriptions ? ' class="new-subscriptions"' : '')?>>Subscriptions</a></li>
+			<li id="nav_comments"<?=Format::add_class($PageID, array('comments'), 'active', true, 'userid')?>><a onmousedown="Stats('comments');" href="comments.php">Comments</a></li>
+			<li id="nav_friends"<?=Format::add_class($PageID, array('friends'), 'active', true)?>><a onmousedown="Stats('friends');" href="friends.php">Friends</a></li>
 		</ul>
 	</div>
 	<div id="menu">
 		<h4 class="hidden">Site Menu</h4>
 		<ul>
-			<li id="nav_index"<?=Format::add_class($PageID, array('index'), 'active', true)?>>
-				<a href="index.php">Home</a>
-			</li>
-			<li id="nav_torrents"<?=Format::add_class($PageID, array('torrents',false,false), 'active', true)?>>
-				<a href="torrents.php">Torrents</a>
-			</li>
-			<li id="nav_collages"<?=Format::add_class($PageID, array('collages'), 'active', true)?>>
-				<a href="collages.php">Collages</a>
-			</li>
-			<li id="nav_requests"<?=Format::add_class($PageID, array('requests'), 'active', true)?>>
-				<a href="requests.php">Requests</a>
-			</li>
-			<li id="nav_forums"<?=Format::add_class($PageID, array('forums'), 'active', true)?>>
-				<a href="forums.php">Forums</a>
-			</li>
-			<li id="nav_irc"<?=Format::add_class($PageID, array('chat'), 'active', true)?>>
-				<a href="chat.php">IRC</a>
-			</li>
-			<li id="nav_top10"<?=Format::add_class($PageID, array('top10'), 'active', true)?>>
-				<a href="top10.php">Top 10</a>
-			</li>
-			<li id="nav_rules"<?=Format::add_class($PageID, array('rules'), 'active', true)?>>
-				<a href="rules.php">Rules</a>
-			</li>
-			<li id="nav_wiki"<?=Format::add_class($PageID, array('wiki'), 'active', true)?>>
-				<a href="wiki.php">Wiki</a>
-			</li>
-			<li id="nav_staff"<?=Format::add_class($PageID, array('staff'), 'active', true)?>>
-				<a href="staff.php">Staff</a>
-			</li>
+			<li id="nav_index"<?=Format::add_class($PageID, array('index'), 'active', true)?>><a href="index.php">Home</a></li>
+			<li id="nav_torrents"<?=Format::add_class($PageID, array('torrents',false,false), 'active', true)?>><a href="torrents.php">Torrents</a></li>
+			<li id="nav_collages"<?=Format::add_class($PageID, array('collages'), 'active', true)?>><a href="collages.php">Collages</a></li>
+			<li id="nav_requests"<?=Format::add_class($PageID, array('requests'), 'active', true)?>><a href="requests.php">Requests</a></li>
+			<li id="nav_forums"<?=Format::add_class($PageID, array('forums'), 'active', true)?>><a href="forums.php">Forums</a></li>
+			<li id="nav_irc"<?=Format::add_class($PageID, array('chat'), 'active', true)?>><a href="chat.php">IRC</a></li>
+			<li id="nav_top10"<?=Format::add_class($PageID, array('top10'), 'active', true)?>><a href="top10.php">Top 10</a></li>
+			<li id="nav_rules"<?=Format::add_class($PageID, array('rules'), 'active', true)?>><a href="rules.php">Rules</a></li>
+			<li id="nav_wiki"<?=Format::add_class($PageID, array('wiki'), 'active', true)?>><a href="wiki.php">Wiki</a></li>
+			<li id="nav_staff"<?=Format::add_class($PageID, array('staff'), 'active', true)?>><a href="staff.php">Staff</a></li>
 		</ul>
 	</div>
 <?
diff --git a/sections/torrents/functions.php b/sections/torrents/functions.php
index 25840690..54b27594 100644
--- a/sections/torrents/functions.php
+++ b/sections/torrents/functions.php
@@ -105,7 +105,7 @@ function get_group_info($GroupID, $Return = true, $RevisionID = 0) {
 
 		$TorrentList = $DB->to_array('ID', MYSQLI_ASSOC);
 		if (count($TorrentList) == 0) {
-			header("Location: log.php?search=Group+$GroupID");
+			header("Location: log.php?search=".(empty($_GET['torrentid']) ? "Group+$GroupID" : "Torrent+$_GET[torrentid]"));
 			die();
 		}
 		if (in_array(0, $DB->collect('Seeders'))) {