diff --git a/phpBB/styles/subSilver/template/confirm_body.html b/phpBB/styles/subSilver/template/confirm_body.html
index 0f6b1f6042..885645fc5e 100644
--- a/phpBB/styles/subSilver/template/confirm_body.html
+++ b/phpBB/styles/subSilver/template/confirm_body.html
@@ -1,18 +1,30 @@
 <!-- INCLUDE overall_header.html -->
 
-<form action="{S_CONFIRM_ACTION}" method="post"><table width="95%" cellspacing="2" cellpadding="2" border="0" align="center">
+<!-- $Id$ -->
+
+<table class="tablebg" width="100%" cellspacing="1">
 	<tr>
-		<td class="nav" align="left"><a href="{U_INDEX}">{L_INDEX}</a></td>
+		<td class="row1"><div class="nav" style="float:left"><a href="{U_INDEX}">{L_INDEX}</a></div><div class="gensmall" style="float:right">{S_TIMEZONE}</div></td>
 	</tr>
 </table>
 
-<table class="tablebg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center">
+<br clear="all" />
+
+<form action="{S_CONFIRM_ACTION}" method="post"><table class="tablebg" width="100%" cellspacing="1">
 	<tr>
-		<th height="28" valign="middle">{MESSAGE_TITLE}</th>
+		<th>{MESSAGE_TITLE}</th>
 	</tr>
 	<tr>
 		<td class="row1" align="center"><span class="gen"><br /><br />{MESSAGE_TEXT}<br /><br />{S_HIDDEN_FIELDS}<input type="submit" name="confirm" value="{L_YES}" class="btnmain" />&nbsp;&nbsp;<input type="submit" name="cancel" value="{L_NO}" class="btnlite" /></span></td>
 	</tr>
 </table></form>
 
+<br clear="all" />
+
+<table class="tablebg" width="100%" cellspacing="1">
+	<tr>
+		<td class="row1"><div class="nav" style="float:left"><a href="{U_INDEX}">{L_INDEX}</a></div><div class="gensmall" style="float:right">{S_TIMEZONE}</div></td>
+	</tr>
+</table>
+
 <!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/phpBB/styles/subSilver/template/faq_body.html b/phpBB/styles/subSilver/template/faq_body.html
index 7c997e90ca..5f1f1abc74 100644
--- a/phpBB/styles/subSilver/template/faq_body.html
+++ b/phpBB/styles/subSilver/template/faq_body.html
@@ -1,14 +1,18 @@
 <!-- INCLUDE overall_header.html -->
 
-<table width="95%" cellspacing="2" cellpadding="2" border="0" align="center">
+<!-- $Id$ -->
+
+<table class="tablebg" width="100%" cellspacing="1">
 	<tr>
-		<td align="left" class="nav"><a href="{U_INDEX}">{L_INDEX}</a></td>
+		<td class="row1"><div class="nav" style="float:left"><a href="{U_INDEX}">{L_INDEX}</a></div><div class="gensmall" style="float:right">{S_TIMEZONE}</div></td>
 	</tr>
 </table>
 
-<table class="tablebg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center">
+<br clear="all" />
+
+<table class="tablebg" width="100%" cellspacing="1">
 	<tr>
-		<th height="28">{L_FAQ_TITLE}</th>
+		<th>{L_FAQ_TITLE}</th>
 	</tr>
 	<tr>
 		<td class="row1">
@@ -22,24 +26,27 @@
 		</td>
 	</tr>
 	<tr>
-		<td class="cat" height="28">&nbsp;</td>
+		<td class="cat">&nbsp;</td>
 	</tr>
 </table>
 
 <br clear="all" />
 
 <!-- BEGIN faq_block -->
-<table class="tablebg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center">
+<table class="tablebg" width="100%" cellspacing="1">
 	<tr> 
-		<td class="cat" height="28" align="center"><span class="cattitle">{faq_block.BLOCK_TITLE}</span></td>
+		<td class="cat" align="center"><span class="cattitle">{faq_block.BLOCK_TITLE}</span></td>
 	</tr>
-	<!-- BEGIN faq_row -->  
+	<!-- BEGIN faq_row --> 
+	<tr>
+	
 	<!-- IF faq_block.faq_row.S_ROW_COUNT is even -->
-	<tr class="row1">
+		<td class="row1" valign="top">
 	<!-- ELSE -->
-	<tr class="row2">
+		<td class="row2" valign="top">
 	<!-- ENDIF -->
-		<td align="left" valign="top"><span class="postbody"><a name="{faq_block.faq_row.U_FAQ_ID}"></a><b>{faq_block.faq_row.FAQ_QUESTION}</b></span><br /><span class="postbody">{faq_block.faq_row.FAQ_ANSWER}<br /><a class="postlink" href="#Top">{L_BACK_TO_TOP}</a></span></td>
+			<span class="postbody"><a name="{faq_block.faq_row.U_FAQ_ID}"></a><b>{faq_block.faq_row.FAQ_QUESTION}</b><br />{faq_block.faq_row.FAQ_ANSWER}<br /><a class="postlink" href="#Top">{L_BACK_TO_TOP}</a></span>
+		</td>
 	</tr>
 	<tr>
 		<td class="spacer" height="1"><img src="images/spacer.gif" alt="" width="1" height="1" /></td>
@@ -50,10 +57,14 @@
 <br clear="all" />
 <!-- END faq_block -->
 
-<table width="95%" cellspacing="2" border="0" align="center">
+<table class="tablebg" width="100%" cellspacing="1">
 	<tr>
-		<td align="right" valign="middle" nowrap="nowrap"><span class="gensmall">{S_TIMEZONE}</span><br /><br /><!-- INCLUDE jumpbox.html --></td> 
+		<td class="row1"><div class="nav" style="float:left"><a href="{U_INDEX}">{L_INDEX}</a></div><div class="gensmall" style="float:right">{S_TIMEZONE}</div></td>
 	</tr>
 </table>
 
+<br clear="all" />
+
+<div style="float:right"><!-- INCLUDE jumpbox.html --></div>
+
 <!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/phpBB/styles/subSilver/template/index_body.html b/phpBB/styles/subSilver/template/index_body.html
index d07d15f598..96188033bb 100644
--- a/phpBB/styles/subSilver/template/index_body.html
+++ b/phpBB/styles/subSilver/template/index_body.html
@@ -1,5 +1,7 @@
 <!-- INCLUDE overall_header.html -->
 
+<!-- $Id$ -->
+
 <table class="tablebg" width="100%" cellspacing="1">
 	<tr>
 		<td class="row1"><div class="nav" style="float:left"><a href="{U_INDEX}">{L_INDEX}</a></div><div class="gensmall" style="float:right">{S_TIMEZONE}</div></td>
diff --git a/phpBB/styles/subSilver/template/login_body.html b/phpBB/styles/subSilver/template/login_body.html
index c421d60b45..835a2d164f 100644
--- a/phpBB/styles/subSilver/template/login_body.html
+++ b/phpBB/styles/subSilver/template/login_body.html
@@ -2,28 +2,39 @@
 
 <!-- $Id$ -->
 
-<form action="{S_LOGIN_ACTION}" method="post"><table width="50%" cellspacing="1">
-	<tr> 
-		<td align="left"><a class="nav" href="{U_INDEX}">{L_INDEX}</a></td>
+<form action="{S_LOGIN_ACTION}" method="post">
+
+<table class="tablebg" width="100%" cellspacing="1" align="center">
+	<tr>
+		<td class="row1"><div class="nav" style="float:left"><a href="{U_INDEX}">{L_INDEX}</a></div><div class="gensmall" style="float:right">{S_TIMEZONE}</div></td>
 	</tr>
 </table>
 
-<table class="tablebg" width="50%" cellspacing="1">
+<br clear="all" />
+
+<table class="tablebg" width="100%" cellspacing="1">
 	<tr> 
-		<th>{L_LOGIN}</th>
+		<th colspan="2">{L_LOGIN}</th>
 	</tr>
 	<!-- IF LOGIN_EXPLAIN -->
 	<tr>
-		<td class="row3" align="center"><span class="gensmall">{LOGIN_EXPLAIN}</td>
+		<td class="row3" colspan="2" align="center"><span class="gensmall">{LOGIN_EXPLAIN}</td>
 	</tr>
 	<!-- ENDIF -->
 	<tr> 
-		<td class="row1"><table cellspacing="1" cellpadding="2">
+		<td class="row1" width="50%">
+			<p class="genmed">{L_LOGIN_INFO}</p>
+
+			<p class="genmed" align="center"><a href="{U_TERMS_USE}">{L_TERMS_USE}</a> | <a href="{U_PRIVACY}">{L_PRIVACY}</a></p>
+		</td>
+		<td class="row2"><table cellspacing="1" cellpadding="4">
+
 			<!-- IF LOGIN_ERROR -->
 			<tr>
 				<td class="gensmall" colspan="2" align="center"><span class="error">{LOGIN_ERROR}</span></td>
 			</tr>
 			<!-- ENDIF -->
+
 			<tr> 
 				<td><b class="gensmall">{L_USERNAME}:</b></td>
 				<td><input class="post" type="text" name="username" size="25" maxlength="40" value="{USERNAME}" tabindex="1" /><br /><a class="gensmall" href="{U_REGISTER}">{L_REGISTER}</a></td>
@@ -40,9 +51,6 @@
 				<td>&nbsp;</td>
 				<td><input type="checkbox" name="viewonline" tabindex="5" /> <span class="gensmall">{L_HIDE_ME}</span></td>
 			</tr>
-			<tr>
-				<td class="gensmall" colspan="2" align="center"><a href="{U_TERMS_USE}">{L_TERMS_USE}</a> | <a href="{U_PRIVACY}">{L_PRIVACY}</a></td>
-			</tr>
 		</table></td>
 	</tr>
 	<tr> 
@@ -50,4 +58,12 @@
 	</tr>
 </table></form>
 
+<br clear="all" />
+
+<table class="tablebg" width="100%" cellspacing="1" align="center">
+	<tr>
+		<td class="row1"><div class="nav" style="float:left"><a href="{U_INDEX}">{L_INDEX}</a></div><div class="gensmall" style="float:right">{S_TIMEZONE}</div></td>
+	</tr>
+</table>
+
 <!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/phpBB/styles/subSilver/template/login_forum.html b/phpBB/styles/subSilver/template/login_forum.html
index 6d706336ef..03379ffc27 100644
--- a/phpBB/styles/subSilver/template/login_forum.html
+++ b/phpBB/styles/subSilver/template/login_forum.html
@@ -1,35 +1,50 @@
-<!-- $Id$ -->
 <!-- INCLUDE overall_header.html -->
 
-<form action="{S_LOGIN_ACTION}" method="post"><table width="45%" cellspacing="2" cellpadding="2" border="0" align="center">
-	<tr> 
-		<td align="left"><a class="nav" href="{U_INDEX}">{L_INDEX}</a></td>
+<!-- $Id$ -->
+
+<form action="{S_LOGIN_ACTION}" method="post">
+
+<table class="tablebg" width="100%" cellspacing="1" align="center">
+	<tr>
+		<td class="row1"><div class="nav" style="float:left"><a href="{U_INDEX}">{L_INDEX}</a></div><div class="gensmall" style="float:right">{S_TIMEZONE}</div></td>
 	</tr>
 </table>
 
-<table class="tablebg" width="45%" cellspacing="1" cellpadding="4" border="0" align="center">
+<br clear="all" />
+
+<table class="tablebg" width="100%" cellspacing="1" align="center">
 	<tr> 
-		<th height="28">{L_LOGIN}</th>
+		<th>{L_LOGIN}</th>
 	</tr>
 	<tr>
 		<td class="row3" align="center"><span class="gensmall">{L_LOGIN_FORUM}</td>
 	</tr>
 	<tr> 
-		<td class="row1" align="center"><table cellspacing="1" cellpadding="2" border="0">
-			<!-- IF LOGIN_ERROR neq '' -->
+		<td class="row1" align="center"><table cellspacing="1" cellpadding="4" border="0">
+
+			<!-- IF LOGIN_ERROR -->
 			<tr>
-				<td class="gensmall" colspan="2" align="center"><span style="color:red">{LOGIN_ERROR}</span></td>
+				<td class="gensmall" colspan="2" align="center"><span class="error">{LOGIN_ERROR}</span></td>
 			</tr>
 			<!-- ENDIF -->
+
 			<tr> 
-				<td><b class="gensmall">{L_PASSWORD}:</b></td>
+				<td class="gensmall"><b>{L_PASSWORD}:</b></td>
 				<td><input class="post" type="password" name="password" size="25" maxlength="25" tabindex="2" /></td>
 			</tr>
 		</table></td>
 	</tr>
 	<tr> 
-		<td class="cat" colspan="2" height="28" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="login" class="btnmain" value="{L_LOGIN}" tabindex="3" /></td>
+		<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="login" class="btnmain" value="{L_LOGIN}" tabindex="3" /></td>
 	</tr>
 </table></form>
 
+<br clear="all" />
+
+<table class="tablebg" width="100%" cellspacing="1" align="center">
+	<tr>
+		<td class="row1"><div class="nav" style="float:left"><a href="{U_INDEX}">{L_INDEX}</a></div><div class="gensmall" style="float:right">{S_TIMEZONE}</div></td>
+	</tr>
+</table>
+
 <!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/phpBB/styles/subSilver/template/overall_header.html b/phpBB/styles/subSilver/template/overall_header.html
index fd2cc24b7b..812dfd593d 100644
--- a/phpBB/styles/subSilver/template/overall_header.html
+++ b/phpBB/styles/subSilver/template/overall_header.html
@@ -78,3 +78,5 @@ function jumpto()
 <div id="maintable">
 
 <div class="gensmall" style="float: left; padding-bottom: 4px;"><a href="{U_SEARCH_UNANSWERED}">{L_SEARCH_UNANSWERED}</a></div><div class="gensmall" style="float: right; padding-bottom: 4px;"><!-- IF S_USER_LOGGED_IN --><a href="{U_SEARCH_NEW}">{L_SEARCH_NEW}</a> | <a href="{U_SEARCH_SELF}">{L_SEARCH_SELF}</a><!-- ENDIF --></div>
+
+<br clear="all" />
diff --git a/phpBB/styles/subSilver/template/search_body.html b/phpBB/styles/subSilver/template/search_body.html
index 441ec21eb0..548b4a65aa 100644
--- a/phpBB/styles/subSilver/template/search_body.html
+++ b/phpBB/styles/subSilver/template/search_body.html
@@ -1,5 +1,7 @@
 <!-- INCLUDE overall_header.html -->
 
+<!-- $Id$ -->
+
 <table class="tablebg" width="100%" cellspacing="1">
 	<tr>
 		<td class="row1"><div class="nav" style="float:left"><a href="{U_INDEX}">{L_INDEX}</a></div><div class="gensmall" style="float:right">{S_TIMEZONE}</div></td>
@@ -62,12 +64,12 @@
 	<!-- ELSE -->
 	<tr class="row1">
 	<!-- ENDIF -->
-		<td class="gen" width="70%"><a href="{recentsearch.U_KEYWORDS}">{recentsearch.KEYWORDS}</a></td>
-		<td class="gen" width="30%"align="center">{recentsearch.TIME}</td>
+		<td class="gen" style="padding: 4px;" width="70%"><a href="{recentsearch.U_KEYWORDS}">{recentsearch.KEYWORDS}</a></td>
+		<td class="gen" style="padding: 4px;" width="30%" align="center">{recentsearch.TIME}</td>
 	</tr>
 	<!-- BEGINELSE -->
-	<tr class="row1">
-		<td class="genmed" colspan="2" align="center">{L_NO_RECENT_SEARCHES}</td>
+	<tr>
+		<td class="row1" colspan="2" align="center"><span class="genmed">{L_NO_RECENT_SEARCHES}</span></td>
 	</tr>
 	<!-- END recentsearch -->
 </table>
diff --git a/phpBB/styles/subSilver/template/search_results_posts.html b/phpBB/styles/subSilver/template/search_results_posts.html
index 3db556dd41..3bd6c71469 100644
--- a/phpBB/styles/subSilver/template/search_results_posts.html
+++ b/phpBB/styles/subSilver/template/search_results_posts.html
@@ -1,8 +1,20 @@
 <!-- INCLUDE overall_header.html -->
 
-<form method="post" action="{S_SEARCH_ACTION}"><table width="95%" cellspacing="2" cellpadding="2" border="0" align="center">
+<!-- $Id$ -->
+
+<form method="post" action="{S_SEARCH_ACTION}">
+
+<table class="tablebg" width="100%" cellspacing="1">
 	<tr>
-		<td colspan="2" align="left"><span class="titles">{SEARCH_MATCHES}</span><br /></td>
+		<td class="row1"><div class="nav" style="float:left"><a href="{U_INDEX}">{L_INDEX}</a></div><div class="gensmall" style="float:right">{S_TIMEZONE}</div></td>
+	</tr>
+</table>
+
+<br clear="all" />
+
+<table width="100%" cellspacing="1">
+	<tr>
+		<td colspan="2"><span class="titles">{SEARCH_MATCHES}</span><br /></td>
 	</tr>
 	<tr>
 		<td class="genmed">{L_SEARCHED_FOR} <a href="{U_SEARCH_WORDS}"><b>{SEARCH_WORDS}</b></a> {L_IGNORED_TERMS} <b>{IGNORED_WORDS}</b></td>
@@ -10,13 +22,9 @@
 	</tr>
 </table>
 
-<table width="95%" cellspacing="2" cellpadding="2" border="0" align="center">
-	<tr>
-		<td class="nav" align="left"><a href="{U_INDEX}">{L_INDEX}</a></td>
-	</tr>
-</table>
+<br clear="all" />
 
-<table class="tablebg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center">
+<table class="tablebg" width="100%" cellspacing="1">
 	<tr>
 		<th width="150" nowrap="nowrap">{L_AUTHOR}</th>
 		<th width="100%" nowrap="nowrap">{L_MESSAGE}</th>
@@ -26,27 +34,22 @@
 	<!-- IF searchresults.S_IGNORE_POST -->
 		<td class="gensmall" colspan="2" height="25" align="center">{searchresults.L_IGNORE_POST}</td>
 	<!-- ELSE -->
-		<td colspan="2"><a name="{searchresults.POST_ID}"></a><span class="topictitle">{L_TOPIC}: <a href="{searchresults.U_VIEW_TOPIC}">{searchresults.TOPIC_TITLE}</a> in forum: <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a></span></td>
+		<td class="topictitle" colspan="2" height="25"><a name="{searchresults.POST_ID}"></a>&nbsp;{L_FORUM}: <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a><span> &nbsp; {L_TOPIC}: <a href="{searchresults.U_VIEW_TOPIC}">{searchresults.TOPIC_TITLE}</a></td>
 	</tr>
 	<tr class="row1">
 		<td width="150" align="center" valign="middle"><b class="postauthor">{searchresults.POSTER_NAME}</b></td>
-		<td><table width="100%" cellspacing="0" cellpadding="0" border="0">
+		<td height="25"><table width="100%" cellspacing="0" cellpadding="0" border="0">
 			<tr>
-				<td valign="middle">{searchresults.POST_ICON_IMG}</td>
-				<td>&nbsp;</td>
-				<td class="postdetails" width="100%" valign="middle">{L_SUBJECT}: <b><a href="{searchresults.U_VIEW_POST}">{searchresults.POST_SUBJECT}</a></b></td>
+				<td class="gensmall"><div style="float:left">&nbsp;<b>{L_POST_SUBJECT}:</b> {searchresults.POST_SUBJECT}</div><div style="float:right"><a href="{postrow.U_MINI_POST}">{searchresults.MINI_POST_IMG}</a><b>{L_POSTED}:</b> {searchresults.POST_DATE}&nbsp;</div></td>
 			</tr>
 		</table></td>
 	</tr>
 	<tr class="row1">
-		<td width="150" align="center" valign="top"><br /><span class="postdetails">{L_REPLIES}: <b>{searchresults.TOPIC_REPLIES}</b><br />{L_VIEWS}: <b>{searchresults.TOPIC_VIEWS}</b></span><br /></td>
-		<td valign="top"><table width="100%" cellspacing="2" cellpadding="2" border="0">
+		<td width="150" align="center" valign="top"><br /><span class="postdetails">{L_REPLIES}: <b>{searchresults.TOPIC_REPLIES}</b><br />{L_VIEWS}: <b>{searchresults.TOPIC_VIEWS}</b></span><br /><br /></td>
+		<td valign="top"><table width="100%" cellspacing="5">
 			<tr>
 				<td class="postbody">{searchresults.MESSAGE}</td>
 			</tr>
-			<tr>
-				<td class="postdetails" align="right">{searchresults.MINI_POST_IMG}{L_POSTED}: {searchresults.POST_DATE}</td>
-			</tr>
 		</table></td>
 	</tr>
 	<!-- ENDIF -->
@@ -55,27 +58,22 @@
 	</tr>
 	<!-- END searchresults -->
 	<tr>
-		<td class="cat" colspan="2" valign="middle" align="center"><span class="gensmall">{L_SORT_BY}:</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<input class="btnlite" type="submit" name="sort" value="{L_GO}" /></td>
+		<td class="cat" colspan="2" align="center"><span class="gensmall">{L_SORT_BY}:</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<input class="btnlite" type="submit" name="sort" value="{L_GO}" /></td>
+	</tr>
+</table></form>
+
+<div class="nav" style="float:left">{PAGE_NUMBER}&nbsp;[ {TOTAL_TOPICS} ]</div><div class="nav" style="float:right">{PAGINATION}</div>
+
+<br clear="all" /><br />
+
+<table class="tablebg" width="100%" cellspacing="1">
+	<tr>
+		<td class="row1"><div class="nav" style="float:left"><a href="{U_INDEX}">{L_INDEX}</a></div><div class="gensmall" style="float:right">{S_TIMEZONE}</div></td>
 	</tr>
 </table>
 
-<table width="95%" cellspacing="2" border="0" align="center" cellpadding="2">
-	<tr>
-		<td class="nav">{PAGE_NUMBER}</td>
-		<td class="gensmall" align="right">{S_TIMEZONE}</td>
-	</tr>
-	<tr>
-		<td>&nbsp;</td>
-		<td class="nav" align="right" valign="bottom" nowrap="nowrap">{PAGINATION}</td>
-	</tr>
-</table>
+<br clear="all" />
 
-</form>
-
-<table width="95%" cellspacing="2" border="0" align="center">
-	<tr>
-		<td valign="top" align="right"><!-- INCLUDE jumpbox.html --></td>
-	</tr>
-</table>
+<div style="float:right"><!-- INCLUDE jumpbox.html --></div>
 
 <!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/phpBB/styles/subSilver/template/search_results_topics.html b/phpBB/styles/subSilver/template/search_results_topics.html
index 59035ca38b..61c53d0c3e 100644
--- a/phpBB/styles/subSilver/template/search_results_topics.html
+++ b/phpBB/styles/subSilver/template/search_results_topics.html
@@ -1,8 +1,20 @@
 <!-- INCLUDE overall_header.html -->
 
-<form method="post" action="{S_SEARCH_ACTION}"><table width="95%" cellspacing="2" cellpadding="2" border="0" align="center">
+<!-- $Id$ -->
+
+<form method="post" action="{S_SEARCH_ACTION}">
+
+<table class="tablebg" width="100%" cellspacing="1">
 	<tr>
-		<td colspan="2" align="left"><span class="titles">{SEARCH_MATCHES}</span><br /></td>
+		<td class="row1"><div class="nav" style="float:left"><a href="{U_INDEX}">{L_INDEX}</a></div><div class="gensmall" style="float:right">{S_TIMEZONE}</div></td>
+	</tr>
+</table>
+
+<br clear="all" />
+
+<table width="100%" cellspacing="1">
+	<tr>
+		<td colspan="2"><span class="titles">{SEARCH_MATCHES}</span><br /></td>
 	</tr>
 	<tr>
 		<td class="genmed">{L_SEARCHED_FOR} <a href="{U_SEARCH_WORDS}"><b>{SEARCH_WORDS}</b></a> {L_IGNORED_TERMS} <b>{IGNORED_WORDS}</b></td>
@@ -10,13 +22,9 @@
 	</tr>
 </table>
 
-<table width="95%" cellspacing="2" cellpadding="2" border="0" align="center">
-	<tr>
-		<td class="nav" align="left"><a href="{U_INDEX}">{L_INDEX}</a></td>
-	</tr>
-</table>
+<br clear="all" />
 
-<table width="95%" cellpadding="4" cellspacing="1" border="0" class="tablebg" align="center">
+<table class="tablebg" width="100%" cellspacing="1">
 	<tr>
 		<th width="4%" nowrap="nowrap">&nbsp;</th>
 		<th colspan="2" nowrap="nowrap">&nbsp;{L_TOPICS}&nbsp;</th>
@@ -39,25 +47,20 @@
 	<tr>
 		<td class="cat" colspan="7" valign="middle" align="center"><span class="gensmall">{L_SORT_BY}:</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<input class="btnlite" type="submit" name="sort" value="{L_GO}" /></td>
 	</tr>
-</table>
+</table></form>
 
-<table width="95%" cellspacing="2" border="0" align="center" cellpadding="2">
+<div class="nav" style="float:left">{PAGE_NUMBER}&nbsp;[ {TOTAL_TOPICS} ]</div><div class="nav" style="float:right">{PAGINATION}</div>
+
+<br clear="all" /><br />
+
+<table class="tablebg" width="100%" cellspacing="1">
 	<tr>
-		<td class="nav">{PAGE_NUMBER}</td>
-		<td class="gensmall" align="right">{S_TIMEZONE}</td>
-	</tr>
-	<tr>
-		<td>&nbsp;</td>
-		<td class="nav" align="right" valign="bottom" nowrap="nowrap">{PAGINATION}</td>
+		<td class="row1"><div class="nav" style="float:left"><a href="{U_INDEX}">{L_INDEX}</a></div><div class="gensmall" style="float:right">{S_TIMEZONE}</div></td>
 	</tr>
 </table>
 
-</form>
+<br clear="all" />
 
-<table width="95%" cellspacing="2" border="0" align="center">
-	<tr>
-		<td valign="top" align="right"><!-- INCLUDE jumpbox.html --></td>
-	</tr>
-</table>
+<div style="float:right"><!-- INCLUDE jumpbox.html --></div>
 
 <!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/phpBB/styles/subSilver/template/viewforum_body.html b/phpBB/styles/subSilver/template/viewforum_body.html
index c247b3e2a0..e6950fb01a 100644
--- a/phpBB/styles/subSilver/template/viewforum_body.html
+++ b/phpBB/styles/subSilver/template/viewforum_body.html
@@ -1,15 +1,18 @@
 <!-- INCLUDE overall_header.html -->
 
+<!-- $Id$ -->
+
 <table class="tablebg" width="100%" cellspacing="1">
 	<tr>
 		<td class="row1"><div class="nav" style="float:left"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> &#187; <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></div><div class="gensmall" style="float:right">{S_TIMEZONE}</div></td>
 	</tr>
-	<!-- IF RULES_LINK -->
+	<!-- IF U_FORUM_RULES -->
 	<tr>
-		<td class="row2"><span class="nav"><a href="">Forum Rules</a></span></td>
+		<td class="row2"><span><a class="nav" href="{U_FORUM_RULES}">{L_FORUM_RULES}</a></td>
 	</tr>
 	<!-- ELSEIF RULES_TEXT -->
 	<tr>
+		<td class="row2"><span class="nav">{L_FORUM_RULES}</span></td>
 	</tr>
 	<!-- ENDIF -->
 </table>
diff --git a/phpBB/styles/subSilver/template/viewtopic_body.html b/phpBB/styles/subSilver/template/viewtopic_body.html
index 7fc7a3a60b..9dd4f82771 100644
--- a/phpBB/styles/subSilver/template/viewtopic_body.html
+++ b/phpBB/styles/subSilver/template/viewtopic_body.html
@@ -6,12 +6,13 @@
 	<tr>
 		<td class="row1"><div class="nav" style="float:left"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> &#187; <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></div><div class="gensmall" style="float:right">{S_TIMEZONE}</div></td>
 	</tr>
-	<!-- IF RULES_LINK -->
+	<!-- IF U_FORUM_RULES -->
 	<tr>
-		<td class="row2"><span class="nav">&bull; <a href="{U_FORUM_RULES}">{L_FORUM_RULES}</a></span></td>
+		<td class="row2"><a class="nav" href="{U_FORUM_RULES}">{L_FORUM_RULES}</a></td>
 	</tr>
 	<!-- ELSEIF RULES_TEXT -->
 	<tr>
+		<td class="row2"><span class="nav">{L_FORUM_RULES}</span></td>
 	</tr>
 	<!-- ENDIF -->
 </table>
@@ -99,7 +100,7 @@
 	</tr>
 	<!-- ENDIF -->
 	<tr>
-		<th width="150" height="28" nowrap="nowrap">{L_AUTHOR}</th>
+		<th width="150" nowrap="nowrap">{L_AUTHOR}</th>
 		<th nowrap="nowrap">{L_MESSAGE}</th>
 	</tr>
 
@@ -251,17 +252,8 @@
 	<tr>
 		<td class="row1"><div class="nav" style="float:left"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> &#187; <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></div><div class="gensmall" style="float:right">{S_TIMEZONE}</div></td>
 	</tr>
-	<!-- IF RULES_LINK -->
-	<tr>
-		<td class="row2"><span class="nav">&bull; <a href="{U_FORUM_RULES}">{L_FORUM_RULES}</a></span></td>
-	</tr>
-	<!-- ELSEIF RULES_TEXT -->
-	<tr>
-	</tr>
-	<!-- ENDIF -->
 </table>
 
-
 <!-- IF S_DISPLAY_ONLINE_LIST -->
 <br clear="all" />