diff --git a/phpBB/styles/subSilver/template/ucp_footer.html b/phpBB/styles/subSilver/template/ucp_footer.html
index 6f9a92d9ff..dd24cabc3a 100644
--- a/phpBB/styles/subSilver/template/ucp_footer.html
+++ b/phpBB/styles/subSilver/template/ucp_footer.html
@@ -1,14 +1,16 @@
 
-</form>
-
-<table width="100%" cellspacing="2" border="0" align="center">
-	<tr>
-		<td align="right" valign="middle" nowrap="nowrap"><span class="gensmall">{S_TIMEZONE}</span><!-- IF S_JUMPBOX --><br /><br /><!-- INCLUDE jumpbox.html --><!-- ENDIF --></td> 
-	</tr>
-</table>
-
 		</td>
 	</tr>
 </table>
 
+<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>
+
+<div align="right"><!-- INCLUDE jumpbox.html --></div>
+
 <!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/phpBB/styles/subSilver/template/ucp_header.html b/phpBB/styles/subSilver/template/ucp_header.html
index cda7cd0f2f..489b19deff 100644
--- a/phpBB/styles/subSilver/template/ucp_header.html
+++ b/phpBB/styles/subSilver/template/ucp_header.html
@@ -1,128 +1,78 @@
-<!-- $Id$ -->
 <!-- INCLUDE overall_header.html -->
 
-<script language="javascript" type="text/javascript">
-<!--
+<!-- $Id$ -->
 
-var form_name = 'ucp';
-var text_name = 'signature';
-
-// Define the bbCode tags
-bbcode = new Array();
-bbtags = new Array('[b]','[/b]','[i]','[/i]','[u]','[/u]','[quote]','[/quote]','[code]','[/code]','[list]','[/list]','[list=]','[/list]','[img]','[/img]','[url]','[/url]');
-imageTag = false;
-
-// Helpline messages
-b_help = "{L_BBCODE_B_HELP}";
-i_help = "{L_BBCODE_I_HELP}";
-u_help = "{L_BBCODE_U_HELP}";
-q_help = "{L_BBCODE_Q_HELP}";
-c_help = "{L_BBCODE_C_HELP}";
-l_help = "{L_BBCODE_L_HELP}";
-o_help = "{L_BBCODE_O_HELP}";
-p_help = "{L_BBCODE_P_HELP}";
-w_help = "{L_BBCODE_W_HELP}";
-a_help = "{L_BBCODE_A_HELP}";
-s_help = "{L_BBCODE_S_HELP}";
-f_help = "{L_BBCODE_F_HELP}";
-e_help = "{L_BBCODE_E_HELP}";
-
-function marklist(form_name, status)
-{
-	for (i = 0; i < document.forms[form_name].length; i++)
-	{
-		document.forms[form_name].elements[i].checked = status;
-	}
-}
-
-//-->
-</script>
-<script language="javascript" type="text/javascript" src="{T_TEMPLATE_PATH}/editor.js"></script>
-
-<form method="post" name="ucp" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}><table width="95%" cellspacing="0" cellpadding="0" border="0" align="center">
+<table class="tablebg" width="100%" cellspacing="1">
 	<tr>
-		<td class="nav" colspan="2" align="left" valign="middle">&nbsp;<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 width="95%" cellspacing="0" cellpadding="2" border="0" align="center">
+<br clear="all" />
+
+
+<table width="100%" cellspacing="0" cellpadding="0" border="0">
 	<tr>
-		<td>
+		<td width="20%" valign="top">
 
-<table width="20%" cellspacing="0" cellpadding="0" border="0" align="left">
+<table class="tablebg" width="100%" cellspacing="1">
 	<tr>
-		<td>
+		<th>{L_OPTIONS}</th>
+	</tr>
+	<!-- BEGIN ucp_section -->
+	<tr>
+		<!-- IF ucp_section.S_SELECTED -->
+		<td class="row1"><b class="nav">{ucp_section.L_TITLE}</b>
 
-			<table class="tablebg" width="100%" cellspacing="1" cellpadding="4" border="0">
-				<tr>
-					<th>{L_OPTIONS}</th>
-				</tr>
-				<!-- BEGIN ucp_section -->
-				<tr>
-					<!-- IF ucp_section.S_SELECTED -->
-					<td class="row1" height="28"><b class="nav">{ucp_section.L_TITLE}</b>
-						<table width="100%" cellspacing="0" cellpadding="0" border="0">
-						<!-- BEGIN ucp_subsection -->
-							<tr>
-								<td class="nav">&#187;&nbsp;</td>
-								<td class="nav" width="100%" height="20"><!-- IF ucp_section.ucp_subsection.S_SELECTED --><b>{ucp_section.ucp_subsection.L_TITLE}</b><!-- ELSE --><a href="{ucp_section.ucp_subsection.U_TITLE}">{ucp_section.ucp_subsection.L_TITLE}</a><!-- ENDIF --></td>
-							</tr>
-						<!-- END ucp_subsection -->
-						</table>
-					<!-- ELSE -->
-					<td class="row2" height="25" nowrap="nowrap" onmouseover="this.className='row1'" onmouseout="this.className='row2'" onclick="location.href='{ucp_section.U_TITLE}'"><a class="nav" href="{ucp_section.U_TITLE}">{ucp_section.L_TITLE}</a>
-					<!-- ENDIF -->
-					</td>
-				</tr>
-				<!-- END ucp_section -->
-			</table>
+			<ul class="nav" style="margin: 0px; padding: 0px; list-style-type: none; line-height: 175%;">
+			<!-- BEGIN ucp_subsection -->
+			<li>&#187; <!-- IF ucp_section.ucp_subsection.S_SELECTED --><b>{ucp_section.ucp_subsection.L_TITLE}</b><!-- ELSE --><a href="{ucp_section.ucp_subsection.U_TITLE}">{ucp_section.ucp_subsection.L_TITLE}</a><!-- ENDIF --></li>
+			<!-- END ucp_subsection -->
+			</ul>
 
-			<table cellspacing="0" cellpadding="0" border="0">
-				<tr>
-					<td><img src="images/spacer.gif" height="2" alt="" /></td>
-				</tr>
-			</table>
+		<!-- ELSE -->
+		<td class="row2" nowrap="nowrap" onmouseover="this.className='row1'" onmouseout="this.className='row2'" onclick="location.href='{ucp_section.U_TITLE}'"><a class="nav" href="{ucp_section.U_TITLE}">{ucp_section.L_TITLE}</a>
+		<!-- ENDIF -->
+		</td>
+	</tr>
+	<!-- END ucp_section -->
+</table>
 
-			<table class="tablebg" width="100%" cellspacing="1" cellpadding="4" border="0">
-				<tr>
-					<th>{L_FRIENDS}</th>
-				</tr>
-				<tr>
-					<td class="row1"><table width="100%" cellspacing="1" cellpadding="0" border="0">
-						<tr>
-							<td class="genmed" height="20" align="center"><b style="color:green">{L_FRIENDS_ONLINE}</td>
-						</tr>
-						<!-- BEGIN friends_online -->
-						<tr>
-							<td class="gensmall" align="center"><a href="{friends_online.U_PROFILE}">{friends_online.USERNAME}</a></td>
-						</tr>
-						<!-- BEGINELSE -->
-						<tr>
-							<td class="genmed" align="center">{L_NO_FRIENDS_ONLINE}</td>
-						</tr>
-						<!-- END friends_online -->
-						<tr>
-							<td class="genmed" height="20" align="center"><b style="color:red">{L_FRIENDS_OFFLINE}</td>
-						</tr>
-						<!-- BEGIN friends_offline -->
-						<tr>
-							<td class="gensmall" align="center"><a href="{friends_offline.U_PROFILE}">{friends_offline.USERNAME}</a></td>
-						</tr>
-						<!-- BEGINELSE -->
-						<tr>
-							<td class="genmed" align="center">{L_NO_FRIENDS_OFFLINE}</td>
-						</tr>
-						<!-- END friends_offline -->
-					</table></td>
-				</tr>
-			</table>
+<div style="padding: 2px;"></div>
+
+<table class="tablebg" width="100%" cellspacing="1">
+	<tr>
+		<th>{L_FRIENDS}</th>
+	</tr>
+	<tr>
+		<td class="row1" align="center">
+		
+			<b class="genmed" style="color:green">{L_FRIENDS_ONLINE}</b>
+
+			<ul class="nav" style="margin: 0px; padding: 0px; list-style-type: none; line-height: 175%;">
+			<!-- BEGIN friends_online -->
+			<li><a href="{friends_online.U_PROFILE}">{friends_online.USERNAME}</a></li>
+			<!-- BEGINELSE -->
+			<li>{L_NO_FRIENDS_ONLINE}</li>
+			<!-- END friends_online -->
+			</ul>
+
+			<hr />
+
+			<b class="genmed" style="color:red">{L_FRIENDS_OFFLINE}</b>
+
+			<ul class="nav" style="margin: 0px; padding: 0px; list-style-type: none; line-height: 175%;">
+			<!-- BEGIN friends_offline -->
+			<li><a href="{friends_online.U_PROFILE}">{friends_offline.USERNAME}</a></li>
+			<!-- BEGINELSE -->
+			<li>{L_NO_FRIENDS_OFFLINE}</li>
+			<!-- END friends_offline -->
+			</ul>
 
 		</td>
 	</tr>
 </table>
 
-<table cellspacing="0" cellpadding="0" border="0" align="left">
-	<tr>
-		<td><img src="images/spacer.gif" width="2" alt="" /></td>
-	</tr>
-</table>
+		</td>
+		<td><img src="images/spacer.gif" width="4" alt="" /></td>
+		<td width="80%" valign="top">
diff --git a/phpBB/styles/subSilver/template/ucp_main_front.html b/phpBB/styles/subSilver/template/ucp_main_front.html
index 40a9bbfc62..c4fbd4e3ba 100644
--- a/phpBB/styles/subSilver/template/ucp_main_front.html
+++ b/phpBB/styles/subSilver/template/ucp_main_front.html
@@ -1,14 +1,14 @@
 <!-- INCLUDE ucp_header.html -->
 
-<table class="tablebg" width="80%" cellspacing="1" cellpadding="4" border="0" align="right">
+<table class="tablebg" width="100%" cellspacing="1">
 	<tr>
-		<th colspan="3" height="28">{L_UCP}</th>
-	</tr>
-	<tr class="row1">
-		<td class="genmed" colspan="3" align="center">{L_UCP_WELCOME}</td>
+		<th colspan="3">{L_UCP}</th>
 	</tr>
 	<tr>
-		<th colspan="3" height="28">{L_IMPORTANT_NEWS}</th>
+		<td class="row1" colspan="3" align="center"><span class="genmed">{L_UCP_WELCOME}</span></td>
+	</tr>
+	<tr>
+		<th colspan="3">{L_IMPORTANT_NEWS}</th>
 	</tr>
 
 	<!-- BEGIN topicrow -->
@@ -19,24 +19,24 @@
 	<tr class="row2">
 	<!-- ENDIF -->
 
-		<td width="20" align="center" valign="middle">{topicrow.TOPIC_FOLDER_IMG}</td>
-		<td width="100%"><span class="topictitle">{topicrow.NEWEST_POST_IMG}{topicrow.ATTACH_ICON_IMG}{topicrow.TOPIC_TYPE}<a href="{topicrow.U_VIEW_TOPIC}">{topicrow.TOPIC_TITLE}</a></span><span class="gensmall"><br />{topicrow.GOTO_PAGE}</span></td>
+		<td style="padding: 6px;" width="20" align="center">{topicrow.TOPIC_FOLDER_IMG}</td>
+		<td style="padding: 6px;" width="100%"><span class="topictitle">{topicrow.NEWEST_POST_IMG}{topicrow.ATTACH_ICON_IMG}{topicrow.TOPIC_TYPE}<a href="{topicrow.U_VIEW_TOPIC}">{topicrow.TOPIC_TITLE}</a></span><span class="gensmall"><br />{topicrow.GOTO_PAGE}</span></td>
 		<td class="postdetails" align="center" valign="middle" nowrap="nowrap">{topicrow.LAST_POST_TIME}<br />{topicrow.LAST_POST_AUTHOR} {topicrow.LAST_POST_IMG}</td>
 	</tr>
 	<!-- END topicrow -->
 
 	<tr>
-		<th colspan="3" height="28">{L_YOUR_DETAILS}</th>
+		<th colspan="3">{L_YOUR_DETAILS}</th>
 	</tr>
-	<tr class="row1">
-		<td colspan="3"><table width="100%" cellspacing="1" cellpadding="2" border="0">
+	<tr>
+		<td class="row1" colspan="3"><table width="100%" cellspacing="1">
 			<tr> 
 				<td align="right" valign="middle" nowrap="nowrap"><b class="genmed">{L_JOINED}: </b></td>
 				<td width="100%"><b class="gen">{JOINED}</b></td>
 			</tr>
 			<tr> 
 				<td  align="right" valign="top" nowrap="nowrap"><b class="genmed">{L_TOTAL_POSTS}: </b></td>
-				<td valign="top"><!-- IF POSTS_PCT neq 0 --><b class="gen">{POSTS}</b><br /><span class="genmed">[{POSTS_PCT} / {POSTS_DAY}]<br /><a href="{U_SEARCH_USER}">{L_SEARCH_YOUR_POSTS}</a></span><!-- ELSE --><b class="gen">{POSTS}<b><!-- ENDIF --></td>
+				<td valign="top"><!-- IF POSTS_PCT --><b class="gen">{POSTS}</b><br /><span class="genmed">[{POSTS_PCT} / {POSTS_DAY}]<br /><a href="{U_SEARCH_USER}">{L_SEARCH_YOUR_POSTS}</a></span><!-- ELSE --><b class="gen">{POSTS}<b><!-- ENDIF --></td>
 			</tr>
 			<!-- IF KARMA -->
 			<tr>
@@ -53,7 +53,7 @@
 		</table></td>
 	</tr>
 	<tr>
-		<td class="cat" colspan="3" height="28">&nbsp;</td>
+		<td class="cat" colspan="3">&nbsp;</td>
 	</tr>
 </table>
 
diff --git a/phpBB/styles/subSilver/template/ucp_profile_profile_info.html b/phpBB/styles/subSilver/template/ucp_profile_profile_info.html
index 1e5d78c2ca..51c20b5868 100644
--- a/phpBB/styles/subSilver/template/ucp_profile_profile_info.html
+++ b/phpBB/styles/subSilver/template/ucp_profile_profile_info.html
@@ -1,9 +1,10 @@
-<!-- $Id$ -->
 <!-- INCLUDE ucp_header.html -->
 
-<table class="tablebg" width="80%" cellspacing="1" cellpadding="4" border="0" align="right">
+<!-- $Id$ -->
+
+<table class="tablebg" width="100%" cellspacing="1">
 	<tr>
-		<th colspan="2" height="28" valign="middle">{L_TITLE}</th>
+		<th colspan="2" valign="middle">{L_TITLE}</th>
 	</tr>
 	<!-- IF ERROR -->
 	<tr>
diff --git a/phpBB/styles/subSilver/template/ucp_profile_signature.html b/phpBB/styles/subSilver/template/ucp_profile_signature.html
index c7df47dd16..a399c61439 100644
--- a/phpBB/styles/subSilver/template/ucp_profile_signature.html
+++ b/phpBB/styles/subSilver/template/ucp_profile_signature.html
@@ -1,15 +1,56 @@
-<!-- $Id$ -->
 <!-- INCLUDE ucp_header.html -->
 
-<table class="tablebg" width="80%" cellspacing="1" cellpadding="4" border="0" align="right">
+<!-- $Id$ -->
+
+<script language="javascript" type="text/javascript">
+<!--
+
+var form_name = 'ucp';
+var text_name = 'signature';
+
+// Define the bbCode tags
+bbcode = new Array();
+bbtags = new Array('[b]','[/b]','[i]','[/i]','[u]','[/u]','[quote]','[/quote]','[code]','[/code]','[list]','[/list]','[list=]','[/list]','[img]','[/img]','[url]','[/url]');
+imageTag = false;
+
+// Helpline messages
+b_help = "{L_BBCODE_B_HELP}";
+i_help = "{L_BBCODE_I_HELP}";
+u_help = "{L_BBCODE_U_HELP}";
+q_help = "{L_BBCODE_Q_HELP}";
+c_help = "{L_BBCODE_C_HELP}";
+l_help = "{L_BBCODE_L_HELP}";
+o_help = "{L_BBCODE_O_HELP}";
+p_help = "{L_BBCODE_P_HELP}";
+w_help = "{L_BBCODE_W_HELP}";
+a_help = "{L_BBCODE_A_HELP}";
+s_help = "{L_BBCODE_S_HELP}";
+f_help = "{L_BBCODE_F_HELP}";
+e_help = "{L_BBCODE_E_HELP}";
+
+function marklist(form_name, status)
+{
+	for (i = 0; i < document.forms[form_name].length; i++)
+	{
+		document.forms[form_name].elements[i].checked = status;
+	}
+}
+
+//-->
+</script>
+<script language="javascript" type="text/javascript" src="{T_TEMPLATE_PATH}/editor.js"></script>
+
+<table class="tablebg" width="80%" cellspacing="1">
 	<tr>
-		<th colspan="2" height="28" valign="middle">{L_TITLE}</th>
+		<th colspan="2">{L_TITLE}</th>
 	</tr>
+
 	<!-- IF ERROR -->
 	<tr>
-		<td class="row3" colspan="2" align="center"><span class="gensmall" style="color:red">{ERROR}</span></td>
+		<td class="row3" colspan="2" align="center"><span class="error">{ERROR}</span></td>
 	</tr>
 	<!-- ENDIF -->
+
 	<tr> 
 		<td class="row1" width="35%"><b class="genmed">{L_SIGNATURE}: </b><br /><span class="gensmall">{L_SIGNATURE_EXPLAIN}</span></td>
 		<td class="row2"><table cellspacing="0" cellpadding="2" border="0">