From cc32775f24707183ded48c5dd17a071c893373c2 Mon Sep 17 00:00:00 2001
From: Git <git@what.cd>
Date: Sun, 19 Aug 2012 08:00:19 +0000
Subject: [PATCH] Empty commit

---
 sections/artist/artist.php                   | 28 ++++---
 sections/artist/artist_rearrange.php         | 42 +++++-----
 sections/artist/change_artistid.php          |  4 +-
 sections/artist/edit.php                     |  4 +-
 sections/artist/history.php                  |  4 +-
 sections/better/files.php                    | 21 ++---
 sections/better/folders.php                  | 18 ++--
 sections/better/tags.php                     | 14 ++--
 sections/bookmarks/artists.php               | 14 ++--
 sections/bookmarks/torrents.php              | 18 ++--
 sections/chat/index.php                      | 12 ++-
 sections/collages/all_comments.php           | 12 +--
 sections/collages/browse.php                 |  6 +-
 sections/collages/collage.php                | 26 +++---
 sections/collages/edit.php                   |  4 +-
 sections/collages/manage.php                 | 10 ++-
 sections/comments/index.php                  | 20 +++--
 sections/donate/cancel.php                   |  4 +-
 sections/donate/complete.php                 |  4 +-
 sections/donate/donate.php                   |  8 +-
 sections/donate/donate_gpal.php              |  8 +-
 sections/error/index.php                     |  4 +-
 sections/forums/edit_rules.php               | 16 ++--
 sections/friends/friends.php                 |  4 +-
 sections/inbox/compose.php                   |  4 +-
 sections/log/index.php                       |  6 +-
 sections/login/disabled.php                  |  4 +-
 sections/reports/report.php                  |  4 +-
 sections/reports/reports.php                 | 88 ++++++++++----------
 sections/reports/stats.php                   | 12 +--
 sections/reportsv2/report.php                |  4 +-
 sections/reportsv2/reports.php               |  9 +-
 sections/reportsv2/search.php                |  7 +-
 sections/reportsv2/static.php                |  6 +-
 sections/reportsv2/views.php                 |  7 +-
 sections/requests/new_edit.php               |  4 +-
 sections/requests/request.php                | 28 +++----
 sections/requests/requests.php               |  6 +-
 sections/requests/requests.php.presphinx     | 12 +--
 sections/rules/clients.php                   | 18 ++--
 sections/rules/collages.php                  |  4 +-
 sections/rules/ratio.php                     |  4 +-
 sections/rules/requests.php                  |  4 +-
 sections/rules/rules.php                     |  4 +-
 sections/rules/tag.php                       |  4 +-
 sections/schedule/index.php                  | 20 ++++-
 sections/staff/index.php                     |  4 +-
 sections/staffpm/common_responses.php        | 20 +++--
 sections/staffpm/staff_inbox.php             | 20 +++--
 sections/staffpm/user_inbox.php              | 12 +--
 sections/staffpm/viewconv.php                | 21 ++---
 sections/tools/data/bitcoin_balance.php      |  4 +-
 sections/tools/managers/bans.php             |  5 +-
 sections/tools/managers/dnu_list.php         |  4 +-
 sections/tools/managers/eb.php               |  4 +-
 sections/tools/managers/forum_list.php       |  5 +-
 sections/tools/managers/login_watch.php      | 28 ++++---
 sections/tools/managers/news.php             |  4 +-
 sections/tools/managers/official_tags.php    |  2 +-
 sections/tools/managers/permissions_list.php |  8 +-
 sections/tools/managers/tag_aliases.php      | 12 +--
 sections/tools/managers/tokens.php           |  9 +-
 sections/tools/managers/whitelist_list.php   |  4 +-
 sections/tools/misc/analysis.php             |  4 +-
 sections/tools/misc/clear_cache.php          |  5 +-
 sections/tools/misc/countries.php            |  5 +-
 sections/tools/misc/create_user.php          |  4 +-
 sections/top10/history.php                   | 15 ++--
 sections/top10/tags.php                      | 12 +--
 sections/top10/torrents.php                  | 12 +--
 sections/top10/users.php                     | 13 +--
 sections/torrents/details.php                | 23 ++---
 sections/torrents/editgroup.php              | 10 ++-
 sections/torrents/editgroupid.php            | 34 ++++----
 sections/torrents/grouplog.php               |  5 +-
 sections/torrents/history.php                |  4 +-
 sections/torrents/masspm.php                 |  4 +-
 sections/torrents/merge.php                  |  8 +-
 sections/torrents/notify.php                 |  4 +-
 sections/torrents/reseed.php                 |  4 +-
 sections/torrents/user.php                   |  5 +-
 sections/user/connchecker.php                |  4 +-
 sections/user/edit.php                       |  4 +-
 sections/user/invite.php                     |  8 +-
 sections/user/invitetree.php                 |  4 +-
 sections/user/notify_edit.php                |  4 +-
 sections/user/permissions.php                |  8 +-
 sections/user/search.php                     |  4 +-
 sections/userhistory/email_history.php       |  4 +-
 sections/userhistory/email_history2.php      |  9 +-
 sections/userhistory/ip_history.php          |  6 +-
 sections/userhistory/ip_tracker_history.php  |  6 +-
 sections/userhistory/passkey_history.php     |  4 +-
 sections/userhistory/password_history.php    |  4 +-
 sections/userhistory/post_history.php        | 10 +--
 sections/userhistory/subscribed_collages.php |  6 +-
 sections/userhistory/subscriptions.php       |  6 +-
 sections/userhistory/token_history.php       |  5 +-
 sections/wiki/aliases.php                    | 10 ++-
 sections/wiki/article.php                    | 11 ++-
 sections/wiki/compare.php                    |  4 +-
 sections/wiki/revisions.php                  |  4 +-
 sections/wiki/search.php                     |  8 +-
 sections/wiki/splash.php                     |  4 +-
 sections/wiki/wiki_browse.php                |  4 +-
 105 files changed, 626 insertions(+), 416 deletions(-)

diff --git a/sections/artist/artist.php b/sections/artist/artist.php
index fcfa4f7c..1aa49893 100644
--- a/sections/artist/artist.php
+++ b/sections/artist/artist.php
@@ -465,10 +465,11 @@ function compare($X, $Y){
 show_header($Name, 'browse,requests,bbcode');
 ?>
 <div class="thin">
-	<h2><?=display_str($Name)?><? if ($RevisionID) { ?> (Revision #<?=$RevisionID?>)<? } if ($VanityHouseArtist) { ?> [Vanity House] <? } ?></h2>
-	<div class="linkbox">
+	<div class="header">
+		<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')) {
@@ -479,41 +480,42 @@ 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?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>
 	<div class="sidebar">
 <? if($Image) { ?>
diff --git a/sections/artist/artist_rearrange.php b/sections/artist/artist_rearrange.php
index 67e3f59b..d01122ef 100644
--- a/sections/artist/artist_rearrange.php
+++ b/sections/artist/artist_rearrange.php
@@ -390,17 +390,18 @@ function display_name($ReleaseType) {
 show_header($Name, 'browse,requests,artists,bbcode');
 ?>
 <div class="thin">
-	<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>
-			<span class="hidden" id="savinglayout">Saving ordering...</span>
-			<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">
+	<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>
+				<span class="hidden" id="savinglayout">Saving ordering...</span>
+				<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,41 +412,42 @@ 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>
 	<div class="sidebar">
 <? if($Image) { ?>
diff --git a/sections/artist/change_artistid.php b/sections/artist/change_artistid.php
index 17f3c2c3..389397fe 100644
--- a/sections/artist/change_artistid.php
+++ b/sections/artist/change_artistid.php
@@ -122,7 +122,9 @@
 } else {
 	show_header('Merging Artists');
 ?>
-	<h2>Confirm merge</h2>
+	<div class="header">
+		<h2>Confirm merge</h2>
+	</div>
 	<form action="artist.php" method="post">
 		<input type="hidden" name="action" value="change_artistid" />
 		<input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
diff --git a/sections/artist/edit.php b/sections/artist/edit.php
index 63f823a1..a38de4af 100644
--- a/sections/artist/edit.php
+++ b/sections/artist/edit.php
@@ -33,7 +33,9 @@
 show_header('Edit artist');
 ?>
 <div class="thin">
-	<h2>Edit <a href="artist.php?id=<?=$ArtistID?>"><?=$Name?></a></h2>
+	<div class="header">
+		<h2>Edit <a href="artist.php?id=<?=$ArtistID?>"><?=$Name?></a></h2>
+	</div>
 	<div class="box pad">
 		<form action="artist.php" method="post">
 			<input type="hidden" name="action" value="edit" />
diff --git a/sections/artist/history.php b/sections/artist/history.php
index 072de78c..3ff9e710 100644
--- a/sections/artist/history.php
+++ b/sections/artist/history.php
@@ -26,7 +26,9 @@
 // Start printing form
 ?>
 <div class="thin">
-	<h2>Revision history for <a href="artist.php?id=<?=$ArtistID?>"><?=$Name?></a></h2>
+	<div class="header">
+		<h2>Revision history for <a href="artist.php?id=<?=$ArtistID?>"><?=$Name?></a></h2>
+	</div>
 <?
 $Wiki->revision_history(); // the wiki class takes over from here
 ?>
diff --git a/sections/better/files.php b/sections/better/files.php
index 7cd03acf..0df5fa19 100644
--- a/sections/better/files.php
+++ b/sections/better/files.php
@@ -25,20 +25,21 @@
 $Results = get_groups($GroupIDs);
 $Results = $Results['matches'];
 ?>
-<div class="linkbox">
+<div class="header">
 <? if($All) { ?>
-	<a href="better.php?method=files">Just those you've snatched</a>
+		<h2>All torrents trumpable for bad file names</h2>
 <? } else { ?>
-	<a href="better.php?method=files&amp;filter=all">Show all</a>
+		<h2>Torrents trumpable for bad file names, that you've snatched</h2>
 <? } ?>
+
+	<div class="linkbox">
+<? if($All) { ?>
+		<a href="better.php?method=files">Just those you've snatched</a>
+<? } else { ?>
+		<a href="better.php?method=files&amp;filter=all">Show all</a>
+<? } ?>
+	</div>
 </div>
-
-<? if($All) { ?>
-	<h2>All torrents trumpable for bad file names</h2>
-<? } else { ?>
-	<h2>Torrents trumpable for bad file names, that you've snatched</h2>
-<? } ?>
-
 <div class="thin box pad">
 	<h3>There are <?=count($TorrentsInfo)?> torrents remaining</h3>
 	<table>
diff --git a/sections/better/folders.php b/sections/better/folders.php
index 6356c396..14c54514 100644
--- a/sections/better/folders.php
+++ b/sections/better/folders.php
@@ -25,20 +25,22 @@
 $Results = get_groups($GroupIDs);
 $Results = $Results['matches'];
 ?>
-<div class="linkbox">
-<? if($All) { ?>
-	<a href="better.php?method=folders">Just those you've snatched</a>
-<? } else { ?>
-	<a href="better.php?method=folders&amp;filter=all">Show all</a>
-<? } ?>
-</div>
-
+<div class="header">
 <? if($All) { ?>
 	<h2>All torrents trumpable for folder names</h2>
 <? } else { ?>
 	<h2>Torrents trumpable for folder names, that you've snatched</h2>
 <? } ?>
 
+	<div class="linkbox">
+<? if($All) { ?>
+		<a href="better.php?method=folders">Just those you've snatched</a>
+<? } else { ?>
+		<a href="better.php?method=folders&amp;filter=all">Show all</a>
+<? } ?>
+	</div>
+</div>
+
 <div class="thin box pad">
 	<h3>There are <?=count($TorrentsInfo)?> torrents remaining</h3>
 	<table>
diff --git a/sections/better/tags.php b/sections/better/tags.php
index 7b50c509..cb077b45 100644
--- a/sections/better/tags.php
+++ b/sections/better/tags.php
@@ -25,19 +25,21 @@
 $Results = get_groups($GroupIDs);
 $Results = $Results['matches'];
 ?>
-<div class="linkbox">
+<div class="header">
 <? if($All) { ?>
-	<a href="better.php?method=tags">Just those you've snatched</a>
+		<h2>All torrents trumpable for tags</h2>
 <? } else { ?>
-	<a href="better.php?method=tags&amp;filter=all">Show all</a>
+		<h2>Torrents trumpable for tags, that you've snatched</h2>
 <? } ?>
-</div>
 
+	<div class="linkbox">
 <? if($All) { ?>
-	<h2>All torrents trumpable for tags</h2>
+		<a href="better.php?method=tags">Just those you've snatched</a>
 <? } else { ?>
-	<h2>Torrents trumpable for tags, that you've snatched</h2>
+		<a href="better.php?method=tags&amp;filter=all">Show all</a>
 <? } ?>
+	</div>
+</div>
 
 <div class="thin box pad">
 	<h3>There are <?=count($TorrentsInfo)?> torrents remaining</h3>
diff --git a/sections/bookmarks/artists.php b/sections/bookmarks/artists.php
index 4cc40bac..3ad41784 100644
--- a/sections/bookmarks/artists.php
+++ b/sections/bookmarks/artists.php
@@ -31,12 +31,14 @@
 
 ?>
 <div class="thin">
-	<h2><?=$Title?></h2>
-	<div class="linkbox">
-		<a href="bookmarks.php?type=torrents">[Torrents]</a>
-		<a href="bookmarks.php?type=artists">[Artists]</a>
-		<a href="bookmarks.php?type=collages">[Collages]</a>
-		<a href="bookmarks.php?type=requests">[Requests]</a>
+	<div class="header">
+		<h2><?=$Title?></h2>
+		<div class="linkbox">
+			<a href="bookmarks.php?type=torrents">[Torrents]</a>
+			<a href="bookmarks.php?type=artists">[Artists]</a>
+			<a href="bookmarks.php?type=collages">[Collages]</a>
+			<a href="bookmarks.php?type=requests">[Requests]</a>
+		</div>
 	</div>
 	<div class="box pad" align="center">
 <? if (count($ArtistList) == 0) { ?>
diff --git a/sections/bookmarks/torrents.php b/sections/bookmarks/torrents.php
index 87a476f3..73eb55f4 100644
--- a/sections/bookmarks/torrents.php
+++ b/sections/bookmarks/torrents.php
@@ -310,16 +310,18 @@ function compare($X, $Y){
 show_header($Title, 'browse,collage');
 ?>
 <div class="thin">
-	<h2><? if (!$Sneaky) { ?><a href="feeds.php?feed=torrents_bookmarks_t_<?=$LoggedUser['torrent_pass']?>&amp;user=<?=$LoggedUser['ID']?>&amp;auth=<?=$LoggedUser['RSS_Auth']?>&amp;passkey=<?=$LoggedUser['torrent_pass']?>&amp;authkey=<?=$LoggedUser['AuthKey']?>&amp;name=<?=urlencode(SITE_NAME.': Bookmarked Torrents')?>"><img src="<?=STATIC_SERVER?>/common/symbols/rss.png" alt="RSS feed" /></a>&nbsp;<? } ?><?=$Title?></h2>
-	<div class="linkbox">
-		<a href="bookmarks.php?type=torrents">[Torrents]</a>
-		<a href="bookmarks.php?type=artists">[Artists]</a>
-		<a href="bookmarks.php?type=collages">[Collages]</a>
-		<a href="bookmarks.php?type=requests">[Requests]</a>
+	<div class="header">
+		<h2><? if (!$Sneaky) { ?><a href="feeds.php?feed=torrents_bookmarks_t_<?=$LoggedUser['torrent_pass']?>&amp;user=<?=$LoggedUser['ID']?>&amp;auth=<?=$LoggedUser['RSS_Auth']?>&amp;passkey=<?=$LoggedUser['torrent_pass']?>&amp;authkey=<?=$LoggedUser['AuthKey']?>&amp;name=<?=urlencode(SITE_NAME.': Bookmarked Torrents')?>"><img src="<?=STATIC_SERVER?>/common/symbols/rss.png" alt="RSS feed" /></a>&nbsp;<? } ?><?=$Title?></h2>
+		<div class="linkbox">
+			<a href="bookmarks.php?type=torrents">[Torrents]</a>
+			<a href="bookmarks.php?type=artists">[Artists]</a>
+			<a href="bookmarks.php?type=collages">[Collages]</a>
+			<a href="bookmarks.php?type=requests">[Requests]</a>
 <? if (count($TorrentList) > 0) { ?>
-		<br /><br />
-		<a href="bookmarks.php?action=remove_snatched&amp;auth=<?=$LoggedUser['AuthKey']?>" onclick="return confirm('Are you sure you want to remove the bookmarks for all items you\'ve snatched?');">[Remove Snatched]</a>
+			<br /><br />
+			<a href="bookmarks.php?action=remove_snatched&amp;auth=<?=$LoggedUser['AuthKey']?>" onclick="return confirm('Are you sure you want to remove the bookmarks for all items you\'ve snatched?');">[Remove Snatched]</a>
 <? } ?>
+		</div>
 	</div>
 <? if (count($TorrentList) == 0) { ?>
 	<div class="box pad" align="center">
diff --git a/sections/chat/index.php b/sections/chat/index.php
index 7a1e8291..cb7d10ce 100644
--- a/sections/chat/index.php
+++ b/sections/chat/index.php
@@ -8,7 +8,9 @@
 if(empty($IRCKey)) {
 ?>
 <div class="thin">
-	<h3 id="irc">IRC Rules - Please read these carefully!</h3>
+	<div class="header">
+		<h3 id="irc">IRC Rules - Please read these carefully!</h3>
+	</div>
 	<div class="box pad" style="padding:10px 10px 10px 20px;">
 		<p>
 			<strong>Please set your IRC Key on your <a href="user.php?action=edit&amp;userid=<?=$LoggedUser['ID']?>">profile</a> first! For more information on IRC, please read the <a href="wiki.php?action=article&amp;name=IRC+-+How+to+join">wiki article</a>.</strong>
@@ -20,7 +22,9 @@
 	if(!isset($_POST["accept"])) {
 ?>
 <div class="thin">
-	<h3 id="irc">IRC Rules - Please read these carefully!</h3>
+	<div class="header">
+		<h3 id="irc">IRC Rules - Please read these carefully!</h3>
+	</div>
 	<div class="box pad" style="padding:10px 10px 10px 20px;">
 		<ul>
 			<li>
@@ -88,7 +92,9 @@
 		}
 ?>
 <div class="thin">
-	<h3 id="general">IRC</h3>
+	<div class="header">
+		<h3 id="general">IRC</h3>
+	</div>
 	<div class="box pad" style="padding:10px 0px 10px 0px;">
 		<div style="padding:0px 10px 10px 20px;">
 			<p>If you have an IRC client, visit <a href="wiki.php?action=article&amp;name=IRC+-+How+to+join">this wiki entry</a> for more information how to connect. (IRC Applet users are automatically identified with Drone.)</p>
diff --git a/sections/collages/all_comments.php b/sections/collages/all_comments.php
index 7b8ad680..f64f1353 100644
--- a/sections/collages/all_comments.php
+++ b/sections/collages/all_comments.php
@@ -53,15 +53,17 @@
 show_header('Comments for collage '.$Name, 'comments,bbcode');
 ?>
 <div class="thin">
-	<h2>
-		<a href="collages.php">Collages</a> &gt;
-		<a href="collages.php?id=<?=$CollageID?>"><?=$Name?></a>
-	</h2>
-	<div class="linkbox">
+	<div class="header">
+		<h2>
+			<a href="collages.php">Collages</a> &gt;
+			<a href="collages.php?id=<?=$CollageID?>"><?=$Name?></a>
+		</h2>
+		<div class="linkbox">
 <?
 $Pages=get_pages($Page,$Posts,POSTS_PER_PAGE,9);
 echo $Pages;
 ?>
+		</div>
 	</div>
 <?
 
diff --git a/sections/collages/browse.php b/sections/collages/browse.php
index dd087d3b..359e64bb 100644
--- a/sections/collages/browse.php
+++ b/sections/collages/browse.php
@@ -141,11 +141,13 @@
 show_header(($BookmarkView)?'Your bookmarked collages':'Browse collages');
 ?>
 <div class="thin">
+	<div class="header">
 <? if ($BookmarkView) { ?>
-	<h2>Your bookmarked collages</h2>
+		<h2>Your bookmarked collages</h2>
 <? } else { ?>
-	<h2>Browse collages<?=(!empty($UserLink) ? (isset($CollageIDs) ? ' with contributions by '.$UserLink : ' started by '.$UserLink) : '')?></h2>
+		<h2>Browse collages<?=(!empty($UserLink) ? (isset($CollageIDs) ? ' with contributions by '.$UserLink : ' started by '.$UserLink) : '')?></h2>
 <? } ?>
+	</div>
 <? if (!$BookmarkView) { ?>
 	<div>
 		<form action="" method="get">
diff --git a/sections/collages/collage.php b/sections/collages/collage.php
index be7029a2..3fae4f2e 100644
--- a/sections/collages/collage.php
+++ b/sections/collages/collage.php
@@ -364,33 +364,35 @@ function compare($X, $Y){
 show_header($Name,'browse,collage,bbcode');
 ?>
 <div class="thin">
-	<h2><?=$Name?></h2>
-	<div class="linkbox">
-		<a href="collages.php">[List of collages]</a> 
+	<div class="header">
+		<h2><?=$Name?></h2>
+		<div class="linkbox">
+			<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 />
+			<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_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>
 <? }
 	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>
 	<div class="sidebar">
 		<div class="box box_category">
diff --git a/sections/collages/edit.php b/sections/collages/edit.php
index 703f0531..a1e66b3f 100644
--- a/sections/collages/edit.php
+++ b/sections/collages/edit.php
@@ -11,7 +11,9 @@
 show_header('Edit collage');
 ?>
 <div class="thin">
-	<h2>Edit collage <a href="collages.php?id=<?=$CollageID?>"><?=$Name?></a></h2>
+	<div class="header">
+		<h2>Edit collage <a href="collages.php?id=<?=$CollageID?>"><?=$Name?></a></h2>
+	</div>
 	<form action="collages.php" method="post">
 		<input type="hidden" name="action" value="edit_handle" />
 		<input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
diff --git a/sections/collages/manage.php b/sections/collages/manage.php
index cfc78ef2..e42b5ef6 100644
--- a/sections/collages/manage.php
+++ b/sections/collages/manage.php
@@ -37,7 +37,9 @@
 <script src="static/functions/jquery.tablesorter.min.js" type="text/javascript"></script>
 <script src="static/functions/sort.js" type="text/javascript"></script>
 <div class="thin">
-	<h2>Manage collage <a href="collages.php?id=<?=$CollageID?>"><?=$Name?></a></h2>
+	<div class="header">
+		<h2>Manage collage <a href="collages.php?id=<?=$CollageID?>"><?=$Name?></a></h2>
+	</div>
 	<table width="100%">
 		<tr class="colhead"><td>Sorting</td></tr>
 		<tr>
@@ -70,7 +72,7 @@
 			</tr>
 		</thead> 
 		<tbody>
-<?php
+<?
 
 	$Number = 0;
 	foreach ($TorrentList as $GroupID=>$Group) {
@@ -113,7 +115,7 @@
 							</td>
 						</form>
 					</tr>
-<?php } ?>
+<? } ?>
 		</tbody>
 	</table>
 	<div class="drag_drop_save hidden">
@@ -129,4 +131,4 @@
 		</div>
 	</form>
 </div>
-<?php show_footer(); ?>
\ No newline at end of file
+<? show_footer(); ?>
\ No newline at end of file
diff --git a/sections/comments/index.php b/sections/comments/index.php
index 0a015b3e..bec0f266 100644
--- a/sections/comments/index.php
+++ b/sections/comments/index.php
@@ -93,16 +93,18 @@
 $DB->set_query_id($Comments);
 
 ?><div class="thin">
-	<h2>
-		<?=$Header?>
-	</h2>
-	
-	<div class="linkbox">
-	<?=$OtherLink?>
-	<br /><br />
-	<?=$Pages?>
+	<div class="header">
+		<h2><?=$Header?></h2>
+<? if ($OtherLink !== '') { ?>
+		<div class="linkbox">
+			<?=$OtherLink?>
+		</div>
+<? } ?>
 	</div>
-<?php
+	<div class="linkbox">
+		<?=$Pages?>
+	</div>
+<?
 
 while(list($UserID, $TorrentID, $GroupID, $Title, $PostID, $Body, $AddedTime, $EditedTime, $EditorID) = $DB->next_record()) {
 	$UserInfo = user_info($UserID);
diff --git a/sections/donate/cancel.php b/sections/donate/cancel.php
index 67c471fd..37590515 100644
--- a/sections/donate/cancel.php
+++ b/sections/donate/cancel.php
@@ -3,7 +3,9 @@
 show_header('Donation Canceled');
 ?>
 <div class="thin">
-	<h3 id="forums">Donation Canceled</h3>
+	<div class="header">
+		<h3 id="forums">Donation Canceled</h3>
+	</div>
 	<div class="box pad" style="padding:10px 10px 10px 20px;">
 		<p>It's the thought that counts. Please reconsider donating in the future.</p>
 	</div>
diff --git a/sections/donate/complete.php b/sections/donate/complete.php
index 96c0ab79..f27b8e2a 100644
--- a/sections/donate/complete.php
+++ b/sections/donate/complete.php
@@ -3,7 +3,9 @@
 show_header('Donation Complete');
 ?>
 <div class="thin">
-	<h3 id="forums">Donation Complete</h3>
+	<div class="header">
+		<h3 id="forums">Donation Complete</h3>
+	</div>
 	<div class="box pad" style="padding:10px 10px 10px 20px;">
 		<p>Thank you for your donation! If this is your first time donating you will now have received 2 invitations and a <img src="<?=STATIC_SERVER?>common/symbols/donor.png" alt="Donor" />.</p>
 	</div>
diff --git a/sections/donate/donate.php b/sections/donate/donate.php
index ff3e0d07..ea4ebb60 100644
--- a/sections/donate/donate.php
+++ b/sections/donate/donate.php
@@ -23,7 +23,9 @@
 <!-- Donate -->
 <div class="thin">
 <? if (check_perms('site_debug')) { ?>
-	<h3>Test IPN</h3>
+	<div class="header">
+		<h3>Test IPN</h3>
+	</div>
 	<div class="box pad">
 		<form method="post" action="donate.php">
 			<input type="hidden" name="action" value="ipn">
@@ -43,7 +45,9 @@
 <?
 }
 ?>
-	<h3>Donate</h3>
+	<div class="header">
+		<h3>Donate</h3>
+	</div>
 	<div class="box pad" style="padding:10px 10px 10px 20px;">
 		<p>We accept donations to cover the costs associated with running the site and tracker. These costs come from the rental and purchase of the hardware the site runs on (Servers, Components, etc.), in addition to operating expenses (Bandwidth, Power, etc.).</p>
 		<p>Because we do not have any advertisements or sponsorships and this service is provided free of charge, we are entirely reliant upon user donations. If you are financially able, please consider making a donation to help us pay the bills!</p>
diff --git a/sections/donate/donate_gpal.php b/sections/donate/donate_gpal.php
index b9326470..4d08ea32 100644
--- a/sections/donate/donate_gpal.php
+++ b/sections/donate/donate_gpal.php
@@ -22,7 +22,9 @@
 <!-- Donate -->
 <div class="thin">
 <? if (check_perms('site_debug')) { ?>
-	<h3>Test IPN</h3>
+	<div class="header">
+		<h3>Test IPN</h3>
+	</div>
 	<div class="box pad">
 		<form method="post" action="donate.php">
 			<input type="hidden" name="action" value="ipn">
@@ -42,7 +44,9 @@
 <?
 }
 ?>
-	<h3>Donate</h3>
+	<div class="header">
+		<h3>Donate</h3>
+	</div>
 	<div class="box pad" style="padding:10px 10px 10px 20px;">
 		<p>We accept donations to cover the costs associated with running the site and tracker. These costs come from the rental and purchase of the hardware the site runs on (Servers, Components, etc.), in addition to operating expenses (Bandwidth, Power, etc.).</p>
 		<p>Because we do not have any advertisements or sponsorships and this service is provided free of charge, we are entirely reliant upon user donations. If you are financially able, please consider making a donation to help us pay the bills!</p>
diff --git a/sections/error/index.php b/sections/error/index.php
index c6478195..2fd2680a 100644
--- a/sections/error/index.php
+++ b/sections/error/index.php
@@ -50,7 +50,9 @@ function notify ($Channel, $Message) {
 		show_header($Title);
 ?>
 	<div class="thin">
-		<h2><?=$Title?></h2>
+		<div class="header">
+			<h2><?=$Title?></h2>
+		</div>
 		<div class="box pad">
 			<p><?=$Description?></p>
 		</div>
diff --git a/sections/forums/edit_rules.php b/sections/forums/edit_rules.php
index 73a15c0a..bae73c8a 100644
--- a/sections/forums/edit_rules.php
+++ b/sections/forums/edit_rules.php
@@ -33,13 +33,15 @@
 show_header();
 ?>
 <div class="thin box pad">
-	<h2>
-		<a href="forums.php">Forums</a>
-		&gt;
-		<a href="forums.php?action=viewforum&amp;forumid=<?=$ForumID?>"><?=$Forums[$ForumID]['Name']?></a>
-		&gt;
-		Edit forum specific rules
-	</h2>
+	<div class="header">
+		<h2>
+			<a href="forums.php">Forums</a>
+			&gt;
+			<a href="forums.php?action=viewforum&amp;forumid=<?=$ForumID?>"><?=$Forums[$ForumID]['Name']?></a>
+			&gt;
+			Edit forum specific rules
+		</h2>
+	</div>
 	<table>
 		<tr class="colhead">
 			<td>Thread ID</td>
diff --git a/sections/friends/friends.php b/sections/friends/friends.php
index fd7b9e18..1b109dca 100644
--- a/sections/friends/friends.php
+++ b/sections/friends/friends.php
@@ -47,7 +47,9 @@
 // Start printing stuff
 ?>
 <div class="thin">
-	<h2>Friends list</h2>
+	<div class="header">
+		<h2>Friends list</h2>
+	</div>
 	<div class="linkbox">
 <?
 // Pagination
diff --git a/sections/inbox/compose.php b/sections/inbox/compose.php
index 872240f3..62983949 100644
--- a/sections/inbox/compose.php
+++ b/sections/inbox/compose.php
@@ -20,7 +20,9 @@
 show_header('Compose', 'inbox,bbcode');
 ?>
 <div class="thin">
-	<h2>Send a message to <a href="user.php?id=<?=$ToID?>"><?=$Username?></a></h2>
+	<div class="header">
+		<h2>Send a message to <a href="user.php?id=<?=$ToID?>"><?=$Username?></a></h2>
+	</div>
 	<form action="inbox.php" method="post" id="messageform">
 		<div class="box pad">
 			<input type="hidden" name="action" value="takecompose" />
diff --git a/sections/log/index.php b/sections/log/index.php
index 428eaef7..8aab741b 100644
--- a/sections/log/index.php
+++ b/sections/log/index.php
@@ -41,7 +41,9 @@
 $DB->set_query_id($Log);
 ?>
 <div class="thin">
-	<h2>Site log</h2>
+	<div class="header">
+		<h2>Site log</h2>
+	</div>
 	<div>
 		<form action="" method="get">
 			<table cellpadding="6" cellspacing="1" border="0" class="border" width="100%">
@@ -57,8 +59,6 @@
 		</form>
 	</div>
 	
-	
-	
 	<div class="linkbox">
 <?
 $Pages=get_pages($Page,$Results,LOG_ENTRIES_PER_PAGE,9);
diff --git a/sections/login/disabled.php b/sections/login/disabled.php
index 1c9ac45c..8c2a454b 100644
--- a/sections/login/disabled.php
+++ b/sections/login/disabled.php
@@ -68,7 +68,9 @@ function toggle_visibility(id) {
 	}
 ?>
 <div class="thin">
-	<h3 id="general">Disabled IRC</h3>
+	<div class="header">
+		<h3 id="general">Disabled IRC</h3>
+	</div>
 	<div class="box pad" style="padding:10px 0px 10px 0px;">
 		<div style="padding:0px 10px 10px 20px;">
 			<p>Please read the topic carefully.</p>
diff --git a/sections/reports/report.php b/sections/reports/report.php
index 99044320..86cc11c7 100644
--- a/sections/reports/report.php
+++ b/sections/reports/report.php
@@ -103,7 +103,9 @@
 show_header('Report a '.$Type['title'],'bbcode');
 ?>
 <div class="thin">
-	<h2>Report <?=$Type['title']?></h2>
+	<div class="header">
+		<h2>Report <?=$Type['title']?></h2>
+	</div>
 	<h3>Reporting guidelines</h3>
 	<div class="box pad">
 		<p>Following these guidelines will help the moderators deal with your report in a timely fashion. </p>
diff --git a/sections/reports/reports.php b/sections/reports/reports.php
index 251c96bd..7bb10013 100644
--- a/sections/reports/reports.php
+++ b/sections/reports/reports.php
@@ -71,40 +71,42 @@
 // Start printing stuff
 ?>
 <div class="thin">
-<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 class="linkbox">
+	<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">
 <?
-	// pagination
-	$Pages = get_pages($Page,$Results,REPORTS_PER_PAGE,11);
-	echo $Pages;
+// pagination
+$Pages = get_pages($Page,$Results,REPORTS_PER_PAGE,11);
+echo $Pages;
 ?>
-</div>
+	</div>
 <?
 while(list($ReportID, $SnitchID, $SnitchName, $ThingID, $Short, $ReportedTime, $Reason, $Status) = $DB->next_record()) {
 	$Type = $Types[$Short];
 	$Reference = "reports.php?id=".$ReportID."#report".$ReportID;
 ?>
-<div id="report<?=$ReportID?>">
-<form action="reports.php" method="post">
-	<div>
-		<input type="hidden" name="reportid" value="<?=$ReportID?>" />
-		<input type="hidden" name="action" value="takeresolve" />
-		<input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
-	</div>
-	<table cellpadding="5" id="report_<?=$ReportID?>">
-		<tr>
-			<td><strong><a href="<?=$Reference?>">Report</a></strong></td>
-			<td><strong><?=$Type['title']?></strong> was reported by <a href="user.php?id=<?=$SnitchID?>"><?=$SnitchName?></a> <?=time_diff($ReportedTime)?></td>
-		</tr>
-		<tr>
+	<div id="report<?=$ReportID?>">
+	<form action="reports.php" method="post">
+		<div>
+			<input type="hidden" name="reportid" value="<?=$ReportID?>" />
+			<input type="hidden" name="action" value="takeresolve" />
+			<input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
+		</div>
+		<table cellpadding="5" id="report_<?=$ReportID?>">
+			<tr>
+				<td><strong><a href="<?=$Reference?>">Report</a></strong></td>
+				<td><strong><?=$Type['title']?></strong> was reported by <a href="user.php?id=<?=$SnitchID?>"><?=$SnitchName?></a> <?=time_diff($ReportedTime)?></td>
+			</tr>
+			<tr>
 			
-			<td class="center" colspan="2">
-				<strong>
+				<td class="center" colspan="2">
+					<strong>
 <?
 	switch($Short) {
 		case "user" :
@@ -191,32 +193,32 @@
 			break;
 	}
 ?>
-				</strong>
-			</td>
-		</tr>
-		<tr>
-			<td colspan="2"><?=$Text->full_format($Reason)?></td>
-		</tr>
+					</strong>
+				</td>
+			</tr>
+			<tr>
+				<td colspan="2"><?=$Text->full_format($Reason)?></td>
+			</tr>
 <? if($Status != "Resolved") { ?>
-		<tr>
-			<td class="center" colspan="2">
-				<input type="submit" name="submit" value="Resolved" />
-			</td>
-		</tr>
+			<tr>
+				<td class="center" colspan="2">
+					<input type="submit" name="submit" value="Resolved" />
+				</td>
+			</tr>
 <? } ?>
-	</table>
-</form>
-</div>
-<br />
+		</table>
+	</form>
+	</div>
+	<br />
 <?
 	$DB->set_query_id($Reports);
 }
 ?>
-</div>
-<div class="linkbox">
+	<div class="linkbox">
 <?
 	echo $Pages;
 ?>
+	</div>
 </div>
 <?
 show_footer();
diff --git a/sections/reports/stats.php b/sections/reports/stats.php
index 19f21ad5..cf5fb4a3 100644
--- a/sections/reports/stats.php
+++ b/sections/reports/stats.php
@@ -7,11 +7,13 @@
 show_header('Other reports stats');
 
 ?>
-<h2>Other reports stats!</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 class="header">
+	<h2>Other reports stats!</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="box pad thin" style="padding: 0px 0px 0px 20px; margin-left: auto; margin-right: auto">
 <?
diff --git a/sections/reportsv2/report.php b/sections/reportsv2/report.php
index eff2fd0d..b571b855 100644
--- a/sections/reportsv2/report.php
+++ b/sections/reportsv2/report.php
@@ -19,7 +19,9 @@
 ?>
 
 <div class="thin">
-	<h2>Report a torrent</h2>
+	<div class="header">
+		<h2>Report a torrent</h2>
+	</div>
 
 	<form action="reportsv2.php?action=takereport" enctype="multipart/form-data" method="post" id="report_table">
 		<div>
diff --git a/sections/reportsv2/reports.php b/sections/reportsv2/reports.php
index 41f0b8f7..c31bf83f 100644
--- a/sections/reportsv2/reports.php
+++ b/sections/reportsv2/reports.php
@@ -22,10 +22,11 @@ function Taste(torrent_id, report_id, taste) {
 	});
 }
 </script>
-<?
-include('header.php');
-?>
-<h2>New reports, auto assigned!</h2>
+
+<div class="header">
+	<h2>New reports, auto assigned!</h2>
+	<? include('header.php'); ?>
+</div>
 <div class="buttonbox thin center">
 	<input type="button" onclick="AddMore();" value="Add More" /><input type="text" name="repop_amount" id="repop_amount" size="2" value="10" />
 	| <span title="Changes whether to automatically replace resolved ones with new ones"><input type="checkbox" checked="checked" id="dynamic"/> <label for="dynamic">Dynamic</label></span>
diff --git a/sections/reportsv2/search.php b/sections/reportsv2/search.php
index c3ed402d..1f9da42f 100644
--- a/sections/reportsv2/search.php
+++ b/sections/reportsv2/search.php
@@ -7,9 +7,12 @@
 }
 
 show_header('Reports V2!', 'reportsv2');
-include('header.php');
+
 ?>
-<h2>Search</h2>
+<div class="header">
+	<h2>Search</h2>
+<? include('header.php'); ?>
+</div>
 <br />
 On hold until FZeroX fixes the main torrents search, then I will steal all his work and claim it as my own.
 <?
diff --git a/sections/reportsv2/static.php b/sections/reportsv2/static.php
index 1fc2d692..93d8ece0 100644
--- a/sections/reportsv2/static.php
+++ b/sections/reportsv2/static.php
@@ -187,10 +187,12 @@
 $PageLinks=get_pages($Page,$Results,REPORTS_PER_PAGE,11);
 
 show_header('Reports V2!', 'reportsv2,bbcode');
-include('header.php');
 
 ?>
-<h2><?=$Title?></h2>
+<div class="header">
+	<h2><?=$Title?></h2>
+    <? include('header.php'); ?>
+</div>
 <div class="buttonbox thin center">
 	<? if($View != "resolved") { ?>
 		<span title="Resolves *all* checked reports with their respective resolutions"><input type="button" onclick="MultiResolve();" value="Multi-Resolve" /></span>
diff --git a/sections/reportsv2/views.php b/sections/reportsv2/views.php
index 1687ea73..a6c85a35 100644
--- a/sections/reportsv2/views.php
+++ b/sections/reportsv2/views.php
@@ -10,7 +10,7 @@
 }
 
 show_header('Reports V2!', 'reportsv2');
-include('header.php');
+
 
 //Grab owners ID, just for examples
 $DB->query("SELECT ID, Username FROM users_main ORDER BY ID ASC LIMIT 1");
@@ -18,7 +18,10 @@
 $Owner = display_str($Owner);
 
 ?>
-<h2>Reports v2 Information!</h2>
+<div class="header">
+	<h2>Reports v2 Information!</h2>
+	<? include('header.php'); ?>
+</div>
 <br />
 <div class="box pad thin" style="padding: 0px 0px 0px 20px; width: 70%; margin-left: auto; margin-right: auto">
 	<table><tr><td style="width: 50%;">
diff --git a/sections/requests/new_edit.php b/sections/requests/new_edit.php
index 60bb53fb..371b24c4 100644
--- a/sections/requests/new_edit.php
+++ b/sections/requests/new_edit.php
@@ -121,7 +121,9 @@
 show_header(($NewRequest ? "Create a request" : "Edit a request"), 'requests');
 ?>
 <div class="thin">
-	<h2><?=($NewRequest ? "Create a request" : "Edit a request")?></h2>
+	<div class="header">
+		<h2><?=($NewRequest ? "Create a request" : "Edit a request")?></h2>
+	</div>
 	
 	<div class="box pad">
 		<form action="" method="post" id="request_form" onsubmit="Calculate();">
diff --git a/sections/requests/request.php b/sections/requests/request.php
index 9ed878c3..d69c5acd 100644
--- a/sections/requests/request.php
+++ b/sections/requests/request.php
@@ -85,25 +85,26 @@
 
 ?>
 <div class="thin">
-	<h2><a href="requests.php">Requests</a> &gt; <?=$CategoryName?> &gt; <?=$DisplayLink?></h2>
-	<div class="linkbox">
+	<div class="header">
+		<h2><a href="requests.php">Requests</a> &gt; <?=$CategoryName?> &gt; <?=$DisplayLink?></h2>
+		<div class="linkbox">
 <? if($CanEdit) { ?> 
-		<a href="requests.php?action=edit&amp;id=<?=$RequestID?>">[Edit]</a>
+			<a href="requests.php?action=edit&amp;id=<?=$RequestID?>">[Edit]</a>
 <? }
 if($UserCanEdit || check_perms('users_mod')) { //check_perms('site_moderate_requests')) { ?>
-		<a href="requests.php?action=delete&amp;id=<?=$RequestID?>">[Delete]</a>
+			<a href="requests.php?action=delete&amp;id=<?=$RequestID?>">[Delete]</a>
 <? } ?>
 <?	if(has_bookmarked('request', $RequestID)) { ?>
-		<a href="#" id="bookmarklink_request_<?=$RequestID?>" onclick="Unbookmark('request', <?=$RequestID?>,'[Bookmark]');return false;">[Remove bookmark]</a>
+			<a href="#" id="bookmarklink_request_<?=$RequestID?>" onclick="Unbookmark('request', <?=$RequestID?>,'[Bookmark]');return false;">[Remove bookmark]</a>
 <?	} else { ?>
-		<a href="#" id="bookmarklink_request_<?=$RequestID?>" onclick="Bookmark('request', <?=$RequestID?>,'[Remove bookmark]');return false;">[Bookmark]</a>
+			<a href="#" id="bookmarklink_request_<?=$RequestID?>" onclick="Bookmark('request', <?=$RequestID?>,'[Remove bookmark]');return false;">[Bookmark]</a>
 <?	} ?>
-		<a href="reports.php?action=report&amp;type=request&amp;id=<?=$RequestID?>">[Report Request]</a>
+			<a href="reports.php?action=report&amp;type=request&amp;id=<?=$RequestID?>">[Report Request]</a>
 <?	if(!$IsFilled) { ?>
-		<a href="upload.php?requestid=<?=$RequestID?><?=($GroupID?"&groupid=$GroupID":'')?>">[Upload Request]</a>
+			<a href="upload.php?requestid=<?=$RequestID?><?=($GroupID?"&groupid=$GroupID":'')?>">[Upload Request]</a>
 <?	}
 	if(!$IsFilled && (($CategoryID == 0) || ($CategoryName == "Music" && $Year == 0))) { ?>
-		<a href="reports.php?action=report&amp;type=request_update&amp;id=<?=$RequestID?>">[Request Update]</a>
+			<a href="reports.php?action=report&amp;type=request_update&amp;id=<?=$RequestID?>">[Request Update]</a>
 <? } ?>
 
 <?
@@ -118,11 +119,10 @@
 $google_url = "https://www.google.com/search?&tbm=shop&q=" . $encoded_artist . " " . $encoded_title;
 
 ?>
-<a href="<? echo $worldcat_url; ?>">[Find in Library]</a>
-<a href="<? echo $google_url; ?>">[Find in Stores]</a>
-
-</div>
-	
+			<a href="<? echo $worldcat_url; ?>">[Find in Library]</a>
+			<a href="<? echo $google_url; ?>">[Find in Stores]</a>
+		</div>
+	</div>
 	<div class="sidebar">
 <? if($CategoryID != 0) { ?>
 		<div class="box box_image box_image_albumart box_albumart"><!-- .box_albumart deprecated -->
diff --git a/sections/requests/requests.php b/sections/requests/requests.php
index 69a3cfd9..44cebb52 100644
--- a/sections/requests/requests.php
+++ b/sections/requests/requests.php
@@ -285,8 +285,9 @@
 
 ?>
 <div class="thin">
-	<h2><?=$Title?></h2>
-	<div class="linkbox">
+	<div class="header">
+		<h2><?=$Title?></h2>
+		<div class="linkbox">
 <?	if (!$BookmarkView) { ?>
 <?		if(check_perms('site_submit_requests')){ ?> 
 		<a href="requests.php?action=new">[New request]</a>
@@ -301,6 +302,7 @@
 		<a href="bookmarks.php?type=collages">[Collages]</a>
 		<a href="bookmarks.php?type=requests">[Requests]</a>
 <?	} ?>
+		</div>
 	</div>
 	<div>
 		<form action="" method="get">
diff --git a/sections/requests/requests.php.presphinx b/sections/requests/requests.php.presphinx
index ed749937..6528a35f 100644
--- a/sections/requests/requests.php.presphinx
+++ b/sections/requests/requests.php.presphinx
@@ -245,15 +245,17 @@ show_header($Title, 'requests');
 
 ?>
 <div class="thin">
-	<h2><?=$Title?></h2>
-	<div class="linkbox">
+	<div class="header">
+		<h2><?=$Title?></h2>
+		<div class="linkbox">
 <?	if(check_perms('site_submit_requests')){ ?> 
-		<a href="requests.php?action=new">[New request]</a>
-		<a href="requests.php?type=created">[My requests]</a>
+			<a href="requests.php?action=new">[New request]</a>
+			<a href="requests.php?type=created">[My requests]</a>
 <?	} 
 	if(check_perms('site_vote')){?> 
-		<a href="requests.php?type=voted">[Requests I've voted on]</a>
+			<a href="requests.php?type=voted">[Requests I've voted on]</a>
 <?	} ?> 
+		</div>
 	</div>
 	<div class="center">
 		<form action="" method="get">
diff --git a/sections/rules/clients.php b/sections/rules/clients.php
index 1bdc5043..d4a9d0d5 100644
--- a/sections/rules/clients.php
+++ b/sections/rules/clients.php
@@ -8,14 +8,16 @@
 }
 ?>
 	<div class="thin">
-	<h2 class="center">Client Whitelist</h2>
-		<div class="box pad">
-			<p>Client rules are how we maintain the integrity of our swarms. This allows us to filter out disruptive and dishonest clients that may hurt the performance of either the tracker or individual peers.</p>
-			<table cellpadding="5" cellspacing="1" border="0" class="border" width="100%">
-				<tr class="colhead">
-					<td style="width:150px;"><strong>Allowed Client</strong></td>
-					<!-- td style="width:400px;"><strong>Additional Notes</strong></td>  -->
-				</tr>
+	<div class="header">
+		<h2 class="center">Client Whitelist</h2>
+	</div>
+	<div class="box pad">
+		<p>Client rules are how we maintain the integrity of our swarms. This allows us to filter out disruptive and dishonest clients that may hurt the performance of either the tracker or individual peers.</p>
+		<table cellpadding="5" cellspacing="1" border="0" class="border" width="100%">
+			<tr class="colhead">
+				<td style="width:150px;"><strong>Allowed Client</strong></td>
+				<!-- td style="width:400px;"><strong>Additional Notes</strong></td>  -->
+			</tr>
 <?
 	$Row = 'a';
 	foreach($WhitelistedClients as $Client) {
diff --git a/sections/rules/collages.php b/sections/rules/collages.php
index b430a83e..fc7a92a8 100644
--- a/sections/rules/collages.php
+++ b/sections/rules/collages.php
@@ -3,7 +3,9 @@
 show_header('Collages Rules');
 ?>
 <div class="thin">
-<h2 class="center">Collages</h2>
+	<div class="header">
+		<h2 class="center">Collages</h2>
+	</div>
 	<div class="box pad" style="padding:10px 10px 10px 20px;">
 		<ul>
 			<li>Collages in the Discography, Staff Picks, Label, and Charts categories must be based on fact, and not opinion. If something is a published Best Of (for instance, "Pitchfork's Best Albums of the 1990's") then it should go in the Charts category.</li>
diff --git a/sections/rules/ratio.php b/sections/rules/ratio.php
index 921af897..caaefeb1 100644
--- a/sections/rules/ratio.php
+++ b/sections/rules/ratio.php
@@ -3,7 +3,9 @@
 show_header('Ratio Requirements');
 ?>
 <div class="thin">
-<h2 class="center">Ratio Rules</h2>
+	<div class="header">
+		<h2 class="center">Ratio Rules</h2>
+	</div>
 	<div class="box pad">
 		<p>
 			Your ratio is the amount you've uploaded divided by the amount you've downloaded. 
diff --git a/sections/rules/requests.php b/sections/rules/requests.php
index 84a826b0..7fa141ff 100644
--- a/sections/rules/requests.php
+++ b/sections/rules/requests.php
@@ -3,7 +3,9 @@
 show_header('Request Rules');
 ?>
 <div class="thin">
-<h2 class="center">Requests</h2>
+	<div class="header">
+		<h2 class="center">Requests</h2>
+	</div>
 	<div class="box pad" style="padding:10px 10px 10px 20px;">
 		<ul>
 			<li>
diff --git a/sections/rules/rules.php b/sections/rules/rules.php
index 53090b06..186d0aba 100644
--- a/sections/rules/rules.php
+++ b/sections/rules/rules.php
@@ -4,7 +4,9 @@
 ?>
 <!-- General Rules -->
 <div class="thin">
-	<h3 id="general">Golden Rules</h3>
+	<div class="header">
+		<h3 id="general">Golden Rules</h3>
+	</div>
 	<div class="box pad" style="padding:10px 10px 10px 20px;">
 		<ul>
 			<li>
diff --git a/sections/rules/tag.php b/sections/rules/tag.php
index a55d67de..432c4526 100644
--- a/sections/rules/tag.php
+++ b/sections/rules/tag.php
@@ -4,7 +4,9 @@
 ?>
 <!-- General Rules -->
 <div class="thin">
-	<h3 id="general">Tagging rules</h3>
+	<div class="header">
+		<h3 id="general">Tagging rules</h3>
+	</div>
 	<div class="box pad" style="padding:10px 10px 10px 20px;">
 		<ul>
 			<li>Tags should be comma separated, and you should use a period ('.') to separate words inside a tag - eg. '<strong style="color:green;">hip.hop</strong>'. 
diff --git a/sections/schedule/index.php b/sections/schedule/index.php
index 1d0f557e..966f8d7a 100644
--- a/sections/schedule/index.php
+++ b/sections/schedule/index.php
@@ -292,17 +292,29 @@ function next_hour() {
 
         $DB->query("UPDATE users_info SET Warned='0000-00-00 00:00:00' WHERE Warned<'$sqltime'");
 
-	// If a user has downloaded more than 10 gigs while on ratio watch, banhammer
+	   // If a user has downloaded more than 10 gigs while on ratio watch disable leeching and send message
 
         $DB->query("SELECT ID FROM users_info AS i JOIN users_main AS m ON m.ID=i.UserID
                 WHERE i.RatioWatchEnds!='0000-00-00 00:00:00'
                 AND i.RatioWatchDownload+10*1024*1024*1024<m.Downloaded
                 And m.Enabled='1'");
 
-        $UserIDs = $DB->collect('ID');
-        if(count($UserIDs) > 0) {
-                disable_users($UserIDs, "Disabled by ratio watch system for downloading more than 10 gigs on ratio watch.", 2);
+        $UserIDs = $DB->collect('ID'  );
+    if(count($UserIDs) > 0) {
+        $Subject = 'Leeching Disabled';
+        $Message = 'You have downloaded more then 10gb while on Ratio Watch. Your Leeching privleges have been disabled. Please reread the rules and refer to this guide on how to improve your ratio https://ssl.what.cd/wiki.php?action=article&id=110';            
+        foreach($UserIDs as $UserID) {
+            send_pm($UserID,0,db_string($Subject),db_string($Message));
         }
+ 
+            $DB->query("UPDATE users_info AS i JOIN users_main AS m ON m.ID=i.UserID
+            SET 
+            m.can_leech='0',
+            i.AdminComment=CONCAT('$sqltime - Leeching ability disabled by ratio watch system - required ratio: ', m.RequiredRatio,'
+
+'           , i.AdminComment)
+            WHERE m.ID IN(".implode(',',$UserIDs).")");
+    }
 
 }
 /*************************************************************************\
diff --git a/sections/staff/index.php b/sections/staff/index.php
index 07214178..d7a1f130 100644
--- a/sections/staff/index.php
+++ b/sections/staff/index.php
@@ -10,7 +10,9 @@
 
 ?>
 <div class="thin">
-	<h2><?=SITE_NAME?> Staff</h2>
+	<div class="header">
+		<h2><?=SITE_NAME?> Staff</h2>
+	</div>
 	<div class="box pad" style="padding:0px 10px 10px 10px;">
 		<br />
 		<h3>Contact Staff</h3>
diff --git a/sections/staffpm/common_responses.php b/sections/staffpm/common_responses.php
index 3ce6bf31..cad7dea5 100644
--- a/sections/staffpm/common_responses.php
+++ b/sections/staffpm/common_responses.php
@@ -11,20 +11,22 @@
 
 ?>
 <div class="thin">
-	<h2>Staff PMs - Manage common responses</h2>
-	<div class="linkbox">
+	<div class="header">
+		<h2>Staff PMs - Manage common responses</h2>
+		<div class="linkbox">
 <? 	if ($IsStaff) { ?>
-		<a href="staffpm.php">[My unanswered]</a>
+			<a href="staffpm.php">[My unanswered]</a>
 <? 	} ?>
-		<a href="staffpm.php?view=unanswered">[All unanswered]</a>
-		<a href="staffpm.php?view=open">[Open]</a>
-		<a href="staffpm.php?view=resolved">[Resolved]</a>
+			<a href="staffpm.php?view=unanswered">[All unanswered]</a>
+			<a href="staffpm.php?view=open">[Open]</a>
+			<a href="staffpm.php?view=resolved">[Resolved]</a>
 <?	if ($ConvID = (int)$_GET['convid']) { ?>
-		<a href="staffpm.php?action=viewconv&id=<?=$ConvID?>">[Back to conversation]</a>
+			<a href="staffpm.php?action=viewconv&id=<?=$ConvID?>">[Back to conversation]</a>
 <?	} ?>
-		<br />
-		<br />
+		</div>
 	</div>
+	<br />
+	<br />
 	<div id="commonresponses" class="center">
 		<br />
 		<div id="ajax_message_0" class="hidden center alertbar"></div>
diff --git a/sections/staffpm/staff_inbox.php b/sections/staffpm/staff_inbox.php
index 1cb4f31f..0683d623 100644
--- a/sections/staffpm/staff_inbox.php
+++ b/sections/staffpm/staff_inbox.php
@@ -79,16 +79,20 @@
 // Start page
 ?>
 <div class="thin">
-	<h2><?=$ViewString?> Staff PMs</h2>
-	<div class="linkbox">
+	<div class="header">
+		<h2><?=$ViewString?> Staff PMs</h2>
+		<div class="linkbox">
 <? 	if ($IsStaff) {
-?>		<a href="staffpm.php">[My unanswered]</a>
+?>			<a href="staffpm.php">[My unanswered]</a>
 <? 	} ?>
-		<a href="staffpm.php?view=unanswered">[All unanswered]</a>
-		<a href="staffpm.php?view=open">[Open]</a>
-		<a href="staffpm.php?view=resolved">[Resolved]</a>
-		<br />
-		<br />
+			<a href="staffpm.php?view=unanswered">[All unanswered]</a>
+			<a href="staffpm.php?view=open">[Open]</a>
+			<a href="staffpm.php?view=resolved">[Resolved]</a>
+		</div>
+	</div>
+	<br />
+	<br />
+	<div class="linkbox">
 		<?=$Pages?>
 	</div>
 	<div class="box pad" id="inbox">
diff --git a/sections/staffpm/user_inbox.php b/sections/staffpm/user_inbox.php
index 56fa4edb..7cbd2256 100644
--- a/sections/staffpm/user_inbox.php
+++ b/sections/staffpm/user_inbox.php
@@ -23,12 +23,14 @@
 // Start page
 ?>
 <div class="thin">
-	<h2>Staff PMs</h2>
-	<div class="linkbox">
-		<a href="#" onClick="$('#compose').toggle();">[Compose New]</a>
-		<br />
-		<br />
+	<div class="header">
+		<h2>Staff PMs</h2>
+		<div class="linkbox">
+			<a href="#" onClick="$('#compose').toggle();">[Compose New]</a>
+		</div>
 	</div>
+	<br />
+	<br />
 	<? print_compose_staff_pm(true); ?>
 	<div class="box pad" id="inbox">
 <?
diff --git a/sections/staffpm/viewconv.php b/sections/staffpm/viewconv.php
index 70050e92..cdfb51f4 100644
--- a/sections/staffpm/viewconv.php
+++ b/sections/staffpm/viewconv.php
@@ -30,34 +30,35 @@
 
 ?>
 <div id="thin">
-	<h2>Staff PM - <?=display_str($Subject)?></h2>
-	<div class="linkbox">
+	<div class="header">
+		<h2>Staff PM - <?=display_str($Subject)?></h2>
+		<div class="linkbox">
 <?
 	// Staff only
 	if ($IsStaff) {
 ?>
-	<a href="staffpm.php">[My unanswered]</a>
+		<a href="staffpm.php">[My unanswered]</a>
 <?
 	}
 
 	// FLS/Staff
 	if ($IsFLS) {
 ?>
-		<a href="staffpm.php?view=unanswered">[All unanswered]</a>
-		<a href="staffpm.php?view=open">[Open]</a>
-		<a href="staffpm.php?view=resolved">[Resolved]</a>
+			<a href="staffpm.php?view=unanswered">[All unanswered]</a>
+			<a href="staffpm.php?view=open">[Open]</a>
+			<a href="staffpm.php?view=resolved">[Resolved]</a>
 <?
 		// User
 	} else {
 ?>
-		<a href="staffpm.php">[Back to inbox]</a>
+			<a href="staffpm.php">[Back to inbox]</a>
 <?
 	}
 
-?>
-		<br />
-		<br />
+?>		</div>
 	</div>
+	<br />
+	<br />
 	<div id="inbox">
 <?
 	// Get messages
diff --git a/sections/tools/data/bitcoin_balance.php b/sections/tools/data/bitcoin_balance.php
index 65701c0d..b2304027 100644
--- a/sections/tools/data/bitcoin_balance.php
+++ b/sections/tools/data/bitcoin_balance.php
@@ -11,7 +11,9 @@
 			WHERE BitcoinAddress IS NOT NULL ORDER BY m.Username ASC");
 ?>
 <div class="thin">
-	<h3><?=$Balance?></h3>
+	<div class="header">
+		<h3><?=$Balance?></h3>
+	</div>
 	<table>
 	<tr>
 		<th>Username</th>
diff --git a/sections/tools/managers/bans.php b/sections/tools/managers/bans.php
index e766811e..4943c3f9 100644
--- a/sections/tools/managers/bans.php
+++ b/sections/tools/managers/bans.php
@@ -74,8 +74,9 @@
 $DB->set_query_id($Bans);
 ?>
 
-<h2>IP Bans</h2>
-
+<div class="header">
+	<h2>IP Bans</h2>
+</div>
 <div>
 	<form action="" method="get">
 		<table cellpadding="6" cellspacing="1" border="0" class="border" width="100%">
diff --git a/sections/tools/managers/dnu_list.php b/sections/tools/managers/dnu_list.php
index 7367f1ad..82a5c8de 100644
--- a/sections/tools/managers/dnu_list.php
+++ b/sections/tools/managers/dnu_list.php
@@ -12,7 +12,9 @@
 	LEFT JOIN users_main AS um ON um.ID=d.UserID
 	ORDER BY d.Time DESC");
 ?>
-<h2>Do Not Uploads</h2>
+<div class="header">
+	<h2>Do Not Uploads</h2>
+</div>
 <table>
 	<tr class="colhead">
 		<td>Name</td>
diff --git a/sections/tools/managers/eb.php b/sections/tools/managers/eb.php
index abefba38..b3a0e3d7 100644
--- a/sections/tools/managers/eb.php
+++ b/sections/tools/managers/eb.php
@@ -12,7 +12,9 @@
 	FROM email_blacklist AS eb 
 	ORDER BY eb.Time DESC");
 ?>
-<h2>Email Blacklist</h2>
+<div class="header">
+	<h2>Email Blacklist</h2>
+</div>
 <table>
 	<tr class="colhead">
 		<td>Email</td>
diff --git a/sections/tools/managers/forum_list.php b/sections/tools/managers/forum_list.php
index 40885ef7..666059e8 100644
--- a/sections/tools/managers/forum_list.php
+++ b/sections/tools/managers/forum_list.php
@@ -48,8 +48,9 @@ function class_list($Selected=0){
 	FROM forums
 	ORDER BY CategoryID, Sort ASC');
 ?>
-
-<h2>Forum control panel</h2>
+<div class="header">
+	<h2>Forum control panel</h2>
+</div>
 <table width="100%">
 	<tr class="colhead">
 		<td>Category</td>
diff --git a/sections/tools/managers/login_watch.php b/sections/tools/managers/login_watch.php
index adcf47c6..f973e483 100644
--- a/sections/tools/managers/login_watch.php
+++ b/sections/tools/managers/login_watch.php
@@ -21,22 +21,24 @@
 	ORDER BY l.BannedUntil ASC');
 ?>
 <div class="thin">
-<h2>Login Watch Management</h2>
-<table width="100%">
-	<tr class="colhead">
-		<td>IP</td>
-		<td>User</td>
-		<td>Bans</td>
-		<td>Remaining</td>
-		<td>Submit</td>
-		<? if(check_perms('admin_manage_ipbans')) { ?>		<td>Submit</td><? } ?>
-	</tr>
+	<div class="header">
+		<h2>Login Watch Management</h2>
+	</div>
+	<table width="100%">
+		<tr class="colhead">
+			<td>IP</td>
+			<td>User</td>
+			<td>Bans</td>
+			<td>Remaining</td>
+			<td>Submit</td>
+			<? if(check_perms('admin_manage_ipbans')) { ?>		<td>Submit</td><? } ?>
+		</tr>
 <?
 $Row = 'b';
 while(list($ID, $IP, $UserID, $LastAttempt, $Attempts, $BannedUntil, $Bans) = $DB->next_record()){
 	$Row = ($Row === 'a' ? 'b' : 'a');
 ?>
-	<tr class="row<?=$Row?>">
+		<tr class="row<?=$Row?>">
 			<td>
 				<?=$IP?>
 			</td>
@@ -70,10 +72,10 @@
 				</form>
 			</td>
 <? } ?>
-	</tr>
+		</tr>
 <?
 }
 ?>
-</table>
+	</table>
 </div>
 <? show_footer(); ?>
diff --git a/sections/tools/managers/news.php b/sections/tools/managers/news.php
index 65bdaa60..867df081 100644
--- a/sections/tools/managers/news.php
+++ b/sections/tools/managers/news.php
@@ -28,7 +28,9 @@
 }
 ?>
 <div class="thin">
-	<h2><?= ($_GET['action'] == 'news')? 'Create a news post' : 'Edit news post';?></h2>
+	<div class="header">
+		<h2><?= ($_GET['action'] == 'news')? 'Create a news post' : 'Edit news post';?></h2>
+	</div>
 	<form action="tools.php" method="post">
 		<div class="box pad">
 			<input type="hidden" name="action" value="<?= ($_GET['action'] == 'news')? 'takenewnews' : 'takeeditnews';?>" />
diff --git a/sections/tools/managers/official_tags.php b/sections/tools/managers/official_tags.php
index d7cab8ca..44291a3a 100644
--- a/sections/tools/managers/official_tags.php
+++ b/sections/tools/managers/official_tags.php
@@ -1 +1 @@
-<?
if (!check_perms('users_mod')) { error(403); }

if (isset($_POST['doit'])) {
	authorize();
	
	if (isset($_POST['oldtags'])) {
		$OldTagIDs = $_POST['oldtags'];
		foreach ($OldTagIDs AS $OldTagID) {
			if (!is_number($OldTagID)) { error(403); }
		}
		$OldTagIDs = implode(', ', $OldTagIDs);
		
		$DB->query("UPDATE tags SET TagType = 'other' WHERE ID IN ($OldTagIDs)");
	}
	
	if ($_POST['newtag']) {
		$TagName = sanitize_tag($_POST['newtag']);

		$DB->query("SELECT t.ID FROM tags AS t WHERE t.Name LIKE '".$TagName."'");
		list($TagID) = $DB->next_record();
	
		if($TagID) {
			$DB->query("UPDATE tags SET TagType = 'genre' WHERE ID = $TagID");
		} else { // Tag doesn't exist yet - create tag
			$DB->query("INSERT INTO tags (Name, UserID, TagType, Uses) VALUES ('".$TagName."', ".$LoggedUser['ID'].", 'genre', 0)");
			$TagID = $DB->inserted_id();
		} 
	}
	
	$Cache->delete_value('genre_tags');
}

show_header('Official Tags');
?>
<h2>Official Tags</h2>
<div style="text-align: center">
	<div style="display: inline-block;">
		<form method="post">
			<input type="hidden" name="action" value="official_tags" />
			<input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
			<input type="hidden" name="doit" value="1" />
			<table>
				<tr class="colhead_dark">
					<td style="font-weight: bold" style="text-align: center">Remove</td>
					<td style="font-weight: bold">Tag</td>
					<td style="font-weight: bold">Uses</td>
					<td>&nbsp;&nbsp;&nbsp;</td>
					<td style="font-weight: bold" style="text-align: center">Remove</td>
					<td style="font-weight: bold">Tag</td>
					<td style="font-weight: bold">Uses</td>
					<td>&nbsp;&nbsp;&nbsp;</td>
					<td style="font-weight: bold" style="text-align: center">Remove</td>
					<td style="font-weight: bold">Tag</td>
					<td style="font-weight: bold">Uses</td>
				</tr>
<?
$i = 0;
$DB->query("SELECT ID, Name, Uses FROM tags WHERE TagType='genre' ORDER BY Name ASC");
$TagCount = $DB->record_count();
$Tags = $DB->to_array();
for ($i = 0; $i < $TagCount / 3; $i++) {
	list($TagID1, $TagName1, $TagUses1) = $Tags[$i];
	list($TagID2, $TagName2, $TagUses2) = $Tags[ceil($TagCount/3) + $i];
	list($TagID3, $TagName3, $TagUses3) = $Tags[2*ceil($TagCount/3) + $i];
?>
				<tr class="<?=(($i % 2)?'rowa':'rowb')?>">
					<td style="text-align: center"><input type="checkbox" name="oldtags[]" value="<?=$TagID1?>" /></td>
					<td><?=$TagName1?></td>
					<td style="text-align: center"><?=$TagUses1?></td>
					<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
					<td style="text-align: center">
<?		if ($TagID2) { ?>
						<input type="checkbox" name="oldtags[]" value="<?=$TagID2?>" />
<?		} ?>
					</td>
					<td><?=$TagName2?></td>
					<td style="text-align: center"><?=$TagUses2?></td>
					<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
					<td style="text-align: center">
<?		if ($TagID3) { ?>
						<input type="checkbox" name="oldtags[]" value="<?=$TagID3?>" />
<?		} ?>
					</td>
					<td><?=$TagName3?></td>
					<td style="text-align: center"><?=$TagUses3?></td>
				</tr>
<?
}
?>		
				<tr class="<?=(($i % 2)?'rowa':'rowb')?>">
					<td colspan="11"><label for="newtag">New official tag: </label><input type="text" name="newtag" /></td>
				</tr>
				<tr style="border-top: thin solid">
					<td colspan="11" style="text-align: center"><input type="submit" value="Submit Changes" /></td>
				</tr>
						
			</table>
		</form>
	</div>
</div>
<?
show_footer();
?>
+<?
if (!check_perms('users_mod')) { error(403); }

if (isset($_POST['doit'])) {
	authorize();

	if (isset($_POST['oldtags'])) {
		$OldTagIDs = $_POST['oldtags'];
		foreach ($OldTagIDs AS $OldTagID) {
			if (!is_number($OldTagID)) { error(403); }
		}
		$OldTagIDs = implode(', ', $OldTagIDs);

		$DB->query("UPDATE tags SET TagType = 'other' WHERE ID IN ($OldTagIDs)");
	}

	if ($_POST['newtag']) {
		$TagName = sanitize_tag($_POST['newtag']);

		$DB->query("SELECT t.ID FROM tags AS t WHERE t.Name LIKE '".$TagName."'");
		list($TagID) = $DB->next_record();

		if($TagID) {
			$DB->query("UPDATE tags SET TagType = 'genre' WHERE ID = $TagID");
		} else { // Tag doesn't exist yet - create tag
			$DB->query("INSERT INTO tags (Name, UserID, TagType, Uses) VALUES ('".$TagName."', ".$LoggedUser['ID'].", 'genre', 0)");
			$TagID = $DB->inserted_id();
		}
	}

	$Cache->delete_value('genre_tags');
}

show_header('Official Tags');
?>
<div class="header">
	<h2>Official Tags</h2>
</div>
<div style="text-align: center">
	<div style="display: inline-block;">
		<form method="post">
			<input type="hidden" name="action" value="official_tags" />
			<input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
			<input type="hidden" name="doit" value="1" />
			<table>
				<tr class="colhead_dark">
					<td style="font-weight: bold" style="text-align: center">Remove</td>
					<td style="font-weight: bold">Tag</td>
					<td style="font-weight: bold">Uses</td>
					<td>&nbsp;&nbsp;&nbsp;</td>
					<td style="font-weight: bold" style="text-align: center">Remove</td>
					<td style="font-weight: bold">Tag</td>
					<td style="font-weight: bold">Uses</td>
					<td>&nbsp;&nbsp;&nbsp;</td>
					<td style="font-weight: bold" style="text-align: center">Remove</td>
					<td style="font-weight: bold">Tag</td>
					<td style="font-weight: bold">Uses</td>
				</tr>
<?
$i = 0;
$DB->query("SELECT ID, Name, Uses FROM tags WHERE TagType='genre' ORDER BY Name ASC");
$TagCount = $DB->record_count();
$Tags = $DB->to_array();
for ($i = 0; $i < $TagCount / 3; $i++) {
	list($TagID1, $TagName1, $TagUses1) = $Tags[$i];
	list($TagID2, $TagName2, $TagUses2) = $Tags[ceil($TagCount/3) + $i];
	list($TagID3, $TagName3, $TagUses3) = $Tags[2*ceil($TagCount/3) + $i];
?>
				<tr class="<?=(($i % 2)?'rowa':'rowb')?>">
					<td style="text-align: center"><input type="checkbox" name="oldtags[]" value="<?=$TagID1?>" /></td>
					<td><?=$TagName1?></td>
					<td style="text-align: center"><?=$TagUses1?></td>
					<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
					<td style="text-align: center">
<?		if ($TagID2) { ?>
						<input type="checkbox" name="oldtags[]" value="<?=$TagID2?>" />
<?		} ?>
					</td>
					<td><?=$TagName2?></td>
					<td style="text-align: center"><?=$TagUses2?></td>
					<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
					<td style="text-align: center">
<?		if ($TagID3) { ?>
						<input type="checkbox" name="oldtags[]" value="<?=$TagID3?>" />
<?		} ?>
					</td>
					<td><?=$TagName3?></td>
					<td style="text-align: center"><?=$TagUses3?></td>
				</tr>
<?
}
?>
				<tr class="<?=(($i % 2)?'rowa':'rowb')?>">
					<td colspan="11"><label for="newtag">New official tag: </label><input type="text" name="newtag" /></td>
				</tr>
				<tr style="border-top: thin solid">
					<td colspan="11" style="text-align: center"><input type="submit" value="Submit Changes" /></td>
				</tr>

			</table>
		</form>
	</div>
</div>
<?
show_footer();
?>
diff --git a/sections/tools/managers/permissions_list.php b/sections/tools/managers/permissions_list.php
index 73522386..96c838bf 100644
--- a/sections/tools/managers/permissions_list.php
+++ b/sections/tools/managers/permissions_list.php
@@ -12,9 +12,11 @@ function confirmDelete(id) {
 //]]>
 </script>
 <div class="thin">
-	<div class="linkbox">
-		[<a href="tools.php?action=permissions&amp;id=new">Create a new permission set</a>]
-		[<a href="tools.php">Back to Tools</a>]
+	<div class="header">
+		<div class="linkbox">
+			[<a href="tools.php?action=permissions&amp;id=new">Create a new permission set</a>]
+			[<a href="tools.php">Back to Tools</a>]
+		</div>
 	</div>
 <?
 $DB->query("SELECT p.ID,p.Name,p.Level,p.Secondary,COUNT(u.ID)+COUNT(DISTINCT l.UserID) 
diff --git a/sections/tools/managers/tag_aliases.php b/sections/tools/managers/tag_aliases.php
index 24f317a7..8a557e31 100644
--- a/sections/tools/managers/tag_aliases.php
+++ b/sections/tools/managers/tag_aliases.php
@@ -27,13 +27,13 @@
     }
 }
 ?>
-
-<div class="linkbox">
-        [<a href="tools.php?action=tag_aliases&order=goodtags">Sort by Good Tags</a>]
-        [<a href="tools.php?action=tag_aliases&order=badtags">Sort by Bad Tags</a>]
+<div class="header">
+	<h2>Tag Aliases</h2>
+	<div class="linkbox">
+	        [<a href="tools.php?action=tag_aliases&order=goodtags">Sort by Good Tags</a>]
+	        [<a href="tools.php?action=tag_aliases&order=badtags">Sort by Bad Tags</a>]
     </div>
-
-<h2>Tag Aliases</h2>
+</div>
 <table width="100%">
 	<tr class="colhead">
 		<td>Tag</td>
diff --git a/sections/tools/managers/tokens.php b/sections/tools/managers/tokens.php
index 51a56747..2fe32e86 100644
--- a/sections/tools/managers/tokens.php
+++ b/sections/tools/managers/tokens.php
@@ -49,9 +49,12 @@
 	show_header('Add tokens sitewide');
 
 ?>
-<h2>Add freeleech tokens to all enabled users</h2>
-
-<div class="linkbox"><a href="tools.php?action=tokens&showabusers=1">[Show Abusers]</a></div>
+<div class="header">
+	<h2>Add freeleech tokens to all enabled users</h2>
+	<div class="linkbox">
+		<a href="tools.php?action=tokens&showabusers=1">[Show Abusers]</a>
+	</div>
+</div>
 <div class="box pad" style="margin-left: auto; margin-right: auto; text-align:center; max-width: 40%">
 	<?=$message?>
 	<form action="" method="post">
diff --git a/sections/tools/managers/whitelist_list.php b/sections/tools/managers/whitelist_list.php
index 5df89725..2ca0f94b 100644
--- a/sections/tools/managers/whitelist_list.php
+++ b/sections/tools/managers/whitelist_list.php
@@ -4,7 +4,9 @@
 show_header('Whitelist Management');
 $DB->query('SELECT id, vstring, peer_id FROM xbt_client_whitelist ORDER BY peer_id ASC');
 ?>
-<h2>Allowed Clients</h2>
+<div class="header">
+	<h2>Allowed Clients</h2>
+</div>
 <table width="100%">
 	<tr class="colhead">
 		<td>Client</td>
diff --git a/sections/tools/misc/analysis.php b/sections/tools/misc/analysis.php
index 02167a9b..204c5d3d 100644
--- a/sections/tools/misc/analysis.php
+++ b/sections/tools/misc/analysis.php
@@ -5,7 +5,9 @@
 
 show_header('Case Analysis');
 ?>
-<h2>Case Analysis (<a href="<?=display_str($Analysis['url'])?>"><?=$_GET['case']?></a>)</h2>
+<div class="header">
+	<h2>Case Analysis (<a href="<?=display_str($Analysis['url'])?>"><?=$_GET['case']?></a>)</h2>
+</div>
 <pre id="#debug_report"><?=display_str($Analysis['message'])?></pre>
 <?
 $Debug->flag_table($Analysis['flags']);
diff --git a/sections/tools/misc/clear_cache.php b/sections/tools/misc/clear_cache.php
index 8a63eabf..755e97bc 100644
--- a/sections/tools/misc/clear_cache.php
+++ b/sections/tools/misc/clear_cache.php
@@ -18,8 +18,9 @@
 	}
 }
 ?>
-	<h2>Clear a cache key</h2>
-	
+	<div class="header">
+		<h2>Clear a cache key</h2>
+	</div>
 	<form method="get" action="" name="clear_cache">
 		<input type="hidden" name="action" value="clear_cache" />
 		<table cellpadding="2" cellspacing="1" border="0" align="center">
diff --git a/sections/tools/misc/countries.php b/sections/tools/misc/countries.php
index a48ed69e..ed87875e 100644
--- a/sections/tools/misc/countries.php
+++ b/sections/tools/misc/countries.php
@@ -24,8 +24,9 @@
 }
 ?>
 
-
-<h2>IRC highlight on (fishy) invites sent to countries</h2>
+<div class="header">
+	<h2>IRC highlight on (fishy) invites sent to countries</h2>
+</div>
 <table width="100%">
 	<tr class="colhead">
 		<td>Country</td>
diff --git a/sections/tools/misc/create_user.php b/sections/tools/misc/create_user.php
index b9dfb7ee..2fe577c0 100644
--- a/sections/tools/misc/create_user.php
+++ b/sections/tools/misc/create_user.php
@@ -74,7 +74,9 @@
 } else {
 
 	?>
-	<h2>Create a User</h2>
+	<div class="header">
+		<h2>Create a User</h2>
+	</div>
 	
 	<form method="post" action="" name="create_user">
 		<input type="hidden" name="action" value="create_user" />
diff --git a/sections/top10/history.php b/sections/top10/history.php
index ecd4a20e..69668d92 100644
--- a/sections/top10/history.php
+++ b/sections/top10/history.php
@@ -4,14 +4,15 @@
 show_header('Top 10 Torrents history!');
 ?>
 <div class="thin">
-	<h2> Top 10 Torrents </h2>
-	<div class="linkbox">
-		<a href="top10.php?type=torrents"><strong>[Torrents]</strong></a>
-		<a href="top10.php?type=users">[Users]</a>
-		<a href="top10.php?type=tags">[Tags]</a>
-		<a href="top10.php?type=history">[History]</a>
+	<div class="header">
+		<h2>Top 10 Torrents</h2>
+		<div class="linkbox">
+			<a href="top10.php?type=torrents"><strong>[Torrents]</strong></a>
+			<a href="top10.php?type=users">[Users]</a>
+			<a href="top10.php?type=tags">[Tags]</a>
+			<a href="top10.php?type=history">[History]</a>
+		</div>
 	</div>
-
 	<div class="pad box">
 		<form method="get" action="">
 			<input type="hidden" name="type" value="history" />
diff --git a/sections/top10/tags.php b/sections/top10/tags.php
index 7780fbcf..fa0382d8 100644
--- a/sections/top10/tags.php
+++ b/sections/top10/tags.php
@@ -13,11 +13,13 @@
 show_header('Top 10 Tags');
 ?>
 <div class="thin">
-	<h2> Top 10 Tags </h2>
-	<div class="linkbox">
-		<a href="top10.php?type=torrents">[Torrents]</a>
-		<a href="top10.php?type=users">[Users]</a>
-		<a href="top10.php?type=tags"><strong>[Tags]</strong></a>
+	<div class="header">
+		<h2>Top 10 Tags</h2>
+		<div class="linkbox">
+			<a href="top10.php?type=torrents">[Torrents]</a>
+			<a href="top10.php?type=users">[Users]</a>
+			<a href="top10.php?type=tags"><strong>[Tags]</strong></a>
+		</div>
 	</div>
 
 <?
diff --git a/sections/top10/torrents.php b/sections/top10/torrents.php
index 35f4bd78..952eddcf 100644
--- a/sections/top10/torrents.php
+++ b/sections/top10/torrents.php
@@ -41,11 +41,13 @@
 show_header('Top '.$Limit.' Torrents');
 ?>
 <div class="thin">
-	<h2> Top <?=$Limit?> Torrents </h2>
-	<div class="linkbox">
-		<a href="top10.php?type=torrents"><strong>[Torrents]</strong></a>
-		<a href="top10.php?type=users">[Users]</a>
-		<a href="top10.php?type=tags">[Tags]</a>
+	<div class="header">
+		<h2>Top <?=$Limit?> Torrents</h2>
+		<div class="linkbox">
+			<a href="top10.php?type=torrents"><strong>[Torrents]</strong></a>
+			<a href="top10.php?type=users">[Users]</a>
+			<a href="top10.php?type=tags">[Tags]</a>
+		</div>
 	</div>
 <?
 
diff --git a/sections/top10/users.php b/sections/top10/users.php
index 023f23bd..32a44432 100644
--- a/sections/top10/users.php
+++ b/sections/top10/users.php
@@ -13,13 +13,14 @@
 show_header('Top 10 Users');
 ?>
 <div class="thin">
-	<h2> Top 10 Users </h2>
-	<div class="linkbox">
-		<a href="top10.php?type=torrents">[Torrents]</a>
-		<a href="top10.php?type=users"><strong>[Users]</strong></a>
-		<a href="top10.php?type=tags">[Tags]</a>
+	<div class="header">
+		<h2>Top 10 Users</h2>
+		<div class="linkbox">
+			<a href="top10.php?type=torrents">[Torrents]</a>
+			<a href="top10.php?type=users"><strong>[Users]</strong></a>
+			<a href="top10.php?type=tags">[Tags]</a>
+		</div>
 	</div>
-
 <?
 
 // defaults to 10 (duh)
diff --git a/sections/torrents/details.php b/sections/torrents/details.php
index c5c694c0..d36aa0a0 100644
--- a/sections/torrents/details.php
+++ b/sections/torrents/details.php
@@ -90,30 +90,31 @@ function compare($X, $Y){
 show_header($Title,'browse,comments,torrent,bbcode');
 ?>
 <div class="thin">
-	<h2><?=$DisplayName?></h2>
-	<div class="linkbox">
+	<div class="header">
+		<h2><?=$DisplayName?></h2>
+		<div class="linkbox">
 <?	if(check_perms('site_edit_wiki')) { ?>
-		<a href="torrents.php?action=editgroup&amp;groupid=<?=$GroupID?>">[Edit description]</a>
+			<a href="torrents.php?action=editgroup&amp;groupid=<?=$GroupID?>">[Edit description]</a>
 <?	} ?>
-		<a href="torrents.php?action=history&amp;groupid=<?=$GroupID?>">[View history]</a>
+			<a href="torrents.php?action=history&amp;groupid=<?=$GroupID?>">[View history]</a>
 <?	if($RevisionID && check_perms('site_edit_wiki')) { ?>
-		<a href="/torrents.php?action=revert&amp;groupid=<?=$GroupID ?>&amp;revisionid=<?=$RevisionID ?>&amp;auth=<?=$LoggedUser['AuthKey']?>">[Revert to this revision]</a>
+			<a href="/torrents.php?action=revert&amp;groupid=<?=$GroupID ?>&amp;revisionid=<?=$RevisionID ?>&amp;auth=<?=$LoggedUser['AuthKey']?>">[Revert to this revision]</a>
 <?	}
 	if(has_bookmarked('torrent', $GroupID)) {
 ?>
-		<a href="#" id="bookmarklink_torrent_<?=$GroupID?>" onclick="Unbookmark('torrent', <?=$GroupID?>,'[Bookmark]');return false;">[Remove bookmark]</a>
+			<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?>" onclick="Bookmark('torrent', <?=$GroupID?>,'[Remove bookmark]');return false;">[Bookmark]</a>
 <?	}
 	if($Categories[$GroupCategoryID-1] == 'Music') { ?>
-		<a href="upload.php?groupid=<?=$GroupID?>">[Add format]</a>
+			<a href="upload.php?groupid=<?=$GroupID?>">[Add format]</a>
 <?	} 
 	if(check_perms('site_submit_requests')) { ?>
-		<a href="requests.php?action=new&amp;groupid=<?=$GroupID?>">[Request format]</a>
+			<a href="requests.php?action=new&amp;groupid=<?=$GroupID?>">[Request format]</a>
 <?	}?>
-	<a href="torrents.php?action=grouplog&amp;groupid=<?=$GroupID?>">[View log]</a>
+			<a href="torrents.php?action=grouplog&amp;groupid=<?=$GroupID?>">[View log]</a>
+		</div>
 	</div>
-
 	<div class="sidebar">
 		<div class="box box_image box_image_albumart box_albumart"><!-- .box_albumart deprecated -->
 			<div class="head"><strong>Cover</strong></div>
diff --git a/sections/torrents/editgroup.php b/sections/torrents/editgroup.php
index 12dded09..43b87f0d 100644
--- a/sections/torrents/editgroup.php
+++ b/sections/torrents/editgroup.php
@@ -42,7 +42,9 @@
 // Start printing form
 ?>
 <div class="thin">
-	<h2>Edit <a href="torrents.php?id=<?=$GroupID?>"><?=$Name?></a></h2>
+	<div class="header">
+		<h2>Edit <a href="torrents.php?id=<?=$GroupID?>"><?=$Name?></a></h2>
+	</div>
 	<div class="box pad">
 		<form action="torrents.php" method="post">
 			<div>
@@ -77,7 +79,7 @@
 <?	$DB->query("SELECT UserID FROM torrents WHERE GroupID = ".$GroupID);
 	//Users can edit the group info if they've uploaded a torrent to the group or have torrents_edit
 	if(in_array($LoggedUser['ID'], $DB->collect('UserID')) || check_perms('torrents_edit')) { ?> 
-	<h2>Non-wiki group editing</h2>
+	<h3>Non-wiki group editing</h3>
 	<div class="box pad">
 		<form action="torrents.php" method="post">
 			<input type="hidden" name="action" value="nonwikiedit" />
@@ -130,7 +132,7 @@
 	}
 	if(check_perms('torrents_edit')) { 
 ?> 
-	<h2>Rename (won't merge)</h2>
+	<h3>Rename (won't merge)</h3>
 	<div class="box pad">
 		<form action="torrents.php" method="post">
 			<div>
@@ -145,7 +147,7 @@
 			</div>
 		</form>
 	</div>
-	<h2>Merge with another group</h2>
+	<h3>Merge with another group</h3>
 	<div class="box pad">
 		<form action="torrents.php" method="post">
 			<div>
diff --git a/sections/torrents/editgroupid.php b/sections/torrents/editgroupid.php
index 0ba7d7b2..bca0aef0 100644
--- a/sections/torrents/editgroupid.php
+++ b/sections/torrents/editgroupid.php
@@ -40,22 +40,24 @@
 	show_header();
 ?>
 	<div class="thin">
-	<h2>Change Group Confirm!</h2>
-	<div class="box pad">
-		<form action="torrents.php" method="post">
-			<input type="hidden" name="action" value="editgroupid" />
-			<input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
-			<input type="hidden" name="confirm" value="true" />
-			<input type="hidden" name="torrentid" value="<?=$TorrentID?>" />
-			<input type="hidden" name="oldgroupid" value="<?=$OldGroupID?>" />
-			<input type="hidden" name="groupid" value="<?=$GroupID?>" />
-			<h2>You are attempting to move the torrent with ID <?=$TorrentID?> from the group:</h2>
-			<ul><li><?= display_artists($Artists[$OldGroupID], true, false)?> - <a href="torrents.php?id=<?=$OldGroupID?>"><?=$Name?></a></li></ul>
-			<h2>Into the group:</h2>
-			<ul><li><?= display_artists($Artists[$GroupID], true, false)?> - <a href="torrents.php?id=<?=$GroupID?>"><?=$NewName?></a></li></ul>
-			<input type="submit" value="Confirm" />
-		</form>
-	</div>
+		<div class="header">
+			<h2>Change Group Confirm!</h2>
+		</div>
+		<div class="box pad">
+			<form action="torrents.php" method="post">
+				<input type="hidden" name="action" value="editgroupid" />
+				<input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
+				<input type="hidden" name="confirm" value="true" />
+				<input type="hidden" name="torrentid" value="<?=$TorrentID?>" />
+				<input type="hidden" name="oldgroupid" value="<?=$OldGroupID?>" />
+				<input type="hidden" name="groupid" value="<?=$GroupID?>" />
+				<h3>You are attempting to move the torrent with ID <?=$TorrentID?> from the group:</h3>
+				<ul><li><?= display_artists($Artists[$OldGroupID], true, false)?> - <a href="torrents.php?id=<?=$OldGroupID?>"><?=$Name?></a></li></ul>
+				<h3>Into the group:</h3>
+				<ul><li><?= display_artists($Artists[$GroupID], true, false)?> - <a href="torrents.php?id=<?=$GroupID?>"><?=$NewName?></a></li></ul>
+				<input type="submit" value="Confirm" />
+			</form>
+		</div>
 	</div>
 <?
 	show_footer();
diff --git a/sections/torrents/grouplog.php b/sections/torrents/grouplog.php
index 6ba9ab98..b19ec6cb 100644
--- a/sections/torrents/grouplog.php
+++ b/sections/torrents/grouplog.php
@@ -14,8 +14,9 @@
 ?>
 
 <div class="thin">
-	<h2>History for <?=$Title?></h2>
-
+	<div class="header">
+		<h2>History for <?=$Title?></h2>
+	</div>
 	<table>
 		<tr class="colhead">
 			<td>Date</td>
diff --git a/sections/torrents/history.php b/sections/torrents/history.php
index 84d9e129..a98a4c92 100644
--- a/sections/torrents/history.php
+++ b/sections/torrents/history.php
@@ -31,7 +31,9 @@
 // Start printing form
 ?>
 <div class="thin">
-	<h2>Revision history for <a href="torrents.php?id=<?=$GroupID?>"><?=$Name?></a></h2>
+	<div class="header">
+		<h2>Revision history for <a href="torrents.php?id=<?=$GroupID?>"><?=$Name?></a></h2>
+	</div>
 <?
 $Wiki->revision_history(); // the wiki class takes over from here
 ?>
diff --git a/sections/torrents/masspm.php b/sections/torrents/masspm.php
index 1d6238d9..33ac4189 100644
--- a/sections/torrents/masspm.php
+++ b/sections/torrents/masspm.php
@@ -40,7 +40,9 @@
 
 ?>
 <div class="thin">
-	<h2>Send PM To All Snatchers Of "<?=$Properties['ArtistName']?> - <?=$Properties['Title']?>"</h2>
+	<div class="header">
+		<h2>Send PM To All Snatchers Of "<?=$Properties['ArtistName']?> - <?=$Properties['Title']?>"</h2>
+	</div>
 	<form action="torrents.php" method="post">
 		<input type="hidden" name="action" value="takemasspm" />
 		<input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
diff --git a/sections/torrents/merge.php b/sections/torrents/merge.php
index 759942da..07b928bc 100644
--- a/sections/torrents/merge.php
+++ b/sections/torrents/merge.php
@@ -29,7 +29,9 @@
 	show_header();
 ?>
 	<div class="center thin">
-	<h2>Merge Confirm!</h2>
+	<div class="header">
+		<h2>Merge Confirm!</h2>
+	</div>
 	<div class="box pad">
 		<form action="torrents.php" method="post">
 			<input type="hidden" name="action" value="merge" />
@@ -37,9 +39,9 @@
 			<input type="hidden" name="confirm" value="true" />
 			<input type="hidden" name="groupid" value="<?=$GroupID?>" />
 			<input type="hidden" name="targetgroupid" value="<?=$NewGroupID?>" />
-			<h2>You are attempting to merge the group:</h2>
+			<h3>You are attempting to merge the group:</h3>
 			<ul><li><?= display_artists($Artists[$GroupID], true, false)?> - <a href="torrents.php?id=<?=$GroupID?>"><?=$Name?></a></li></ul>
-			<h2>Into the group:</h2>
+			<h3>Into the group:</h3>
 			<ul><li><?= display_artists($Artists[$NewGroupID], true, false)?> - <a href="torrents.php?id=<?=$NewGroupID?>"><?=$NewName?></a></li></ul>
 			<input type="submit" value="Confirm" />
 		</form>
diff --git a/sections/torrents/notify.php b/sections/torrents/notify.php
index 2fbbab74..0cdebab0 100644
--- a/sections/torrents/notify.php
+++ b/sections/torrents/notify.php
@@ -46,7 +46,9 @@
 show_header('My notifications', 'notifications');
 $DB->set_query_id($Results);
 ?>
-<h2>Latest notifications <a href="torrents.php?action=notify_clear&amp;auth=<?=$LoggedUser['AuthKey']?>">(clear all)</a> <a href="javascript:SuperGroupClear()">(clear selected)</a> <a href="user.php?action=notify">(edit filters)</a></h2>
+<div class="header">
+	<h2>Latest notifications <a href="torrents.php?action=notify_clear&amp;auth=<?=$LoggedUser['AuthKey']?>">(clear all)</a> <a href="javascript:SuperGroupClear()">(clear selected)</a> <a href="user.php?action=notify">(edit filters)</a></h2>
+</div>
 <div class="linkbox">
 	<?=$Pages?>
 </div>
diff --git a/sections/torrents/reseed.php b/sections/torrents/reseed.php
index ef148ed4..4cdabb40 100644
--- a/sections/torrents/reseed.php
+++ b/sections/torrents/reseed.php
@@ -62,7 +62,9 @@
 show_header();
 ?>
 <div class="thin">
-	<h2>Successfully sent re-seed request</h2>
+	<div class="header">
+		<h2>Successfully sent re-seed request</h2>
+	</div>
 	<p>Successfully sent re-seed request for torrent <a href="torrents.php?id=<?=$GroupID?>&amp;torrentid=<?=$TorrentID?>"><?=display_str($Name)?></a> to <?=$NumUsers?> user(s).</p>
 </div>
 <?show_footer();?>
diff --git a/sections/torrents/user.php b/sections/torrents/user.php
index 3c3e9c08..8776acd2 100644
--- a/sections/torrents/user.php
+++ b/sections/torrents/user.php
@@ -271,8 +271,9 @@ function header_link($SortKey,$DefaultWay="DESC") {
 
 ?>
 <div class="thin">
-	<h2><a href="user.php?id=<?=$UserID?>"><?=$User['Username']?></a><?='\'s '.$Action.' torrents'?></h2>
-	
+	<div class="header">
+		<h2><a href="user.php?id=<?=$UserID?>"><?=$User['Username']?></a><?='\'s '.$Action.' torrents'?></h2>
+	</div>
 	<div>
 		<form action="" method="get">
 			<table>
diff --git a/sections/user/connchecker.php b/sections/user/connchecker.php
index 62b93e77..527eb07e 100644
--- a/sections/user/connchecker.php
+++ b/sections/user/connchecker.php
@@ -35,7 +35,9 @@
 show_header('Connectability Checker');
 ?>
 <div class="thin">
-	<h2><a href="user.php?id=<?=$LoggedUser['ID']?>"><?=$LoggedUser['Username']?></a> &gt; Connectability Checker</h2>
+	<div class="header">
+		<h2><a href="user.php?id=<?=$LoggedUser['ID']?>"><?=$LoggedUser['Username']?></a> &gt; Connectability Checker</h2>
+	</div>
 	<form action="javascript:check_ip();" method="get">
 		<table>
 			<tr>
diff --git a/sections/user/edit.php b/sections/user/edit.php
index 7b4235bf..fa1dbc49 100644
--- a/sections/user/edit.php
+++ b/sections/user/edit.php
@@ -65,7 +65,9 @@ function checked($Checked) {
 echo $Val->GenerateJS('userform');
 ?>
 <div class="thin">
-	<h2><?=format_username($UserID, false, false, false)?> &gt; Settings</h2>
+	<div class="header">
+		<h2><?=format_username($UserID, false, false, false)?> &gt; Settings</h2>
+	</div>
 	<form id="userform" name="userform" action="" method="post" onsubmit="return formVal();" autocomplete="off">
 		<div>
 			<input type="hidden" name="action" value="takeedit" />
diff --git a/sections/user/invite.php b/sections/user/invite.php
index dc5def4b..4c225863 100644
--- a/sections/user/invite.php
+++ b/sections/user/invite.php
@@ -88,9 +88,11 @@
 show_header('Invites');
 ?>
 <div class="thin">
-	<h2><?=format_username($UserID, false, false, false)?> &gt; Invites</h2>
-	<div class="linkbox">
-		[<a href="user.php?action=invitetree<? if($Sneaky){ echo '&amp;userid='.$UserID; }?>">Invite tree</a>]
+	<div class="header">
+		<h2><?=format_username($UserID, false, false, false)?> &gt; Invites</h2>
+		<div class="linkbox">
+			[<a href="user.php?action=invitetree<? if($Sneaky){ echo '&amp;userid='.$UserID; }?>">Invite tree</a>]
+		</div>
 	</div>
 <? if ($UserCount >= USER_LIMIT && !check_perms('site_can_invite_always')) { ?>
 	<div class="box pad notice">
diff --git a/sections/user/invitetree.php b/sections/user/invitetree.php
index fffc0773..4f68b84f 100644
--- a/sections/user/invitetree.php
+++ b/sections/user/invitetree.php
@@ -23,7 +23,9 @@
 show_header($Username.' &gt; Invites &gt; Tree');
 ?>
 <div class="thin">
-	<h2><?=format_username($UserID, false, false, false)?> &gt; <a href="user.php?action=invite&amp;userid=<?=$UserID?>">Invites</a> &gt; Tree</h2>
+	<div class="header">
+		<h2><?=format_username($UserID, false, false, false)?> &gt; <a href="user.php?action=invite&amp;userid=<?=$UserID?>">Invites</a> &gt; Tree</h2>
+	</div>
 	<div class="box pad">
 <?	$Tree->make_tree(); ?>
 	</div>
diff --git a/sections/user/notify_edit.php b/sections/user/notify_edit.php
index 0731c1b7..e7d38972 100644
--- a/sections/user/notify_edit.php
+++ b/sections/user/notify_edit.php
@@ -3,7 +3,9 @@
 show_header('Manage notifications');
 ?>
 <div class="thin">
-	<h2>Notify me of all new torrents with...<a href="torrents.php?action=notify">(View)</a></h2>
+	<div class="header">
+		<h2>Notify me of all new torrents with...<a href="torrents.php?action=notify">(View)</a></h2>
+	</div>
 <?
 $DB->query("SELECT ID, Label, Artists, ExcludeVA, NewGroupsOnly, Tags, NotTags, ReleaseTypes, Categories, Formats, Encodings, Media, FromYear, ToYear FROM users_notify_filters WHERE UserID='$LoggedUser[ID]' UNION ALL SELECT NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL");
 $i = 0;
diff --git a/sections/user/permissions.php b/sections/user/permissions.php
index ab4ef7f9..b30668b0 100644
--- a/sections/user/permissions.php
+++ b/sections/user/permissions.php
@@ -64,9 +64,11 @@ function reset() {
 	}
 }
 </script>
-<h2><?=format_username($UserID, false, false, false)?> > Permissions</h2>
-<div class="linkbox">
-	[<a href="#" onclick="reset();return false;">Defaults</a>]
+<div class="header">
+	<h2><?=format_username($UserID, false, false, false)?> > Permissions</h2>
+	<div class="linkbox">
+		[<a href="#" onclick="reset();return false;">Defaults</a>]
+	</div>
 </div>
 <div class="box pad">
 	Before using permissions, please understand that it allows you to both add and remove access to specific features. If you think that to add access to a feature, you need to uncheck everything else, <strong>YOU ARE WRONG</strong>. The checkmarks on the left, which are grayed out, are the standard permissions granted by their class (and donor/artist status), any changes you make to the right side will overwrite this. It's not complicated, and if you screw up, click the defaults link at the top. It will reset the user to their respective features granted by class, then you can check or uncheck the one or two things you want to change. <strong>DO NOT UNCHECK EVERYTHING.</strong> If you need further clarification, ask A9 before using this tool.
diff --git a/sections/user/search.php b/sections/user/search.php
index 63d4af87..c2fa2c98 100644
--- a/sections/user/search.php
+++ b/sections/user/search.php
@@ -40,7 +40,9 @@
 show_header('User search');
 ?>
 <div class="thin">
-	<h3>Search results</h3>
+	<div class="header">
+		<h3>Search results</h3>
+	</div>
 	<div class="linkbox">
 <?
 $Pages=get_pages($Page,$NumResults,USERS_PER_PAGE,9);
diff --git a/sections/userhistory/email_history.php b/sections/userhistory/email_history.php
index 55588e7d..c0bfe943 100644
--- a/sections/userhistory/email_history.php
+++ b/sections/userhistory/email_history.php
@@ -68,7 +68,9 @@
 }
 $History = $DB->to_array();
 ?>
-<h2>Email history for <a href="user.php?id=<?=$UserID ?>"><?=$Username ?></a></h2>
+<div class="header">
+	<h2>Email history for <a href="user.php?id=<?=$UserID ?>"><?=$Username ?></a></h2>
+</div>
 <table width="100%">
 	<tr class="colhead">
 		<td>Email</td>
diff --git a/sections/userhistory/email_history2.php b/sections/userhistory/email_history2.php
index 1a680ade..d0fb8f80 100644
--- a/sections/userhistory/email_history2.php
+++ b/sections/userhistory/email_history2.php
@@ -155,11 +155,12 @@
 
 // Start page with current email
 ?>
-<h2>Email history for <a href="user.php?id=<?=$UserID ?>"><?=$Username ?></a></h2>
 <div class="thin">
-	<br />
-	<div class="center">
-		<a href="userhistory.php?action=email&userid=<?=$UserID?>"><strong>Old email history</strong></a>
+	<div class="header">
+		<h2>Email history for <a href="user.php?id=<?=$UserID ?>"><?=$Username ?></a></h2>
+		<div class=" linkbox center">
+			<a href="userhistory.php?action=email&userid=<?=$UserID?>"><strong>Old email history</strong></a>
+		</div>
 	</div>
 	<br />
 	<table width="100%">
diff --git a/sections/userhistory/ip_history.php b/sections/userhistory/ip_history.php
index 99c28d8a..1a07bbb4 100644
--- a/sections/userhistory/ip_history.php
+++ b/sections/userhistory/ip_history.php
@@ -69,7 +69,6 @@ function UnBan(ip, id, elemID) {
 }
  */
 </script>
-<div class="thin">
 <?
 list($Page,$Limit) = page_limit(IPS_PER_PAGE);
 
@@ -120,7 +119,10 @@ function UnBan(ip, id, elemID) {
 $Pages=get_pages($Page,$NumResults,IPS_PER_PAGE,9);
 
 ?>
-	<h2>IP history for <a href="/user.php?id=<?=$UserID?>"><?=$Username?></a></h2>
+<div class="thin">
+	<div class="header">
+		<h2>IP history for <a href="/user.php?id=<?=$UserID?>"><?=$Username?></a></h2>
+	</div>
 	<div class="linkbox"><?=$Pages?></div>
 	<table>
 		<tr class="colhead">
diff --git a/sections/userhistory/ip_tracker_history.php b/sections/userhistory/ip_tracker_history.php
index 27a835cb..0a62e769 100644
--- a/sections/userhistory/ip_tracker_history.php
+++ b/sections/userhistory/ip_tracker_history.php
@@ -33,7 +33,6 @@ function ShowIPs(rowname) {
 	$('tr[name="'+rowname+'"]').toggle();
 }
 </script>
-<div class="thin">
 <?
 list($Page,$Limit) = page_limit(IPS_PER_PAGE);
 
@@ -46,7 +45,10 @@ function ShowIPs(rowname) {
 $Pages=get_pages($Page,$NumResults,IPS_PER_PAGE,9);
 
 ?>
-	<h2>Tracker IP history for <a href="/user.php?id=<?=$UserID?>"><?=$Username?></a></h2>
+<div class="thin">
+	<div class="header">
+		<h2>Tracker IP history for <a href="/user.php?id=<?=$UserID?>"><?=$Username?></a></h2>
+	</div>
 	<div class="linkbox"><?=$Pages?></div>
 	<table>
 		<tr class="colhead">
diff --git a/sections/userhistory/passkey_history.php b/sections/userhistory/passkey_history.php
index 5271aa47..26243a8e 100644
--- a/sections/userhistory/passkey_history.php
+++ b/sections/userhistory/passkey_history.php
@@ -32,7 +32,9 @@
 	ORDER BY ChangeTime DESC");
 
 ?>
-<h2>Passkey history for <a href="/user.php?id=<?=$UserID?>"><?=$Username?></a></h2>
+<div class="header">
+	<h2>Passkey history for <a href="/user.php?id=<?=$UserID?>"><?=$Username?></a></h2>
+</div>
 <table width="100%">
 	<tr class="colhead">
 		<td>Old</td>
diff --git a/sections/userhistory/password_history.php b/sections/userhistory/password_history.php
index 0ea70d10..c6fd3ec8 100644
--- a/sections/userhistory/password_history.php
+++ b/sections/userhistory/password_history.php
@@ -30,7 +30,9 @@
 	ORDER BY ChangeTime DESC");
 
 ?>
-<h2>Password reset history for <a href="/user.php?id=<?=$UserID?>"><?=$Username?></a></h2>
+<div class="header">
+	<h2>Password reset history for <a href="/user.php?id=<?=$UserID?>"><?=$Username?></a></h2>
+</div>
 <table width="100%">
 	<tr class="colhead">
 		<td>Changed</td>
diff --git a/sections/userhistory/post_history.php b/sections/userhistory/post_history.php
index 2a1c6bb1..0e161187 100644
--- a/sections/userhistory/post_history.php
+++ b/sections/userhistory/post_history.php
@@ -185,7 +185,8 @@
 
 ?>
 <div class="thin">
-	<h2>
+	<div class="header">
+		<h2>
 <?
 	if($ShowGrouped) {
 		echo "Grouped ".($ShowUnread?"unread ":"")."post history for <a href=\"user.php?id=$UserID\">$Username</a>";
@@ -197,9 +198,8 @@
 		echo "Post history for <a href=\"user.php?id=$UserID\">$Username</a>";
 	}
 ?>
-	</h2>
-	
-	<div class="linkbox">
+		</h2>
+		<div class="linkbox">
 <?
 if($ViewingOwn) {
 	if(($UserSubscriptions = $Cache->get_value('subscriptions_user_'.$LoggedUser['ID'])) === FALSE) {
@@ -232,8 +232,8 @@
 			<a href="userhistory.php?action=subscriptions">Go to subscriptions</a>
 <?
 }
-
 ?>
+		</div>
 	</div>
 <?
 if(empty($Results)) {
diff --git a/sections/userhistory/subscribed_collages.php b/sections/userhistory/subscribed_collages.php
index 60709451..1bba2c0b 100644
--- a/sections/userhistory/subscribed_collages.php
+++ b/sections/userhistory/subscribed_collages.php
@@ -39,9 +39,10 @@
 $CollageSubs = $DB->to_array();
 ?>
 <div class="thin">
-	<h2>Subscribed collages<?=($ShowAll?'':' with new additions')?></h2>
+	<div class="header">
+		<h2>Subscribed collages<?=($ShowAll?'':' with new additions')?></h2>
 
-	<div class="linkbox">
+		<div class="linkbox">
 <?
 if($ShowAll) {
 ?>
@@ -56,6 +57,7 @@
 }
 ?>
 			[<a href="userhistory.php?action=catchup_collages&auth=<?=$LoggedUser['AuthKey']?>">Catch up</a>]&nbsp;&nbsp;&nbsp;
+		</div>
 	</div>
 <?
 if(!$NumResults) {
diff --git a/sections/userhistory/subscriptions.php b/sections/userhistory/subscriptions.php
index b445cb2c..78f527d5 100644
--- a/sections/userhistory/subscriptions.php
+++ b/sections/userhistory/subscriptions.php
@@ -92,9 +92,10 @@
 }
 ?>
 <div class="thin">
-	<h2><?='Subscribed topics'.($ShowUnread?' with unread posts':'')?></h2>
+	<div class="header">
+		<h2><?='Subscribed topics'.($ShowUnread?' with unread posts':'')?></h2>
 
-	<div class="linkbox">
+		<div class="linkbox">
 <?
 if(!$ShowUnread) {
 ?>
@@ -115,6 +116,7 @@
 ?>
 			<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;
+		</div>
 	</div>
 <?
 if(!$NumResults) {
diff --git a/sections/userhistory/token_history.php b/sections/userhistory/token_history.php
index 139dffa1..8e1beba5 100644
--- a/sections/userhistory/token_history.php
+++ b/sections/userhistory/token_history.php
@@ -67,8 +67,9 @@
 $Pages=get_pages($Page, $NumResults, 25);
 
 ?>
-<h2>Freeleech token history for <?=format_username($UserID, true, true, true)?></h2>
-
+<div class="header">
+	<h2>Freeleech token history for <?=format_username($UserID, true, true, true)?></h2>
+</div>
 <div class="linkbox"><?=$Pages?></div>
 <table>
 	<tr class="colhead_dark">
diff --git a/sections/wiki/aliases.php b/sections/wiki/aliases.php
index 2a4dfc9b..6616e630 100644
--- a/sections/wiki/aliases.php
+++ b/sections/wiki/aliases.php
@@ -8,11 +8,13 @@
 
 show_header($Title." Aliases");
 ?>
-<h2><a href="wiki.php?action=article&id=<?=$ArticleID?>"><?=$Title?></a> Aliases</h2>
-<div class="linkbox">
-	Aliases are exact search strings or names that can be used to link to an article. [[Alias]]
-</div>
 <div class="thin">
+	<div class="header">
+		<h2><a href="wiki.php?action=article&id=<?=$ArticleID?>"><?=$Title?></a> Aliases</h2>
+		<div class="linkbox">
+			Aliases are exact search strings or names that can be used to link to an article. [[Alias]]
+		</div>
+	</div>
 	<form action="wiki.php" method="get">
 		<input type="hidden" name="action" id="action" value="compare" />
 		<input type="hidden" name="id" id="id" value="<?=$ArticleID?>" />
diff --git a/sections/wiki/article.php b/sections/wiki/article.php
index ad31577d..b738c63a 100644
--- a/sections/wiki/article.php
+++ b/sections/wiki/article.php
@@ -15,7 +15,9 @@
 	show_header('No article found');
 ?>
 <div class="thin">
-	<h2>No article found</h2>
+	<div class="header">
+		<h2>No article found</h2>
+	</div>
 	<div class="box pad" style="padding:10px 10px 10px 20px;">
 		There is no article matching the name you requested.
 		<ul>
@@ -36,8 +38,9 @@
 show_header($Title,'wiki,bbcode');
 ?>
 <div class="thin">
-	<h2><?=$Title?></h2>
-	<div class="linkbox box">
+	<div class="header">
+		<h2><?=$Title?></h2>
+		<div class="linkbox box">
 			<a href="wiki.php?action=create">[Create]</a>
 			<a href="wiki.php?action=edit&amp;id=<?=$ArticleID?>">[Contribute]</a>
 			<a href="wiki.php?action=revisions&amp;id=<?=$ArticleID?>">[History]</a>
@@ -45,8 +48,8 @@
 			<a href="wiki.php?action=delete&amp;id=<?=$ArticleID?>&amp;authkey=<?=$LoggedUser['AuthKey']?>" onclick="return confirm('Are you sure you want to delete?\nYes, DELETE, not as in \'Oh hey, if this is wrong we can get someone to magically undelete it for us later\' it will be GONE.\nGiven this new information, do you still want to DELETE this article and all its revisions and all its alias\' and act like it never existed?')">[Delete]</a>
 <? } ?>
 			<!--<a href="reports.php?action=submit&amp;type=wiki&amp;article=<?=$ArticleID ?>">[Report]</a>-->
+		</div>
 	</div>
-	<br />
 	<div class="sidebar">
 		<!--
 		<div class="box pad">
diff --git a/sections/wiki/compare.php b/sections/wiki/compare.php
index 6c582097..ad45fe19 100644
--- a/sections/wiki/compare.php
+++ b/sections/wiki/compare.php
@@ -84,7 +84,9 @@ function get_body($ID, $Rev) {
 $Diff1 = get_body($ArticleID, $_GET['old']);
 ?>
 <div class="thin">
-	<h2>Compare <a href="wiki.php?action=article&id=<?=$ArticleID?>"><?=$Title?></a> Revisions</h2>
+	<div class="header">
+		<h2>Compare <a href="wiki.php?action=article&id=<?=$ArticleID?>"><?=$Title?></a> Revisions</h2>
+	</div>
 	<div class="box center_revision" id="center">
 		<div class="body"><? foreach(diff($Diff1, $Diff2) AS $Line) { echo $Line; } ?></div>
 	</div>
diff --git a/sections/wiki/revisions.php b/sections/wiki/revisions.php
index ef961ea5..df72ce16 100644
--- a/sections/wiki/revisions.php
+++ b/sections/wiki/revisions.php
@@ -9,8 +9,10 @@
 
 show_header("Revisions of ".$Title);
 ?>
-<h2>Revision history for <a href="wiki.php?action=article&id=<?=$ArticleID?>"><?=$Title?></a></h2>
 <div class="thin">
+	<div class="header">
+		<h2>Revision history for <a href="wiki.php?action=article&id=<?=$ArticleID?>"><?=$Title?></a></h2>
+	</div>
 	<form action="wiki.php" method="get">
 		<input type="hidden" name="action" id="action" value="compare" />
 		<input type="hidden" name="id" id="id" value="<?=$ArticleID?>" />
diff --git a/sections/wiki/search.php b/sections/wiki/search.php
index 5244d4f4..d99239e3 100644
--- a/sections/wiki/search.php
+++ b/sections/wiki/search.php
@@ -54,9 +54,11 @@
 $DB->set_query_id($RS);
 ?>
 <div class="thin">
-	<h2>Search articles</h2>
-	<div class="linkbox">
-		[<a href="wiki.php?action=create&amp;alias=<?=display_str($Alias->convert($_GET['search']))?>">Create an article</a>] [<a  href="wiki.php?action=link&amp;alias=<?=display_str($Alias->convert($_GET['search']))?>">Link this search</a>]
+	<div class="header">
+		<h2>Search articles</h2>
+		<div class="linkbox">
+			[<a href="wiki.php?action=create&amp;alias=<?=display_str($Alias->convert($_GET['search']))?>">Create an article</a>] [<a  href="wiki.php?action=link&amp;alias=<?=display_str($Alias->convert($_GET['search']))?>">Link this search</a>]
+		</div>
 	</div>
 	<div>
 		<form action="" method="get">
diff --git a/sections/wiki/splash.php b/sections/wiki/splash.php
index 5f9e4b71..1ca0bd53 100644
--- a/sections/wiki/splash.php
+++ b/sections/wiki/splash.php
@@ -1,6 +1,8 @@
 <?show_header('Wiki');?>
 <div class="thin">
-<h2>Wiki</h2>
+	<div class="header">
+		<h2>Wiki</h2>
+	</div>
 	<div class="box pad center">
 		<p>Search the wiki for user created tutorials and information.</p>
 		<form action="wiki.php" method="get">
diff --git a/sections/wiki/wiki_browse.php b/sections/wiki/wiki_browse.php
index f71fecff..3a55369d 100644
--- a/sections/wiki/wiki_browse.php
+++ b/sections/wiki/wiki_browse.php
@@ -23,7 +23,9 @@
 ?>
 <div class="thin">
 <? if($Letter) { ?>
-	<h2>Browse articles (<?=$Letter?>)</h2>
+	<div class="header">
+		<h2>Browse articles (<?=$Letter?>)</h2>
+	</div>
 	<table width="100%" style="margin-bottom:10px;">
 		<tr class="colhead">
 			<td>Article</td>